diff --git a/libvirt.spec b/libvirt.spec index 6c20c87..71b2fc5 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -270,7 +270,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 9.10.0 -Release: 1%{?dist} +Release: 2 License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1 URL: https://libvirt.org/ @@ -278,6 +278,7 @@ URL: https://libvirt.org/ %define mainturl stable_updates/ %endif Source: https://download.libvirt.org/%{?mainturl}libvirt-%{version}.tar.xz +Patch0000: nodedev-delete-mdev.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -352,6 +353,7 @@ BuildRequires: libnl3-devel BuildRequires: libselinux-devel BuildRequires: iptables BuildRequires: ebtables +BuildRequires: module-init-tools # For modprobe BuildRequires: kmod BuildRequires: cyrus-sasl-devel @@ -614,7 +616,7 @@ Requires: libvirt-libs = %{version}-%{release} # needed for device enumeration Requires: systemd >= 185 # For managing persistent mediated devices -Requires: mdevctl +# Requires: mdevctl # for modprobe of pci devices Requires: module-init-tools @@ -2559,5 +2561,8 @@ exit 0 %endif %changelog +* Wed Mar 27 2024 mayunlong - 9.10.0-2 +- nodedev: delete mdev + * Thu Feb 29 2024 mayunlong - 9.10.0-1 - Update to 9.10.0 release, Initial package for openEuler. diff --git a/nodedev-delete-mdev.patch b/nodedev-delete-mdev.patch new file mode 100644 index 0000000..7428077 --- /dev/null +++ b/nodedev-delete-mdev.patch @@ -0,0 +1,30 @@ +From b782178492141454fc263040708dffa039e7de2a Mon Sep 17 00:00:00 2001 +From: mayunlong +Date: Wed, 27 Mar 2024 01:08:02 +0800 +Subject: [PATCH] nodedev: delete mdev + +mdev is deleted because it has no application scenario + +Signed-off-by: mayunlong +--- + src/node_device/node_device_driver.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c +index a59cd08..f2c3b36 100644 +--- a/src/node_device/node_device_driver.c ++++ b/src/node_device/node_device_driver.c +@@ -850,6 +850,10 @@ nodeDeviceCreateXMLMdev(virConnectPtr conn, + { + g_autofree char *uuid = NULL; + ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("Unsupported device type")); ++ return NULL; ++ + if (!def->parent) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("cannot create a mediated device without a parent")); +-- +2.33.0 +