diff --git a/libvirt.spec b/libvirt.spec index 6c20c87f1d70fc9b7fe2d2fb3b3011480749ebf0..4d280c17d5b9f080d4010752bfff60c97112fae0 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -93,15 +93,15 @@ # A few optional bits off by default, we enable later %define with_fuse 0 -%define with_sanlock 0 +%define with_sanlock 1 %define with_numad 0 %define with_nbdkit 0 %define with_nbdkit_config_default 0 -%define with_firewalld_zone 0 +%define with_firewalld_zone 1 %define with_netcf 0 -%define with_libssh2 0 -%define with_wireshark 0 -%define with_libssh 0 +%define with_libssh2 1 +%define with_wireshark 1 +%define with_libssh 1 %define with_dmidecode 0 # Finally set the OS / architecture specific special cases @@ -141,7 +141,7 @@ # fuse is used to provide virtualized /proc for LXC %if %{with_lxc} - %define with_fuse 0%{!?_without_fuse:1} + %define with_fuse 0%{!?_without_fuse:0} %endif # Enable sanlock library for lock management with QEMU @@ -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 @@ -1021,7 +1023,7 @@ capabilities of recent versions of Linux (and other OSes). %package client-qemu Summary: Additional client side utilities for QEMU Requires: libvirt-libs = %{version}-%{release} -Requires: python3-libvirt >= 3.7.0 +#Requires: python3-libvirt >= 3.7.0 Requires: python3-cryptography Requires: python3-lxml @@ -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 0000000000000000000000000000000000000000..0df54f08aa7c0c1ac2e23f0fca29a74a55581dcd --- /dev/null +++ b/nodedev-delete-mdev.patch @@ -0,0 +1,30 @@ +From 21d14e400cdc724e6c40c11814e7deed8a2aa687 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..c7f166c 100644 +--- a/src/node_device/node_device_driver.c ++++ b/src/node_device/node_device_driver.c +@@ -848,6 +848,10 @@ static virNodeDevicePtr + nodeDeviceCreateXMLMdev(virConnectPtr conn, + virNodeDeviceDef *def) + { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("Unsupported device type")); ++ return NULL; ++ + g_autofree char *uuid = NULL; + + if (!def->parent) { +-- +2.33.0 +