[03/17] ppc/pnv: rename PnvPHB3.dma_spaces to PnvPHB3.v3_dma_spaces

Commit Message

Daniel Henrique Barboza May 7, 2022, 7:06 p.m. UTC

The last common attribute that has a different meaning/semantic between
PnvPHB3 and PnvPHB4 devices is the 'dma_spaces' QLIST.

Rename the PHB3 version to 'v3_dma_spaces'. The reason why we chose that
instead of 'dma3_spaces' or similar is to avoid any misunderstanding
about this being related to DMA version 3.

Signed-off-by: Daniel Henrique Barboza <[e-mail]>
---
 hw/pci-host/pnv_phb3.c         | 10 +++++-----
 include/hw/pci-host/pnv_phb3.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

Patch

diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c
index 77ee2325be..70d92edd94 100644
--- a/hw/pci-host/pnv_phb3.c
+++ b/hw/pci-host/pnv_phb3.c
@@ -421,7 +421,7 @@  static void pnv_phb3_rtc_invalidate(PnvPHB3 *phb, uint64_t val)
     PnvPhb3DMASpace *ds;
 
     /* Always invalidate all for now ... */
-    QLIST_FOREACH(ds, &phb->dma_spaces, list) {
+    QLIST_FOREACH(ds, &phb->v3_dma_spaces, list) {
         ds->pe_num = PHB_INVALID_PE;
     }
 }
@@ -460,7 +460,7 @@  static void pnv_phb3_update_all_msi_regions(PnvPHB3 *phb)
 {
     PnvPhb3DMASpace *ds;
 
-    QLIST_FOREACH(ds, &phb->dma_spaces, list) {
+    QLIST_FOREACH(ds, &phb->v3_dma_spaces, list) {
         pnv_phb3_update_msi_regions(ds);
     }
 }
@@ -938,7 +938,7 @@  static AddressSpace *pnv_phb3_dma_iommu(PCIBus *bus, void *opaque, int devfn)
     PnvPHB3 *phb = opaque;
     PnvPhb3DMASpace *ds;
 
-    QLIST_FOREACH(ds, &phb->dma_spaces, list) {
+    QLIST_FOREACH(ds, &phb->v3_dma_spaces, list) {
         if (ds->bus == bus && ds->devfn == devfn) {
             break;
         }
@@ -961,7 +961,7 @@  static AddressSpace *pnv_phb3_dma_iommu(PCIBus *bus, void *opaque, int devfn)
                               ds, "msi64", 0x100000);
         pnv_phb3_update_msi_regions(ds);
 
-        QLIST_INSERT_HEAD(&phb->dma_spaces, ds, list);
+        QLIST_INSERT_HEAD(&phb->v3_dma_spaces, ds, list);
     }
     return &ds->dma_as;
 }
@@ -970,7 +970,7 @@  static void pnv_phb3_instance_init(Object *obj)
 {
     PnvPHB3 *phb = PNV_PHB3(obj);
 
-    QLIST_INIT(&phb->dma_spaces);
+    QLIST_INIT(&phb->v3_dma_spaces);
 
     /* LSI sources */
     object_initialize_child(obj, "lsi", &phb->lsis, TYPE_ICS);
diff --git a/include/hw/pci-host/pnv_phb3.h b/include/hw/pci-host/pnv_phb3.h
index 486dbbefee..35483e59c3 100644
--- a/include/hw/pci-host/pnv_phb3.h
+++ b/include/hw/pci-host/pnv_phb3.h
@@ -155,7 +155,7 @@  struct PnvPHB3 {
 
     PnvPBCQState pbcq;
 
-    QLIST_HEAD(, PnvPhb3DMASpace) dma_spaces;
+    QLIST_HEAD(, PnvPhb3DMASpace) v3_dma_spaces;
 
     PnvChip *chip;
 };