Update to libvirt v12.0.0

Update SLFO:Main with libvirt v12.0.0. Includes implementation for
jsc#PED-14592, jsc#PED-14597, jsc#PED-14623 and jsc#PED-15320.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>

_service

@@ -1,18 +1,19 @@
 <services>
-  <service name="tar_scm" mode="manual">
+  <service name="obs_scm" mode="manual">
     <param name="scm">git</param>
-    <param name="url">https://github.com/openSUSE/libvirt.git</param>
+    <param name="url">https://gitlab.suse.de/virtualization/libvirt.git</param>
     <param name="revision">factory</param>
     <param name="extract">libvirt.spec</param>
     <param name="extract">README.packaging.txt</param>
     <param name="extract">libvirt-supportconfig</param>
     <param name="versionformat">@PARENT_TAG@</param>
-    <param name="versionrewrite-pattern">[v]?([^-+a-z]+)(.*)</param>
+    <param name="versionrewrite-pattern">[v]?([^-a-z]+)(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
     <param name="changesgenerate">disable</param>
   </service>
   <service name="set_version" mode="manual"/>
-  <service name="recompress" mode="manual">
+  <service name="tar" mode="buildtime"/>
+  <service name="recompress" mode="buildtime">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>

libvirt-10.7.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2314e043bc143e5fbc2f4d2c5127cfe9926485716b2e54ed9724ba38ac1587e4
-size 9849808

libvirt.changes

@@ -1,3 +1,230 @@
+-------------------------------------------------------------------
+Thu Jan 15 18:32:20 UTC 2026 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 12.0.0
+  - jsc#PED-14592, jsc#PED-14597, jsc#PED-14623, jsc#PED-15320
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v12-0-0-2026-01-15
+
+-------------------------------------------------------------------
+Tue Dec 16 00:33:28 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Deactive gluster backend, package is going away for being
+  unmaintained.
+
+-------------------------------------------------------------------
+Mon Dec  1 21:57:32 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 11.10.0
+  - build: drop userfaultfd_sysctl option
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v11-10-0-2025-12-01
+
+-------------------------------------------------------------------
+Wed Nov 19 03:10:14 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- CVE-2025-13193: qemu: Set umask for 'qemu-img' when creating
+  external inactive snapshots
+  bsc#1253703
+
+-------------------------------------------------------------------
+Sat Nov 15 02:41:49 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- spec: Adjust dbus dependency
+  bsc#1253642
+- CVE-2025-12748: Check ACLs before parsing the whole domain XML
+  bsc#1253278
+
+-------------------------------------------------------------------
+Wed Nov  5 18:33:48 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 11.9.0
+  - jsc#PED-155, bsc#1251789: By default, VMs are now confined by
+    the security framework (apparmor or selinux) active on the host
+  - bsc#1252958: Fix build with wireshark 4.6.0 
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v11-9-0-2025-11-03
+
+-------------------------------------------------------------------
+Mon Oct  6 17:31:16 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 11.8.0
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v11-8-0-2025-10-01
+
+-------------------------------------------------------------------
+Tue Sep  2 17:04:02 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 11.7.0
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v11-7-0-2025-09-01
+
+-------------------------------------------------------------------
+Wed Aug  6 17:55:30 UTC 2025 - Cathy Hu <cathy.hu@suse.com>
+
+- Set virt_hooks_unconfined boolean to true in libvirt-daemon-hooks
+  %post script (see comment 13 in bsc#1242998)
+
+-------------------------------------------------------------------
+Tue Jul  8 21:33:25 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- qemu: ARM: Change default SCSI controller model from 'lsilogic'
+  to 'virtio-scsi'
+  bsc#1240762
+
+-------------------------------------------------------------------
+Tue Jul  1 16:56:29 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- qemu: Use numa-preplace instead of numad for numa placement advice
+  bsc#1242979, jsc#PED-12821
+
+-------------------------------------------------------------------
+Fri Jun  6 22:32:30 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 11.4.0
+  - bsc#1241481, boo#1243740, bsc#1244488
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v11-4-0-2025-06-02
+- spec: Drop support for old distros
+
+-------------------------------------------------------------------
+Wed May 28 17:20:09 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- spec: Drop dependencies on the nwfilter driver (which requires
+  iptables) for Factory and SLFO
+  boo#1231798, jsc#PED-12034
+
+-------------------------------------------------------------------
+Mon May  5 15:47:51 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 11.3.0
+  - bsc#1241952
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v11-3-0-2025-05-02
+- spec: Build with fuse3
+  boo#1242081
+
+-------------------------------------------------------------------
+Thu Apr 10 14:53:16 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- cpu_map: Install Ampere-1 ARM CPU models
+  bsc#1240922
+
+-------------------------------------------------------------------
+Tue Apr  1 21:44:05 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 11.2.0
+  - jsc#PED-6556, jsc#PED-11466
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v11-2-0-2025-04-01
+
+-------------------------------------------------------------------
+Fri Mar 21 22:21:48 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- spec: Disable rbd storage driver for SLFO
+  bsc#1239836
+
+-------------------------------------------------------------------
+Mon Mar  3 23:48:42 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 11.1.0
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v11-1-0-2025-03-03
+
+-------------------------------------------------------------------
+Mon Feb 24 19:06:04 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- Adjust downstream patch 'Add virt-create-rootfs utility' to only
+  install virt-create-rootfs when building the LXC driver
+
+-------------------------------------------------------------------
+Tue Feb 18 23:48:40 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- spec: Add note about packages with no files
+  bsc#1237228
+
+-------------------------------------------------------------------
+Mon Feb  3 21:44:39 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- spec: Change hooks dependency from libvirtd to the qemu driver
+  bsc#1236378
+
+-------------------------------------------------------------------
+Thu Jan 16 18:31:32 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 11.0.0
+  - jsc#PED-5899, jsc#PED-8909, jsc#PED-9543, jsc#PED-9854,
+    jsc#PED-9855
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v11-0-0-2025-01-15
+
+-------------------------------------------------------------------
+Wed Jan  8 14:01:35 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Convert from tar_scm to obs_scm: allow OBS internal data
+  structure to be more efficient by using .obscpio files
+
+-------------------------------------------------------------------
+Mon Jan  6 22:38:12 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- security: apparmor: Fix probing of apparmor availability on the
+  VM host when using modular daemons
+  bsc#1235079
+
+-------------------------------------------------------------------
+Fri Jan  3 19:34:51 UTC 2025 - James Fehlig <jfehlig@suse.com>
+
+- tests: Extend EOY check in virtimetest
+  boo#1234995
+
+-------------------------------------------------------------------
+Thu Dec 12 18:00:38 UTC 2024 - James Fehlig <jfehlig@suse.com>
+
+- qemu: tpm: do not update profile name for transient domains
+  Fixes a crash when starting a transient domain
+  boo#1234438
+
+-------------------------------------------------------------------
+Mon Dec  2 18:48:20 UTC 2024 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 10.10.0
+  - jsc#PED-8909, jsc#PED-9543, jsc#PED-9854, jsc#PED-9855
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v10-10-0-2024-12-02
+
+-------------------------------------------------------------------
+Mon Nov  4 21:00:34 UTC 2024 - James Fehlig <jfehlig@suse.com>
+
+- json: do not call json_tokener_free with NULL
+  Fixes potential SEGV in libvirt-nss module
+  boo#1232726
+
+-------------------------------------------------------------------
+Fri Nov  1 19:52:45 UTC 2024 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 10.9.0
+  - jsc#PED-8909, jsc#PED-9854, jsc#PED-9855
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v10-9-0-2024-11-01
+
+-------------------------------------------------------------------
+Tue Oct 22 15:59:15 UTC 2024 - James Fehlig <jfehlig@suse.com>
+
+- spec: Use default_firewall_backend prjconf setting
+- spec: Loosen nwfilter dependency
+  boo#1231798
+
+-------------------------------------------------------------------
+Tue Oct  1 19:57:06 UTC 2024 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 10.8.0
+  - libvirt-daemon-driver-storage-core: Change dependency on
+    nfs-utils from Requires to Recommends
+  - Switch from YAJL to json-c for JSON parsing and formatting
+  - jsc#PED-8909
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v10-8-0-2024-10-01
+
 -------------------------------------------------------------------
 Tue Sep  3 17:23:41 UTC 2024 - James Fehlig <jfehlig@suse.com>
 
@@ -47,6 +274,8 @@ Wed May  8 22:39:10 UTC 2024 - James Fehlig <jfehlig@suse.com>
 Thu May  2 22:48:28 UTC 2024 - James Fehlig <jfehlig@suse.com>
 
 - Update to libvirt 10.3.0
+  - bsc#1220714
+  - bsc#1226492
   - Many incremental improvements and bug fixes, see
     https://libvirt.org/news.html#v10-3-0-2024-05-02
 
@@ -61,6 +290,7 @@ Tue Apr  2 15:03:20 UTC 2024 - James Fehlig <jfehlig@suse.com>
 
 - Update to libvirt 10.2.0
   - CVE-2024-2494
+  - bsc#1221879
   - Many incremental improvements and bug fixes, see
     https://libvirt.org/news.html#v10-2-0-2024-04-02
 
@@ -76,6 +306,7 @@ Tue Mar  5 21:20:53 UTC 2024 - James Fehlig <jfehlig@suse.com>
 
 - Update to libvirt 10.1.0
   - CVE-2024-1441
+    bsc#1221237
   - Many incremental improvements and bug fixes, see
     https://libvirt.org/news.html#v10-1-0-2024-03-01
 
@@ -254,6 +485,8 @@ Tue May  2 17:18:02 UTC 2023 - James Fehlig <jfehlig@suse.com>
 - Update to libvirt 9.3.0
   - Many incremental improvements and bug fixes, see
     https://libvirt.org/news.html#v9-3-0-2023-05-02
+  - CVE-2023-2700
+    bsc#1211390 
   - boo#1210654
 
 -------------------------------------------------------------------
@@ -325,6 +558,7 @@ Thu Mar  2 23:11:37 UTC 2023 - James Fehlig <jfehlig@suse.com>
 Wed Mar  1 20:58:57 UTC 2023 - James Fehlig <jfehlig@suse.com>
 
 - Update to libvirt 9.1.0
+  - bsc#1210666
   - Many incremental improvements and bug fixes, see
     https://libvirt.org/news.html#v9-1-0-2023-03-01
   - spec: Remove obsolete Groups tag
@@ -426,6 +660,7 @@ Thu Sep  1 20:37:17 UTC 2022 - James Fehlig <jfehlig@suse.com>
 
 - Update to libvirt 8.7.0
   - jsc#PED-620, jsc#PED-1540
+  - bsc#1202630
   - Many incremental improvements and bug fixes, see
     https://libvirt.org/news.html#v8-7-0-2022-09-01
   - Dropped patches:
@@ -516,6 +751,7 @@ Fri Apr  1 17:30:25 UTC 2022 - James Fehlig <jfehlig@suse.com>
 
 - Update to libvirt 8.2.0
   - CVE-2022-0897
+    bsc#1197636
   - Many incremental improvements and bug fixes, see
     https://libvirt.org/news.html#v8-2-0-2022-04-01
   - Dropped patches:
@@ -1328,6 +1564,8 @@ Thu Mar  5 04:09:43 UTC 2020 - James Fehlig <jfehlig@suse.com>
 - Update to libvirt 6.1.0
   - Many incremental improvements and bug fixes, see
     https://libvirt.org/news.html
+  - CVE-2020-12430
+    bsc#1170765 
   - Dropped patches:
     6c1dddaf-libxl-shutdown-inhibit.patch,
     849052ec-libxl-support-credit2.patch,

libvirt.obsinfo

@@ -0,0 +1,4 @@
+name: libvirt
+version: 12.0.0
+mtime: 1768511279
+commit: be8a9b1d10144a0ee37d228f7db2d2c04a445396

libvirt.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libvirt
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -33,11 +33,11 @@
 
 # Stateful secondary host drivers that run in daemons
 %define with_storage_rbd   0%{!?_without_storage_rbd:0}
-# The gluster storage backend is built for both openSUSE and SLE, but it is
-# not supported
-%define with_storage_gluster  0%{!?_without_storage_gluster:1}
-%define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:0}
+%define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}
 %define with_apparmor      0%{!?_without_apparmor:1}
