On 7/15/25 11:26, Mark Cave-Ayland wrote:
> 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>
Thanks,
C.
> ---
> hw/vfio/cpr.c | 4 ++--
> hw/vfio/pci.c | 4 ++--
> hw/vfio/pci.h | 2 +-
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/hw/vfio/cpr.c b/hw/vfio/cpr.c
> index 3e3f4035ab..366490c908 100644
> --- a/hw/vfio/cpr.c
> +++ b/hw/vfio/cpr.c
> @@ -171,8 +171,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 fb9eb58da5..1db6be8f21 100644
> --- a/hw/vfio/pci.c
> +++ b/hw/vfio/pci.c
> @@ -2804,8 +2804,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 []) {
> diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
> index c0c3d68742..37d8b996f5 100644
> --- a/hw/vfio/pci.h
> +++ b/hw/vfio/pci.h
> @@ -131,7 +131,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(VFIOPCIDevice, VFIO_PCI_BASE)
> /* TYPE_VFIO_PCI shares struct VFIOPCIDevice. */
>
> struct VFIOPCIDevice {
> - PCIDevice pdev;
> + PCIDevice parent_obj;
>
> VFIODevice vbasedev;
> VFIOINTx intx;