Accepting request 1008079 from home:jfehlig:branches:Virtualization

- Update to libvirt 8.8.0 - jsc#PED-620, jsc#PED-1540 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html#v8-8-0-2022-10-03 - spec: Switch from monolithic to modular daemons for Factory OBS-URL: https://build.opensuse.org/request/show/1008079 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=949
2022-10-05 14:41:22 +00:00 · 2022-10-05 14:41:22 +00:00 · 85ae3cda41
commit 85ae3cda41
parent a3df6bd816
25 changed files with 357 additions and 252 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.7.0/src/libxl/libxl_api_wrapper.h
+Index: libvirt-8.8.0/src/libxl/libxl_api_wrapper.h
 ===================================================================
--- libvirt-8.7.0.orig/src/libxl/libxl_api_wrapper.h
-+++ libvirt-8.7.0/src/libxl/libxl_api_wrapper.h
+--- libvirt-8.8.0.orig/src/libxl/libxl_api_wrapper.h
+++ libvirt-8.8.0/src/libxl/libxl_api_wrapper.h
@@ -215,3 +215,18 @@ libxlSetMemoryTargetWrapper(libxl_ctx *c
 
     return ret;
@ -35,10 +35,10 @@ Index: libvirt-8.7.0/src/libxl/libxl_api_wrapper.h
 +
 +    return ret;
 +}