+%define with_selinux_unconfined_daemon_hooks	0%{!?_without_selinux:1}
+# The gluster storage backend is currently unmaintained in both openSUSE and SLE
+%define with_storage_gluster  0%{!?_without_storage_gluster:0}
 # The udev interface backend is the only one that works across SUSE distros.
 # It supports just a handful of read-only operations, has a history of
 # instability, and is insufficiently maintained. Completely disable the
@@ -48,15 +48,16 @@
 %define with_sanlock       0%{!?_without_sanlock:1}
 %define with_polkit_rules  0%{!?_without_polkit_rules:1}
 %define with_wireshark     0%{!?_without_wireshark:1}
+%define with_libssh        0%{!?_without_libssh:1}
 %define with_libssh2       0%{!?_without_libssh2:1}
 %define with_numactl       0%{!?_without_numactl:1}
+%define with_nwfilter      0%{!?_without_nwfilter:1}
 %define with_modular_daemons 0%{!?_without_modular_daemons:1}
-%define with_userfaultfd_sysctl 0%{!?_without_userfaultfd_sysctl:1}
+%define with_firewalld_zone 0%{!?_without_firewalld_zone:1}
 
 # A few optional bits off by default, we enable later
+%define with_fuse          0%{!?_without_fuse:0}
 %define with_numad         0%{!?_without_numad:0}
