[v1] vfio: improve naming conventions

[PATCH 03/27] include/hw/vfio/vfio-container.h: rename file to vfio-container-legacy.h

Posted by Mark Cave-Ayland 5 days, 1 hour ago

With the rename of VFIOContainer to VFIOLegacyContainer, the vfio-container.h
header file containing the struct definition is misleading. Rename it from
vfio-container.h to vfio-container-legacy.h accordingly.

Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
---
 hw/ppc/spapr_pci_vfio.c                                       | 2 +-
 hw/s390x/s390-pci-vfio.c                                      | 2 +-
 hw/vfio/container.c                                           | 2 +-
 hw/vfio/cpr-legacy.c                                          | 2 +-
 hw/vfio/spapr.c                                               | 2 +-
 include/hw/vfio/{vfio-container.h => vfio-container-legacy.h} | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename include/hw/vfio/{vfio-container.h => vfio-container-legacy.h} (100%)

diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c
index c8175dd8a8..a748a0bf4c 100644
--- a/hw/ppc/spapr_pci_vfio.c
+++ b/hw/ppc/spapr_pci_vfio.c
@@ -24,7 +24,7 @@
 #include "hw/pci-host/spapr.h"
 #include "hw/pci/msix.h"
 #include "hw/pci/pci_device.h"
-#include "hw/vfio/vfio-container.h"
+#include "hw/vfio/vfio-container-legacy.h"
 #include "qemu/error-report.h"
 #include CONFIG_DEVICES /* CONFIG_VFIO_PCI */
 
diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c
index 938a551171..7760780aff 100644
--- a/hw/s390x/s390-pci-vfio.c
+++ b/hw/s390x/s390-pci-vfio.c
@@ -20,7 +20,7 @@
 #include "hw/s390x/s390-pci-clp.h"
 #include "hw/s390x/s390-pci-vfio.h"
 #include "hw/vfio/pci.h"
-#include "hw/vfio/vfio-container.h"
+#include "hw/vfio/vfio-container-legacy.h"
 #include "hw/vfio/vfio-helpers.h"
 
 /*
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index dc8425efb1..c0f87f774a 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -34,7 +34,7 @@
 #include "migration/cpr.h"
 #include "migration/blocker.h"
 #include "pci.h"
-#include "hw/vfio/vfio-container.h"
+#include "hw/vfio/vfio-container-legacy.h"
 #include "vfio-helpers.h"
 #include "vfio-listener.h"
 
diff --git a/hw/vfio/cpr-legacy.c b/hw/vfio/cpr-legacy.c
index bd3f6fc3d3..bbf7a0d35f 100644
--- a/hw/vfio/cpr-legacy.c
+++ b/hw/vfio/cpr-legacy.c
@@ -7,7 +7,7 @@
 #include <sys/ioctl.h>
 #include <linux/vfio.h>
 #include "qemu/osdep.h"
-#include "hw/vfio/vfio-container.h"
+#include "hw/vfio/vfio-container-legacy.h"
 #include "hw/vfio/vfio-device.h"
 #include "hw/vfio/vfio-listener.h"
 #include "migration/blocker.h"
diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c
index 6d462aa13c..acaa9c1419 100644
--- a/hw/vfio/spapr.c
+++ b/hw/vfio/spapr.c
@@ -15,7 +15,7 @@
 #include "system/hostmem.h"
 #include "system/address-spaces.h"
 
-#include "hw/vfio/vfio-container.h"
+#include "hw/vfio/vfio-container-legacy.h"
 #include "hw/hw.h"
 #include "system/ram_addr.h"
 #include "qemu/error-report.h"
diff --git a/include/hw/vfio/vfio-container.h b/include/hw/vfio/vfio-container-legacy.h
similarity index 100%
rename from include/hw/vfio/vfio-container.h
rename to include/hw/vfio/vfio-container-legacy.h
-- 
2.43.0

Re: [PATCH 03/27] include/hw/vfio/vfio-container.h: rename file to vfio-container-legacy.h

Posted by Cédric Le Goater 4 days, 1 hour ago

On 9/23/25 15:53, Mark Cave-Ayland wrote:
> With the rename of VFIOContainer to VFIOLegacyContainer, the vfio-container.h
> header file containing the struct definition is misleading. Rename it from
> vfio-container.h to vfio-container-legacy.h accordingly.
> 
> Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.

Re: [PATCH 03/27] include/hw/vfio/vfio-container.h: rename file to vfio-container-legacy.h

Posted by Mark Cave-Ayland 3 days, 23 hours ago

On 24/09/2025 14:54, Cédric Le Goater wrote:

> On 9/23/25 15:53, Mark Cave-Ayland wrote:
>> With the rename of VFIOContainer to VFIOLegacyContainer, the vfio- 
>> container.h
>> header file containing the struct definition is misleading. Rename it 
>> from
>> vfio-container.h to vfio-container-legacy.h accordingly.
>>
>> Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
> 
> 
> Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks for the series reviews! Whilst looking at some other vfio bits 
and pieces today, I noticed that for this patch and the following one, 
the #ifdef ... #endif guard names now no longer match the name of the 
header file.

Would you like me to submit updates to these patches with the guard 
names also updated?

ATB,

Mark.

Re: [PATCH 03/27] include/hw/vfio/vfio-container.h: rename file to vfio-container-legacy.h

Posted by Cédric Le Goater 3 days, 23 hours ago

On 9/24/25 17:30, Mark Cave-Ayland wrote:
> On 24/09/2025 14:54, Cédric Le Goater wrote:
> 
>> On 9/23/25 15:53, Mark Cave-Ayland wrote:
>>> With the rename of VFIOContainer to VFIOLegacyContainer, the vfio- container.h
>>> header file containing the struct definition is misleading. Rename it from
>>> vfio-container.h to vfio-container-legacy.h accordingly.
>>>
>>> Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
>>
>>
>> Reviewed-by: Cédric Le Goater <clg@redhat.com>
> 
> Thanks for the series reviews! Whilst looking at some other vfio bits and pieces today, I noticed that for this patch and the following one, the #ifdef ... #endif guard names now no longer match the name of the header file.
> 
> Would you like me to submit updates to these patches with the guard names also updated?
> 
Sure. Please send a v2. I will queue it.


Thanks,

C.