libvirt update to version 6.2.0-61

- vdpa: Release pci slot address when unplugging vdpa device
- vdpa: return pcieFlags when calculate vdpa passthrough devices.

Signed-off-by: jiangdongxu <jiangdongxu1@huawei.com>
This commit is contained in:
jiangdongxu 2024-03-13 17:16:33 +08:00
parent 7fae69e362
commit f2391b0ded
3 changed files with 78 additions and 1 deletions

View File

@ -101,7 +101,7 @@
Summary: Library providing a simple virtualization API
Name: libvirt
Version: 6.2.0
Release: 60
Release: 61
License: LGPLv2+
URL: https://libvirt.org/
@ -504,6 +504,8 @@ Patch0391: node_device-fix-leak-of-DIR.patch
Patch0392: vdpa-Introduce-the-new-device-type-vdpa-to-hostdev.patch
Patch0393: vdpa-support-vdpa-device-hot-plug-unplug.patch
Patch0394: vdpa-support-vdpa-device-migrate.patch
Patch0395: vdpa-return-pcieFlags-when-calculate-vdpa-passthroug.patch
Patch0396: vdpa-Release-pci-slot-address-when-unplugging-vdpa-d.patch
Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-daemon-config-network = %{version}-%{release}
@ -2240,6 +2242,10 @@ exit 0
%changelog
* Wed Mar 13 2024 jiangdongxu <jiangdongxu1@huawei.com> - 6.2.0-61
- vdpa: Release pci slot address when unplugging vdpa device
- vdpa: return pcieFlags when calculate vdpa passthrough devices.
* Wed Nov 29 2023 Jiabo Feng <fengjiabo1@huawei.com> - 6.2.0-60
- vdpa: support vdpa device migrate
- vdpa: support vdpa device hot plug/unplug

View File

@ -0,0 +1,39 @@
From 9858958385ae145196a0b95befbd9ae8f2f5ce18 Mon Sep 17 00:00:00 2001
From: jiangdongxu1 <jiangdongxu1@huawei.com>
Date: Wed, 13 Mar 2024 15:28:47 +0800
Subject: [PATCH] vdpa: Release pci slot address when unplugging vdpa device
Signed-off-by: jiangdongxu1 <jiangdongxu1@huawei.com>
---
src/qemu/qemu_hotplug.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 3c5540291b..f44ac938ae 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -4560,6 +4560,12 @@ qemuDomainRemoveMediatedDevice(virQEMUDriverPtr driver,
qemuDomainReleaseDeviceAddress(vm, hostdev->info);
}
+static void
+qemuDomainRemoveVDPADevice(virDomainObjPtr vm,
+ virDomainHostdevDefPtr hostdev)
+{
+ qemuDomainReleaseDeviceAddress(vm, hostdev->info);
+}
static int
qemuDomainRemoveHostDevice(virQEMUDriverPtr driver,
@@ -4653,6 +4659,8 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver,
qemuDomainRemoveMediatedDevice(driver, vm, hostdev);
break;
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
+ qemuDomainRemoveVDPADevice(vm, hostdev);
+ break;
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
break;
}
--
2.27.0

View File

@ -0,0 +1,32 @@
From 78b7156840b421becd45c13c0ff4da57c314b4a5 Mon Sep 17 00:00:00 2001
From: jiangdongxu1 <jiangdongxu1@huawei.com>
Date: Wed, 13 Mar 2024 15:23:57 +0800
Subject: [PATCH] vdpa: return pcieFlags when calculate vdpa passthrough
devices.
Signed-off-by: jiangdongxu1 <jiangdongxu1@huawei.com>
---
src/qemu/qemu_domain_address.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 6649553486..ce40fdc928 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -825,6 +825,13 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev,
if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV)
return pcieFlags;
+ /*
+ * vDPA passthrough is currently only support on arm architechture.
+ * Thus, we just assume it's PCI Express.
+ */
+ if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA)
+ return pcieFlags;
+
/* according to pbonzini, from the guest PoV vhost-scsi devices
* are the same as virtio-scsi, so they should follow virtio logic
*/
--
2.27.0