From: Mark Cave-Ayland <mark.caveayland@nutanix.com>
Now that nothing accesses the pdev field directly, rename pdev to
parent_obj as per our current coding guidelines.
Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Steve Sistare <steven.sistare@oracle.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Link: https://lore.kernel.org/qemu-devel/20250715093110.107317-23-mark.caveayland@nutanix.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
hw/vfio/pci.h | 2 +-
hw/vfio/cpr.c | 4 ++--
hw/vfio/pci.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
index 2db76b6f4fb58679d65b651f0507c474e5c05857..e0aef82a8931c78a5504411a912acddda1fd6549 100644
--- a/hw/vfio/pci.h
+++ b/hw/vfio/pci.h
@@ -123,7 +123,7 @@ typedef struct VFIOMSIXInfo {
OBJECT_DECLARE_SIMPLE_TYPE(VFIOPCIDevice, VFIO_PCI_BASE)
struct VFIOPCIDevice {
- PCIDevice pdev;
+ PCIDevice parent_obj;
VFIODevice vbasedev;
VFIOINTx intx;
diff --git a/hw/vfio/cpr.c b/hw/vfio/cpr.c
index f911988adddfdc1c8e8f87d66d1647c81f633570..2c71fc1e8ef7b0765d015b0f423cb6a30f273f0f 100644
--- a/hw/vfio/cpr.c
+++ b/hw/vfio/cpr.c
@@ -173,8 +173,8 @@ const VMStateDescription vfio_cpr_pci_vmstate = {
.post_load = vfio_cpr_pci_post_load,
.needed = cpr_incoming_needed,
.fields = (VMStateField[]) {
- VMSTATE_PCI_DEVICE(pdev, VFIOPCIDevice),
- VMSTATE_MSIX_TEST(pdev, VFIOPCIDevice, pci_msix_present),
+ VMSTATE_PCI_DEVICE(parent_obj, VFIOPCIDevice),
+ VMSTATE_MSIX_TEST(parent_obj, VFIOPCIDevice, pci_msix_present),
VMSTATE_VFIO_INTX(intx, VFIOPCIDevice),
VMSTATE_END_OF_LIST()
}
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 052591d2c970a1668db390f31ea06cd90e6a420f..d14e96b2f82d78746d361fc86ccbf14f6275a8de 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -2811,8 +2811,8 @@ static const VMStateDescription vmstate_vfio_pci_config = {
.version_id = 1,
.minimum_version_id = 1,
.fields = (const VMStateField[]) {
- VMSTATE_PCI_DEVICE(pdev, VFIOPCIDevice),
- VMSTATE_MSIX_TEST(pdev, VFIOPCIDevice, vfio_msix_present),
+ VMSTATE_PCI_DEVICE(parent_obj, VFIOPCIDevice),
+ VMSTATE_MSIX_TEST(parent_obj, VFIOPCIDevice, vfio_msix_present),
VMSTATE_END_OF_LIST()
},
.subsections = (const VMStateDescription * const []) {
--
2.51.0