[Qemu-devel] [RFC PATCH v0 03/15] ppc: Rename sPAPRDrcEntry.phb_buid to sPAPRDrcEntry.id

[Bharata B Rao <bharata@linux.vnet.ibm.com>]

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 <bharata@linux.vnet.ibm.com>
---
 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