-%define with_firewalld_zone 0%{!?_without_firewalld_zone:0}
-%define with_libssh        0%{!?_without_libssh:0}
 %define with_nbdkit        0%{!?_without_nbdkit:0}
 %define with_nbdkit_config_default 0%{!?_without_nbdkit_config_default:0}
 
@@ -72,60 +73,55 @@
     %define with_numactl   0
 %endif
 
-# Tumbleweeed is new enough to support /dev/userfaultfd, which
-# does not require enabling vm.unprivileged_userfaultfd sysct
-%if 0%{?suse_version} > 1500
-    %define with_userfaultfd_sysctl 0
-%endif
-
 # vbox is available only on i386 x86_64
 %ifnarch %{ix86} x86_64
     %define with_vbox      0
 %endif
 
-# The 'libvirt' zone must be used with firewalld >= 0.7.0
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
-    %define with_firewalld_zone 0%{!?_without_firewalld_zone:1}
-%endif
-
-# Enable libssh support in newer code bases
-%if 0%{?suse_version} >= 1500
-    %define with_libssh    0%{!?_without_libssh:1}
-%endif
-
 %ifarch x86_64 aarch64
     %define with_storage_rbd 0%{!?_without_storage_rbd:1}
 %endif
 
-# libiscsi storage backend needs libiscsi >= 1.18.0 which is only available
-# in suse_version >= 1500
-%if 0%{?suse_version} >= 1500
-    %define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}
-%endif
-
-# numad is used to manage the CPU and memory placement dynamically for
-# qemu and lxc drivers
+# numa-preplace (formerly numad) is used to manage the CPU and memory
+# placement dynamically for qemu and lxc drivers
 %if %{with_qemu} || %{with_lxc}
