[v1] vfio: improve naming conventions

[PATCH 12/27] vfio/pci.c: rename vfio_instance_init() to vfio_pci_init()

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

This is the more typical naming convention for QOM init() functions, in
particular it changes the prefix to match the name of the QOM type.

Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
---
 hw/vfio/pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index d14e96b2f8..9046244e7f 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3629,7 +3629,7 @@ post_reset:
     vfio_pci_post_reset(vdev);
 }
 
-static void vfio_instance_init(Object *obj)
+static void vfio_pci_init(Object *obj)
 {
     PCIDevice *pci_dev = PCI_DEVICE(obj);
     VFIOPCIDevice *vdev = VFIO_PCI_BASE(obj);
@@ -3920,7 +3920,7 @@ static const TypeInfo vfio_pci_dev_info = {
     .name = TYPE_VFIO_PCI,
     .parent = TYPE_VFIO_PCI_BASE,
     .class_init = vfio_pci_dev_class_init,
-    .instance_init = vfio_instance_init,
+    .instance_init = vfio_pci_init,
     .instance_finalize = vfio_instance_finalize,
 };
 
-- 
2.43.0

Re: [PATCH 12/27] vfio/pci.c: rename vfio_instance_init() to vfio_pci_init()

Posted by Cédric Le Goater 4 days ago

On 9/23/25 15:53, Mark Cave-Ayland wrote:
> This is the more typical naming convention for QOM init() functions, in
> particular it changes the prefix to match the name of the QOM type.
> 
> Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
> ---
>   hw/vfio/pci.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
> index d14e96b2f8..9046244e7f 100644
> --- a/hw/vfio/pci.c
> +++ b/hw/vfio/pci.c
> @@ -3629,7 +3629,7 @@ post_reset:
>       vfio_pci_post_reset(vdev);
>   }
>   
> -static void vfio_instance_init(Object *obj)
> +static void vfio_pci_init(Object *obj)
>   {
>       PCIDevice *pci_dev = PCI_DEVICE(obj);
>       VFIOPCIDevice *vdev = VFIO_PCI_BASE(obj);
> @@ -3920,7 +3920,7 @@ static const TypeInfo vfio_pci_dev_info = {
>       .name = TYPE_VFIO_PCI,
>       .parent = TYPE_VFIO_PCI_BASE,
>       .class_init = vfio_pci_dev_class_init,
> -    .instance_init = vfio_instance_init,
> +    .instance_init = vfio_pci_init,

I would have preferred vfio_pci_instance_init. This is minor.

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

Thanks,

C.



>       .instance_finalize = vfio_instance_finalize,
>   };
>