Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
vfio/pci: Move VFIODevice initializations in vfio_instance_init
Some of the VFIODevice initializations is in vfio_realize,
move all of them in vfio_instance_init.

No functional change intended.

Suggested-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Nicolin Chen <nicolinc@nvidia.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
  • Loading branch information
duanzhenzhong authored and legoater committed Dec 19, 2023
1 parent 64ad06f commit dd2fcb1
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions hw/vfio/pci.c
Expand Up @@ -2969,9 +2969,6 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
if (vfio_device_get_name(vbasedev, errp) < 0) {
return;
}
vbasedev->ops = &vfio_pci_ops;
vbasedev->type = VFIO_DEVICE_TYPE_PCI;
vbasedev->dev = DEVICE(vdev);

/*
* Mediated devices *might* operate compatibly with discarding of RAM, but
Expand Down Expand Up @@ -3320,6 +3317,7 @@ static void vfio_instance_init(Object *obj)
{
PCIDevice *pci_dev = PCI_DEVICE(obj);
VFIOPCIDevice *vdev = VFIO_PCI(obj);
VFIODevice *vbasedev = &vdev->vbasedev;

device_add_bootindex_property(obj, &vdev->bootindex,
"bootindex", NULL,
Expand All @@ -3328,7 +3326,11 @@ static void vfio_instance_init(Object *obj)
vdev->host.bus = ~0U;
vdev->host.slot = ~0U;
vdev->host.function = ~0U;
vdev->vbasedev.fd = -1;

vbasedev->type = VFIO_DEVICE_TYPE_PCI;
vbasedev->ops = &vfio_pci_ops;
vbasedev->dev = DEVICE(vdev);
vbasedev->fd = -1;

vdev->nv_gpudirect_clique = 0xFF;

Expand Down

0 comments on commit dd2fcb1

Please sign in to comment.