-# Enable numad for most architectures
-    %ifnarch s390 s390x %arm %ix86
+    %ifarch aarch64 %{power64} x86_64
         %define with_numad 0%{!?_without_numad:1}
     %endif
 %endif
 
-# Items to exclude in ALP-based products
-%if 0%{?suse_version} == 1600
-    %define with_libxl     0
-    %define with_apparmor  0
-    %define with_interface 0
-    %define with_sanlock   0
-    %define with_numad     0
-    %define with_esx       0
-    %define with_storage_gluster 0
+# fuse is used to provide virtualized /proc for LXC
+%if %{with_lxc}
+    %define with_fuse      0%{!?_without_fuse:1}
 %endif
 
-# Prefer nftables for Tumbleweed, but keep using iptables for distros based
-# on SLE15 codestream
-%if 0%{?suse_version} > 1500
+# Items to exclude in SLFO:Main based products
+%if 0%{?suse_version} == 1600
+    %define with_apparmor  0
+    %define with_esx       0
+    %define with_interface 0
+    %define with_libxl     0
+    %define with_lxc       0
+    %define with_fuse      0
+    %define with_sanlock   0
+    %define with_storage_gluster 0
+    %define with_storage_rbd     0
+%endif
+
+%if 0%{?suse_version} < 1600
+    %define with_selinux_unconfined_daemon_hooks 0
+%endif
+
+# Factory and SLFO strive to drop iptables. The nwfilter driver has a runtime
+# dependency on iptables, but no build-time one. The driver will be built
+# unconditionally, but will no longer be required/recommended by the meta
+# subpackages in Factory and SLFO.
+%if 0%{?suse_version} >= 1600
+    %define with_nwfilter  0
+%endif
+
+# Prefer nftables if available
+%if "%{?default_firewall_backend}" == "nftables"
     %define prefer_nftables 1
     %define firewall_backend_priority nftables,iptables
 %else
@@ -149,14 +145,17 @@
 
 Name:           libvirt
 URL:            https://libvirt.org/
-Version:        10.7.0
+Version:        12.0.0
 Release:        0
 Summary:        Library providing a virtualization API
 License:        LGPL-2.1-or-later
 
 Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       %{name}-daemon-config-network = %{version}-%{release}
+%if %{with_nwfilter}
 Requires:       %{name}-daemon-config-nwfilter = %{version}-%{release}
+Requires:       %{name}-daemon-driver-nwfilter = %{version}-%{release}
+%endif
 %if %{with_libxl}
 Requires:       %{name}-daemon-driver-libxl = %{version}-%{release}
 %endif
@@ -173,7 +172,6 @@ Requires:       %{name}-daemon-driver-interface = %{version}-%{release}
 %endif
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}
 Requires:       %{name}-daemon-driver-nodedev = %{version}-%{release}
-Requires:       %{name}-daemon-driver-nwfilter = %{version}-%{release}
 Requires:       %{name}-daemon-driver-secret = %{version}-%{release}
 Requires:       %{name}-daemon-driver-storage = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
@@ -196,7 +194,7 @@ BuildRequires:  libacl-devel
 BuildRequires:  qemu-tools
 %endif
 BuildRequires:  bash-completion-devel >= 2.0
-BuildRequires:  glib2-devel >= 2.58
+BuildRequires:  glib2-devel >= 2.66
 BuildRequires:  libattr-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgnutls-devel
@@ -211,7 +209,7 @@ BuildRequires:  readline-devel
 # For pool-build probing for existing pools
 BuildRequires:  libblkid-devel >= 2.17
 BuildRequires:  libpciaccess0-devel >= 0.10.9
-BuildRequires:  libyajl-devel
+BuildRequires:  libjson-c-devel
 BuildRequires:  pkgconfig(libudev) >= 145
 %if %{with_sanlock}
 BuildRequires:  sanlock-devel >= 2.4
@@ -229,12 +227,6 @@ BuildRequires:  polkit >= 0.112
 %if %{with_nbdkit}
 BuildRequires:  libnbd-devel
 %endif
-# For mount/umount in FS driver
-BuildRequires:  util-linux
-# For LVM drivers
-BuildRequires:  lvm2
-# For pool type=iscsi
-BuildRequires:  open-iscsi
 %if %{with_storage_iscsi_direct}
 # For pool type=iscsi-direct
 BuildRequires:  libiscsi-devel
