Accepting request 1060520 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/1060520 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=367
2023-01-25 16:42:21 +00:00 · 2023-01-25 16:42:21 +00:00 · 640b5b4970
commit 640b5b4970
parent 213137c8ab f3a503e4c0
28 changed files with 326 additions and 208 deletions
--- a/0001-libxl-add-support-for-BlockResize-API.patch
+++ b/0001-libxl-add-support-for-BlockResize-API.patch
@ -12,10 +12,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 src/libxl/libxl_driver.c      | 90 +++++++++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+)

-Index: libvirt-8.10.0/src/libxl/libxl_api_wrapper.h
+Index: libvirt-9.0.0/src/libxl/libxl_api_wrapper.h
 ===================================================================
--- libvirt-8.10.0.orig/src/libxl/libxl_api_wrapper.h
-+++ libvirt-8.10.0/src/libxl/libxl_api_wrapper.h
+--- libvirt-9.0.0.orig/src/libxl/libxl_api_wrapper.h
+++ libvirt-9.0.0/src/libxl/libxl_api_wrapper.h
@@ -215,3 +215,18 @@ libxlSetMemoryTargetWrapper(libxl_ctx *c
 
     return ret;
@ -35,10 +35,10 @@ Index: libvirt-8.10.0/src/libxl/libxl_api_wrapper.h
 +
 +    return ret;
 +}