-Index: libvirt-8.7.0/src/libxl/libxl_driver.c
+Index: libvirt-8.8.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-8.7.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-8.7.0/src/libxl/libxl_driver.c
+--- libvirt-8.8.0.orig/src/libxl/libxl_driver.c
+++ libvirt-8.8.0/src/libxl/libxl_driver.c
@@ -5257,6 +5257,95 @@ libxlDomainMemoryStats(virDomainPtr dom,
 
 #undef LIBXL_SET_MEMSTAT
@ -89,7 +89,7 @@ Index: libvirt-8.7.0/src/libxl/libxl_driver.c
 +    if (virDomainBlockResizeEnsureACL(dom->conn, vm->def) < 0)
 +        goto cleanup;
 +
-+    if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0)
+    if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0)
 +        goto cleanup;
 +
 +    if (!virDomainObjIsActive(vm)) {
@ -124,7 +124,7 @@ Index: libvirt-8.7.0/src/libxl/libxl_driver.c
 +    ret = 0;
 +
 + endjob:
-+    libxlDomainObjEndJob(driver, vm);
+    virDomainObjEndJob(vm);
 +
 + cleanup:
 +    virDomainObjEndAPI(&vm);
@ -135,7 +135,7 @@ Index: libvirt-8.7.0/src/libxl/libxl_driver.c
 static int
 libxlDomainGetJobInfo(virDomainPtr dom,
                       virDomainJobInfoPtr info)
-@@ -6583,6 +6672,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6577,6 +6666,7 @@ static virHypervisorDriver libxlHypervis
     .domainGetNumaParameters = libxlDomainGetNumaParameters, /* 1.1.1 */
     .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */
     .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */
--- 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.7.0/src/util/virpolkit.c
+Index: libvirt-8.8.0/src/util/virpolkit.c
 ===================================================================
--- libvirt-8.7.0.orig/src/util/virpolkit.c
-+++ libvirt-8.7.0/src/util/virpolkit.c
+--- libvirt-8.8.0.orig/src/util/virpolkit.c
+++ libvirt-8.8.0/src/util/virpolkit.c
@@ -235,6 +235,9 @@ virPolkitAgentAvailable(void)
     const char *termid = ctermid(NULL);
     VIR_AUTOCLOSE fd = -1;
--- a/libvirt-8.7.0.tar.xz
+++ b/libvirt-8.7.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:72e63a0f27911e339afd8269c6e8b029721893940edec11e09e471944f60e538
-size 8937316
--- a/libvirt-8.7.0.tar.xz.asc
+++ b/libvirt-8.7.0.tar.xz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmMQguYACgkQymi+gBAI
-TJw+uBAAnAkoDhPUE//FRXmFir04uK1KUbkfNxjNDBUf0FfWDB0rSy24WO8rKTHw
-DLEo2KtMGrck2huy2r1YN4O5Vks6IEg1cCpqX+WIvVaofMSCkX5Eg1k4Z6/ZD6kE
-SFh+dCbuAx+HF+LHuT2jybn+eE4FzxlM8blY+YPI8Klo6cz2yIFICZnLnwF+jGFj
-mlJc3y+Shz7sQTtJGIvWaI+F39zSW0djdLiTsx/o2hk8e2BvMlgiKDh6WxCf4OEx
-tPybRhsif6cxwT0chx7NdG2Hs9EKAk5zGYcIU0OglBcDDhj0UIocgjyqYvmNSU25
-shnAD4uWz4TGDFuISDz9FnLslVY41iDgXIrzFWHUkknQ5y6G72I4Uy2pP9bj13g2
-fzLKsutQEEke1/pods1KTftnMQeZYdgTuoSNbZxEAQKz65CAQq7wdSMKeE3xSTBM
-4IXCWRjAblEDPykSQMUGr4XPBLMB6aQwLsJTsdyejZFu/S74maHq3u3449Nl+AI3
-aQhR+vwyJE2XsvlNRtOtFyfNd8MOqy0MQPeinkWMomXzrAXJlPotii3k7OU2PxvU
-mkmzqURxEFC8sg9vO3qwBEv5vTMnb4yr17ljt/cSVmTyNH0zANxY8PDGQcjQteI5
-ZlUZrs3e8Pg6OGOPjZQWvqH8a040etUjUelxrjpRWprvm+6qsNM=
-=TSbn
-----END PGP SIGNATURE-----
--- a/libvirt-8.8.0.tar.xz
+++ b/libvirt-8.8.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb0cbb6cd199e7a2f341e62f5410ca2daf65a0bf91bd522d951c1a18f0df0fa3
+size 8941928
--- a/libvirt-8.8.0.tar.xz.asc
+++ b/libvirt-8.8.0.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmM6l7cACgkQymi+gBAI
+TJxNJg/6Aj40XkTtzaRpeEtVCwq4FSbSmKOYtlTi4YiNLXSGqyYLQbszMe4M/7i7
+jl7x6uUVJ6JM0SeXZZzOrKtMdabfyi9PkKtKW5Ud2uQWdj1KRWIZQM8IYjdiHv0V
+G1grmYy8SNNqca/uSF+FXekbngciUm0ZyioUQShiSmmHXhJcFphADLv509X2gtA6
+iF4K3QAOjjW07GkuqCLKypG47k17oaHD0F5NxT3fIHI3+gH0v0h/E9NwdYkB45Uu
+MrV7wGQVCYM0G/g637vYT9NcsTwErtlwbe3Ie0VJb41ewXuJiSe7SkuLzuBMBZ12
+BfBuHSaIuOT3vOFw3kuIUfZDJ+ZRcTj6B/6QhWq/8ouQ6dHHoRUp/O3XcPKMzDe3
+Jv8sWU4Et8QEWTYMvqBJz+KMIjPrpEogPNu8rbF/Cv/C1HzCcJxbhygDCA8VkQ3w
+e+8GF0S9uR/CAw102ys2OhpxUAnfSuPbgfgHmnnYOiQuoZzirT2cXL3S5Q0UBRX8
+qVUlpgK3lh9GdRUVJ4H54YhCBTfbrQ28MqWwmL446HyqzKzm/u7CWl+A9diDrkhs
+PzLt7qYIbxNqrUjdZetTJeoiL4oGBHEnvTR6GT2srz/97yVtX2IGo5jXRMJNR3nK
+rN6lBp3yUepHKEQLdmwFNZ5qLqW3tuYxUgGCHhMAJwInYmcbbzQ=
+=IBi4
+-----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.7.0/src/cpu_map/ppc64_POWER8.xml
+Index: libvirt-8.8.0/src/cpu_map/ppc64_POWER8.xml
 ===================================================================
--- libvirt-8.7.0.orig/src/cpu_map/ppc64_POWER8.xml
-+++ libvirt-8.7.0/src/cpu_map/ppc64_POWER8.xml
+--- libvirt-8.8.0.orig/src/cpu_map/ppc64_POWER8.xml
+++ libvirt-8.8.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.7.0/meson.build
+Index: libvirt-8.8.0/meson.build
 ===================================================================
--- libvirt-8.7.0.orig/meson.build
-+++ libvirt-8.7.0/meson.build
-@@ -1073,6 +1073,12 @@ else
+--- libvirt-8.8.0.orig/meson.build
+++ libvirt-8.8.0/meson.build
+@@ -1060,6 +1060,12 @@ else
   netcf_dep = dependency('', required: false)
 endif
 
@ -30,7 +30,7 @@ Index: libvirt-8.7.0/meson.build
 have_gnu_gettext_tools = false
 if not get_option('nls').disabled()
   have_gettext = cc.has_function('gettext')
-@@ -1480,10 +1486,10 @@ elif get_option('driver_hyperv').enabled
+@@ -1467,10 +1473,10 @@ elif get_option('driver_hyperv').enabled
   error('openwsman is required for the Hyper-V driver')
 endif
 
@ -43,7 +43,7 @@ Index: libvirt-8.7.0/meson.build
 endif
 
 if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD')
-@@ -2291,6 +2297,7 @@ libs_summary = {
+@@ -2267,6 +2273,7 @@ libs_summary = {
   'libssh2': libssh2_dep.found(),
   'libutil': libutil_dep.found(),
   'netcf': conf.has('WITH_NETCF'),
@ -51,10 +51,10 @@ Index: libvirt-8.7.0/meson.build
   'NLS': have_gnu_gettext_tools,
   'numactl': numactl_dep.found(),
   'openwsman': openwsman_dep.found(),
-Index: libvirt-8.7.0/meson_options.txt
+Index: libvirt-8.8.0/meson_options.txt
 ===================================================================
--- libvirt-8.7.0.orig/meson_options.txt
-+++ libvirt-8.7.0/meson_options.txt
+--- libvirt-8.8.0.orig/meson_options.txt
+++ libvirt-8.8.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.7.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.7.0/src/interface/interface_backend_netcf.c
+Index: libvirt-8.8.0/src/interface/interface_backend_netcf.c
 ===================================================================
--- libvirt-8.7.0.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-8.7.0/src/interface/interface_backend_netcf.c
+--- libvirt-8.8.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-8.8.0/src/interface/interface_backend_netcf.c
@@ -21,7 +21,12 @@
 
 #include <config.h>
@ -119,7 +119,7 @@ Index: libvirt-8.7.0/src/interface/interface_backend_netcf.c
 
 static void
 virNetcfDriverStateDispose(void *obj)
-@@ -125,6 +161,10 @@ netcfStateInitialize(bool privileged,
+@@ -126,6 +162,10 @@ netcfStateInitialize(bool privileged,
          virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0)
         goto error;
 
@ -130,7 +130,7 @@ Index: libvirt-8.7.0/src/interface/interface_backend_netcf.c
     /* open netcf */
     if (ncf_init(&driver->netcf, NULL) != 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-@@ -1070,6 +1110,7 @@ static int netcfInterfaceIsActive(virInt
+@@ -1071,6 +1111,7 @@ static int netcfInterfaceIsActive(virInt
     return ret;
 }
 
@ -138,7 +138,7 @@ Index: libvirt-8.7.0/src/interface/interface_backend_netcf.c
 static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags)
 {
     int ret = -1;
-@@ -1141,6 +1182,7 @@ static int netcfInterfaceChangeRollback(
+@@ -1142,6 +1183,7 @@ static int netcfInterfaceChangeRollback(
 
     return ret;
 }
@ -146,7 +146,7 @@ Index: libvirt-8.7.0/src/interface/interface_backend_netcf.c
 
 static virInterfaceDriver interfaceDriver = {
     .name = INTERFACE_DRIVER_NAME,
-@@ -1157,9 +1199,11 @@ static virInterfaceDriver interfaceDrive
+@@ -1158,9 +1200,11 @@ static virInterfaceDriver interfaceDrive
     .interfaceCreate = netcfInterfaceCreate, /* 0.7.0 */
     .interfaceDestroy = netcfInterfaceDestroy, /* 0.7.0 */
     .interfaceIsActive = netcfInterfaceIsActive, /* 0.7.3 */
@ -158,7 +158,7 @@ Index: libvirt-8.7.0/src/interface/interface_backend_netcf.c
 };
 
 
-@@ -1190,6 +1234,19 @@ static virStateDriver interfaceStateDriv
+@@ -1191,6 +1235,19 @@ static virStateDriver interfaceStateDriv
 
 int netcfIfaceRegister(void)
 {
@ -178,10 +178,10 @@ Index: libvirt-8.7.0/src/interface/interface_backend_netcf.c
     if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
         return -1;
     if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
-Index: libvirt-8.7.0/src/interface/interface_driver.c
+Index: libvirt-8.8.0/src/interface/interface_driver.c
 ===================================================================
--- libvirt-8.7.0.orig/src/interface/interface_driver.c
-+++ libvirt-8.7.0/src/interface/interface_driver.c
+--- libvirt-8.8.0.orig/src/interface/interface_driver.c
+++ libvirt-8.8.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
     if (netcfIfaceRegister() == 0)
         return 0;
@ -199,10 +199,10 @@ Index: libvirt-8.7.0/src/interface/interface_driver.c
     if (udevIfaceRegister() == 0)
         return 0;
 #endif /* WITH_UDEV */
-Index: libvirt-8.7.0/src/interface/meson.build
+Index: libvirt-8.8.0/src/interface/meson.build
 ===================================================================
--- libvirt-8.7.0.orig/src/interface/meson.build
-+++ libvirt-8.7.0/src/interface/meson.build
+--- libvirt-8.8.0.orig/src/interface/meson.build
+++ libvirt-8.8.0/src/interface/meson.build
@@ -2,7 +2,7 @@ interface_driver_sources = [
   'interface_driver.c',
 ]
@ -220,10 +220,10 @@ Index: libvirt-8.7.0/src/interface/meson.build
       udev_dep,
     ],
     'link_args': [
-Index: libvirt-8.7.0/tools/virsh.c
+Index: libvirt-8.8.0/tools/virsh.c
 ===================================================================
--- libvirt-8.7.0.orig/tools/virsh.c
-+++ libvirt-8.7.0/tools/virsh.c
+--- libvirt-8.8.0.orig/tools/virsh.c
+++ libvirt-8.8.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,12 @@
+-------------------------------------------------------------------
+Wed Oct  5 01:23:33 UTC 2022 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 8.8.0
+  - jsc#PED-620, jsc#PED-1540
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v8-8-0-2022-10-03
+- spec: Switch from monolithic to modular daemons for Factory
+
 -------------------------------------------------------------------
 Tue Sep 27 22:36:37 UTC 2022 - James Fehlig <jfehlig@suse.com>

--- a/libvirt.spec
+++ b/libvirt.spec
@ -34,7 +34,6 @@

 # Then the secondary host drivers, which run inside libvirtd
 %define with_storage_rbd   0%{!?_without_storage_rbd:0}
-%define with_storage_sheepdog 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}
@ -124,6 +123,11 @@
    %endif
 %endif

+%define with_modular_daemons 0
+%if 0%{?suse_version} > 1500
+    %define with_modular_daemons 1
+%endif
+
 # Force QEMU to run as qemu:qemu
 %define qemu_user          qemu
 %define qemu_group         qemu
@ -158,7 +162,7 @@

 Name:           libvirt
 URL:            http://libvirt.org/
-Version:        8.7.0
+Version:        8.8.0
 Release:        0
 Summary:        Library providing a virtualization API
 License:        LGPL-2.1-or-later
@ -283,7 +287,7 @@ BuildRequires:  numad
 BuildRequires:  wireshark-devel
 %endif
 %if %{with_libssh}
-BuildRequires:  libssh-devel >= 0.7.0
+BuildRequires:  libssh-devel >= 0.8.1
 %endif
 # Needed for the firewalld_reload macro
 %if %{with_firewalld_zone}
@ -589,17 +593,6 @@ Requires:       %{name}-libs = %{version}-%{release}
 The storage driver backend adding implementation of the storage APIs for rbd
 volumes using the ceph protocol.

-%package daemon-driver-storage-sheepdog
-Summary:        Storage driver plugin for sheepdog
-Group:          System/Management
-Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
-Requires:       %{name}-libs = %{version}-%{release}
-Requires:       sheepdog
-
-%description daemon-driver-storage-sheepdog
-The storage driver backend adding implementation of the storage APIs for
-sheepdog volumes using.
-
 %package daemon-driver-storage
 Summary:        Storage driver plugin including all backends for the libvirtd daemon
 Group:          System/Management
@ -617,9 +610,6 @@ Requires:       %{name}-daemon-driver-storage-scsi = %{version}-%{release}
 %if %{with_storage_rbd}
 Requires:       %{name}-daemon-driver-storage-rbd = %{version}-%{release}
 %endif
-%if %{with_storage_sheepdog}
-Requires:       %{name}-daemon-driver-storage-sheepdog = %{version}-%{release}
-%endif
 %if %{with_storage_iscsi_direct}
 Requires:       %{name}-daemon-driver-storage-iscsi-direct = %{version}-%{release}
 %endif
@ -868,11 +858,6 @@ libvirt plugin for NSS for translating domain names into IP addresses.
 %else
    %define arg_storage_rbd -Dstorage_rbd=disabled
 %endif
-%if %{with_storage_sheepdog}
-    %define arg_storage_sheepdog -Dstorage_sheepdog=enabled
-%else
-    %define arg_storage_sheepdog -Dstorage_sheepdog=disabled
-%endif
 %if %{with_storage_gluster}
    %define arg_storage_gluster -Dstorage_gluster=enabled -Dglusterfs=enabled
 %else
@ -893,6 +878,11 @@ libvirt plugin for NSS for translating domain names into IP addresses.
 %else
    %define arg_libssh2 -Dlibssh2=disabled
 %endif
+%if %{with_modular_daemons}
+    %define arg_remote_mode -Dremote_default_mode=direct
+%else
+    %define arg_remote_mode -Dremote_default_mode=legacy
+%endif
 %if %{with_numactl}
    %define arg_numactl -Dnumactl=enabled
 %else
@ -997,7 +987,7 @@ libvirt plugin for NSS for translating domain names into IP addresses.
           -Ddriver_vz=disabled \
           -Ddriver_bhyve=disabled \
           -Ddriver_ch=disabled \
-           -Dremote_default_mode=legacy \
+           %{?arg_remote_mode} \
           -Ddriver_interface=enabled \
           -Ddriver_network=enabled \
           -Dstorage_fs=enabled \
@ -1007,7 +997,6 @@ libvirt plugin for NSS for translating domain names into IP addresses.
           -Dstorage_disk=enabled \
           -Dstorage_mpath=enabled \
           %{?arg_storage_rbd} \
-           %{?arg_storage_sheepdog} \
           %{?arg_storage_gluster} \
           %{?arg_storage_iscsi_direct} \
           -Dstorage_zfs=disabled \
@ -1153,9 +1142,37 @@ mv %{buildroot}/%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
 %check
 VIR_TEST_DEBUG=1 %meson_test -t 5 --no-suite syntax-check

+# For daemons with only UNIX sockets
+%define libvirt_daemon_systemd_pre() %service_add_pre %1.socket %1-ro.socket %1-admin.socket %1.service
+%define libvirt_daemon_systemd_post() %service_add_post %1.socket %1-ro.socket %1-admin.socket %1.service
+%define libvirt_daemon_systemd_preun() %service_del_preun %1.service %1-ro.socket %1-admin.socket %1.socket
+%define libvirt_daemon_systemd_postun() %service_del_postun_without_restart %1.service %1-ro.socket %1-admin.socket %1.socket
+%define libvirt_daemon_systemd_postun_restart() %service_del_postun %1.service %1-ro.socket %1-admin.socket %1.socket
+
+# For daemons with UNIX and INET sockets
+%define libvirt_daemon_systemd_pre_inet() %service_add_pre %1.socket %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket %1.service
+%define libvirt_daemon_systemd_post_inet() %service_add_post %1.socket %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket %1.service
+%define libvirt_daemon_systemd_preun_inet() %service_del_preun %1.service %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket %1.socket
+%define libvirt_daemon_systemd_postun_inet() %service_del_postun_without_restart %1.service %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket %1.socket
+%define libvirt_daemon_systemd_postun_inet_restart() %service_del_postun %1.service %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket %1.socket
+
+# For daemons with only UNIX sockets and no unprivileged read-only access
+%define libvirt_daemon_systemd_pre_priv() %service_add_pre %1.socket %1-admin.socket %1.service
+%define libvirt_daemon_systemd_post_priv() %service_add_post %1.socket %1-admin.socket %1.service
+%define libvirt_daemon_systemd_preun_priv() %service_del_preun %1.service %1-admin.socket %1.socket
+%define libvirt_daemon_systemd_postun_priv() %service_del_postun_without_restart %1.service %1-admin.socket %1.socket
+%define libvirt_daemon_systemd_postun_priv_restart() %service_del_postun %1.service %1-admin.socket %1.socket
+
 %pre daemon
 %libvirt_sysconfig_pre libvirtd virtproxyd virtlogd virtlockd libvirt-guests
-%service_add_pre libvirtd.service libvirtd.socket libvirtd-ro.socket libvirt-guests.service libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket
+%libvirt_daemon_systemd_pre_priv virtlogd
+%libvirt_daemon_systemd_pre_priv virtlockd
+%if %{with_modular_daemons}
+%libvirt_daemon_systemd_pre_inet virtproxyd
+%else
+%libvirt_daemon_systemd_pre_inet libvirtd
+%endif
+%service_add_pre libvirt-guests
 %libvirt_logrotate_pre libvirtd

 %post daemon
@ -1163,18 +1180,36 @@ VIR_TEST_DEBUG=1 %meson_test -t 5 --no-suite syntax-check
 %if %{with_apparmor}
 %apparmor_reload /etc/apparmor.d/usr.sbin.libvirtd
 %endif
-%service_add_post libvirtd.service libvirtd.socket libvirtd-ro.socket libvirt-guests.service libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket
+%libvirt_daemon_systemd_post_priv virtlogd
+%libvirt_daemon_systemd_post_priv virtlockd
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_post_inet virtproxyd
+%else
+    %libvirt_daemon_systemd_post_inet libvirtd
+%endif
+%service_add_post libvirt-guests.service

 %preun daemon
-%service_del_preun libvirtd.service libvirtd.socket libvirtd-ro.socket libvirt-guests.service libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket
+%service_del_preun libvirt-guests.service
 if [ $1 = 0 ]; then
    rm -f /var/lib/%{name}/libvirt-guests
 fi
+%libvirt_daemon_systemd_preun_inet libvirtd
+%libvirt_daemon_systemd_preun_inet virtproxyd
+%libvirt_daemon_systemd_preun_priv virtlogd
+%libvirt_daemon_systemd_preun_priv virtlockd

 %postun daemon
 /sbin/ldconfig
 # Handle restart/reload in posttrans
-%service_del_postun_without_restart libvirtd.service libvirtd.socket libvirtd-ro.socket libvirt-guests.service libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket
+%libvirt_daemon_systemd_postun_priv virtlogd
+%libvirt_daemon_systemd_postun_priv virtlockd
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_postun_inet virtproxyd
+%else
+    %libvirt_daemon_systemd_postun_inet libvirtd
+%endif
+%service_del_postun_without_restart libvirt-guests.service

 %posttrans daemon
 %libvirt_logrotate_posttrans libvirtd
@ -1222,22 +1257,30 @@ if test "$DISABLE_RESTART_ON_UPDATE" != yes -a \
 fi

 %pre daemon-driver-network
-%service_add_pre virtnetworkd.service virtnetworkd.socket virtnetworkd-ro.socket virtnetworkd-admin.socket
+%libvirt_sysconfig_pre virtnetworkd
+%libvirt_daemon_systemd_pre virtnetworkd

 %post daemon-driver-network
-%service_add_post virtnetworkd.service virtnetworkd.socket virtnetworkd-ro.socket virtnetworkd-admin.socket
 %if %{with_firewalld_zone}
    %firewalld_reload
 %endif
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_post virtnetworkd
+%endif

 %preun daemon-driver-network
-%service_del_preun virtnetworkd.service virtnetworkd.socket virtnetworkd-ro.socket virtnetworkd-admin.socket
+%libvirt_daemon_systemd_preun virtnetworkd

 %postun daemon-driver-network
-%service_del_postun virtnetworkd.service virtnetworkd.socket virtnetworkd-ro.socket virtnetworkd-admin.socket
 %if %{with_firewalld_zone}
    %firewalld_reload
 %endif
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_postun_restart virtnetworkd
+%endif
+
+%posttrans daemon-driver-network
+%libvirt_sysconfig_posttrans virtnetworkd

 %post daemon-config-network
 # Install the default network if one doesn't exist
@ -1248,112 +1291,170 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/%{name}/qemu/networks/default.xml ;
 fi

 %pre daemon-driver-nwfilter
-%service_add_pre virtnwfilterd.service virtnwfilterd.socket virtnwfilterd-ro.socket virtnwfilterd-admin.socket
+%libvirt_sysconfig_pre virtnwfilterd
+%libvirt_daemon_systemd_pre virtnwfilterd

 %post daemon-driver-nwfilter
-%service_add_post virtnwfilterd.service virtnwfilterd.socket virtnwfilterd-ro.socket virtnwfilterd-admin.socket
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_post virtnwfilterd
+%endif

 %preun daemon-driver-nwfilter
-%service_del_preun virtnwfilterd.service virtnwfilterd.socket virtnwfilterd-ro.socket virtnwfilterd-admin.socket
+%libvirt_daemon_systemd_preun virtnwfilterd

 %postun daemon-driver-nwfilter
-%service_del_postun virtnwfilterd.service virtnwfilterd.socket virtnwfilterd-ro.socket virtnwfilterd-admin.socket
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_postun_restart virtnwfilterd
+%endif
+
+%posttrans daemon-driver-nwfilter
+%libvirt_sysconfig_posttrans virtnwfilterd

 %pre daemon-driver-storage-core
-%service_add_pre virtstoraged.service virtstoraged.socket virtstoraged-ro.socket virtstoraged-admin.socket
+%libvirt_sysconfig_pre virtstoraged
+%libvirt_daemon_systemd_pre virtstoraged

 %post daemon-driver-storage-core
-%service_add_post virtstoraged.service virtstoraged.socket virtstoraged-ro.socket virtstoraged-admin.socket
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_post virtstoraged
+%endif

 %preun daemon-driver-storage-core
-%service_del_preun virtstoraged.service virtstoraged.socket virtstoraged-ro.socket virtstoraged-admin.socket
+%libvirt_daemon_systemd_preun virtstoraged

 %postun daemon-driver-storage-core
-%service_del_postun virtstoraged.service virtstoraged.socket virtstoraged-ro.socket virtstoraged-admin.socket
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_postun_restart virtstoraged
+%endif
+
+%posttrans daemon-driver-storage-core
+%libvirt_sysconfig_posttrans virtstoraged

 %pre daemon-driver-interface
-%service_add_pre virtinterfaced.service virtinterfaced.socket virtinterfaced-ro.socket virtinterfaced-admin.socket
+%libvirt_sysconfig_pre virtinterfaced
+%libvirt_daemon_systemd_pre virtinterfaced

 %post daemon-driver-interface
-%service_add_post virtinterfaced.service virtinterfaced.socket virtinterfaced-ro.socket virtinterfaced-admin.socket
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_post virtinterfaced
+%endif

 %preun daemon-driver-interface
-%service_del_preun virtinterfaced.service virtinterfaced.socket virtinterfaced-ro.socket virtinterfaced-admin.socket
+%libvirt_daemon_systemd_preun virtinterfaced

 %postun daemon-driver-interface
-%service_del_postun virtinterfaced.service virtinterfaced.socket virtinterfaced-ro.socket virtinterfaced-admin.socket
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_postun_restart virtinterfaced
+%endif
+
+%posttrans daemon-driver-interface
+%libvirt_sysconfig_posttrans virtinterfaced

 %pre daemon-driver-nodedev
-%service_add_pre virtnodedevd.service virtnodedevd.socket virtnodedevd-ro.socket virtnodedevd-admin.socket
+%libvirt_sysconfig_pre virtnodedevd
+%libvirt_daemon_systemd_pre virtnodedevd

 %post daemon-driver-nodedev
-%service_add_post virtnodedevd.service virtnodedevd.socket virtnodedevd-ro.socket virtnodedevd-admin.socket
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_post virtnodedevd
+%endif

 %preun daemon-driver-nodedev
-%service_del_preun virtnodedevd.service virtnodedevd.socket virtnodedevd-ro.socket virtnodedevd-admin.socket
+%libvirt_daemon_systemd_preun virtnodedevd

 %postun daemon-driver-nodedev
-%service_del_postun virtnodedevd.service virtnodedevd.socket virtnodedevd-ro.socket virtnodedevd-admin.socket
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_postun_restart virtnodedevd
+%endif
+
+%posttrans daemon-driver-nodedev
+%libvirt_sysconfig_posttrans virtnodedevd

 %pre daemon-driver-secret
-%service_add_pre virtsecretd.service virtsecretd.socket virtsecretd-ro.socket virtsecretd-admin.socket
+%libvirt_sysconfig_pre virtsecretd
+%libvirt_daemon_systemd_pre virtsecretd

 %post daemon-driver-secret
-%service_add_post virtsecretd.service virtsecretd.socket virtsecretd-ro.socket virtsecretd-admin.socket
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_post virtsecretd
+%endif

 %preun daemon-driver-secret
-%service_del_preun virtsecretd.service virtsecretd.socket virtsecretd-ro.socket virtsecretd-admin.socket
+%libvirt_daemon_systemd_preun virtsecretd

 %postun daemon-driver-secret
-%service_del_postun virtsecretd.service virtsecretd.socket virtsecretd-ro.socket virtsecretd-admin.socket
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_postun_restart virtsecretd
+%endif
+
+%posttrans daemon-driver-secret
+%libvirt_sysconfig_posttrans virtsecretd

 %pre daemon-driver-qemu
-%service_add_pre virtqemud.service virtqemud.socket virtqemud-ro.socket virtqemud-admin.socket
+%libvirt_sysconfig_pre virtqemud
+%libvirt_daemon_systemd_pre virtqemud
 %libvirt_logrotate_pre libvirtd.qemu

 %post daemon-driver-qemu
-%service_add_post virtqemud.service virtqemud.socket virtqemud-ro.socket virtqemud-admin.socket
-
-%posttrans daemon-driver-qemu
-%libvirt_logrotate_posttrans libvirtd.qemu
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_post virtqemud
+%endif

 %preun daemon-driver-qemu
-%service_del_preun virtqemud.service virtqemud.socket virtqemud-ro.socket virtqemud-admin.socket
+%libvirt_daemon_systemd_preun virtqemud

 %postun daemon-driver-qemu
-%service_del_postun virtqemud.service virtqemud.socket virtqemud-ro.socket virtqemud-admin.socket
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_postun_restart virtqemud
+%endif
+
+%posttrans daemon-driver-qemu
+%libvirt_sysconfig_posttrans virtqemud
+%libvirt_logrotate_posttrans libvirtd.qemu

 %pre daemon-driver-lxc
-%service_add_pre virtlxcd.service virtlxcd.socket virtlxcd-ro.socket virtlxcd-admin.socket
+%libvirt_sysconfig_pre virtlxcd
+%libvirt_daemon_systemd_pre virtlxcd
 %libvirt_logrotate_pre libvirtd.lxc

 %post daemon-driver-lxc
-%service_add_post virtlxcd.service virtlxcd.socket virtlxcd-ro.socket virtlxcd-admin.socket
-
-%posttrans daemon-driver-lxc
-%libvirt_logrotate_posttrans libvirtd.lxc
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_post virtlxcd
+%endif

 %preun daemon-driver-lxc
-%service_del_preun virtlxcd.service virtlxcd.socket virtlxcd-ro.socket virtlxcd-admin.socket
+%libvirt_daemon_systemd_preun virtlxcd

 %postun daemon-driver-lxc
-%service_del_postun virtlxcd.service virtlxcd.socket virtlxcd-ro.socket virtlxcd-admin.socket
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_postun_restart virtlxcd
+%endif
+
+%posttrans daemon-driver-lxc
+%libvirt_sysconfig_posttrans virtlxcd
+%libvirt_logrotate_posttrans libvirtd.lxc

 %pre daemon-driver-libxl
-%service_add_pre virtxend.service virtxend.socket virtxend-ro.socket virtxend-admin.socket
+%libvirt_sysconfig_pre virtxend
+%libvirt_daemon_systemd_pre virtxend
 %libvirt_logrotate_pre libvirtd.libxl

 %post daemon-driver-libxl
-%service_add_post virtxend.service virtxend.socket virtxend-ro.socket virtxend-admin.socket
-
-%posttrans daemon-driver-libxl
-%libvirt_logrotate_posttrans libvirtd.libxl
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_post virtxend
+%endif

 %preun daemon-driver-libxl
-%service_del_preun virtxend.service virtxend.socket virtxend-ro.socket virtxend-admin.socket
+%libvirt_daemon_systemd_preun virtxend

 %postun daemon-driver-libxl
-%service_del_postun virtxend.service virtxend.socket virtxend-ro.socket virtxend-admin.socket
+%if %{with_modular_daemons}
+    %libvirt_daemon_systemd_postun_restart virtxend
+%endif
+
+%posttrans daemon-driver-libxl
+%libvirt_sysconfig_posttrans virtxend
+%libvirt_logrotate_posttrans libvirtd.libxl

 %post libs -p /sbin/ldconfig

@ -1608,11 +1709,6 @@ fi
 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_rbd.so
 %endif

-%if %{with_storage_sheepdog}
-%files daemon-driver-storage-sheepdog
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_sheepdog.so
-%endif
-
 %if %{with_storage_iscsi_direct}
 %files daemon-driver-storage-iscsi-direct
 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi-direct.so
--- a/libxl-dom-reset.patch
+++ b/libxl-dom-reset.patch
@ -12,11 +12,11 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 src/libxl/libxl_driver.c | 58 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

-Index: libvirt-8.7.0/src/libxl/libxl_driver.c
+Index: libvirt-8.8.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-8.7.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-8.7.0/src/libxl/libxl_driver.c
-@@ -1354,6 +1354,63 @@ libxlDomainReboot(virDomainPtr dom, unsi
+--- libvirt-8.8.0.orig/src/libxl/libxl_driver.c
+++ libvirt-8.8.0/src/libxl/libxl_driver.c
+@@ -1355,6 +1355,63 @@ libxlDomainReboot(virDomainPtr dom, unsi
 }
 
 static int
@ -37,7 +37,7 @@ Index: libvirt-8.7.0/src/libxl/libxl_driver.c
 +    if (virDomainResetEnsureACL(dom->conn, vm->def) < 0)
 +        goto cleanup;
 +
-+    if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0)
+    if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0)
 +        goto cleanup;
 +
 +    if (!virDomainObjIsActive(vm)) {
@ -68,7 +68,7 @@ Index: libvirt-8.7.0/src/libxl/libxl_driver.c
 +    ret = 0;
 +
 + endjob:
-+    libxlDomainObjEndJob(driver, vm);
+    virDomainObjEndJob(vm);
 +
 + cleanup:
 +    virDomainObjEndAPI(&vm);
@ -80,7 +80,7 @@ Index: libvirt-8.7.0/src/libxl/libxl_driver.c
 libxlDomainDestroyFlags(virDomainPtr dom,
                         unsigned int flags)
 {
-@@ -6461,6 +6518,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6455,6 +6512,7 @@ static virHypervisorDriver libxlHypervis
     .domainShutdown = libxlDomainShutdown, /* 0.9.0 */
     .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */
     .domainReboot = libxlDomainReboot, /* 0.9.0 */
--- a/libxl-set-cach-mode.patch
+++ b/libxl-set-cach-mode.patch
@ -10,10 +10,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 src/libxl/libxl_conf.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

-Index: libvirt-8.7.0/src/libxl/libxl_conf.c
+Index: libvirt-8.8.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-8.7.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-8.7.0/src/libxl/libxl_conf.c
+--- libvirt-8.8.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.8.0/src/libxl/libxl_conf.c
@@ -941,6 +941,28 @@ libxlDiskSetDiscard(libxl_device_disk *x
     }
 }
--- a/libxl-set-migration-constraints.patch
+++ b/libxl-set-migration-constraints.patch
@ -15,10 +15,10 @@ Signed-off-by: Olaf Hering <olaf@aepfle.de>
 tools/virsh-domain.c             | 29 +++++++++++++++++
 6 files changed, 124 insertions(+), 21 deletions(-)

-Index: libvirt-8.7.0/docs/manpages/virsh.rst
+Index: libvirt-8.8.0/docs/manpages/virsh.rst
 ===================================================================
--- libvirt-8.7.0.orig/docs/manpages/virsh.rst
-+++ libvirt-8.7.0/docs/manpages/virsh.rst
+--- libvirt-8.8.0.orig/docs/manpages/virsh.rst
+++ libvirt-8.8.0/docs/manpages/virsh.rst
@@ -3297,6 +3297,7 @@ migrate
       [--parallel [--parallel-connections connections]]
       [--bandwidth bandwidth] [--tls-destination hostname]
@ -40,10 +40,10 @@ Index: libvirt-8.7.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.7.0/include/libvirt/libvirt-domain.h
+Index: libvirt-8.8.0/include/libvirt/libvirt-domain.h
 ===================================================================
--- libvirt-8.7.0.orig/include/libvirt/libvirt-domain.h
-+++ libvirt-8.7.0/include/libvirt/libvirt-domain.h
+--- libvirt-8.8.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-8.8.0/include/libvirt/libvirt-domain.h
@@ -1367,6 +1367,31 @@ typedef enum {
  */
 # define VIR_MIGRATE_PARAM_TLS_DESTINATION          "tls.destination"
@ -76,11 +76,11 @@ Index: libvirt-8.7.0/include/libvirt/libvirt-domain.h
 /* Domain migration. */
 virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
                                unsigned long flags, const char *dname,
-Index: libvirt-8.7.0/src/libxl/libxl_driver.c
+Index: libvirt-8.8.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-8.7.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-8.7.0/src/libxl/libxl_driver.c
-@@ -6002,6 +6002,9 @@ libxlDomainMigratePerform3Params(virDoma
+--- libvirt-8.8.0.orig/src/libxl/libxl_driver.c
+++ libvirt-8.8.0/src/libxl/libxl_driver.c
+@@ -5996,6 +5996,9 @@ libxlDomainMigratePerform3Params(virDoma
     const char *dname = NULL;
     const char *uri = NULL;
     int ret = -1;
@ -90,7 +90,7 @@ Index: libvirt-8.7.0/src/libxl/libxl_driver.c
 
 #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
     virReportUnsupportedError();
-@@ -6018,6 +6021,15 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6012,6 +6015,15 @@ libxlDomainMigratePerform3Params(virDoma
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_DEST_NAME,
                                 &dname) < 0 ||
@ -106,7 +106,7 @@ Index: libvirt-8.7.0/src/libxl/libxl_driver.c
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_URI,
                                 &uri) < 0)
-@@ -6032,11 +6044,11 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6026,11 +6038,11 @@ libxlDomainMigratePerform3Params(virDoma
 
     if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
         if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml,
@ -120,10 +120,10 @@ Index: libvirt-8.7.0/src/libxl/libxl_driver.c
             goto cleanup;
     }
 
-Index: libvirt-8.7.0/src/libxl/libxl_migration.c
+Index: libvirt-8.8.0/src/libxl/libxl_migration.c
 ===================================================================
--- libvirt-8.7.0.orig/src/libxl/libxl_migration.c
-+++ libvirt-8.7.0/src/libxl/libxl_migration.c
+--- libvirt-8.8.0.orig/src/libxl/libxl_migration.c
+++ libvirt-8.8.0/src/libxl/libxl_migration.c
@@ -329,18 +329,38 @@ libxlMigrateDstReceive(virNetSocket *soc
 static int
 libxlDoMigrateSrcSend(libxlDriverPrivate *driver,
@ -284,10 +284,10 @@ Index: libvirt-8.7.0/src/libxl/libxl_migration.c
     virObjectLock(vm);
 
     if (ret == 0) {
-Index: libvirt-8.7.0/src/libxl/libxl_migration.h
+Index: libvirt-8.8.0/src/libxl/libxl_migration.h
 ===================================================================
--- libvirt-8.7.0.orig/src/libxl/libxl_migration.h
-+++ libvirt-8.7.0/src/libxl/libxl_migration.h
+--- libvirt-8.8.0.orig/src/libxl/libxl_migration.h
+++ libvirt-8.8.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,10 +330,10 @@ Index: libvirt-8.7.0/src/libxl/libxl_migration.h
 
 virDomainPtr
 libxlDomainMigrationDstFinish(virConnectPtr dconn,
-Index: libvirt-8.7.0/tools/virsh-domain.c
+Index: libvirt-8.8.0/tools/virsh-domain.c
 ===================================================================
--- libvirt-8.7.0.orig/tools/virsh-domain.c
-+++ libvirt-8.7.0/tools/virsh-domain.c
+--- libvirt-8.8.0.orig/tools/virsh-domain.c
+++ libvirt-8.8.0/tools/virsh-domain.c
@@ -11026,6 +11026,18 @@ static const vshCmdOptDef opts_migrate[]
      .completer = virshCompleteEmpty,
      .help = N_("override the destination host name used for TLS verification")
--- a/libxl-support-block-script.patch
+++ b/libxl-support-block-script.patch
@ -13,10 +13,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 src/libxl/libxl_conf.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

-Index: libvirt-8.7.0/src/libxl/libxl_conf.c
+Index: libvirt-8.8.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-8.7.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-8.7.0/src/libxl/libxl_conf.c
+--- libvirt-8.8.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.8.0/src/libxl/libxl_conf.c
@@ -942,6 +942,20 @@ libxlDiskSetDiscard(libxl_device_disk *x
 }
 
--- 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.7.0/src/lxc/lxc_controller.c
+Index: libvirt-8.8.0/src/lxc/lxc_controller.c
 ===================================================================
--- libvirt-8.7.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-8.7.0/src/lxc/lxc_controller.c
+--- libvirt-8.8.0.orig/src/lxc/lxc_controller.c
+++ libvirt-8.8.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.7.0/src/lxc/lxc_controller.c
 
     return ret;
 }
-Index: libvirt-8.7.0/src/lxc/lxc_driver.c
+Index: libvirt-8.8.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-8.7.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-8.7.0/src/lxc/lxc_driver.c
-@@ -3507,6 +3507,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive
+--- libvirt-8.8.0.orig/src/lxc/lxc_driver.c
+++ libvirt-8.8.0/src/lxc/lxc_driver.c
+@@ -3498,6 +3498,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.7.0/src/lxc/lxc_driver.c
             break;
 
         case VIR_DOMAIN_NET_TYPE_DIRECT:
-@@ -3948,6 +3949,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
+@@ -3939,6 +3940,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
             virDomainAuditNet(vm, detach, NULL, "detach", false);
             goto cleanup;
         }
@ -47,10 +47,10 @@ Index: libvirt-8.7.0/src/lxc/lxc_driver.c
         break;
 
         /* It'd be nice to support this, but with macvlan
-Index: libvirt-8.7.0/src/lxc/lxc_process.c
+Index: libvirt-8.8.0/src/lxc/lxc_process.c
 ===================================================================
--- libvirt-8.7.0.orig/src/lxc/lxc_process.c
-+++ libvirt-8.7.0/src/lxc/lxc_process.c
+--- libvirt-8.8.0.orig/src/lxc/lxc_process.c
+++ libvirt-8.8.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,11 +17,11 @@ 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.7.0/src/network/bridge_driver.c
+Index: libvirt-8.8.0/src/network/bridge_driver.c
 ===================================================================
--- libvirt-8.7.0.orig/src/network/bridge_driver.c
-+++ libvirt-8.7.0/src/network/bridge_driver.c
-@@ -1043,7 +1043,14 @@ networkDnsmasqConfDHCP(virBuffer *buf,
+--- libvirt-8.8.0.orig/src/network/bridge_driver.c
+++ libvirt-8.8.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) {
             virBufferAddLit(buf, "dhcp-no-override\n");
@ -37,10 +37,10 @@ Index: libvirt-8.7.0/src/network/bridge_driver.c
         }
 
         if (ipdef->bootfile) {
-Index: libvirt-8.7.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+Index: libvirt-8.8.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
 ===================================================================
--- libvirt-8.7.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
-+++ libvirt-8.7.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+--- libvirt-8.8.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-8.8.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.7.0/src/util/virarch.c
+Index: libvirt-8.8.0/src/util/virarch.c
 ===================================================================
--- libvirt-8.7.0.orig/src/util/virarch.c
-+++ libvirt-8.7.0/src/util/virarch.c
+--- libvirt-8.8.0.orig/src/util/virarch.c
+++ libvirt-8.8.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.7.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-8.8.0/src/security/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-8.7.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-8.7.0/src/security/apparmor/libvirt-qemu
+--- libvirt-8.8.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-8.8.0/src/security/apparmor/libvirt-qemu
@@ -253,3 +253,6 @@
   # required for QEMU accessing UEFI nvram variables
   owner /var/lib/libvirt/qemu/nvram/*_VARS.fd rwk,
--- 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.7.0/tools/libvirt-guests.sh.in
+Index: libvirt-8.8.0/tools/libvirt-guests.sh.in
 ===================================================================
--- libvirt-8.7.0.orig/tools/libvirt-guests.sh.in
-+++ libvirt-8.7.0/tools/libvirt-guests.sh.in
+--- libvirt-8.8.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-8.8.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.7.0/src/remote/libvirtd.conf.in
+Index: libvirt-8.8.0/src/remote/libvirtd.conf.in
 ===================================================================
--- libvirt-8.7.0.orig/src/remote/libvirtd.conf.in
-+++ libvirt-8.7.0/src/remote/libvirtd.conf.in
+--- libvirt-8.8.0.orig/src/remote/libvirtd.conf.in
+++ libvirt-8.8.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,11 +29,11 @@ Index: libvirt-8.7.0/src/remote/libvirtd.conf.in
 
 # Listen for unencrypted TCP connections on the public TCP/IP port.
 #
-Index: libvirt-8.7.0/src/remote/remote_daemon_config.c
+Index: libvirt-8.8.0/src/remote/remote_daemon_config.c
 ===================================================================
--- libvirt-8.7.0.orig/src/remote/remote_daemon_config.c
-+++ libvirt-8.7.0/src/remote/remote_daemon_config.c
-@@ -97,7 +97,7 @@ daemonConfigNew(bool privileged G_GNUC_U
+--- libvirt-8.8.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-8.8.0/src/remote/remote_daemon_config.c
+@@ -95,7 +95,7 @@ daemonConfigNew(bool privileged G_GNUC_U
 
 #ifdef WITH_IP
 # ifdef LIBVIRTD
@ -42,10 +42,10 @@ Index: libvirt-8.7.0/src/remote/remote_daemon_config.c
 # else /* ! LIBVIRTD */
     data->listen_tls = false; /* Always honoured, --listen doesn't exist. */
 # endif /* ! LIBVIRTD */
-Index: libvirt-8.7.0/src/remote/test_libvirtd.aug.in
+Index: libvirt-8.8.0/src/remote/test_libvirtd.aug.in
 ===================================================================
--- libvirt-8.7.0.orig/src/remote/test_libvirtd.aug.in
-+++ libvirt-8.7.0/src/remote/test_libvirtd.aug.in
+--- libvirt-8.8.0.orig/src/remote/test_libvirtd.aug.in
+++ libvirt-8.8.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.7.0/src/libxl/libxl.conf
+Index: libvirt-8.8.0/src/libxl/libxl.conf
 ===================================================================
--- libvirt-8.7.0.orig/src/libxl/libxl.conf
-+++ libvirt-8.7.0/src/libxl/libxl.conf
+--- libvirt-8.8.0.orig/src/libxl/libxl.conf
+++ libvirt-8.8.0/src/libxl/libxl.conf
@@ -4,12 +4,11 @@
 
 # Enable autoballooning of domain0
@ -37,10 +37,10 @@ Index: libvirt-8.7.0/src/libxl/libxl.conf
 
 
 # In order to prevent accidentally starting two domains that
-Index: libvirt-8.7.0/src/libxl/libxl_conf.c
+Index: libvirt-8.8.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-8.7.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-8.7.0/src/libxl/libxl_conf.c
+--- libvirt-8.8.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.8.0/src/libxl/libxl_conf.c
@@ -1737,15 +1737,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
 /*
  * Get domain0 autoballoon configuration.  Honor user-specified
@ -76,10 +76,10 @@ Index: libvirt-8.7.0/src/libxl/libxl_conf.c
     return 0;
 }
 
-Index: libvirt-8.7.0/src/libxl/test_libvirtd_libxl.aug.in
+Index: libvirt-8.8.0/src/libxl/test_libvirtd_libxl.aug.in
 ===================================================================
--- libvirt-8.7.0.orig/src/libxl/test_libvirtd_libxl.aug.in
-+++ libvirt-8.7.0/src/libxl/test_libvirtd_libxl.aug.in
+--- libvirt-8.8.0.orig/src/libxl/test_libvirtd_libxl.aug.in
+++ libvirt-8.8.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.7.0/src/qemu/qemu.conf.in
+Index: libvirt-8.8.0/src/qemu/qemu.conf.in
 ===================================================================
--- libvirt-8.7.0.orig/src/qemu/qemu.conf.in
-+++ libvirt-8.7.0/src/qemu/qemu.conf.in
+--- libvirt-8.8.0.orig/src/qemu/qemu.conf.in
+++ libvirt-8.8.0/src/qemu/qemu.conf.in
@@ -491,10 +491,19 @@
 # isolation, but it cannot appear in a list of drivers.
 #
@ -70,10 +70,10 @@ Index: libvirt-8.7.0/src/qemu/qemu.conf.in
 #
 #lock_manager = "lockd"
 
-Index: libvirt-8.7.0/src/qemu/qemu_conf.c
+Index: libvirt-8.8.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-8.7.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-8.7.0/src/qemu/qemu_conf.c
+--- libvirt-8.8.0.orig/src/qemu/qemu_conf.c
+++ libvirt-8.8.0/src/qemu/qemu_conf.c
@@ -256,7 +256,7 @@ virQEMUDriverConfig *virQEMUDriverConfig
     cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER);
     cfg->dbusDaemonName = g_strdup(QEMU_DBUS_DAEMON);
@ -83,10 +83,10 @@ Index: libvirt-8.7.0/src/qemu/qemu_conf.c
     cfg->securityRequireConfined = false;
 
     cfg->keepAliveInterval = 5;
-Index: libvirt-8.7.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-8.8.0/src/qemu/test_libvirtd_qemu.aug.in
 ===================================================================
--- libvirt-8.7.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-8.7.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-8.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-8.8.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.7.0/src/qemu/qemu.conf.in
+Index: libvirt-8.8.0/src/qemu/qemu.conf.in
 ===================================================================
--- libvirt-8.7.0.orig/src/qemu/qemu.conf.in
-+++ libvirt-8.7.0/src/qemu/qemu.conf.in
+--- libvirt-8.8.0.orig/src/qemu/qemu.conf.in
+++ libvirt-8.8.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.7.0/src/qemu/qemu.conf.in
 #]
 
 # The backend to use for handling stdout/stderr output from
-Index: libvirt-8.7.0/src/qemu/qemu_conf.c
+Index: libvirt-8.8.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-8.7.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-8.7.0/src/qemu/qemu_conf.c
+--- libvirt-8.8.0.orig/src/qemu/qemu_conf.c
+++ libvirt-8.8.0/src/qemu/qemu_conf.c
@@ -82,10 +82,9 @@ VIR_ONCE_GLOBAL_INIT(virQEMUConfig);
 
 #ifndef DEFAULT_LOADER_NVRAM
@ -52,10 +52,10 @@ Index: libvirt-8.7.0/src/qemu/qemu_conf.c
 #endif
 
 
-Index: libvirt-8.7.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-8.8.0/src/qemu/test_libvirtd_qemu.aug.in
 ===================================================================
--- libvirt-8.7.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-8.7.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-8.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-8.8.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.7.0/src/qemu/test_libvirtd_qemu.aug.in
 }
 { "stdio_handler" = "logd" }
 { "gluster_debug_level" = "9" }
-Index: libvirt-8.7.0/src/security/virt-aa-helper.c
+Index: libvirt-8.8.0/src/security/virt-aa-helper.c
 ===================================================================
--- libvirt-8.7.0.orig/src/security/virt-aa-helper.c
-+++ libvirt-8.7.0/src/security/virt-aa-helper.c
+--- libvirt-8.8.0.orig/src/security/virt-aa-helper.c
+++ libvirt-8.8.0/src/security/virt-aa-helper.c
@@ -480,7 +480,8 @@ valid_path(const char *path, const bool
         "/usr/share/ovmf/",              /* for OVMF images */
         "/usr/share/AAVMF/",             /* for AAVMF images */
--- a/suse-xen-ovmf-paths.patch
+++ b/suse-xen-ovmf-paths.patch
@ -12,10 +12,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 src/libxl/libxl_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-Index: libvirt-8.7.0/src/libxl/libxl_conf.c
+Index: libvirt-8.8.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-8.7.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-8.7.0/src/libxl/libxl_conf.c
+--- libvirt-8.8.0.orig/src/libxl/libxl_conf.c
+++ libvirt-8.8.0/src/libxl/libxl_conf.c
@@ -1788,7 +1788,7 @@ libxlDriverConfigNew(void)
     cfg->firmwares = g_new0(virFirmware *, 1);
     cfg->nfirmwares = 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.7.0/docs/manpages/meson.build
+Index: libvirt-8.8.0/docs/manpages/meson.build
 ===================================================================
--- libvirt-8.7.0.orig/docs/manpages/meson.build
-+++ libvirt-8.7.0/docs/manpages/meson.build
+--- libvirt-8.8.0.orig/docs/manpages/meson.build
+++ libvirt-8.8.0/docs/manpages/meson.build
@@ -19,6 +19,7 @@ docs_man_files = [
   { 'name': 'virt-pki-validate', 'section': '1', 'install': true },
   { 'name': 'virt-qemu-run', 'section': '1', 'install': conf.has('WITH_QEMU') },
@ -25,10 +25,10 @@ Index: libvirt-8.7.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.7.0/docs/manpages/virt-create-rootfs.rst
+Index: libvirt-8.8.0/docs/manpages/virt-create-rootfs.rst
 ===================================================================
 --- /dev/null
-+++ libvirt-8.7.0/docs/manpages/virt-create-rootfs.rst
+++ libvirt-8.8.0/docs/manpages/virt-create-rootfs.rst
@@ -0,0 +1,88 @@
 +==================
 +virt-create-rootfs
@ -118,10 +118,10 @@ Index: libvirt-8.7.0/docs/manpages/virt-create-rootfs.rst
 +========
 +
 +virsh(1), `https://libvirt.org/ <https://libvirt.org/>`_
-Index: libvirt-8.7.0/tools/meson.build
+Index: libvirt-8.8.0/tools/meson.build
 ===================================================================
--- libvirt-8.7.0.orig/tools/meson.build
-+++ libvirt-8.7.0/tools/meson.build
+--- libvirt-8.8.0.orig/tools/meson.build
+++ libvirt-8.8.0/tools/meson.build
@@ -154,6 +154,8 @@ else
   virsh_icon_res = []
 endif
@ -131,10 +131,10 @@ Index: libvirt-8.7.0/tools/meson.build
 executable(
   'virsh',
   [
-Index: libvirt-8.7.0/tools/virt-create-rootfs
+Index: libvirt-8.8.0/tools/virt-create-rootfs
 ===================================================================
 --- /dev/null
-+++ libvirt-8.7.0/tools/virt-create-rootfs
+++ libvirt-8.8.0/tools/virt-create-rootfs
@@ -0,0 +1,236 @@
 +#!/bin/sh
 +set -e