@@ -254,7 +246,9 @@ BuildRequires:  glusterfs-devel >= 3.4.1
 # For QEMU/LXC numa info
 BuildRequires:  libnuma-devel
 %endif
-BuildRequires:  fuse-devel >= 2.8.6
+%if %{with_fuse}
+BuildRequires:  pkgconfig(fuse3) >= 3.1.0
+%endif
 BuildRequires:  libcap-ng-devel >= 0.5.0
 %if %{with_interface}
 BuildRequires:  libnetcontrol-devel >= 0.2.0
@@ -271,9 +265,6 @@ BuildRequires:  libwsman-devel >= 2.6.3
 BuildRequires:  audit-devel
 # For /usr/sbin/dtrace
 BuildRequires:  systemtap-sdt-devel
-%if %{with_numad}
-BuildRequires:  numad
-%endif
 %if %{with_wireshark}
 BuildRequires:  wireshark-devel
 %endif
@@ -302,6 +293,8 @@ on a single hardware system where the basic resources are driven by a
 Linux instance. The library aims to provide long term stable C API
 to interact with Linux virtualization technologies.
 
+This package does not contain files, it just requires the necessary packages.
+
 %package doc
 Summary:        API reference and website documentation for libvirt
 BuildArch:      noarch
@@ -344,7 +337,11 @@ Requires:       dmidecode
 # For service management
 %{?systemd_requires}
 # Daemons depend on the 'messagebus' service
+%if 0%{?suse_version} < 1600
 Requires:       dbus-1
+%else
+Requires:       dbus-service
+%endif
 Requires:       group(libvirt)
 # Needed by libvirt-guests init script.
 Requires:       gettext-runtime
@@ -378,6 +375,7 @@ resources
 %package daemon-plugin-lockd
 Summary:        lockd client plugin for virtlockd
 Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name}-daemon-common = %{version}-%{release}
 
 %description daemon-plugin-lockd
 A client-side plugin that implements disk locking using POSIX fcntl advisory
@@ -399,12 +397,16 @@ Server side daemon providing functionality previously provided by
 the monolithic libvirtd
 
 %package daemon-hooks
-Summary:        Hook scripts for the libvirtd daemon
-Requires:       %{name}-daemon = %{version}-%{release}
+Summary:        Hook scripts for QEMU
+%if %{with_selinux_unconfined_daemon_hooks}
+BuildRequires:       selinux-policy-devel
+%selinux_requires
+%endif
+Requires:       %{name}-daemon-driver-qemu = %{version}-%{release}
 Requires:       python3-lxml
 
 %description daemon-hooks
-Default hook scripts for the libvirt daemon
+Hook scripts for the virtqemud daemon
 
 %package daemon-config-network
 Summary:        Default configuration files for the libvirtd daemon
@@ -454,9 +456,7 @@ Summary:        Nodedev driver plugin for the libvirtd daemon
 Requires:       %{name}-daemon-common = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 # For managing persistent mediated devices
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
 Requires:       mdevctl
-%endif
 # For modprobe of pci devices
 Requires:       modutils
 
@@ -487,8 +487,8 @@ an implementation of the secret key APIs.
 Summary:        Storage driver plugin including base backends for the libvirtd daemon
 Requires:       %{name}-daemon-common = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
-Requires:       nfs-utils
-# For mkfs
+Recommends:     nfs-utils
+# For mkfs and mount/unmount
 Requires:       util-linux
 %if %{with_qemu}
 # From QEMU RPMs
@@ -601,6 +601,8 @@ The storage driver plugin for the libvirtd daemon, providing
 an implementation of the storage APIs using LVM, iSCSI,
 parted and more.
 
+This package does not contain files, it just requires the necessary packages.
+
 %package daemon-driver-qemu
 Summary:        Qemu driver plugin for the libvirtd daemon
 Requires:       %{name}-daemon-common = %{version}-%{release}
@@ -616,9 +618,7 @@ Requires:       /usr/bin/zstd
 Requires:       qemu
 Requires:       systemd-container
 # swtp is needed to manage <tpm> devices.
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
 Requires:       swtpm
-%endif
 %ifarch x86_64
 Requires:       qemu-ovmf-x86_64
 %endif
@@ -626,7 +626,7 @@ Requires:       qemu-ovmf-x86_64
 Requires:       qemu-uefi-aarch64
 %endif
 %if %{with_numad}
-Suggests:       numad
+Suggests:       numa-preplace
 %endif
 %if %{with_nbdkit}
 Recommends:     nbdkit
@@ -648,7 +648,7 @@ Requires:       systemd-container
 # For modprobe of nbd driver
 Requires:       modutils
 %if %{with_numad}
-Suggests:       numad
+Suggests:       numa-preplace
 %endif
 
 %description daemon-driver-lxc
@@ -690,7 +690,9 @@ Requires:       %{name}-daemon-driver-interface = %{version}-%{release}
 %endif
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}
 Requires:       %{name}-daemon-driver-nodedev = %{version}-%{release}