-Index: libvirt-8.10.0/src/libxl/libxl_driver.c
+Index: libvirt-9.0.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-8.10.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-8.10.0/src/libxl/libxl_driver.c
+--- libvirt-9.0.0.orig/src/libxl/libxl_driver.c
+++ libvirt-9.0.0/src/libxl/libxl_driver.c
@@ -5257,6 +5257,95 @@ libxlDomainMemoryStats(virDomainPtr dom,
 
 #undef LIBXL_SET_MEMSTAT
--- a/0001-util-Don-t-spawn-pkttyagent-when-stdin-is-not-a-tty.patch
+++ b/0001-util-Don-t-spawn-pkttyagent-when-stdin-is-not-a-tty.patch
@ -18,10 +18,10 @@ Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
 src/util/virpolkit.c | 3 +++
 1 file changed, 3 insertions(+)

-Index: libvirt-8.10.0/src/util/virpolkit.c
+Index: libvirt-9.0.0/src/util/virpolkit.c
 ===================================================================
--- libvirt-8.10.0.orig/src/util/virpolkit.c
-+++ libvirt-8.10.0/src/util/virpolkit.c
+--- libvirt-9.0.0.orig/src/util/virpolkit.c
+++ libvirt-9.0.0/src/util/virpolkit.c
@@ -235,6 +235,9 @@ virPolkitAgentAvailable(void)
     const char *termid = ctermid(NULL);
     VIR_AUTOCLOSE fd = -1;
--- a/d6a8b9ee-qemu-Fix-managed-no-when-creating-ethdev.patch
+++ b/d6a8b9ee-qemu-Fix-managed-no-when-creating-ethdev.patch
@ -0,0 +1,50 @@
+From 9f09c5b36cc9c97c508aeb60ed268d2e04367877 Mon Sep 17 00:00:00 2001
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Mon, 23 Jan 2023 11:42:18 +0100
+Subject: [PATCH] qemu_interface: Fix managed='no' case when creating an
+ ethernet interface
+
+In a recent commit of v9.0.0-rc1~192 I've tried to forbid case
+where a TAP device already exists, but at the same time it's
+managed by Libvirt (<interface type='ethernet'> <target
+dev='tap0' managed='yes'/> </interface>). NB, if @managed
+attribute is missing then it's assumed to be managed by Libvirt.
+
+Anyway, I've mistakenly put setting of
+VIR_NETDEV_TAP_CREATE_ALLOW_EXISTING flag into managed='yes'
+branch instead of managed='no' branch in
+qemuInterfaceEthernetConnect().
+
+Move the setting of the flag into the correct branch.
+
+Fixes: a2ae3d299cf9c5ada8aa42ec4271748eb479dc27
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
+(cherry picked from commit d6a8b9eef70887e01fa5fd292580e14ca5eab08c)
+---
+ src/qemu/qemu_interface.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+Index: libvirt-9.0.0/src/qemu/qemu_interface.c
+===================================================================
+--- libvirt-9.0.0.orig/src/qemu/qemu_interface.c
+++ libvirt-9.0.0/src/qemu/qemu_interface.c
+@@ -443,6 +443,9 @@ qemuInterfaceEthernetConnect(virDomainDe
+                            _("target managed='no' but specified dev doesn't exist"));
+             goto cleanup;
+         }
+
+        tap_create_flags |= VIR_NETDEV_TAP_CREATE_ALLOW_EXISTING;
+
+         if (virNetDevMacVLanIsMacvtap(net->ifname)) {
+             auditdev = net->ifname;
+             if (virNetDevMacVLanTapOpen(net->ifname, tapfd, tapfdSize) < 0)
+@@ -461,8 +464,6 @@ qemuInterfaceEthernetConnect(virDomainDe
+         if (!net->ifname)
+             template_ifname = true;
+ 
+-        tap_create_flags |= VIR_NETDEV_TAP_CREATE_ALLOW_EXISTING;
+-
+         if (virNetDevTapCreate(&net->ifname, tunpath, tapfd, tapfdSize,
+                                tap_create_flags) < 0) {
+             goto cleanup;
--- a/ef482951-apparmor-Allow-umount-dev.patch
+++ b/ef482951-apparmor-Allow-umount-dev.patch
@ -0,0 +1,55 @@
+From b0d070a9b2d655c1bda5980c8176454fe7ee00b1 Mon Sep 17 00:00:00 2001
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Wed, 18 Jan 2023 10:28:04 +0100
+Subject: [PATCH] apparmor: Allow umount(/dev)
+
+Commit 379c0ce4bfed introduced a call to umount(/dev) performed
+inside the namespace that we run QEMU in.
+
+As a result of this, on machines using AppArmor, VM startup now
+fails with
+
+  internal error: Process exited prior to exec: libvirt:
+  QEMU Driver error: failed to umount devfs on /dev: Permission denied
+
+The corresponding denial is
+
+  AVC apparmor="DENIED" operation="umount" profile="libvirtd"
+      name="/dev/" pid=70036 comm="rpc-libvirtd"
+
+Extend the AppArmor configuration for virtqemud and libvirtd so
+that this operation is allowed.
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Jim Fehlig <jfehlig@suse.com>
+(cherry picked from commit ef4829510549ec68cf80774e98b200a3e7bbe51f)
+---
+ src/security/apparmor/usr.sbin.libvirtd.in  | 1 +
+ src/security/apparmor/usr.sbin.virtqemud.in | 1 +
+ 2 files changed, 2 insertions(+)
+
+Index: libvirt-9.0.0/src/security/apparmor/usr.sbin.libvirtd.in
+===================================================================
+--- libvirt-9.0.0.orig/src/security/apparmor/usr.sbin.libvirtd.in
+++ libvirt-9.0.0/src/security/apparmor/usr.sbin.libvirtd.in
+@@ -35,6 +35,7 @@ profile libvirtd @sbindir@/libvirtd flag
+   mount options=(rw,rslave)  -> /,
+   mount options=(rw, nosuid) -> /{var/,}run/libvirt/qemu/*.dev/,
+   umount /{var/,}run/libvirt/qemu/*.dev/,
+  umount /dev/,
+ 
+   # libvirt provides any mounts under /dev to qemu namespaces
+   mount options=(rw, move) /dev/ -> /{,var/}run/libvirt/qemu/*.dev/,
+Index: libvirt-9.0.0/src/security/apparmor/usr.sbin.virtqemud.in
+===================================================================
+--- libvirt-9.0.0.orig/src/security/apparmor/usr.sbin.virtqemud.in
+++ libvirt-9.0.0/src/security/apparmor/usr.sbin.virtqemud.in
+@@ -35,6 +35,7 @@ profile virtqemud @sbindir@/virtqemud fl
+   mount options=(rw,rslave)  -> /,
+   mount options=(rw, nosuid) -> /{var/,}run/libvirt/qemu/*.dev/,
+   umount /{var/,}run/libvirt/qemu/*.dev/,
+  umount /dev/,
+ 
+   # libvirt provides any mounts under /dev to qemu namespaces
+   mount options=(rw, move) /dev/ -> /{,var/}run/libvirt/qemu/*.dev/,
--- a/libvirt-8.10.0.tar.xz
+++ b/libvirt-8.10.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bb07b7b00f08f826dd4f623f8b233e4e8b221b8859bb5937ff45355f0ae29952
-size 8984348
--- a/libvirt-8.10.0.tar.xz.asc
+++ b/libvirt-8.10.0.tar.xz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmOIeyQACgkQymi+gBAI
-TJxRMA//cgdGLkyzpoOgfMBPQ+uk5VBb4tYBS/HaZyAGU71CYNbwngsvGx4GR+6E
-69AoYQXZi56yvPzyL7HMBMqn8/kadVWUKBk+gMQktTQrimkO4PyrLM2tbdfzPubE
-8tWp9CIoheVlwOloyVdAtn1FAjl1yzcXbjrcJeyvGXkRBZwJpLvdgBz2NMfrLCWN
-Q0stVBBDIuAOWI/6cYTqEcB2GHAK4KnQg8bHLPk5stzYMe0tbC/kDYWv7iW6qU69
-N1VkUwr+DvDdexV7MGMQaZUvSMzPK5wqIpm/74RRdkXsTtItlQq+8nYa1hFdSxMP
-GN0gcnQZxLui9AWX9gPRc7X5jloBNu4H5gqtuqg7GJC1wC/7EOIi9YM4hq6V/I/f
-feRTb8+8wO9hGRCyy9e0x52P2qs7Bh+JQZ8lmugaRKFYq5pJaKhjXrEgw1pJGDD0
-M58fTc4ZJmDK5L+GKgo6Nx8xYY93ED7n0vTNoSVWfSF9vIDI0QgwPxomskfKgSXA
-6KKHkWNIeeFkRzoOVExOZrsGg/wMjkSBgTOMj/57fKPVhAdFwTCVD1qt2e1PP8T4
-jPtldPQPMXaLrcBmVefnRwIMHgGyHCue4AHTpfJ+BVn4htKC7hnCO0r9LrPCj2DU
-+P22UXj1UG/4bpLTONAZQ+lqxCx16I85puhU7AtZlNEb0tDqrDY=
-=CbLX
-----END PGP SIGNATURE-----
--- a/libvirt-9.0.0.tar.xz
+++ b/libvirt-9.0.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:deca5cff1b7baac297bca9663907c61f71a47183371dc7ac019c107806d5435a
+size 9007104
--- a/libvirt-9.0.0.tar.xz.asc
+++ b/libvirt-9.0.0.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmPFOOsACgkQymi+gBAI
+TJwPphAAizsDgrGKO1Bp59d2cCaB//c00m99uSbI2OS+Pef1soNE5j5EiIaZY7hT
+FxoZzNaSQBD/LoJ+AZzfUKBCxdKt9SweydxHRLIfiSqBhyxhnfzysdQ5rnWZbxPn
+GiF7Rdkym7SGPjZ6davlCQq+BG4hKugdEKyOhiR2BxAXtawf1q0i2/XfsfX1vRuo
+Unk4J6chwP6vBCeDQyiIhDQry+Xr2aNybn4erUTggqcfvakv5/8ecysRfU3omHKv
+QwC7S9wknSAGxEqDB4xXPoSbGCv5aX9HVroPM8S4Jfrep+2zu0pm6+hhvQa1m2X7
+Y2HqEAM2zTy3SS8xIAkIFZdryP1tYEjsX4yYyWMuSj9UqJk0MRANz1tuwh/rnx4O
+VPulM5Ws+TDNUlCcJcWB6089HQav6fvE5nzjr+QAMhqdruFulschpN27rjYTFlTO
+g12xKuxkdcnftCire9RWKRDPM4+7yrRFdC0tM21GC7FE51oNj/Z7J86u10oamTmC
+/5Lx/80fHFfxBrQqNjdIJta9Vul3ZkR3F3F7mDfPKWuYlAfOWuPj1nVUFDEox0W2
+slVtwuU+h2zA/Q5WjeX4RjP9aoFuAJm8/kRBAl42xGmHSmIv316MrdqlVZMsTFRO
+Nawme/VZz312hRZKXBBfOcqt+8BePdaPsZlHf7kwdV3Cj5aLtNo=
+=DT2H
+-----END PGP SIGNATURE-----
--- a/libvirt-power8-models.patch
+++ b/libvirt-power8-models.patch
@ -8,10 +8,10 @@ From: <ro@suse.de>
 src/cpu_map/ppc64_POWER8.xml | 2 ++
 1 file changed, 2 insertions(+)

-Index: libvirt-8.10.0/src/cpu_map/ppc64_POWER8.xml
+Index: libvirt-9.0.0/src/cpu_map/ppc64_POWER8.xml
 ===================================================================
--- libvirt-8.10.0.orig/src/cpu_map/ppc64_POWER8.xml
-+++ libvirt-8.10.0/src/cpu_map/ppc64_POWER8.xml
+--- libvirt-9.0.0.orig/src/cpu_map/ppc64_POWER8.xml
+++ libvirt-9.0.0/src/cpu_map/ppc64_POWER8.xml
@@ -4,5 +4,7 @@
     <pvr value='0x004b0000' mask='0xffff0000'/>
     <pvr value='0x004c0000' mask='0xffff0000'/>
--- a/libvirt-suse-netcontrol.patch
+++ b/libvirt-suse-netcontrol.patch
@ -13,11 +13,11 @@ Originally authored by mt@suse.de
 tools/virsh.c                           |  2 +
 6 files changed, 80 insertions(+), 5 deletions(-)

-Index: libvirt-8.10.0/meson.build
+Index: libvirt-9.0.0/meson.build
 ===================================================================
--- libvirt-8.10.0.orig/meson.build
-+++ libvirt-8.10.0/meson.build
-@@ -1060,6 +1060,12 @@ else
+--- libvirt-9.0.0.orig/meson.build
+++ libvirt-9.0.0/meson.build
+@@ -1017,6 +1017,12 @@ else
   netcf_dep = dependency('', required: false)
 endif
 
@ -30,7 +30,7 @@ Index: libvirt-8.10.0/meson.build
 have_gnu_gettext_tools = false
 if not get_option('nls').disabled()
   have_gettext = cc.has_function('gettext')
-@@ -1467,10 +1473,10 @@ elif get_option('driver_hyperv').enabled
+@@ -1427,10 +1433,10 @@ elif get_option('driver_hyperv').enabled
   error('openwsman is required for the Hyper-V driver')
 endif
 
@ -43,7 +43,7 @@ Index: libvirt-8.10.0/meson.build
 endif
 
 if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD')
-@@ -2267,6 +2273,7 @@ libs_summary = {
+@@ -2200,6 +2206,7 @@ libs_summary = {
   'libssh2': libssh2_dep.found(),
   'libutil': libutil_dep.found(),
   'netcf': conf.has('WITH_NETCF'),
@ -51,10 +51,10 @@ Index: libvirt-8.10.0/meson.build
   'NLS': have_gnu_gettext_tools,
   'numactl': numactl_dep.found(),
   'openwsman': openwsman_dep.found(),
-Index: libvirt-8.10.0/meson_options.txt
+Index: libvirt-9.0.0/meson_options.txt
 ===================================================================
--- libvirt-8.10.0.orig/meson_options.txt
-+++ libvirt-8.10.0/meson_options.txt
+--- libvirt-9.0.0.orig/meson_options.txt
+++ libvirt-9.0.0/meson_options.txt
@@ -29,6 +29,7 @@ option('libpcap', type: 'feature', value
 option('libssh', type: 'feature', value: 'auto', description: 'libssh support')
 option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 support')
@ -63,10 +63,10 @@ Index: libvirt-8.10.0/meson_options.txt
 option('nls', type: 'feature', value: 'auto', description: 'nls support')
 option('numactl', type: 'feature', value: 'auto', description: 'numactl support')
 option('openwsman', type: 'feature', value: 'auto', description: 'openwsman support')
-Index: libvirt-8.10.0/src/interface/interface_backend_netcf.c
+Index: libvirt-9.0.0/src/interface/interface_backend_netcf.c
 ===================================================================
--- libvirt-8.10.0.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-8.10.0/src/interface/interface_backend_netcf.c
+--- libvirt-9.0.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-9.0.0/src/interface/interface_backend_netcf.c
@@ -21,7 +21,12 @@
 
 #include <config.h>
@ -178,10 +178,10 @@ Index: libvirt-8.10.0/src/interface/interface_backend_netcf.c
     if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
         return -1;
     if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
-Index: libvirt-8.10.0/src/interface/interface_driver.c
+Index: libvirt-9.0.0/src/interface/interface_driver.c
 ===================================================================
--- libvirt-8.10.0.orig/src/interface/interface_driver.c
-+++ libvirt-8.10.0/src/interface/interface_driver.c
+--- libvirt-9.0.0.orig/src/interface/interface_driver.c
+++ libvirt-9.0.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
     if (netcfIfaceRegister() == 0)
         return 0;
@ -199,10 +199,10 @@ Index: libvirt-8.10.0/src/interface/interface_driver.c
     if (udevIfaceRegister() == 0)
         return 0;
 #endif /* WITH_UDEV */
-Index: libvirt-8.10.0/src/interface/meson.build
+Index: libvirt-9.0.0/src/interface/meson.build
 ===================================================================
--- libvirt-8.10.0.orig/src/interface/meson.build
-+++ libvirt-8.10.0/src/interface/meson.build
+--- libvirt-9.0.0.orig/src/interface/meson.build
+++ libvirt-9.0.0/src/interface/meson.build
@@ -2,7 +2,7 @@ interface_driver_sources = [
   'interface_driver.c',
 ]
@ -220,10 +220,10 @@ Index: libvirt-8.10.0/src/interface/meson.build
       udev_dep,
     ],
     'link_args': [
-Index: libvirt-8.10.0/tools/virsh.c
+Index: libvirt-9.0.0/tools/virsh.c
 ===================================================================
--- libvirt-8.10.0.orig/tools/virsh.c
-+++ libvirt-8.10.0/tools/virsh.c
+--- libvirt-9.0.0.orig/tools/virsh.c
+++ libvirt-9.0.0/tools/virsh.c
@@ -545,6 +545,8 @@ virshShowVersion(vshControl *ctl G_GNUC_
     vshPrint(ctl, " Interface");
 # if defined(WITH_NETCF)
--- a/libvirt.changes
+++ b/libvirt.changes
@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Jan 17 17:33:00 UTC 2023 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 9.0.0
+  - jsc#PED-620
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v9-0-0-2023-01-16
+  - Added patches:
+    ef482951-apparmor-Allow-umount-dev.patch,
+    d6a8b9ee-qemu-Fix-managed-no-when-creating-ethdev.patch
+
 -------------------------------------------------------------------
 Tue Dec 27 17:49:38 UTC 2022 - James Fehlig <jfehlig@suse.com>

--- a/libvirt.spec
+++ b/libvirt.spec
@ -1,7 +1,7 @@
 #
 # spec file for package libvirt
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -162,7 +162,7 @@

 Name:           libvirt
 URL:            http://libvirt.org/
-Version:        8.10.0
+Version:        9.0.0
 Release:        0
 Summary:        Library providing a virtualization API
 License:        LGPL-2.1-or-later
@ -304,6 +304,8 @@ Source6:        libvirtd-relocation-server.xml
 Source99:       baselibs.conf
 Source100:      %{name}-rpmlintrc
 # Upstream patches
+Patch0:         ef482951-apparmor-Allow-umount-dev.patch
+Patch1:         d6a8b9ee-qemu-Fix-managed-no-when-creating-ethdev.patch
 # Patches pending upstream review
 Patch100:       libxl-dom-reset.patch
 Patch101:       network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@ -1481,9 +1483,9 @@ fi
 %{_sbindir}/virtproxyd
 %{_sbindir}/virtlogd
 %{_sbindir}/virtlockd
-%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/
 %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
-%dir %attr(0700, root, root) %{_sysconfdir}/%{name}/hooks
+%dir %attr(0700, root, root) %{_sysconfdir}/%{name}/hooks/
 %{_unitdir}/libvirtd.service
 %{_unitdir}/libvirtd.socket
 %{_unitdir}/libvirtd-ro.socket
@ -1519,8 +1521,8 @@ fi
 %dir %{_sysconfdir}/sasl2/
 %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
 %dir %{_datadir}/augeas/
-%dir %{_datadir}/augeas/lenses
-%dir %{_datadir}/augeas/lenses/tests
+%dir %{_datadir}/augeas/lenses/
+%dir %{_datadir}/augeas/lenses/tests/
 %{_datadir}/augeas/lenses/libvirtd.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd.aug
 %{_datadir}/augeas/lenses/virtlogd.aug
@ -1539,7 +1541,7 @@ fi
 %dir %attr(0711, root, root) %{_localstatedir}/lib/%{name}/boot/
 %dir %attr(0711, root, root) %{_localstatedir}/cache/%{name}/
 %dir %attr(0700, root, root) %{_localstatedir}/log/%{name}/
-%dir %attr(0755, root, root) %{_libdir}/%{name}/lock-driver
+%dir %attr(0755, root, root) %{_libdir}/%{name}/lock-driver/
 %attr(0755, root, root) %{_libdir}/%{name}/lock-driver/lockd.so
 %if %{with_polkit_rules}
 %{_datadir}/polkit-1/rules.d/50-libvirt.rules
@ -1557,10 +1559,10 @@ fi
 %doc %{_mandir}/man8/virtlockd.8*
 %doc %{_mandir}/man8/virtproxyd.8*
 %if %{with_apparmor}
-%dir %{_sysconfdir}/apparmor.d
-%dir %{_sysconfdir}/apparmor.d/abstractions
-%dir %{_sysconfdir}/apparmor.d/%{name}
-%dir %{_sysconfdir}/apparmor.d/local
+%dir %{_sysconfdir}/apparmor.d/
+%dir %{_sysconfdir}/apparmor.d/abstractions/
+%dir %{_sysconfdir}/apparmor.d/%{name}/
+%dir %{_sysconfdir}/apparmor.d/local/
 %config(noreplace) %{_sysconfdir}/apparmor.d/usr.sbin.libvirtd
 %config(noreplace) %{_sysconfdir}/apparmor.d/usr.lib.libvirt.virt-aa-helper
 %config(noreplace) %{_sysconfdir}/apparmor.d/abstractions/libvirt-qemu
@ -1570,11 +1572,11 @@ fi
 %config(noreplace) %{_sysconfdir}/apparmor.d/local/usr.lib.libvirt.virt-aa-helper
 %{_libexecdir}/virt-aa-helper
 %endif
-%dir %{_prefix}/lib/firewalld
+%dir %{_prefix}/lib/firewalld/
 %dir %{_fwdefdir}
 %{_fwdefdir}/libvirtd-relocation-server.xml
-%dir /usr/lib/supportconfig
-%dir /usr/lib/supportconfig/plugins
+%dir /usr/lib/supportconfig/
+%dir /usr/lib/supportconfig/plugins/
 /usr/lib/supportconfig/plugins/libvirt

 %files daemon-hooks
@ -1598,7 +1600,7 @@ fi
 %{_unitdir}/virtinterfaced-admin.socket
 %{_sbindir}/virtinterfaced
 %{_sbindir}/rcvirtinterfaced
-%dir %{_libdir}/%{name}/connection-driver
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so
 %doc %{_mandir}/man8/virtinterfaced.8*

@ -1614,11 +1616,11 @@ fi
 %{_sbindir}/rcvirtnetworkd
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/networks/
-%dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/networks/autostart
+%dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/networks/autostart/
 %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
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so
 %if %{with_firewalld_zone}
 %dir %{_prefix}/lib/firewalld/zones/
@ -1641,7 +1643,7 @@ fi
 %{_unitdir}/virtnodedevd-admin.socket
 %{_sbindir}/virtnodedevd
 %{_sbindir}/rcvirtnodedevd
-%dir %{_libdir}/%{name}/connection-driver
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so
 %doc %{_mandir}/man8/virtnodedevd.8*

@ -1656,7 +1658,7 @@ fi
 %{_sbindir}/virtnwfilterd
 %{_sbindir}/rcvirtnwfilterd
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/nwfilter/
-%dir %{_libdir}/%{name}/connection-driver
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so
 %doc %{_mandir}/man8/virtnwfilterd.8*

@ -1671,7 +1673,7 @@ fi
 %{_sbindir}/virtsecretd
 %{_sbindir}/rcvirtsecretd
 %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/secrets/
-%dir %{_libdir}/%{name}/connection-driver
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so
 %doc %{_mandir}/man8/virtsecretd.8*

@ -1690,11 +1692,11 @@ 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
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so
-%dir %{_libdir}/%{name}/storage-backend
+%dir %{_libdir}/%{name}/storage-backend/
 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_fs.so
-%dir %{_libdir}/%{name}/storage-file
+%dir %{_libdir}/%{name}/storage-file/
 %{_libdir}/%{name}/storage-file/libvirt_storage_file_fs.so
 %doc %{_mandir}/man8/virtstoraged.8*

@ -1752,7 +1754,7 @@ 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
+%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/
@ -1784,7 +1786,7 @@ 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
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_lxc.so
 %{_bindir}/virt-create-rootfs
 %doc %{_mandir}/man1/virt-create-rootfs.1*
@ -1817,7 +1819,7 @@ 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
+%dir %{_libdir}/%{name}/connection-driver/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so
 %doc %{_mandir}/man8/virtxend.8*
 %endif
@ -1869,7 +1871,7 @@ fi
 %{_bindir}/virt-pki-query-dn
 %{_bindir}/virt-pki-validate
 %{_datadir}/bash-completion/completions/virsh
-%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/

 %if %{with_qemu}
 %files client-qemu
@ -1918,7 +1920,7 @@ fi
 %files doc
 %doc AUTHORS.rst NEWS.rst README.rst
 %license COPYING COPYING.LESSER
-%dir %{_datadir}/doc/%{name}
+%dir %{_datadir}/doc/%{name}/
 %doc %{_datadir}/doc/%{name}/*

 %if %{with_sanlock}
@ -1934,11 +1936,11 @@ fi
 %dir %{_libdir}/%{name}/lock-driver/
 %attr(0755, root, root) %{_libdir}/%{name}/lock-driver/sanlock.so
 %dir %{_datadir}/augeas/
-%dir %{_datadir}/augeas/lenses
-%dir %{_datadir}/augeas/lenses/tests
+%dir %{_datadir}/augeas/lenses/
+%dir %{_datadir}/augeas/lenses/tests/
 %{_datadir}/augeas/lenses/libvirt_sanlock.aug
 %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
-%dir %attr(0700, root, sanlock) %{_localstatedir}/lib/%{name}/sanlock
+%dir %attr(0700, root, sanlock) %{_localstatedir}/lib/%{name}/sanlock/
 %{_sbindir}/virt-sanlock-cleanup
 %attr(0755, root, root) %{_libexecdir}/libvirt_sanlock_helper
 %endif
--- a/libxl-dom-reset.patch
+++ b/libxl-dom-reset.patch
@ -12,10 +12,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 src/libxl/libxl_driver.c | 58 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

-Index: libvirt-8.10.0/src/libxl/libxl_driver.c
+Index: libvirt-9.0.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-8.10.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-8.10.0/src/libxl/libxl_driver.c
+--- libvirt-9.0.0.orig/src/libxl/libxl_driver.c
+++ libvirt-9.0.0/src/libxl/libxl_driver.c
@@ -1355,6 +1355,63 @@ libxlDomainReboot(virDomainPtr dom, unsi
 }
 
--- a/libxl-set-cach-mode.patch
+++ b/libxl-set-cach-mode.patch
@ -10,11 +10,11 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 src/libxl/libxl_conf.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

-Index: libvirt-8.10.0/src/libxl/libxl_conf.c
+Index: libvirt-9.0.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-8.10.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-8.10.0/src/libxl/libxl_conf.c
-@@ -945,6 +945,28 @@ libxlDiskSetDiscard(libxl_device_disk *x
+--- libvirt-9.0.0.orig/src/libxl/libxl_conf.c
+++ libvirt-9.0.0/src/libxl/libxl_conf.c
+@@ -949,6 +949,28 @@ libxlDiskSetDiscard(libxl_device_disk *x
     }
 }
 
@ -43,7 +43,7 @@ Index: libvirt-8.10.0/src/libxl/libxl_conf.c
 static char *
 libxlMakeNetworkDiskSrcStr(virStorageSource *src,
                            const char *username,
-@@ -1184,6 +1206,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk,
+@@ -1188,6 +1210,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk,
     x_disk->readwrite = !l_disk->src->readonly;
     x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
     libxlDiskSetDiscard(x_disk, l_disk->discard);
--- a/libxl-set-migration-constraints.patch
+++ b/libxl-set-migration-constraints.patch
@ -15,11 +15,11 @@ Signed-off-by: Olaf Hering <olaf@aepfle.de>
 tools/virsh-domain.c             | 29 +++++++++++++++++
 6 files changed, 124 insertions(+), 21 deletions(-)

-Index: libvirt-8.10.0/docs/manpages/virsh.rst
+Index: libvirt-9.0.0/docs/manpages/virsh.rst
 ===================================================================
--- libvirt-8.10.0.orig/docs/manpages/virsh.rst
-+++ libvirt-8.10.0/docs/manpages/virsh.rst
-@@ -3359,6 +3359,7 @@ migrate
+--- libvirt-9.0.0.orig/docs/manpages/virsh.rst
+++ libvirt-9.0.0/docs/manpages/virsh.rst
+@@ -3362,6 +3362,7 @@ migrate
       [--parallel [--parallel-connections connections]]
       [--bandwidth bandwidth] [--tls-destination hostname]
       [--disks-uri URI] [--copy-storage-synchronous-writes]
@ -27,7 +27,7 @@ Index: libvirt-8.10.0/docs/manpages/virsh.rst
 
 Migrate domain to another host.  Add *--live* for live migration; <--p2p>
 for peer-2-peer migration; *--direct* for direct migration; or *--tunnelled*
-@@ -3485,6 +3486,12 @@ parallel connections. The number of such
+@@ -3488,6 +3489,12 @@ parallel connections. The number of such
 network link between the source and the target and thus speeding up the
 migration.
 
@ -40,10 +40,10 @@ Index: libvirt-8.10.0/docs/manpages/virsh.rst
 Running migration can be canceled by interrupting virsh (usually using
 ``Ctrl-C``) or by ``domjobabort`` command sent from another virsh instance.
 
-Index: libvirt-8.10.0/include/libvirt/libvirt-domain.h
+Index: libvirt-9.0.0/include/libvirt/libvirt-domain.h
 ===================================================================
--- libvirt-8.10.0.orig/include/libvirt/libvirt-domain.h
-+++ libvirt-8.10.0/include/libvirt/libvirt-domain.h
+--- libvirt-9.0.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-9.0.0/include/libvirt/libvirt-domain.h
@@ -1367,6 +1367,31 @@ typedef enum {
  */
 # define VIR_MIGRATE_PARAM_TLS_DESTINATION          "tls.destination"
@ -76,10 +76,10 @@ Index: libvirt-8.10.0/include/libvirt/libvirt-domain.h
 /* Domain migration. */
 virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
                                unsigned long flags, const char *dname,
-Index: libvirt-8.10.0/src/libxl/libxl_driver.c
+Index: libvirt-9.0.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-8.10.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-8.10.0/src/libxl/libxl_driver.c
+--- libvirt-9.0.0.orig/src/libxl/libxl_driver.c
+++ libvirt-9.0.0/src/libxl/libxl_driver.c
@@ -5996,6 +5996,9 @@ libxlDomainMigratePerform3Params(virDoma
     const char *dname = NULL;
     const char *uri = NULL;
@ -120,15 +120,15 @@ Index: libvirt-8.10.0/src/libxl/libxl_driver.c
             goto cleanup;
     }
 
-Index: libvirt-8.10.0/src/libxl/libxl_migration.c
+Index: libvirt-9.0.0/src/libxl/libxl_migration.c
 ===================================================================
--- libvirt-8.10.0.orig/src/libxl/libxl_migration.c
-+++ libvirt-8.10.0/src/libxl/libxl_migration.c
+--- libvirt-9.0.0.orig/src/libxl/libxl_migration.c
+++ libvirt-9.0.0/src/libxl/libxl_migration.c
@@ -329,18 +329,38 @@ libxlMigrateDstReceive(virNetSocket *soc
 static int
 libxlDoMigrateSrcSend(libxlDriverPrivate *driver,
                       virDomainObj *vm,
-                      unsigned long flags,
+-                      unsigned int flags,
 +                      const libxlDomainMigrationProps *props,
                       int sockfd)
 {
@ -169,7 +169,7 @@ Index: libvirt-8.10.0/src/libxl/libxl_migration.c
 static int
 libxlMigrationSrcStartTunnel(libxlDriverPrivate *driver,
                              virDomainObj *vm,
-                             unsigned long flags,
+-                             unsigned int flags,
 +                             const libxlDomainMigrationProps *props,
                              virStreamPtr st,
                              struct libxlTunnelControl **tnl)
@ -284,10 +284,10 @@ Index: libvirt-8.10.0/src/libxl/libxl_migration.c
     virObjectLock(vm);
 
     if (ret == 0) {
-Index: libvirt-8.10.0/src/libxl/libxl_migration.h
+Index: libvirt-9.0.0/src/libxl/libxl_migration.h
 ===================================================================
--- libvirt-8.10.0.orig/src/libxl/libxl_migration.h
-+++ libvirt-8.10.0/src/libxl/libxl_migration.h
+--- libvirt-9.0.0.orig/src/libxl/libxl_migration.h
+++ libvirt-9.0.0/src/libxl/libxl_migration.h
@@ -35,6 +35,9 @@
     VIR_MIGRATE_PARAM_URI,              VIR_TYPED_PARAM_STRING, \
     VIR_MIGRATE_PARAM_DEST_NAME,        VIR_TYPED_PARAM_STRING, \
@ -330,11 +330,11 @@ Index: libvirt-8.10.0/src/libxl/libxl_migration.h
 
 virDomainPtr
 libxlDomainMigrationDstFinish(virConnectPtr dconn,
-Index: libvirt-8.10.0/tools/virsh-domain.c
+Index: libvirt-9.0.0/tools/virsh-domain.c
 ===================================================================
--- libvirt-8.10.0.orig/tools/virsh-domain.c
-+++ libvirt-8.10.0/tools/virsh-domain.c
-@@ -11041,6 +11041,18 @@ static const vshCmdOptDef opts_migrate[]
+--- libvirt-9.0.0.orig/tools/virsh-domain.c
+++ libvirt-9.0.0/tools/virsh-domain.c
+@@ -11104,6 +11104,18 @@ static const vshCmdOptDef opts_migrate[]
      .completer = virshCompleteEmpty,
      .help = N_("override the destination host name used for TLS verification")
     },
@ -353,7 +353,7 @@ Index: libvirt-8.10.0/tools/virsh-domain.c
     {.name = NULL}
 };
 
-@@ -11061,6 +11073,7 @@ doMigrate(void *opaque)
+@@ -11124,6 +11136,7 @@ doMigrate(void *opaque)
     unsigned long long ullOpt = 0;
     int rv;
     virConnectPtr dconn = data->dconn;
@ -361,7 +361,7 @@ Index: libvirt-8.10.0/tools/virsh-domain.c
 #ifndef WIN32
     sigset_t sigmask, oldsigmask;
 
-@@ -11191,6 +11204,22 @@ doMigrate(void *opaque)
+@@ -11254,6 +11267,22 @@ doMigrate(void *opaque)
             goto save_error;
     }
 
--- a/libxl-support-block-script.patch
+++ b/libxl-support-block-script.patch
@ -13,11 +13,11 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 src/libxl/libxl_conf.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

-Index: libvirt-8.10.0/src/libxl/libxl_conf.c
+Index: libvirt-9.0.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-8.10.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-8.10.0/src/libxl/libxl_conf.c
-@@ -946,6 +946,20 @@ libxlDiskSetDiscard(libxl_device_disk *x
+--- libvirt-9.0.0.orig/src/libxl/libxl_conf.c
+++ libvirt-9.0.0/src/libxl/libxl_conf.c
+@@ -950,6 +950,20 @@ libxlDiskSetDiscard(libxl_device_disk *x
 }
 
 static void
@ -38,7 +38,7 @@ Index: libvirt-8.10.0/src/libxl/libxl_conf.c
 libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode)
 {
     switch (cachemode) {
-@@ -1088,6 +1102,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
+@@ -1092,6 +1106,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
 int
 libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk)
 {
@ -46,7 +46,7 @@ Index: libvirt-8.10.0/src/libxl/libxl_conf.c
     const char *driver = virDomainDiskGetDriver(l_disk);
     int format = virDomainDiskGetFormat(l_disk);
     virStorageType actual_type = virStorageSourceGetActualType(l_disk->src);
-@@ -1101,7 +1116,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk,
+@@ -1105,7 +1120,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk,
         if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0)
             return -1;
     } else {
@ -55,7 +55,7 @@ Index: libvirt-8.10.0/src/libxl/libxl_conf.c
     }
 
     x_disk->vdev = g_strdup(l_disk->dst);
-@@ -1207,6 +1222,8 @@ libxlMakeDisk(virDomainDiskDef *l_disk,
+@@ -1211,6 +1226,8 @@ libxlMakeDisk(virDomainDiskDef *l_disk,
     x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
     libxlDiskSetDiscard(x_disk, l_disk->discard);
     libxlDiskSetCacheMode(x_disk, l_disk->cachemode);
--- a/lxc-wait-after-eth-del.patch
+++ b/lxc-wait-after-eth-del.patch
@ -15,10 +15,10 @@ From: <cbosdonnat@suse.com>
 src/lxc/lxc_process.c    | 1 +
 3 files changed, 4 insertions(+)

-Index: libvirt-8.10.0/src/lxc/lxc_controller.c
+Index: libvirt-9.0.0/src/lxc/lxc_controller.c
 ===================================================================
--- libvirt-8.10.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-8.10.0/src/lxc/lxc_controller.c
+--- libvirt-9.0.0.orig/src/lxc/lxc_controller.c
+++ libvirt-9.0.0/src/lxc/lxc_controller.c
@@ -1997,6 +1997,7 @@ static int virLXCControllerDeleteInterfa
         if (virNetDevVethDelete(ctrl->veths[i]) < 0)
             ret = -1;
@ -27,11 +27,11 @@ Index: libvirt-8.10.0/src/lxc/lxc_controller.c
 
     return ret;
 }
-Index: libvirt-8.10.0/src/lxc/lxc_driver.c
+Index: libvirt-9.0.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-8.10.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-8.10.0/src/lxc/lxc_driver.c
-@@ -3498,6 +3498,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive
+--- libvirt-9.0.0.orig/src/lxc/lxc_driver.c
+++ libvirt-9.0.0/src/lxc/lxc_driver.c
+@@ -3494,6 +3494,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive
         case VIR_DOMAIN_NET_TYPE_NETWORK:
         case VIR_DOMAIN_NET_TYPE_ETHERNET:
             ignore_value(virNetDevVethDelete(veth));
@ -39,7 +39,7 @@ Index: libvirt-8.10.0/src/lxc/lxc_driver.c
             break;
 
         case VIR_DOMAIN_NET_TYPE_DIRECT:
-@@ -3939,6 +3940,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
+@@ -3935,6 +3936,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
             virDomainAuditNet(vm, detach, NULL, "detach", false);
             goto cleanup;
         }
@ -47,10 +47,10 @@ Index: libvirt-8.10.0/src/lxc/lxc_driver.c
         break;
 
         /* It'd be nice to support this, but with macvlan
-Index: libvirt-8.10.0/src/lxc/lxc_process.c
+Index: libvirt-9.0.0/src/lxc/lxc_process.c
 ===================================================================
--- libvirt-8.10.0.orig/src/lxc/lxc_process.c
-+++ libvirt-8.10.0/src/lxc/lxc_process.c
+--- libvirt-9.0.0.orig/src/lxc/lxc_process.c
+++ libvirt-9.0.0/src/lxc/lxc_process.c
@@ -226,6 +226,7 @@ static void virLXCProcessCleanup(virLXCD
                 VIR_WARN("Unable to release network device '%s'", NULLSTR(iface->ifname));
         }
--- a/network-don-t-use-dhcp-authoritative-on-static-netwo.patch
+++ b/network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@ -17,10 +17,10 @@ Signed-off-by: Martin Wilck <mwilck@suse.com>
 tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 -
 2 files changed, 8 insertions(+), 2 deletions(-)

-Index: libvirt-8.10.0/src/network/bridge_driver.c
+Index: libvirt-9.0.0/src/network/bridge_driver.c
 ===================================================================
--- libvirt-8.10.0.orig/src/network/bridge_driver.c
-+++ libvirt-8.10.0/src/network/bridge_driver.c
+--- libvirt-9.0.0.orig/src/network/bridge_driver.c
+++ libvirt-9.0.0/src/network/bridge_driver.c
@@ -1044,7 +1044,14 @@ networkDnsmasqConfDHCP(virBuffer *buf,
     if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
         if (ipdef->nranges || ipdef->nhosts) {
@ -37,10 +37,10 @@ Index: libvirt-8.10.0/src/network/bridge_driver.c
         }
 
         if (ipdef->bootfile) {
-Index: libvirt-8.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+Index: libvirt-9.0.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
 ===================================================================
--- libvirt-8.10.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
-+++ libvirt-8.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+--- libvirt-9.0.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-9.0.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
@@ -10,7 +10,6 @@ bind-dynamic
 interface=virbr1
 dhcp-range=192.168.122.1,static
--- a/ppc64le-canonical-name.patch
+++ b/ppc64le-canonical-name.patch
@ -10,10 +10,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 src/util/virarch.c | 2 ++
 1 file changed, 2 insertions(+)

-Index: libvirt-8.10.0/src/util/virarch.c
+Index: libvirt-9.0.0/src/util/virarch.c
 ===================================================================
--- libvirt-8.10.0.orig/src/util/virarch.c
-+++ libvirt-8.10.0/src/util/virarch.c
+--- libvirt-9.0.0.orig/src/util/virarch.c
+++ libvirt-9.0.0/src/util/virarch.c
@@ -222,6 +222,8 @@ virArch virArchFromHost(void)
         arch = VIR_ARCH_X86_64;
     } else if (STREQ(ut.machine, "arm64")) {
--- a/qemu-apparmor-screenshot.patch
+++ b/qemu-apparmor-screenshot.patch
@ -8,10 +8,10 @@ Not sure who added this patch. See bug#904426 for possible suspects.
 src/security/apparmor/libvirt-qemu | 3 +++
 1 file changed, 3 insertions(+)

-Index: libvirt-8.10.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-9.0.0/src/security/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-8.10.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-8.10.0/src/security/apparmor/libvirt-qemu
+--- libvirt-9.0.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-9.0.0/src/security/apparmor/libvirt-qemu
@@ -254,3 +254,6 @@
   # required for QEMU accessing UEFI nvram variables
   owner /var/lib/libvirt/qemu/nvram/*_VARS.fd rwk,
--- a/suse-fix-lxc-container-init.patch
+++ b/suse-fix-lxc-container-init.patch
@ -15,10 +15,10 @@ Signed-off-by: Eric van Blokland <mail@ericvanblokland.nl>
 src/lxc/lxc_process.c | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

-Index: libvirt-8.10.0/src/lxc/lxc_process.c
+Index: libvirt-9.0.0/src/lxc/lxc_process.c
 ===================================================================
--- libvirt-8.10.0.orig/src/lxc/lxc_process.c
-+++ libvirt-8.10.0/src/lxc/lxc_process.c
+--- libvirt-9.0.0.orig/src/lxc/lxc_process.c
+++ libvirt-9.0.0/src/lxc/lxc_process.c
@@ -49,6 +49,9 @@
 #include "virprocess.h"
 #include "netdev_bandwidth_conf.h"
--- a/suse-libvirt-guests-service.patch
+++ b/suse-libvirt-guests-service.patch
@ -8,10 +8,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 tools/libvirt-guests.sh.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

-Index: libvirt-8.10.0/tools/libvirt-guests.sh.in
+Index: libvirt-9.0.0/tools/libvirt-guests.sh.in
 ===================================================================
--- libvirt-8.10.0.orig/tools/libvirt-guests.sh.in
-+++ libvirt-8.10.0/tools/libvirt-guests.sh.in
+--- libvirt-9.0.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-9.0.0/tools/libvirt-guests.sh.in
@@ -20,10 +20,6 @@ sysconfdir="@sysconfdir@"
 localstatedir="@localstatedir@"
 libvirtd="@sbindir@"/libvirtd
--- a/suse-libvirtd-disable-tls.patch
+++ b/suse-libvirtd-disable-tls.patch
@ -14,10 +14,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 src/remote/test_libvirtd.aug.in   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

-Index: libvirt-8.10.0/src/remote/libvirtd.conf.in
+Index: libvirt-9.0.0/src/remote/libvirtd.conf.in
 ===================================================================
--- libvirt-8.10.0.orig/src/remote/libvirtd.conf.in
-+++ libvirt-8.10.0/src/remote/libvirtd.conf.in
+--- libvirt-9.0.0.orig/src/remote/libvirtd.conf.in
+++ libvirt-9.0.0/src/remote/libvirtd.conf.in
@@ -19,8 +19,8 @@
 # It is necessary to setup a CA and issue server certificates before
 # using this capability.
@ -29,10 +29,10 @@ Index: libvirt-8.10.0/src/remote/libvirtd.conf.in
 
 # Listen for unencrypted TCP connections on the public TCP/IP port.
 #
-Index: libvirt-8.10.0/src/remote/remote_daemon_config.c
+Index: libvirt-9.0.0/src/remote/remote_daemon_config.c
 ===================================================================
--- libvirt-8.10.0.orig/src/remote/remote_daemon_config.c
-+++ libvirt-8.10.0/src/remote/remote_daemon_config.c
+--- libvirt-9.0.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-9.0.0/src/remote/remote_daemon_config.c
@@ -95,7 +95,7 @@ daemonConfigNew(bool privileged G_GNUC_U
 
 #ifdef WITH_IP
@ -42,10 +42,10 @@ Index: libvirt-8.10.0/src/remote/remote_daemon_config.c
 # else /* ! LIBVIRTD */
     data->listen_tls = false; /* Always honoured, --listen doesn't exist. */
 # endif /* ! LIBVIRTD */
-Index: libvirt-8.10.0/src/remote/test_libvirtd.aug.in
+Index: libvirt-9.0.0/src/remote/test_libvirtd.aug.in
 ===================================================================
--- libvirt-8.10.0.orig/src/remote/test_libvirtd.aug.in
-+++ libvirt-8.10.0/src/remote/test_libvirtd.aug.in
+--- libvirt-9.0.0.orig/src/remote/test_libvirtd.aug.in
+++ libvirt-9.0.0/src/remote/test_libvirtd.aug.in
@@ -3,7 +3,7 @@ module Test_@DAEMON_NAME@ =
 
    test @DAEMON_NAME_UC@.lns get conf =
--- a/suse-libxl-disable-autoballoon.patch
+++ b/suse-libxl-disable-autoballoon.patch
@ -16,10 +16,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 src/libxl/test_libvirtd_libxl.aug.in |  2 +-
 3 files changed, 8 insertions(+), 19 deletions(-)

-Index: libvirt-8.10.0/src/libxl/libxl.conf
+Index: libvirt-9.0.0/src/libxl/libxl.conf
 ===================================================================
--- libvirt-8.10.0.orig/src/libxl/libxl.conf
-+++ libvirt-8.10.0/src/libxl/libxl.conf
+--- libvirt-9.0.0.orig/src/libxl/libxl.conf
+++ libvirt-9.0.0/src/libxl/libxl.conf
@@ -4,12 +4,11 @@
 
 # Enable autoballooning of domain0
@ -37,11 +37,11 @@ Index: libvirt-8.10.0/src/libxl/libxl.conf
 
 
 # In order to prevent accidentally starting two domains that
-Index: libvirt-8.10.0/src/libxl/libxl_conf.c
+Index: libvirt-9.0.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-8.10.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-8.10.0/src/libxl/libxl_conf.c
-@@ -1741,15 +1741,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
+--- libvirt-9.0.0.orig/src/libxl/libxl_conf.c
+++ libvirt-9.0.0/src/libxl/libxl_conf.c
+@@ -1745,15 +1745,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
 /*
  * Get domain0 autoballoon configuration.  Honor user-specified
  * setting in libxl.conf first.  If not specified, autoballooning
@ -58,7 +58,7 @@ Index: libvirt-8.10.0/src/libxl/libxl_conf.c
     int res;
 
     res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon);
-@@ -1758,15 +1755,8 @@ libxlGetAutoballoonConf(libxlDriverConfi
+@@ -1762,15 +1759,8 @@ libxlGetAutoballoonConf(libxlDriverConfi
     else if (res == 1)
         return 0;
 
@ -76,10 +76,10 @@ Index: libvirt-8.10.0/src/libxl/libxl_conf.c
     return 0;
 }
 
-Index: libvirt-8.10.0/src/libxl/test_libvirtd_libxl.aug.in
+Index: libvirt-9.0.0/src/libxl/test_libvirtd_libxl.aug.in
 ===================================================================
--- libvirt-8.10.0.orig/src/libxl/test_libvirtd_libxl.aug.in
-+++ libvirt-8.10.0/src/libxl/test_libvirtd_libxl.aug.in
+--- libvirt-9.0.0.orig/src/libxl/test_libvirtd_libxl.aug.in
+++ libvirt-9.0.0/src/libxl/test_libvirtd_libxl.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd_libxl =
   @CONFIG@
 
--- a/suse-qemu-conf.patch
+++ b/suse-qemu-conf.patch
@ -17,10 +17,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 src/qemu/test_libvirtd_qemu.aug.in |  1 +
 3 files changed, 28 insertions(+), 7 deletions(-)

-Index: libvirt-8.10.0/src/qemu/qemu.conf.in
+Index: libvirt-9.0.0/src/qemu/qemu.conf.in
 ===================================================================
--- libvirt-8.10.0.orig/src/qemu/qemu.conf.in
-+++ libvirt-8.10.0/src/qemu/qemu.conf.in
+--- libvirt-9.0.0.orig/src/qemu/qemu.conf.in
+++ libvirt-9.0.0/src/qemu/qemu.conf.in
@@ -491,10 +491,19 @@
 # isolation, but it cannot appear in a list of drivers.
 #
@ -70,11 +70,11 @@ Index: libvirt-8.10.0/src/qemu/qemu.conf.in
 #
 #lock_manager = "lockd"
 
-Index: libvirt-8.10.0/src/qemu/qemu_conf.c
+Index: libvirt-9.0.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-8.10.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-8.10.0/src/qemu/qemu_conf.c
-@@ -264,7 +264,7 @@ virQEMUDriverConfig *virQEMUDriverConfig
+--- libvirt-9.0.0.orig/src/qemu/qemu_conf.c
+++ libvirt-9.0.0/src/qemu/qemu_conf.c
+@@ -265,7 +265,7 @@ virQEMUDriverConfig *virQEMUDriverConfig
     cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER);
     cfg->dbusDaemonName = g_strdup(QEMU_DBUS_DAEMON);
 
@ -83,10 +83,10 @@ Index: libvirt-8.10.0/src/qemu/qemu_conf.c
     cfg->securityRequireConfined = false;
 
     cfg->keepAliveInterval = 5;
-Index: libvirt-8.10.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-9.0.0/src/qemu/test_libvirtd_qemu.aug.in
 ===================================================================
--- libvirt-8.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-8.10.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-9.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-9.0.0/src/qemu/test_libvirtd_qemu.aug.in
@@ -45,6 +45,7 @@ module Test_libvirtd_qemu =
 { "remote_websocket_port_min" = "5700" }
 { "remote_websocket_port_max" = "65535" }
--- a/suse-qemu-ovmf-paths.patch
+++ b/suse-qemu-ovmf-paths.patch
@ -16,10 +16,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 src/security/virt-aa-helper.c      | 3 ++-
 4 files changed, 11 insertions(+), 13 deletions(-)

-Index: libvirt-8.10.0/src/qemu/qemu.conf.in
+Index: libvirt-9.0.0/src/qemu/qemu.conf.in
 ===================================================================
--- libvirt-8.10.0.orig/src/qemu/qemu.conf.in
-+++ libvirt-8.10.0/src/qemu/qemu.conf.in
+--- libvirt-9.0.0.orig/src/qemu/qemu.conf.in
+++ libvirt-9.0.0/src/qemu/qemu.conf.in
@@ -857,10 +857,9 @@
 # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
 # follows this scheme.
@ -34,10 +34,10 @@ Index: libvirt-8.10.0/src/qemu/qemu.conf.in
 #]
 
 # The backend to use for handling stdout/stderr output from
-Index: libvirt-8.10.0/src/qemu/qemu_conf.c
+Index: libvirt-9.0.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-8.10.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-8.10.0/src/qemu/qemu_conf.c
+--- libvirt-9.0.0.orig/src/qemu/qemu_conf.c
+++ libvirt-9.0.0/src/qemu/qemu_conf.c
@@ -90,10 +90,9 @@ VIR_ONCE_GLOBAL_INIT(virQEMUConfig);
 
 #ifndef DEFAULT_LOADER_NVRAM
@ -52,10 +52,10 @@ Index: libvirt-8.10.0/src/qemu/qemu_conf.c
 #endif
 
 
-Index: libvirt-8.10.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-9.0.0/src/qemu/test_libvirtd_qemu.aug.in
 ===================================================================
--- libvirt-8.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-8.10.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-9.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-9.0.0/src/qemu/test_libvirtd_qemu.aug.in
@@ -96,10 +96,9 @@ module Test_libvirtd_qemu =
 { "migration_port_max" = "49215" }
 { "log_timestamp" = "0" }
@ -70,10 +70,10 @@ Index: libvirt-8.10.0/src/qemu/test_libvirtd_qemu.aug.in
 }
 { "stdio_handler" = "logd" }
 { "gluster_debug_level" = "9" }
-Index: libvirt-8.10.0/src/security/virt-aa-helper.c
+Index: libvirt-9.0.0/src/security/virt-aa-helper.c
 ===================================================================
--- libvirt-8.10.0.orig/src/security/virt-aa-helper.c
-+++ libvirt-8.10.0/src/security/virt-aa-helper.c
+--- libvirt-9.0.0.orig/src/security/virt-aa-helper.c
+++ libvirt-9.0.0/src/security/virt-aa-helper.c
@@ -482,7 +482,8 @@ valid_path(const char *path, const bool
         "/usr/share/qemu-efi/",              /* for AAVMF images */
         "/usr/share/qemu-efi-aarch64/",      /* for AAVMF images */
--- a/suse-xen-ovmf-paths.patch
+++ b/suse-xen-ovmf-paths.patch
@ -12,11 +12,11 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 src/libxl/libxl_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-Index: libvirt-8.10.0/src/libxl/libxl_conf.c
+Index: libvirt-9.0.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-8.10.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-8.10.0/src/libxl/libxl_conf.c
-@@ -1792,7 +1792,7 @@ libxlDriverConfigNew(void)
+--- libvirt-9.0.0.orig/src/libxl/libxl_conf.c
+++ libvirt-9.0.0/src/libxl/libxl_conf.c
+@@ -1796,7 +1796,7 @@ libxlDriverConfigNew(void)
     cfg->firmwares = g_new0(virFirmware *, 1);
     cfg->nfirmwares = 1;
     cfg->firmwares[0] = g_new0(virFirmware, 1);
--- a/virt-create-rootfs.patch
+++ b/virt-create-rootfs.patch
@ -13,10 +13,10 @@ From <cbosdonnat@suse.com>
 create mode 100644 docs/manpages/virt-create-rootfs.rst
 create mode 100644 tools/virt-create-rootfs

-Index: libvirt-8.10.0/docs/manpages/meson.build
+Index: libvirt-9.0.0/docs/manpages/meson.build
 ===================================================================
--- libvirt-8.10.0.orig/docs/manpages/meson.build
-+++ libvirt-8.10.0/docs/manpages/meson.build
+--- libvirt-9.0.0.orig/docs/manpages/meson.build
+++ libvirt-9.0.0/docs/manpages/meson.build
@@ -21,6 +21,7 @@ docs_man_files = [
   { 'name': 'virt-qemu-qmp-proxy', 'section': '1', 'install': conf.has('WITH_QEMU') },
   { 'name': 'virt-xml-validate', 'section': '1', 'install': true },
@ -25,10 +25,10 @@ Index: libvirt-8.10.0/docs/manpages/meson.build
 
   { 'name': 'libvirt-guests', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') },
   { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') },
-Index: libvirt-8.10.0/docs/manpages/virt-create-rootfs.rst
+Index: libvirt-9.0.0/docs/manpages/virt-create-rootfs.rst
 ===================================================================
 --- /dev/null
-+++ libvirt-8.10.0/docs/manpages/virt-create-rootfs.rst
+++ libvirt-9.0.0/docs/manpages/virt-create-rootfs.rst
@@ -0,0 +1,88 @@
 +==================
 +virt-create-rootfs
@ -118,10 +118,10 @@ Index: libvirt-8.10.0/docs/manpages/virt-create-rootfs.rst
 +========
 +
 +virsh(1), `https://libvirt.org/ <https://libvirt.org/>`_
-Index: libvirt-8.10.0/tools/meson.build
+Index: libvirt-9.0.0/tools/meson.build
 ===================================================================
--- libvirt-8.10.0.orig/tools/meson.build
-+++ libvirt-8.10.0/tools/meson.build
+--- libvirt-9.0.0.orig/tools/meson.build
+++ libvirt-9.0.0/tools/meson.build
@@ -154,6 +154,8 @@ else
   virsh_icon_res = []
 endif
@ -131,10 +131,10 @@ Index: libvirt-8.10.0/tools/meson.build
 executable(
   'virsh',
   [
-Index: libvirt-8.10.0/tools/virt-create-rootfs
+Index: libvirt-9.0.0/tools/virt-create-rootfs
 ===================================================================
 --- /dev/null
-+++ libvirt-8.10.0/tools/virt-create-rootfs
+++ libvirt-9.0.0/tools/virt-create-rootfs
@@ -0,0 +1,236 @@
 +#!/bin/sh
 +set -e