From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPQC6-0003fi-1X for qemu-devel@nongnu.org; Thu, 04 Sep 2014 02:07:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPQBx-0004HH-3q for qemu-devel@nongnu.org; Thu, 04 Sep 2014 02:06:53 -0400 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:59499) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPQBv-0004GU-Vb for qemu-devel@nongnu.org; Thu, 04 Sep 2014 02:06:45 -0400 Received: from /spool/local by e28smtp05.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 4 Sep 2014 11:36:40 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 32E773940068 for ; Thu, 4 Sep 2014 11:36:34 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay03.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id s8468rCV62521364 for ; Thu, 4 Sep 2014 11:38:55 +0530 Received: from d28av01.in.ibm.com (localhost [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s8466Tb3017460 for ; Thu, 4 Sep 2014 11:36:30 +0530 From: Bharata B Rao Date: Thu, 4 Sep 2014 11:36:13 +0530 Message-Id: <1409810785-12391-4-git-send-email-bharata@linux.vnet.ibm.com> In-Reply-To: <1409810785-12391-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1409810785-12391-1-git-send-email-bharata@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC PATCH v0 03/15] ppc: Rename sPAPRDrcEntry.phb_buid to sPAPRDrcEntry.id List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, Bharata B Rao sPAPRDrcEntry.phb_buid field can be reused for CPU entries too, hence call it by a generic name. This patch doesn't change any functionality. Signed-off-by: Bharata B Rao --- hw/ppc/spapr.c | 8 ++++---- include/hw/ppc/spapr.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 071d65b..29b7de4 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -301,7 +301,7 @@ sPAPRDrcEntry *spapr_phb_to_drc_entry(uint64_t buid) int i; for (i = 0; i < SPAPR_DRC_PHB_TABLE_SIZE; i++) { - if (spapr->drc_table[i].phb_buid == buid) { + if (spapr->drc_table[i].id == buid) { return &spapr->drc_table[i]; } } @@ -351,11 +351,11 @@ sPAPRDrcEntry *spapr_add_phb_to_drc_table(uint64_t buid, uint32_t state) int i, phb_index; for (i = 0; i < SPAPR_DRC_PHB_TABLE_SIZE; i++) { - if (spapr->drc_table[i].phb_buid == 0) { + if (spapr->drc_table[i].id == 0) { empty_drc = &spapr->drc_table[i]; } - if (spapr->drc_table[i].phb_buid == buid) { + if (spapr->drc_table[i].id == buid) { found_drc = &spapr->drc_table[i]; break; } @@ -366,8 +366,8 @@ sPAPRDrcEntry *spapr_add_phb_to_drc_table(uint64_t buid, uint32_t state) } if (empty_drc) { - empty_drc->phb_buid = buid; empty_drc->state = state << INDICATOR_ENTITY_SENSE_SHIFT; + empty_drc->id = buid; empty_drc->cc_state.fdt = NULL; empty_drc->cc_state.offset = 0; empty_drc->cc_state.depth = 0; diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 9631aeb..d7f9562 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -32,7 +32,7 @@ typedef struct sPAPRDrcEntry sPAPRDrcEntry; struct sPAPRDrcEntry { uint32_t drc_index; - uint64_t phb_buid; + uint64_t id; void *fdt; int fdt_offset; uint32_t state; -- 1.7.11.7