-Requires:       %{name}-daemon-driver-nwfilter = %{version}-%{release}
+%if %{with_nwfilter}
+Recommends:     %{name}-daemon-driver-nwfilter = %{version}-%{release}
+%endif
 Requires:       %{name}-daemon-driver-qemu = %{version}-%{release}
 Requires:       %{name}-daemon-driver-secret = %{version}-%{release}
 Requires:       %{name}-daemon-driver-storage = %{version}-%{release}
@@ -699,6 +701,8 @@ Requires:       %{name}-daemon-driver-storage = %{version}-%{release}
 Server side daemon and driver required to manage the virtualization
 capabilities of the QEMU emulators
 
+This package does not contain files, it just requires the necessary packages.
+
 %package daemon-lxc
 Summary:        Server side daemon & driver required to run LXC guests
 %if %{with_modular_daemons}
@@ -712,7 +716,9 @@ Requires:       %{name}-daemon-driver-interface = %{version}-%{release}
 Requires:       %{name}-daemon-driver-lxc = %{version}-%{release}
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}
 Requires:       %{name}-daemon-driver-nodedev = %{version}-%{release}
-Requires:       %{name}-daemon-driver-nwfilter = %{version}-%{release}
+%if %{with_nwfilter}
+Recommends:     %{name}-daemon-driver-nwfilter = %{version}-%{release}
+%endif
 Requires:       %{name}-daemon-driver-secret = %{version}-%{release}
 Requires:       %{name}-daemon-driver-storage = %{version}-%{release}
 
@@ -720,6 +726,8 @@ Requires:       %{name}-daemon-driver-storage = %{version}-%{release}
 Server side daemon and driver required to manage the virtualization
 capabilities of LXC
 
+This package does not contain files, it just requires the necessary packages.
+
 %package daemon-xen
 Summary:        Server side daemon & driver required to run XEN guests
 %if %{with_modular_daemons}
@@ -734,7 +742,6 @@ Requires:       %{name}-daemon-driver-interface = %{version}-%{release}
 Requires:       %{name}-daemon-driver-libxl = %{version}-%{release}
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}
 Requires:       %{name}-daemon-driver-nodedev = %{version}-%{release}
-Requires:       %{name}-daemon-driver-nwfilter = %{version}-%{release}
 Requires:       %{name}-daemon-driver-secret = %{version}-%{release}
 Requires:       %{name}-daemon-driver-storage = %{version}-%{release}
 Requires:       xen
@@ -743,6 +750,8 @@ Requires:       xen
 Server side daemon and driver required to manage the virtualization
 capabilities of XEN
 
+This package does not contain files, it just requires the necessary packages.
+
 %package daemon-vbox
 Summary:        Server side daemon & driver required to run VirtualBox guests
 %if ! %{with_modular_daemons}
@@ -753,7 +762,9 @@ Requires:       %{name}-daemon-driver-interface = %{version}-%{release}
 %endif
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}
 Requires:       %{name}-daemon-driver-nodedev = %{version}-%{release}
-Requires:       %{name}-daemon-driver-nwfilter = %{version}-%{release}
+%if %{with_nwfilter}
+Recommends:     %{name}-daemon-driver-nwfilter = %{version}-%{release}
+%endif
 Requires:       %{name}-daemon-driver-secret = %{version}-%{release}
 Requires:       %{name}-daemon-driver-storage = %{version}-%{release}
 Requires:       %{name}-daemon-driver-vbox = %{version}-%{release}
@@ -765,6 +776,8 @@ Requires:       virtualbox < 5.3
 Server side daemon and driver required to manage the virtualization
 capabilities of VirtualBox
 
+This package does not contain files, it just requires the necessary packages.
+
 %package client
 Summary:        Client side utilities of the libvirt library
 Requires:       %{name}-libs = %{version}-%{release}
@@ -809,6 +822,7 @@ Summary:        Sanlock lock manager plugin for QEMU driver
 Requires:       sanlock >= 2.4
 # For virt-sanlock-cleanup require augeas
 Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name}-daemon-common = %{version}-%{release}
 Requires:       augeas
 Obsoletes:      %{name}-lock-sanlock < 9.0.0
 Provides:       %{name}-lock-sanlock = %{version}-%{release}
@@ -929,10 +943,10 @@ Allows SSH into domains via VSOCK without need for network.
 %else
     %define arg_numad -Dnumad=disabled
 %endif
-%if %{with_userfaultfd_sysctl}
-    %define arg_userfaultfd_sysctl -Duserfaultfd_sysctl=enabled
+%if %{with_fuse}
+    %define arg_fuse -Dfuse=enabled
 %else
-    %define arg_userfaultfd_sysctl -Duserfaultfd_sysctl=disabled
+    %define arg_fuse -Dfuse=disabled
 %endif
 %if %{with_nbdkit}
     %define arg_nbdkit -Dnbdkit=enabled
@@ -969,26 +983,6 @@ Allows SSH into domains via VSOCK without need for network.
 
 %define arg_selinux_mount -Dselinux_mount="/selinux"
 
