4daf6a89f5
Add migration support for VFIO devices and the pre-requisite for this Signed-off-by: imxcc <xingchaochao@huawei.com>
74 lines
2.4 KiB
Diff
74 lines
2.4 KiB
Diff
From b20bf027d44809dd6c6376cf0b77e5c5b2057cba Mon Sep 17 00:00:00 2001
|
|
From: Jens Freimann <jfreimann@redhat.com>
|
|
Date: Tue, 29 Oct 2019 12:49:05 +0100
|
|
Subject: [PATCH] vfio: Make vfio-pci device migration capable
|
|
|
|
If the device is not a failover primary device, call
|
|
vfio_migration_probe() and vfio_migration_finalize() to enable
|
|
migration support for those devices that support it respectively to
|
|
tear it down again.
|
|
Removed migration blocker from VFIO PCI device specific structure and use
|
|
migration blocker from generic structure of VFIO device.
|
|
|
|
Note: Since the current version don't add the failover feature for assigned
|
|
PCI devices, just remove the failover related code in the original patch for
|
|
simplicity.
|
|
|
|
Signed-off-by: Kirti Wankhede <kwankhede@nvidia.com>
|
|
Reviewed-by: Neo Jia <cjia@nvidia.com>
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
|
|
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
|
|
Signed-off-by: Shenming Lu <lushenming@huawei.com>
|
|
---
|
|
hw/vfio/pci.c | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
|
|
index b9fae3ad28..a637c35e7a 100644
|
|
--- a/hw/vfio/pci.c
|
|
+++ b/hw/vfio/pci.c
|
|
@@ -3049,6 +3049,11 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
|
|
}
|
|
}
|
|
|
|
+ ret = vfio_migration_probe(&vdev->vbasedev, errp);
|
|
+ if (ret) {
|
|
+ error_report("%s: Migration disabled", vdev->vbasedev.name);
|
|
+ }
|
|
+
|
|
vfio_register_err_notifier(vdev);
|
|
vfio_register_req_notifier(vdev);
|
|
vfio_setup_resetfn_quirk(vdev);
|
|
@@ -3096,6 +3101,7 @@ static void vfio_exitfn(PCIDevice *pdev)
|
|
}
|
|
vfio_teardown_msi(vdev);
|
|
vfio_bars_exit(vdev);
|
|
+ vfio_migration_finalize(&vdev->vbasedev);
|
|
}
|
|
|
|
static void vfio_pci_reset(DeviceState *dev)
|
|
@@ -3204,11 +3210,6 @@ static Property vfio_pci_dev_properties[] = {
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
-static const VMStateDescription vfio_pci_vmstate = {
|
|
- .name = "vfio-pci",
|
|
- .unmigratable = 1,
|
|
-};
|
|
-
|
|
static void vfio_pci_dev_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
@@ -3216,7 +3217,6 @@ static void vfio_pci_dev_class_init(ObjectClass *klass, void *data)
|
|
|
|
dc->reset = vfio_pci_reset;
|
|
dc->props = vfio_pci_dev_properties;
|
|
- dc->vmsd = &vfio_pci_vmstate;
|
|
dc->desc = "VFIO-based PCI device assignment";
|
|
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
|
pdc->realize = vfio_realize;
|
|
--
|
|
2.27.0
|
|
|