71 lines
2.4 KiB
Diff
71 lines
2.4 KiB
Diff
|
From 942bd7251d166f558e0e6acf7ba853e940e2fb52 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
||
|
|
Date: Tue, 21 Nov 2023 16:44:21 +0800
|
||
|
|
Subject: [PATCH 042/101] vfio/pci: Move VFIODevice initializations in
|
||
|
|
vfio_instance_init
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Eric Auger <eric.auger@redhat.com>
|
||
|
|
RH-MergeRequest: 211: IOMMUFD backend backport
|
||
|
|
RH-Jira: RHEL-19302 RHEL-21057
|
||
|
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
RH-Acked-by: Sebastian Ott <sebott@redhat.com>
|
||
|
|
RH-Commit: [41/67] 67392d7a92a6ec2155697a355c88d295338a0785 (eauger1/centos-qemu-kvm)
|
||
|
|
|
||
|
|
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>
|
||
|
|
(cherry picked from commit dd2fcb1716be9b89c726b3446f38446bb99d6b3a)
|
||
|
|
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
||
|
|
---
|
||
|
|
hw/vfio/pci.c | 10 ++++++----
|
||
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
|
||
|
|
index 3412a63bb1..3f5900cc46 100644
|
||
|
|
--- a/hw/vfio/pci.c
|
||
|
|
+++ b/hw/vfio/pci.c
|
||
|
|
@@ -2995,9 +2995,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
|
||
|
|
@@ -3346,6 +3343,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,
|
||
|
|
@@ -3354,7 +3352,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;
|
||
|
|
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|