-# UEFI firmwares
-# For SLE15 SP2 (Leap 15.2) and newer, use firmware descriptor files from the
-# firmware packages, otherwise define firmwares via configure option
-%if ! (0%{?suse_version} > 1500 || 0%{?sle_version} > 150100)
-    # x86_64 UEFI firmwares
-    # To more closely resemble actual hardware, we use the firmwares with
-    # embedded Microsoft keys
-    #
-    # The Windows HCK test requires a bigger variable store, so 4MB firmware
-    # images have been introduced. They are advertised first and will be
-    # used by default for new VM installations. The 2MB images are still
-    # available for existing VMs, and can be selected for new installations
-    # as well.
-    LOADERS="/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin"
-    LOADERS="$LOADERS:/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin"
-    # aarch64 UEFI firmwares
-    LOADERS="$LOADERS:/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin"
-    %define arg_loader_nvram -Dloader-nvram="$LOADERS"
-%endif
-
 # Macros for moving vendor provided configuration from /etc to /usr
 %if 0%{?suse_version} > 1500
     %define logrotate_prefix %nil
@@ -1056,13 +1050,12 @@ Allows SSH into domains via VSOCK without need for network.
            -Dstorage_vstorage=disabled \
            %{?arg_numactl} \
            %{?arg_numad} \
-           %{?arg_userfaultfd_sysctl} \
            %{?arg_nbdkit} \
            %{?arg_nbdkit_config_default} \
            -Dssh_proxy=enabled \
            -Dsysctl_config=enabled \
            -Dcapng=enabled \
-           -Dfuse=enabled \
+           %{?arg_fuse} \
            -Dnetcf=disabled \
            %{?arg_netcontrol} \
            -Dselinux=enabled \
@@ -1070,7 +1063,7 @@ Allows SSH into domains via VSOCK without need for network.
            %{?arg_apparmor} \
            %{?arg_apparmor_profiles} \
            -Dudev=enabled \
-           -Dyajl=enabled \
+           -Djson_c=enabled \
            %{?arg_sanlock} \
            -Dlibpcap=enabled \
            -Dlibnl=enabled \
@@ -1088,7 +1081,6 @@ Allows SSH into domains via VSOCK without need for network.
            -Dqemu_moddir=%{qemu_moddir} \
            -Dqemu_datadir=%{qemu_datadir} \
            -Dexpensive_tests=enabled \
-           %{?arg_loader_nvram} \
            -Dinit_script=systemd \
            -Dfirewall_backend_priority=%{firewall_backend_priority} \
            -Ddocs=enabled \
@@ -1119,7 +1111,9 @@ mv %{buildroot}/%{_sysconfdir}/logrotate.d/libvirtd %{buildroot}/%{logrotate_dir
 %endif
 
 mkdir -p %{buildroot}/%{_localstatedir}/lib/%{name}
+%if %{with_qemu}
 mkdir -p %{buildroot}/%{_sysconfdir}/%{name}/hooks
+%endif
 %find_lang %{name}
 install -d -m 0755 %{buildroot}/%{_datadir}/%{name}/networks/
 cp %{buildroot}/%{_sysconfdir}/%{name}/qemu/networks/default.xml \
@@ -1151,6 +1145,7 @@ rm -f %{buildroot}/%{_datadir}/augeas/lenses/libvirt_sanlock.aug
 rm -f %{buildroot}/%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
 %endif
 
+rm -f %{buildroot}/%{_sysusersdir}/libvirt.conf
 rm -f %{buildroot}/%{_sysusersdir}/libvirt-qemu.conf
 rm -f %{buildroot}/usr/lib/sysctl.d/60-libvirtd.conf
 
@@ -1163,7 +1158,9 @@ mkdir -p %{buildroot}/usr/lib/supportconfig/plugins
 install -m 755 %{S:1} %{buildroot}/usr/lib/supportconfig/plugins/libvirt
 
 # Install qemu hook script
+%if %{with_qemu}
 install -m 755 %{S:2} %{buildroot}/%{_sysconfdir}/%{name}/hooks/qemu
+%endif
 
 %ifarch %{power64} s390x x86_64
 mv %{buildroot}/%{_datadir}/systemtap/tapset/libvirt_probes.stp \
@@ -1235,14 +1232,23 @@ fi
 
 %preun daemon-common
 %service_del_preun libvirt-guests.service
-if [ $1 = 0 ]; then
-    rm -f /var/lib/%{name}/libvirt-guests
-fi
 
 %postun daemon-common
 /sbin/ldconfig
 %service_del_postun_without_restart libvirt-guests.service
 
+%if %{with_selinux_unconfined_daemon_hooks}
+%post daemon-hooks
+if [ $1 -eq 1 ]; then
+    %selinux_set_booleans -s targeted virt_hooks_unconfined=1
+fi
+
+%postun daemon-hooks
+if [ $1 -eq 0 ]; then
+    %selinux_unset_booleans -s targeted virt_hooks_unconfined=1
+fi
+%endif
+
 %pre daemon-proxy
 %libvirt_daemon_systemd_pre_inet virtproxyd
 
@@ -1461,6 +1467,7 @@ fi
 
 %files daemon-common
 %dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/connection-driver/
 %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/hooks
 %{_unitdir}/libvirt-guests.service
@@ -1545,8 +1552,10 @@ fi
 %{_datadir}/augeas/lenses/tests/test_virtproxyd.aug
 %doc %{_mandir}/man8/virtproxyd.8*
 
+%if %{with_qemu}
 %files daemon-hooks
 %{_sysconfdir}/%{name}/hooks/qemu
+%endif
 
 %files daemon-config-network
 %dir %{_datadir}/%{name}/networks/
@@ -1566,7 +1575,6 @@ fi
 %{_unitdir}/virtinterfaced-ro.socket
 %{_unitdir}/virtinterfaced-admin.socket
 %{_sbindir}/virtinterfaced
-%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so
 %doc %{_mandir}/man8/virtinterfaced.8*
 %endif
@@ -1589,7 +1597,6 @@ fi
 %dir %attr(0700, root, root) %{_localstatedir}/lib/%{name}/network/
 %dir %attr(0755, root, root) %{_localstatedir}/lib/%{name}/dnsmasq/
 %attr(0755, root, root) %{_libexecdir}/libvirt_leaseshelper
-%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so
 %if %{with_firewalld_zone}
 %dir %{_prefix}/lib/firewalld/zones/
@@ -1611,7 +1618,6 @@ fi
 %{_unitdir}/virtnodedevd-ro.socket
 %{_unitdir}/virtnodedevd-admin.socket
 %{_sbindir}/virtnodedevd
-%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so
 %doc %{_mandir}/man8/virtnodedevd.8*
 
@@ -1625,7 +1631,6 @@ fi
 %{_unitdir}/virtnwfilterd-admin.socket
 %{_sbindir}/virtnwfilterd
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/nwfilter/
-%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so
 %doc %{_mandir}/man8/virtnwfilterd.8*
 
@@ -1639,7 +1644,6 @@ fi
 %{_unitdir}/virtsecretd-admin.socket
 %{_sbindir}/virtsecretd
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/secrets/
-%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so
 %doc %{_mandir}/man8/virtsecretd.8*
 
@@ -1657,12 +1661,9 @@ fi
 %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/storage/
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/storage/autostart/
-%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so
 %dir %{_libdir}/%{name}/storage-backend/
 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_fs.so
-%dir %{_libdir}/%{name}/storage-file/
-%{_libdir}/%{name}/storage-file/libvirt_storage_file_fs.so
 %doc %{_mandir}/man8/virtstoraged.8*
 
 %files daemon-driver-storage-disk
@@ -1683,6 +1684,7 @@ fi
 %if %{with_storage_gluster}
 %files daemon-driver-storage-gluster
 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_gluster.so
+%dir %{_libdir}/%{name}/storage-file/
 %{_libdir}/%{name}/storage-file/libvirt_storage_file_gluster.so
 %endif
 
@@ -1703,9 +1705,6 @@ fi
 %if %{with_apparmor}
 %config(noreplace) %{_sysconfdir}/apparmor.d/usr.sbin.virtqemud
 %endif
-%if %{with_userfaultfd_sysctl}
-%config(noreplace) %{_prefix}/lib/sysctl.d/60-qemu-postcopy-migration.conf
-%endif
 %{_datadir}/augeas/lenses/virtqemud.aug
 %{_datadir}/augeas/lenses/tests/test_virtqemud.aug
 %{_unitdir}/virtqemud.service
@@ -1722,7 +1721,6 @@ fi
 %dir %attr(0700, root, root) %{_localstatedir}/log/%{name}/qemu/
 %{_datadir}/augeas/lenses/libvirtd_qemu.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
-%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so
 %dir %attr(0711, root, root) %{_localstatedir}/lib/%{name}/swtpm/
 %dir %attr(0711, root, root) %{_localstatedir}/log/swtpm/
@@ -1753,7 +1751,6 @@ fi
 %attr(0755, root, root) %{_libexecdir}/libvirt_lxc
 %{_datadir}/augeas/lenses/libvirtd_lxc.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
-%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_lxc.so
 %{_bindir}/virt-create-rootfs
 %doc %{_mandir}/man1/virt-create-rootfs.1*
@@ -1785,7 +1782,6 @@ fi
 %dir %attr(0700, root, root) %{_localstatedir}/lib/%{name}/libxl/dump/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/%{name}/libxl/save/
 %dir %attr(0700, root, root) %{_localstatedir}/log/%{name}/libxl/
-%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so
 %doc %{_mandir}/man8/virtxend.8*
 %endif
@@ -1836,7 +1832,6 @@ fi
 %{_bindir}/virt-pki-query-dn
 %{_bindir}/virt-pki-validate
 %{_datadir}/bash-completion/completions/virsh
-%dir %{_libdir}/%{name}/
 
 %if %{with_qemu}
 %files client-qemu