Accepting request 882668 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/882668 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=329
2021-04-08 19:01:47 +00:00 · 2021-04-08 19:01:47 +00:00 · cc07db0831
commit cc07db0831
parent 8d8cc6979f d419828bef
36 changed files with 279 additions and 495 deletions
--- a/0001-Extract-stats-functions-from-the-qemu-driver.patch
+++ b/0001-Extract-stats-functions-from-the-qemu-driver.patch
@ -18,10 +18,10 @@ them.
 create mode 100644 src/conf/domain_stats.c
 create mode 100644 src/conf/domain_stats.h

-Index: libvirt-7.1.0/src/conf/domain_stats.c
+Index: libvirt-7.2.0/src/conf/domain_stats.c
 ===================================================================
 --- /dev/null
-+++ libvirt-7.1.0/src/conf/domain_stats.c
+++ libvirt-7.2.0/src/conf/domain_stats.c
@@ -0,0 +1,119 @@
 +/*
 + * domain_stats.c: domain stats extraction helpers
@ -142,10 +142,10 @@ Index: libvirt-7.1.0/src/conf/domain_stats.c
 +}
 +
 +#undef STATS_ADD_NET_PARAM
-Index: libvirt-7.1.0/src/conf/domain_stats.h
+Index: libvirt-7.2.0/src/conf/domain_stats.h
 ===================================================================
 --- /dev/null
-+++ libvirt-7.1.0/src/conf/domain_stats.h
+++ libvirt-7.2.0/src/conf/domain_stats.h
@@ -0,0 +1,62 @@
 +/*
 + * domain_stats.h: domain stats extraction helpers
@ -209,11 +209,11 @@ Index: libvirt-7.1.0/src/conf/domain_stats.h
 +                           virTypedParamListPtr params);
 +
 +#endif /* __DOMAIN_STATS_H */
-Index: libvirt-7.1.0/src/libvirt_private.syms
+Index: libvirt-7.2.0/src/libvirt_private.syms
 ===================================================================
--- libvirt-7.1.0.orig/src/libvirt_private.syms
-+++ libvirt-7.1.0/src/libvirt_private.syms
-@@ -745,12 +745,16 @@ virDomainConfNWFilterTeardown;
+--- libvirt-7.2.0.orig/src/libvirt_private.syms
+++ libvirt-7.2.0/src/libvirt_private.syms
+@@ -752,12 +752,16 @@ virDomainConfNWFilterTeardown;
 virDomainConfVMNWFilterTeardown;
 
 
@ -231,7 +231,7 @@ Index: libvirt-7.1.0/src/libvirt_private.syms
 # conf/interface_conf.h
 virInterfaceDefFormat;
 virInterfaceDefFree;
-@@ -1898,6 +1902,7 @@ virCgroupGetMemoryUsage;
+@@ -1908,6 +1912,7 @@ virCgroupGetMemoryUsage;
 virCgroupGetMemSwapHardLimit;
 virCgroupGetMemSwapUsage;
 virCgroupGetPercpuStats;
@ -239,10 +239,10 @@ Index: libvirt-7.1.0/src/libvirt_private.syms
 virCgroupHasController;
 virCgroupHasEmptyTasks;
 virCgroupKillPainfully;
-Index: libvirt-7.1.0/src/qemu/qemu_driver.c
+Index: libvirt-7.2.0/src/qemu/qemu_driver.c
 ===================================================================
--- libvirt-7.1.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-7.1.0/src/qemu/qemu_driver.c
+--- libvirt-7.2.0.orig/src/qemu/qemu_driver.c
+++ libvirt-7.2.0/src/qemu/qemu_driver.c
@@ -67,6 +67,7 @@
 #include "virarptable.h"
 #include "viruuid.h"
@ -251,7 +251,7 @@ Index: libvirt-7.1.0/src/qemu/qemu_driver.c
 #include "domain_audit.h"
 #include "domain_cgroup.h"
 #include "domain_driver.h"
-@@ -17515,13 +17516,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
+@@ -17552,13 +17553,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
                         virTypedParamListPtr params,
                         unsigned int privflags G_GNUC_UNUSED)
 {
@ -266,7 +266,7 @@ Index: libvirt-7.1.0/src/qemu/qemu_driver.c
 }
 
 
-@@ -17815,25 +17810,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
+@@ -17852,25 +17847,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
                             virTypedParamListPtr params)
 {
     qemuDomainObjPrivatePtr priv = dom->privateData;
@ -293,7 +293,7 @@ Index: libvirt-7.1.0/src/qemu/qemu_driver.c
 }
 
 
-@@ -18000,76 +17981,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
+@@ -18043,76 +18024,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
     return ret;
 }
 
@ -371,10 +371,10 @@ Index: libvirt-7.1.0/src/qemu/qemu_driver.c
 
 /* refresh information by opening images on the disk */
 static int
-Index: libvirt-7.1.0/src/util/vircgroup.c
+Index: libvirt-7.2.0/src/util/vircgroup.c
 ===================================================================
--- libvirt-7.1.0.orig/src/util/vircgroup.c
-+++ libvirt-7.1.0/src/util/vircgroup.c
+--- libvirt-7.2.0.orig/src/util/vircgroup.c
+++ libvirt-7.2.0/src/util/vircgroup.c
@@ -2981,6 +2981,31 @@ virCgroupControllerAvailable(int control
     return virCgroupHasController(cgroup, controller);
 }
@ -422,10 +422,10 @@ Index: libvirt-7.1.0/src/util/vircgroup.c
 int
 virCgroupNewPartition(const char *path G_GNUC_UNUSED,
                       bool create G_GNUC_UNUSED,
-Index: libvirt-7.1.0/src/util/vircgroup.h
+Index: libvirt-7.2.0/src/util/vircgroup.h
 ===================================================================
--- libvirt-7.1.0.orig/src/util/vircgroup.h
-+++ libvirt-7.1.0/src/util/vircgroup.h
+--- libvirt-7.2.0.orig/src/util/vircgroup.h
+++ libvirt-7.2.0/src/util/vircgroup.h
@@ -23,6 +23,7 @@
 
 #include "virbitmap.h"
@ -441,10 +441,10 @@ Index: libvirt-7.1.0/src/util/vircgroup.h
 +
 +int virCgroupGetStatsCpu(virCgroupPtr cgroup,
 +                         virTypedParamListPtr params);
-Index: libvirt-7.1.0/src/conf/meson.build
+Index: libvirt-7.2.0/src/conf/meson.build
 ===================================================================
--- libvirt-7.1.0.orig/src/conf/meson.build
-+++ libvirt-7.1.0/src/conf/meson.build
+--- libvirt-7.2.0.orig/src/conf/meson.build
+++ libvirt-7.2.0/src/conf/meson.build
@@ -15,6 +15,7 @@ domain_conf_sources = [
   'domain_conf.c',
   'domain_nwfilter.c',
--- a/0001-libxl-add-support-for-BlockResize-API.patch
+++ b/0001-libxl-add-support-for-BlockResize-API.patch
@ -19,11 +19,11 @@ reworking this patch and submitting it to upstream libvirt.
 src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

-Index: libvirt-7.1.0/src/libxl/libxl_driver.c
+Index: libvirt-7.2.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-7.1.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-7.1.0/src/libxl/libxl_driver.c
-@@ -5311,6 +5311,96 @@ libxlDomainMemoryStats(virDomainPtr dom,
+--- libvirt-7.2.0.orig/src/libxl/libxl_driver.c
+++ libvirt-7.2.0/src/libxl/libxl_driver.c
+@@ -5307,6 +5307,96 @@ libxlDomainMemoryStats(virDomainPtr dom,
 
 #undef LIBXL_SET_MEMSTAT
 
@ -120,7 +120,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_driver.c
 static int
 libxlDomainGetJobInfo(virDomainPtr dom,
                       virDomainJobInfoPtr info)
-@@ -6610,6 +6700,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6607,6 +6697,7 @@ static virHypervisorDriver libxlHypervis
 #endif
     .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */
     .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */
--- a/0002-lxc-implement-connectGetAllDomainStats.patch
+++ b/0002-lxc-implement-connectGetAllDomainStats.patch
@ -9,10 +9,10 @@ them using the existing API.
 src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)

-Index: libvirt-7.1.0/src/lxc/lxc_driver.c
+Index: libvirt-7.2.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-7.1.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-7.1.0/src/lxc/lxc_driver.c
+--- libvirt-7.2.0.orig/src/lxc/lxc_driver.c
+++ libvirt-7.2.0/src/lxc/lxc_driver.c
@@ -74,6 +74,8 @@
 #include "netdev_bandwidth_conf.h"
 #include "virsocket.h"
@ -22,7 +22,7 @@ Index: libvirt-7.1.0/src/lxc/lxc_driver.c
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
-@@ -5065,6 +5067,128 @@ lxcDomainHasManagedSaveImage(virDomainPt
+@@ -5068,6 +5070,128 @@ lxcDomainHasManagedSaveImage(virDomainPt
     return ret;
 }
 
@ -151,7 +151,7 @@ Index: libvirt-7.1.0/src/lxc/lxc_driver.c
 
 /* Function Tables */
 static virHypervisorDriver lxcHypervisorDriver = {
-@@ -5162,6 +5286,7 @@ static virHypervisorDriver lxcHypervisor
+@@ -5165,6 +5289,7 @@ static virHypervisorDriver lxcHypervisor
     .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */
     .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */
     .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */
--- a/6b8e9613-avoid-use-after-free.patch
+++ b/6b8e9613-avoid-use-after-free.patch
@ -1,27 +0,0 @@
-commit 6b8e961399549c5c8fdf06875e5981c564829ad6
-Author: Peter Krempa <pkrempa@redhat.com>
-Date:   Fri Mar 12 10:12:51 2021 +0100
-
-    virLockSpacePreExecRestart: Avoid use-after-free
-    
-    Recent refactor marked 'object' which is returned from the function as
-    autofree but forgot to use g_steal_pointer in the return statement to
-    prevent freeing it.
-    
-    Fixes: 9a1651f64d7
-    Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-    Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-
-Index: libvirt-7.1.0/src/util/virlockspace.c
-===================================================================
--- libvirt-7.1.0.orig/src/util/virlockspace.c
-+++ libvirt-7.1.0/src/util/virlockspace.c
-@@ -472,7 +472,7 @@ virJSONValuePtr virLockSpacePreExecResta
-         goto error;
- 
-     virMutexUnlock(&lockspace->lock);
-    return object;
-+    return g_steal_pointer(&object);
- 
-  error:
-     virMutexUnlock(&lockspace->lock);
--- a/c363f03e-virnetdaemon-intro-virNetDaemonQuitExecRestart.patch
+++ b/c363f03e-virnetdaemon-intro-virNetDaemonQuitExecRestart.patch
@ -1,85 +0,0 @@
-commit c363f03e6d0298416179c7f7b24f00da9d85a14f
-Author: Peter Krempa <pkrempa@redhat.com>
-Date:   Wed Mar 10 17:01:23 2021 +0100
-
-    virnetdaemon: Introduce virNetDaemonQuitExecRestart
-    
-    Recent changes which meant to fix daemon shutdown broke the exec-restart
-    capability of virtlogd and virtlockd, since the code actually closed all
-    the sockets and shut down all the internals.
-    
-    Add virNetDaemonQuitExecRestart, which requests a shutdown of the
-    process, but keeps all the services open and registered since they are
-    preserved across the restart.
-    
-    Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-    Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-
-Index: libvirt-7.1.0/src/libvirt_remote.syms
-===================================================================
--- libvirt-7.1.0.orig/src/libvirt_remote.syms
-+++ libvirt-7.1.0/src/libvirt_remote.syms
-@@ -85,6 +85,7 @@ virNetDaemonNew;
- virNetDaemonNewPostExecRestart;
- virNetDaemonPreExecRestart;
- virNetDaemonQuit;
-+virNetDaemonQuitExecRestart;
- virNetDaemonRemoveShutdownInhibition;
- virNetDaemonRun;
- virNetDaemonSetShutdownCallbacks;
-Index: libvirt-7.1.0/src/rpc/virnetdaemon.c
-===================================================================
--- libvirt-7.1.0.orig/src/rpc/virnetdaemon.c
-+++ libvirt-7.1.0/src/rpc/virnetdaemon.c
-@@ -76,6 +76,7 @@ struct _virNetDaemon {
-     bool quit;
-     bool finished;
-     bool graceful;
-+    bool execRestart;
- 
-     unsigned int autoShutdownTimeout;
-     size_t autoShutdownInhibitions;
-@@ -857,6 +858,10 @@ virNetDaemonRun(virNetDaemonPtr dmn)
- 
-         virHashForEach(dmn->servers, daemonServerProcessClients, NULL);
- 
-+        /* don't shutdown services when performing an exec-restart */
-+        if (dmn->quit && dmn->execRestart)
-+            goto cleanup;
-+
-         if (dmn->quit && dmn->finishTimer == -1) {
-             virHashForEach(dmn->servers, daemonServerClose, NULL);
-             if (dmn->shutdownPrepareCb && dmn->shutdownPrepareCb() < 0)
-@@ -912,6 +917,20 @@ virNetDaemonQuit(virNetDaemonPtr dmn)
-     virObjectUnlock(dmn);
- }
- 
-+
-+void
-+virNetDaemonQuitExecRestart(virNetDaemon *dmn)
-+{
-+    virObjectLock(dmn);
-+
-+    VIR_DEBUG("Exec-restart requested %p", dmn);
-+    dmn->quit = true;
-+    dmn->execRestart = true;
-+
-+    virObjectUnlock(dmn);
-+}
-+
-+
- static int
- daemonServerClose(void *payload,
-                   const char *key G_GNUC_UNUSED,
-Index: libvirt-7.1.0/src/rpc/virnetdaemon.h
-===================================================================
--- libvirt-7.1.0.orig/src/rpc/virnetdaemon.h
-+++ libvirt-7.1.0/src/rpc/virnetdaemon.h
-@@ -75,6 +75,7 @@ void virNetDaemonSetStateStopWorkerThrea
- void virNetDaemonRun(virNetDaemonPtr dmn);
- 
- void virNetDaemonQuit(virNetDaemonPtr dmn);
-+void virNetDaemonQuitExecRestart(virNetDaemon *dmn);
- 
- bool virNetDaemonHasClients(virNetDaemonPtr dmn);
- 
--- a/ccc6dd8f-fix-exec-restart.patch
+++ b/ccc6dd8f-fix-exec-restart.patch
@ -1,41 +0,0 @@
-commit ccc6dd8f11f32f9387fd05de4ad98d61d4e88b69
-Author: Peter Krempa <pkrempa@redhat.com>
-Date:   Wed Mar 10 17:14:18 2021 +0100
-
-    virtlo(g|ck)d: Fix exec-restart
-    
-    Commit 94e45d1042e broke exec-restart of virtlogd and virtlockd as the
-    code waiting for the daemon shutdown closed the daemons before
-    exec-restarting.
-    
-    Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1912243
-    Fixes: 94e45d1042e
-    Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-    Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-
-Index: libvirt-7.1.0/src/locking/lock_daemon.c
-===================================================================
--- libvirt-7.1.0.orig/src/locking/lock_daemon.c
-+++ libvirt-7.1.0/src/locking/lock_daemon.c
-@@ -336,7 +336,7 @@ virLockDaemonExecRestartHandler(virNetDa
-                                 void *opaque G_GNUC_UNUSED)
- {
-     execRestart = true;
-    virNetDaemonQuit(dmn);
-+    virNetDaemonQuitExecRestart(dmn);
- }
- 
- static int
-Index: libvirt-7.1.0/src/logging/log_daemon.c
-===================================================================
--- libvirt-7.1.0.orig/src/logging/log_daemon.c
-+++ libvirt-7.1.0/src/logging/log_daemon.c
-@@ -283,7 +283,7 @@ virLogDaemonExecRestartHandler(virNetDae
-                                void *opaque G_GNUC_UNUSED)
- {
-     execRestart = true;
-    virNetDaemonQuit(dmn);
-+    virNetDaemonQuitExecRestart(dmn);
- }
- 
- static int
--- a/eab7ae6b-fix-array-access.patch
+++ b/eab7ae6b-fix-array-access.patch
@ -1,40 +0,0 @@
-commit eab7ae6bfe13503ea705e70e32edaa60357cbaa1
-Author: Peter Krempa <pkrempa@redhat.com>
-Date:   Fri Mar 12 10:16:11 2021 +0100
-
-    virLockSpaceNewPostExecRestart: Fix out-of-bounds array access
-    
-    'res->owners' is allocated to 'res->nOwners' elements, but unfortunately
-    'res->nOwners' doesn't contain the proper value until after the
-    allocation so 0 elements are allocated. The following loop which assumes
-    that the array has the right number of elements then accesses the
-    pointer out of bounds. The bug was also faithfully converted from
-    VIR_ALLOC_N to g_new0.
-    
-    Fixes: 4a3d6ed5ee0
-    Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-    Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-
-Index: libvirt-7.1.0/src/util/virlockspace.c
-===================================================================
--- libvirt-7.1.0.orig/src/util/virlockspace.c
-+++ libvirt-7.1.0/src/util/virlockspace.c
-@@ -324,7 +324,6 @@ virLockSpacePtr virLockSpaceNewPostExecR
-         const char *tmp;
-         virJSONValuePtr owners;
-         size_t j;
-        size_t m;
- 
-         res = g_new0(virLockSpaceResource, 1);
-         res->fd = -1;
-@@ -384,9 +383,8 @@ virLockSpacePtr virLockSpaceNewPostExecR
-             goto error;
-         }
- 
-        m = virJSONValueArraySize(owners);
-+        res->nOwners = virJSONValueArraySize(owners);
-         res->owners = g_new0(pid_t, res->nOwners);
-        res->nOwners = m;
- 
-         for (j = 0; j < res->nOwners; j++) {
-             unsigned long long int owner;
--- a/ee3dc2c2-libxl-default-pcistub-name.patch
+++ b/ee3dc2c2-libxl-default-pcistub-name.patch
@ -1,37 +0,0 @@
-commit ee3dc2c2c8e5b2d3976e43dde95bc0aeeafbef4f
-Author: Jim Fehlig <jfehlig@suse.com>
-Date:   Mon Mar 1 15:41:44 2021 -0700
-
-    libxl: Fix node device detach when driver unspecified
-    
-    Commit 887dd0d331 caused a small regression in NodeDeviceDetach in the libxl
-    driver when the 'driver' parameter is not specified. E.g.
-    
-    # virsh nodedev-detach pci_0000_0a_10_0
-    error: Failed to detach device pci_0000_0a_10_0
-    error: An error occurred, but the cause is unknown
-    
-    If the driver name is not specified, NULL is passed to
-    virDomainDriverNodeDeviceDetachFlags, in which case virPCIDeviceSetStubDriver
-    is never called to set the stub to pciback. Fix it by setting the driver to
-    "xen" if it is not specified when invoking NodeDeviceDetach.
-    
-    Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-    Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
-
-Index: libvirt-7.1.0/src/libxl/libxl_driver.c
-===================================================================
--- libvirt-7.1.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-7.1.0/src/libxl/libxl_driver.c
-@@ -5777,7 +5777,10 @@ libxlNodeDeviceDetachFlags(virNodeDevice
- 
-     virCheckFlags(0, -1);
- 
-    if (driverName && STRNEQ(driverName, "xen")) {
-+    if (!driverName)
-+        driverName = "xen";
-+
-+    if (STRNEQ(driverName, "xen")) {
-         virReportError(VIR_ERR_INVALID_ARG,
-                        _("unsupported driver name '%s'"), driverName);
-         return -1;
--- a/libvirt-7.1.0.tar.xz
+++ b/libvirt-7.1.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:870f180d80256411c5afc39bc5aac4f8acca04a4e0725c576ad24053dc64a06c
-size 8645944
--- a/libvirt-7.1.0.tar.xz.asc
+++ b/libvirt-7.1.0.tar.xz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmA8ySIACgkQymi+gBAI
-TJz9lA/+P9rkzHysDajRUdQB35uW3a2xT/wS598J2sucJ1Ff6UTvwbyuLwLm9qE8
-2X0dZWpNshjnQ/Oj5F/qMa/MRQK3pSSks6gWmWFUw5eW/sQydxn41OIFEuLbAmdT
-W6538/vLVGakVLhJlvL9DxBC5kXzESkik3I5ORHNGMEAgDkSF1rj4MFYhYqNNV0B
-pwVIkbSBTWyW0bsqID1KT3ygq5qYWTwE9Gd06uAORCmZebpBgtdldLnkqAp4rog0
-gDyAY0AQ9PnsqCUowpgKzK2tPtJZ+lRz9M0xFG3OypNEmoqcnc3OlNVONB+7EYKW
-dmLNwa24UWyOJMjKmZivvC2kqhQ0YqLxjb3oMUiLFkn4ahAspCfySG2fb9wfo3wh
-Z5p1j/gpbSJU/hD7ifkqNPxIGDZHuzmTDeLZ6Q7kBENY3/aS99dOKHfpPV2/gYoJ
-ZvVbzraUBsl1rTkK3btKevq/0LGJDfM5/YmEPrH6auXLq0a/TNDv19uZaqpPr8Gh
-Y5r3gXS8RUmgG7zH0acaCYBXM02INNmVrlc6n4BGFnWgsqgEzdEgGtsfBcMoqhan
-/pBzs33FZxaMhFLPpqLamR7aDxkrlpynWYqKnAKxymwPZR7DgoeMbJEabWiDuwDN
-OA7MkTcyGa1OXaymUf7MYD3y0aDl4Uh2tNd80RmE+DTm9UvGH9M=
-=4z9B
-----END PGP SIGNATURE-----
--- a/libvirt-7.2.0.tar.xz
+++ b/libvirt-7.2.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:01f459d0c7ba5009622a628dba1a026200e8f4a299fea783b936a71d7e0ed1d0
+size 8661052
--- a/libvirt-7.2.0.tar.xz.asc
+++ b/libvirt-7.2.0.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAmBlnvUACgkQymi+gBAI
+TJzB5g/+I5cXk+emrHJbTxAsq0uNk0WYWexVgSQW433w1ETAEP7IXpcnUdYhrHqS
+v/SYKZfOLOwZW89A+gZvWorIG/hWhGG1ayen8LQSVdAJFnAR1dugfSk5OQs0cRJP
+ZvZ/pCnxYJ09f8FSANcJCVRDMHN+Zm5JMd/U7IrcU7qQVGcaqwl/p70oV9Xq89Hz
+WZJJGoHM3vNu0S8KkD7MMadFfV8Kz0pbpkl0Ok0sYYo+b0dkSpC1wLW2UO4hzF16
+MUazsCQKjxjSzOdsy1nbi/cUxNX4js4exdqScgHXgE8FRmnPzASMQ8+OWZZJDMDI
+Szhr4E0s/fB8zlt9solzBVUZdd2ocB7A3DkRKcMjHdtSF8fqh4+VRIidtCLKV84
+7CX20ZwL60dtYijfpYolitS8S8U7xB3+17KIidpgglqPkXK1Ly4886sDHspcShaz
+duMDHJRxbhX5hUIAtZHb4zWs6jhuaw8aZbq7HD10c1Su8Xx2d31EoNC1x10F4/Cf
+CxkUq7dOsGmK6xBlW9ZIvPYwOobBhxyW6Z30CGuh71TF5I9rrufsAQ3q4EbyrPU6
+PK6JUK9+Dxjcur7udE5dKFsAq87jiF4R1puvrTMDlPSjH4+DM8+ag2LO7872S/3P
+OuYcBM98fCjbmn6h9aaUj+AmfPYwDa6IrhIOKLKpBLfNngXlaLM=
+=8POk
+-----END PGP SIGNATURE-----
--- a/libvirt-power8-models.patch
+++ b/libvirt-power8-models.patch
@ -2,10 +2,10 @@ Add POWER8 v2.0 and v2.1 to cpu map XML

 From: <ro@suse.de>

-Index: libvirt-7.1.0/src/cpu_map/ppc64_POWER8.xml
+Index: libvirt-7.2.0/src/cpu_map/ppc64_POWER8.xml
 ===================================================================
--- libvirt-7.1.0.orig/src/cpu_map/ppc64_POWER8.xml
-+++ libvirt-7.1.0/src/cpu_map/ppc64_POWER8.xml
+--- libvirt-7.2.0.orig/src/cpu_map/ppc64_POWER8.xml
+++ libvirt-7.2.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
@ -1,7 +1,7 @@
-Index: libvirt-7.1.0/tools/virsh.c
+Index: libvirt-7.2.0/tools/virsh.c
 ===================================================================
--- libvirt-7.1.0.orig/tools/virsh.c
-+++ libvirt-7.1.0/tools/virsh.c
+--- libvirt-7.2.0.orig/tools/virsh.c
+++ libvirt-7.2.0/tools/virsh.c
@@ -543,6 +543,8 @@ virshShowVersion(vshControl *ctl G_GNUC_
     vshPrint(ctl, " Interface");
 # if defined(WITH_NETCF)
@ -11,10 +11,10 @@ Index: libvirt-7.1.0/tools/virsh.c
 # elif defined(WITH_UDEV)
     vshPrint(ctl, " udev");
 # endif
-Index: libvirt-7.1.0/src/interface/interface_backend_netcf.c
+Index: libvirt-7.2.0/src/interface/interface_backend_netcf.c
 ===================================================================
--- libvirt-7.1.0.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-7.1.0/src/interface/interface_backend_netcf.c
+--- libvirt-7.2.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-7.2.0/src/interface/interface_backend_netcf.c
@@ -21,7 +21,12 @@
 
 #include <config.h>
@ -78,7 +78,7 @@ Index: libvirt-7.1.0/src/interface/interface_backend_netcf.c
     /* open netcf */
     if (ncf_init(&driver->netcf, NULL) != 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-@@ -1112,6 +1152,7 @@ static int netcfInterfaceIsActive(virInt
+@@ -1110,6 +1150,7 @@ static int netcfInterfaceIsActive(virInt
     return ret;
 }
 
@ -86,7 +86,7 @@ Index: libvirt-7.1.0/src/interface/interface_backend_netcf.c
 static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags)
 {
     int ret;
-@@ -1186,6 +1227,7 @@ static int netcfInterfaceChangeRollback(
+@@ -1184,6 +1225,7 @@ static int netcfInterfaceChangeRollback(
     virObjectUnlock(driver);
     return ret;
 }
@ -94,7 +94,7 @@ Index: libvirt-7.1.0/src/interface/interface_backend_netcf.c
 
 static virInterfaceDriver interfaceDriver = {
     .name = INTERFACE_DRIVER_NAME,
-@@ -1202,9 +1244,11 @@ static virInterfaceDriver interfaceDrive
+@@ -1200,9 +1242,11 @@ static virInterfaceDriver interfaceDrive
     .interfaceCreate = netcfInterfaceCreate, /* 0.7.0 */
     .interfaceDestroy = netcfInterfaceDestroy, /* 0.7.0 */
     .interfaceIsActive = netcfInterfaceIsActive, /* 0.7.3 */
@ -106,7 +106,7 @@ Index: libvirt-7.1.0/src/interface/interface_backend_netcf.c
 };
 
 
-@@ -1235,6 +1279,19 @@ static virStateDriver interfaceStateDriv
+@@ -1233,6 +1277,19 @@ static virStateDriver interfaceStateDriv
 
 int netcfIfaceRegister(void)
 {
@ -126,10 +126,10 @@ Index: libvirt-7.1.0/src/interface/interface_backend_netcf.c
     if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
         return -1;
     if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
-Index: libvirt-7.1.0/src/interface/interface_driver.c
+Index: libvirt-7.2.0/src/interface/interface_driver.c
 ===================================================================
--- libvirt-7.1.0.orig/src/interface/interface_driver.c
-+++ libvirt-7.1.0/src/interface/interface_driver.c
+--- libvirt-7.2.0.orig/src/interface/interface_driver.c
+++ libvirt-7.2.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
     if (netcfIfaceRegister() == 0)
         return 0;
@ -147,11 +147,11 @@ Index: libvirt-7.1.0/src/interface/interface_driver.c
     if (udevIfaceRegister() == 0)
         return 0;
 #endif /* WITH_UDEV */
-Index: libvirt-7.1.0/meson.build
+Index: libvirt-7.2.0/meson.build
 ===================================================================
--- libvirt-7.1.0.orig/meson.build
-+++ libvirt-7.1.0/meson.build
-@@ -1162,6 +1162,12 @@ if not get_option('netcf').disabled()
+--- libvirt-7.2.0.orig/meson.build
+++ libvirt-7.2.0/meson.build
+@@ -1165,6 +1165,12 @@ if not get_option('netcf').disabled()
   endif
 endif
 
@ -164,7 +164,7 @@ Index: libvirt-7.1.0/meson.build
 have_gnu_gettext_tools = false
 if not get_option('nls').disabled()
   have_gettext = cc.has_function('gettext')
-@@ -1553,10 +1559,10 @@ elif get_option('driver_hyperv').enabled
+@@ -1556,10 +1562,10 @@ elif get_option('driver_hyperv').enabled
   error('openwsman is required for the Hyper-V driver')
 endif
 
@ -177,7 +177,7 @@ Index: libvirt-7.1.0/meson.build
 endif
 
 if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD')
-@@ -2360,6 +2366,7 @@ libs_summary = {
+@@ -2363,6 +2369,7 @@ libs_summary = {
   'libssh2': libssh2_dep.found(),
   'libutil': libutil_dep.found(),
   'netcf': conf.has('WITH_NETCF'),
@ -185,10 +185,10 @@ Index: libvirt-7.1.0/meson.build
   'NLS': have_gnu_gettext_tools,
   'numactl': numactl_dep.found(),
   'openwsman': openwsman_dep.found(),
-Index: libvirt-7.1.0/src/interface/meson.build
+Index: libvirt-7.2.0/src/interface/meson.build
 ===================================================================
--- libvirt-7.1.0.orig/src/interface/meson.build
-+++ libvirt-7.1.0/src/interface/meson.build
+--- libvirt-7.2.0.orig/src/interface/meson.build
+++ libvirt-7.2.0/src/interface/meson.build
@@ -2,7 +2,7 @@ interface_driver_sources = [
   'interface_driver.c',
 ]
@ -206,11 +206,11 @@ Index: libvirt-7.1.0/src/interface/meson.build
       udev_dep,
     ],
     'link_args': [
-Index: libvirt-7.1.0/meson_options.txt
+Index: libvirt-7.2.0/meson_options.txt
 ===================================================================
--- libvirt-7.1.0.orig/meson_options.txt
-+++ libvirt-7.1.0/meson_options.txt
-@@ -28,6 +28,7 @@ option('libpcap', type: 'feature', value
+--- libvirt-7.2.0.orig/meson_options.txt
+++ libvirt-7.2.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')
 option('netcf', type: 'feature', value: 'auto', description: 'netcf support')
--- a/libvirt.changes
+++ b/libvirt.changes
@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Thu Apr  1 23:42:46 UTC 2021 - James Fehlig <jfehlig@suse.com>
+
+- spec: Remove use of %fdupes since it was only acting on files
+  that should be excluded
+  bsc#1184293
+- Remove bogus comment from /etc/sysconfig/libvirtd
+  bsc#1184253
+
+-------------------------------------------------------------------
+Thu Apr  1 17:26:46 UTC 2021 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 7.2.0
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html
+  - Dropped patches:
+    ee3dc2c2-libxl-default-pcistub-name.patch,
+    6b8e9613-avoid-use-after-free.patch,
+    eab7ae6b-fix-array-access.patch,
+    c363f03e-virnetdaemon-intro-virNetDaemonQuitExecRestart.patch,
+    ccc6dd8f-fix-exec-restart.patch
+
 -------------------------------------------------------------------
 Thu Mar 18 21:29:19 UTC 2021 - James Fehlig <jfehlig@suse.com>

--- a/libvirt.spec
+++ b/libvirt.spec
@ -141,7 +141,7 @@

 Name:           libvirt
 URL:            http://libvirt.org/
-Version:        7.1.0
+Version:        7.2.0
 Release:        0
 Summary:        Library providing a virtualization API
 License:        LGPL-2.1-or-later
@ -189,7 +189,6 @@ BuildRequires:  libacl-devel
 BuildRequires:  qemu-tools
 %endif
 BuildRequires:  bash-completion-devel >= 2.0
-BuildRequires:  fdupes
 BuildRequires:  glib2-devel >= 2.56
 BuildRequires:  libattr-devel
 BuildRequires:  libgcrypt-devel
@ -291,11 +290,6 @@ Source6:        libvirtd-relocation-server.xml
 Source99:       baselibs.conf
 Source100:      %{name}-rpmlintrc
 # Upstream patches
-Patch0:         ee3dc2c2-libxl-default-pcistub-name.patch
-Patch1:         6b8e9613-avoid-use-after-free.patch
-Patch2:         eab7ae6b-fix-array-access.patch
-Patch3:         c363f03e-virnetdaemon-intro-virNetDaemonQuitExecRestart.patch
-Patch4:         ccc6dd8f-fix-exec-restart.patch
 # Patches pending upstream review
 Patch100:       libxl-dom-reset.patch
 Patch101:       network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@ -1142,7 +1136,6 @@ mv %{buildroot}/%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
   %{buildroot}/%{_datadir}/systemtap/tapset/libvirt_qemu_probes-64.stp
 %endif
 %endif
-%fdupes -s %{buildroot}

 %check
 VIR_TEST_DEBUG=1 %meson_test -t 5 --no-suite syntax-check
--- a/libxl-dom-reset.patch
+++ b/libxl-dom-reset.patch
@ -8,10 +8,10 @@ Date:   Mon Jun 23 15:51:20 2014 -0600
    option, but domainReset can be implemented in the libxl driver by
    forcibly destroying the domain and starting it again.

-Index: libvirt-7.1.0/src/libxl/libxl_driver.c
+Index: libvirt-7.2.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-7.1.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-7.1.0/src/libxl/libxl_driver.c
+--- libvirt-7.2.0.orig/src/libxl/libxl_driver.c
+++ libvirt-7.2.0/src/libxl/libxl_driver.c
@@ -1372,6 +1372,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
 }
 
@ -74,7 +74,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_driver.c
 libxlDomainDestroyFlags(virDomainPtr dom,
                         unsigned int flags)
 {
-@@ -6488,6 +6543,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6485,6 +6540,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
@ -3,11 +3,11 @@ https://bugzilla.novell.com/show_bug.cgi?id=879425
 src/libxl/libxl_conf.c |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

-Index: libvirt-7.1.0/src/libxl/libxl_conf.c
+Index: libvirt-7.2.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-7.1.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-7.1.0/src/libxl/libxl_conf.c
-@@ -921,6 +921,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
+--- libvirt-7.2.0.orig/src/libxl/libxl_conf.c
+++ libvirt-7.2.0/src/libxl/libxl_conf.c
+@@ -916,6 +916,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
 #endif
 }
 
@ -38,7 +38,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_conf.c
 static char *
 libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src,
                            const char *username,
-@@ -1163,6 +1187,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -1158,6 +1182,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
     x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
     if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
         return -1;
--- a/libxl-set-migration-constraints.patch
+++ b/libxl-set-migration-constraints.patch
@ -16,11 +16,11 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 tools/virsh.pod                  |    8 ++++++++
 6 files changed, 125 insertions(+), 6 deletions(-)

-Index: libvirt-7.1.0/docs/manpages/virsh.rst
+Index: libvirt-7.2.0/docs/manpages/virsh.rst
 ===================================================================
--- libvirt-7.1.0.orig/docs/manpages/virsh.rst
-+++ libvirt-7.1.0/docs/manpages/virsh.rst
-@@ -3145,7 +3145,8 @@ migrate
+--- libvirt-7.2.0.orig/docs/manpages/virsh.rst
+++ libvirt-7.2.0/docs/manpages/virsh.rst
+@@ -3178,7 +3178,8 @@ migrate
       [--postcopy-bandwidth bandwidth]
       [--parallel [--parallel-connections connections]]
       [--bandwidth bandwidth] [--tls-destination hostname]
@ -30,7 +30,7 @@ Index: libvirt-7.1.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*
-@@ -3251,6 +3252,12 @@ parallel connections. The number of such
+@@ -3284,6 +3285,12 @@ parallel connections. The number of such
 network link between the source and the target and thus speeding up the
 migration.
 
@ -43,10 +43,10 @@ Index: libvirt-7.1.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-7.1.0/include/libvirt/libvirt-domain.h
+Index: libvirt-7.2.0/include/libvirt/libvirt-domain.h
 ===================================================================
--- libvirt-7.1.0.orig/include/libvirt/libvirt-domain.h
-+++ libvirt-7.1.0/include/libvirt/libvirt-domain.h
+--- libvirt-7.2.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-7.2.0/include/libvirt/libvirt-domain.h
@@ -1078,6 +1078,25 @@ typedef enum {
  */
 # define VIR_MIGRATE_PARAM_TLS_DESTINATION          "tls.destination"
@ -73,11 +73,11 @@ Index: libvirt-7.1.0/include/libvirt/libvirt-domain.h
 /* Domain migration. */
 virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
                                unsigned long flags, const char *dname,
-Index: libvirt-7.1.0/src/libxl/libxl_driver.c
+Index: libvirt-7.2.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-7.1.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-7.1.0/src/libxl/libxl_driver.c
-@@ -6050,6 +6050,9 @@ libxlDomainMigratePerform3Params(virDoma
+--- libvirt-7.2.0.orig/src/libxl/libxl_driver.c
+++ libvirt-7.2.0/src/libxl/libxl_driver.c
+@@ -6047,6 +6047,9 @@ libxlDomainMigratePerform3Params(virDoma
     const char *dname = NULL;
     const char *uri = NULL;
     int ret = -1;
@ -87,7 +87,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_driver.c
 
 #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
     virReportUnsupportedError();
-@@ -6066,6 +6069,15 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6063,6 +6066,15 @@ libxlDomainMigratePerform3Params(virDoma
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_DEST_NAME,
                                 &dname) < 0 ||
@ -103,7 +103,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_driver.c
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_URI,
                                 &uri) < 0)
-@@ -6080,11 +6092,11 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6077,11 +6089,11 @@ libxlDomainMigratePerform3Params(virDoma
 
     if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
         if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml,
@ -117,10 +117,10 @@ Index: libvirt-7.1.0/src/libxl/libxl_driver.c
             goto cleanup;
     }
 
-Index: libvirt-7.1.0/src/libxl/libxl_migration.c
+Index: libvirt-7.2.0/src/libxl/libxl_migration.c
 ===================================================================
--- libvirt-7.1.0.orig/src/libxl/libxl_migration.c
-+++ libvirt-7.1.0/src/libxl/libxl_migration.c
+--- libvirt-7.2.0.orig/src/libxl/libxl_migration.c
+++ libvirt-7.2.0/src/libxl/libxl_migration.c
@@ -340,18 +340,38 @@ libxlMigrateDstReceive(virNetSocketPtr s
 static int
 libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver,
@ -162,7 +162,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_migration.c
     if (ret != 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("Failed to send migration data to destination host"));
-@@ -900,7 +920,7 @@ struct libxlTunnelControl {
+@@ -898,7 +918,7 @@ struct libxlTunnelControl {
 static int
 libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver,
                              virDomainObjPtr vm,
@ -171,7 +171,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_migration.c
                              virStreamPtr st,
                              struct libxlTunnelControl **tnl)
 {
-@@ -933,7 +953,7 @@ libxlMigrationSrcStartTunnel(libxlDriver
+@@ -931,7 +951,7 @@ libxlMigrationSrcStartTunnel(libxlDriver
 
     virObjectUnlock(vm);
     /* Send data to pipe */
@ -180,7 +180,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_migration.c
     virObjectLock(vm);
 
  out:
-@@ -969,7 +989,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -967,7 +987,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
                      const char *dconnuri G_GNUC_UNUSED,
                      const char *dname,
                      const char *uri,
@ -189,7 +189,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_migration.c
 {
     virDomainPtr ddomain = NULL;
     virTypedParameterPtr params = NULL;
-@@ -1014,11 +1034,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1012,11 +1032,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
     /* We don't require the destination to have P2P support
      * as it looks to be normal migration from the receiver perspective.
      */
@ -203,7 +203,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_migration.c
         if (!(st = virStreamNew(dconn, 0)))
             goto confirm;
         ret = dconn->driver->domainMigratePrepareTunnel3Params
-@@ -1032,7 +1052,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1030,7 +1050,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
     if (ret == -1)
         goto confirm;
 
@ -212,7 +212,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_migration.c
         if (uri_out) {
             if (virTypedParamsReplaceString(&params, &nparams,
                                             VIR_MIGRATE_PARAM_URI, uri_out) < 0) {
-@@ -1047,11 +1067,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1045,11 +1065,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
     }
 
     VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out));
@ -227,7 +227,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_migration.c
     if (ret < 0) {
         notify_source = false;
         virErrorPreserveLast(&orig_err);
-@@ -1086,7 +1106,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1084,7 +1104,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
  confirm:
     if (notify_source) {
         VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm);
@ -236,7 +236,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_migration.c
 
         if (ret < 0)
             VIR_WARN("Guest %s probably left in 'paused' state on source",
-@@ -1094,7 +1114,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1092,7 +1112,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
     }
 
  cleanup:
@ -245,7 +245,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_migration.c
         libxlMigrationSrcStopTunnel(tc);
         virObjectUnref(st);
     }
-@@ -1138,7 +1158,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
+@@ -1136,7 +1156,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
                                   const char *dconnuri,
                                   const char *uri_str G_GNUC_UNUSED,
                                   const char *dname,
@ -254,7 +254,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_migration.c
 {
     int ret = -1;
     int useParams;
-@@ -1175,7 +1195,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
+@@ -1173,7 +1193,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
     }
 
     ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri,
@ -263,7 +263,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_migration.c
 
     if (ret < 0) {
         /*
-@@ -1202,7 +1222,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
+@@ -1200,7 +1220,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
                                const char *dconnuri G_GNUC_UNUSED,
                                const char *uri_str,
                                const char *dname G_GNUC_UNUSED,
@ -272,7 +272,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_migration.c
 {
     libxlDomainObjPrivatePtr priv = vm->privateData;
     char *hostname = NULL;
-@@ -1238,7 +1258,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
+@@ -1236,7 +1256,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
 
     /* suspend vm and send saved data to dst through socket fd */
     virObjectUnlock(vm);
@ -281,10 +281,10 @@ Index: libvirt-7.1.0/src/libxl/libxl_migration.c
     virObjectLock(vm);
 
     if (ret == 0) {
-Index: libvirt-7.1.0/src/libxl/libxl_migration.h
+Index: libvirt-7.2.0/src/libxl/libxl_migration.h
 ===================================================================
--- libvirt-7.1.0.orig/src/libxl/libxl_migration.h
-+++ libvirt-7.1.0/src/libxl/libxl_migration.h
+--- libvirt-7.2.0.orig/src/libxl/libxl_migration.h
+++ libvirt-7.2.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, \
@ -327,11 +327,11 @@ Index: libvirt-7.1.0/src/libxl/libxl_migration.h
 
 virDomainPtr
 libxlDomainMigrationDstFinish(virConnectPtr dconn,
-Index: libvirt-7.1.0/tools/virsh-domain.c
+Index: libvirt-7.2.0/tools/virsh-domain.c
 ===================================================================
--- libvirt-7.1.0.orig/tools/virsh-domain.c
-+++ libvirt-7.1.0/tools/virsh-domain.c
-@@ -10703,6 +10703,18 @@ static const vshCmdOptDef opts_migrate[]
+--- libvirt-7.2.0.orig/tools/virsh-domain.c
+++ libvirt-7.2.0/tools/virsh-domain.c
+@@ -10691,6 +10691,18 @@ static const vshCmdOptDef opts_migrate[]
      .type = VSH_OT_STRING,
      .help = N_("override the destination host name used for TLS verification")
     },
@ -350,7 +350,7 @@ Index: libvirt-7.1.0/tools/virsh-domain.c
     {.name = NULL}
 };
 
-@@ -10723,6 +10735,7 @@ doMigrate(void *opaque)
+@@ -10711,6 +10723,7 @@ doMigrate(void *opaque)
     unsigned long long ullOpt = 0;
     int rv;
     virConnectPtr dconn = data->dconn;
@ -358,7 +358,7 @@ Index: libvirt-7.1.0/tools/virsh-domain.c
 #ifndef WIN32
     sigset_t sigmask, oldsigmask;
 
-@@ -10853,6 +10866,22 @@ doMigrate(void *opaque)
+@@ -10841,6 +10854,22 @@ doMigrate(void *opaque)
             goto save_error;
     }
 
--- a/libxl-support-block-script.patch
+++ b/libxl-support-block-script.patch
@ -7,11 +7,11 @@ and npiv.

 For more details, see bsc#954872 and FATE#319810

-Index: libvirt-7.1.0/src/libxl/libxl_conf.c
+Index: libvirt-7.2.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-7.1.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-7.1.0/src/libxl/libxl_conf.c
-@@ -921,6 +921,22 @@ libxlDiskSetDiscard(libxl_device_disk *x
+--- libvirt-7.2.0.orig/src/libxl/libxl_conf.c
+++ libvirt-7.2.0/src/libxl/libxl_conf.c
+@@ -916,6 +916,22 @@ libxlDiskSetDiscard(libxl_device_disk *x
 #endif
 }
 
@ -34,7 +34,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_conf.c
 static void
 libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode)
 {
-@@ -1062,6 +1078,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
+@@ -1057,6 +1073,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
 int
 libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)
 {
@ -42,7 +42,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_conf.c
     const char *driver = virDomainDiskGetDriver(l_disk);
     int format = virDomainDiskGetFormat(l_disk);
     int actual_type = virStorageSourceGetActualType(l_disk->src);
-@@ -1077,7 +1094,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -1072,7 +1089,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
         if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0)
             return -1;
     } else {
@ -51,7 +51,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_conf.c
     }
 
     x_disk->vdev = g_strdup(l_disk->dst);
-@@ -1188,6 +1205,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -1183,6 +1200,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
     if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
         return -1;
     libxlDiskSetCacheMode(x_disk, l_disk->cachemode);
--- a/lxc-wait-after-eth-del.patch
+++ b/lxc-wait-after-eth-del.patch
@ -13,11 +13,11 @@ device with the same name that is being created.
 src/lxc/lxc_process.c    | 1 +
 3 files changed, 4 insertions(+)

-Index: libvirt-7.1.0/src/lxc/lxc_controller.c
+Index: libvirt-7.2.0/src/lxc/lxc_controller.c
 ===================================================================
--- libvirt-7.1.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-7.1.0/src/lxc/lxc_controller.c
-@@ -2015,6 +2015,7 @@ static int virLXCControllerDeleteInterfa
+--- libvirt-7.2.0.orig/src/lxc/lxc_controller.c
+++ libvirt-7.2.0/src/lxc/lxc_controller.c
+@@ -2005,6 +2005,7 @@ static int virLXCControllerDeleteInterfa
         if (virNetDevVethDelete(ctrl->veths[i]) < 0)
             ret = -1;
     }
@ -25,10 +25,10 @@ Index: libvirt-7.1.0/src/lxc/lxc_controller.c
 
     return ret;
 }
-Index: libvirt-7.1.0/src/lxc/lxc_driver.c
+Index: libvirt-7.2.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-7.1.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-7.1.0/src/lxc/lxc_driver.c
+--- libvirt-7.2.0.orig/src/lxc/lxc_driver.c
+++ libvirt-7.2.0/src/lxc/lxc_driver.c
@@ -67,6 +67,7 @@
 #include "virtime.h"
 #include "virtypedparam.h"
@ -37,7 +37,7 @@ Index: libvirt-7.1.0/src/lxc/lxc_driver.c
 #include "virstring.h"
 #include "viraccessapicheck.h"
 #include "viraccessapichecklxc.h"
-@@ -3545,6 +3546,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive
+@@ -3546,6 +3547,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive
         case VIR_DOMAIN_NET_TYPE_NETWORK:
         case VIR_DOMAIN_NET_TYPE_ETHERNET:
             ignore_value(virNetDevVethDelete(veth));
@ -45,7 +45,7 @@ Index: libvirt-7.1.0/src/lxc/lxc_driver.c
             break;
 
         case VIR_DOMAIN_NET_TYPE_DIRECT:
-@@ -3984,6 +3986,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
+@@ -3985,6 +3987,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
             virDomainAuditNet(vm, detach, NULL, "detach", false);
             goto cleanup;
         }
@ -53,10 +53,10 @@ Index: libvirt-7.1.0/src/lxc/lxc_driver.c
         break;
 
         /* It'd be nice to support this, but with macvlan
-Index: libvirt-7.1.0/src/lxc/lxc_process.c
+Index: libvirt-7.2.0/src/lxc/lxc_process.c
 ===================================================================
--- libvirt-7.1.0.orig/src/lxc/lxc_process.c
-+++ libvirt-7.1.0/src/lxc/lxc_process.c
+--- libvirt-7.2.0.orig/src/lxc/lxc_process.c
+++ libvirt-7.2.0/src/lxc/lxc_process.c
@@ -51,6 +51,7 @@
 #include "virstring.h"
 #include "virprocess.h"
@ -65,7 +65,7 @@ Index: libvirt-7.1.0/src/lxc/lxc_process.c
 #include "netdev_bandwidth_conf.h"
 #include "virutil.h"
 
-@@ -250,6 +251,7 @@ static void virLXCProcessCleanup(virLXCD
+@@ -249,6 +250,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-7.1.0/src/network/bridge_driver.c
+Index: libvirt-7.2.0/src/network/bridge_driver.c
 ===================================================================
--- libvirt-7.1.0.orig/src/network/bridge_driver.c
-+++ libvirt-7.1.0/src/network/bridge_driver.c
-@@ -1449,7 +1449,14 @@ networkDnsmasqConfContents(virNetworkObj
+--- libvirt-7.2.0.orig/src/network/bridge_driver.c
+++ libvirt-7.2.0/src/network/bridge_driver.c
+@@ -1483,7 +1483,14 @@ networkDnsmasqConfContents(virNetworkObj
         if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
             if (ipdef->nranges || ipdef->nhosts) {
                 virBufferAddLit(&configbuf, "dhcp-no-override\n");
@ -37,10 +37,10 @@ Index: libvirt-7.1.0/src/network/bridge_driver.c
             }
 
             if (ipdef->tftproot) {
-Index: libvirt-7.1.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+Index: libvirt-7.2.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
 ===================================================================
--- libvirt-7.1.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
-+++ libvirt-7.1.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+--- libvirt-7.2.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-7.2.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
@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64

 See bnc#894956

-Index: libvirt-7.1.0/src/util/virarch.c
+Index: libvirt-7.2.0/src/util/virarch.c
 ===================================================================
--- libvirt-7.1.0.orig/src/util/virarch.c
-+++ libvirt-7.1.0/src/util/virarch.c
+--- libvirt-7.2.0.orig/src/util/virarch.c
+++ libvirt-7.2.0/src/util/virarch.c
@@ -220,6 +220,8 @@ virArch virArchFromHost(void)
         arch = VIR_ARCH_I686;
     } else if (STREQ(ut.machine, "amd64")) {
--- a/qemu-apparmor-screenshot.patch
+++ b/qemu-apparmor-screenshot.patch
@ -1,7 +1,7 @@
-Index: libvirt-7.1.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-7.2.0/src/security/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-7.1.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-7.1.0/src/security/apparmor/libvirt-qemu
+--- libvirt-7.2.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-7.2.0/src/security/apparmor/libvirt-qemu
@@ -244,3 +244,6 @@
   # /sys/bus/nd/devices
   / r, # harmless on any lsb compliant system
--- a/suse-apparmor-libnl-paths.patch
+++ b/suse-apparmor-libnl-paths.patch
@ -8,10 +8,10 @@ It was also noticed that the per-domain profiles need a libnl rule
 to squelch a denial when starting confined domains.

 Found while investigating bsc#1058847
-Index: libvirt-7.1.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-7.2.0/src/security/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-7.1.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-7.1.0/src/security/apparmor/libvirt-qemu
+--- libvirt-7.2.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-7.2.0/src/security/apparmor/libvirt-qemu
@@ -64,6 +64,7 @@
   #/dev/fb* rw,
 
@ -20,10 +20,10 @@ Index: libvirt-7.1.0/src/security/apparmor/libvirt-qemu
   @{HOME}/.pulse-cookie rwk,
   owner /root/.pulse-cookie rwk,
   owner /root/.pulse/ rw,
-Index: libvirt-7.1.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+Index: libvirt-7.2.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
 ===================================================================
--- libvirt-7.1.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
-+++ libvirt-7.1.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+--- libvirt-7.2.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+++ libvirt-7.2.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -19,7 +19,7 @@ profile virt-aa-helper @libexecdir@/virt
   # Used when internally running another command (namely apparmor_parser)
   @{PROC}/@{pid}/fd/ r,
--- a/suse-bump-xen-version.patch
+++ b/suse-bump-xen-version.patch
@ -9,23 +9,23 @@ need backporting to anything older. The dependency on xen.git commit
 c3999835df makes it hard to upstream this patch.

 See bsc#1157490 and bsc#1167007 for more details
-Index: libvirt-7.1.0/src/libxl/libxl_conf.c
+Index: libvirt-7.2.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-7.1.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-7.1.0/src/libxl/libxl_conf.c
-@@ -1831,7 +1831,7 @@ libxlDriverConfigNew(void)
+--- libvirt-7.2.0.orig/src/libxl/libxl_conf.c
+++ libvirt-7.2.0/src/libxl/libxl_conf.c
+@@ -1822,7 +1822,7 @@ libxlDriverConfigNew(void)
 int
 libxlDriverConfigInit(libxlDriverConfigPtr cfg)
 {
 -    unsigned int free_mem;
 +    uint64_t free_mem;
 
-     if (virFileMakePath(cfg->logDir) < 0) {
+     if (g_mkdir_with_parents(cfg->logDir, 0777) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
-Index: libvirt-7.1.0/src/libxl/libxl_domain.c
+Index: libvirt-7.2.0/src/libxl/libxl_domain.c
 ===================================================================
--- libvirt-7.1.0.orig/src/libxl/libxl_domain.c
-+++ libvirt-7.1.0/src/libxl/libxl_domain.c
+--- libvirt-7.2.0.orig/src/libxl/libxl_domain.c
+++ libvirt-7.2.0/src/libxl/libxl_domain.c
@@ -1007,8 +1007,8 @@ libxlDomainSetVcpuAffinities(libxlDriver
 static int
 libxlDomainFreeMem(libxl_ctx *ctx, libxl_domain_config *d_config)
@ -46,10 +46,10 @@ Index: libvirt-7.1.0/src/libxl/libxl_domain.c
                                           &aop_console_how);
         libxl_domain_restore_params_dispose(&params);
     }
-Index: libvirt-7.1.0/tests/libxlmock.c
+Index: libvirt-7.2.0/tests/libxlmock.c
 ===================================================================
--- libvirt-7.1.0.orig/tests/libxlmock.c
-+++ libvirt-7.1.0/tests/libxlmock.c
+--- libvirt-7.2.0.orig/tests/libxlmock.c
+++ libvirt-7.2.0/tests/libxlmock.c
@@ -67,7 +67,7 @@ VIR_MOCK_IMPL_RET_ARGS(libxl_get_version
 VIR_MOCK_STUB_RET_ARGS(libxl_get_free_memory,
                        int, 0,
@ -59,11 +59,11 @@ Index: libvirt-7.1.0/tests/libxlmock.c
 
 VIR_MOCK_STUB_RET_ARGS(xc_interface_close,
                        int, 0,
-Index: libvirt-7.1.0/meson.build
+Index: libvirt-7.2.0/meson.build
 ===================================================================
--- libvirt-7.1.0.orig/meson.build
-+++ libvirt-7.1.0/meson.build
-@@ -1566,7 +1566,7 @@ elif get_option('driver_interface').enab
+--- libvirt-7.2.0.orig/meson.build
+++ libvirt-7.2.0/meson.build
+@@ -1569,7 +1569,7 @@ elif get_option('driver_interface').enab
 endif
 
 if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD')
@ -72,7 +72,7 @@ Index: libvirt-7.1.0/meson.build
   libxl_dep = dependency('xenlight', version: '>=' + libxl_version, required: get_option('driver_libxl'))
 
   if libxl_dep.found()
-@@ -1596,7 +1596,7 @@ if not get_option('driver_libxl').disabl
+@@ -1599,7 +1599,7 @@ if not get_option('driver_libxl').disabl
     endif
 
     libxl_dep = declare_dependency(
--- a/suse-libvirt-guests-service.patch
+++ b/suse-libvirt-guests-service.patch
@ -1,9 +1,9 @@
 Adjust libvirt-guests service to conform to SUSE standards

-Index: libvirt-7.1.0/tools/libvirt-guests.sh.in
+Index: libvirt-7.2.0/tools/libvirt-guests.sh.in
 ===================================================================
--- libvirt-7.1.0.orig/tools/libvirt-guests.sh.in
-+++ libvirt-7.1.0/tools/libvirt-guests.sh.in
+--- libvirt-7.2.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-7.2.0/tools/libvirt-guests.sh.in
@@ -20,10 +20,6 @@ sysconfdir="@sysconfdir@"
 localstatedir="@localstatedir@"
 libvirtd="@sbindir@"/libvirtd
@ -28,10 +28,10 @@ Index: libvirt-7.1.0/tools/libvirt-guests.sh.in
 
 RETVAL=0
 
-Index: libvirt-7.1.0/tools/libvirt-guests.sysconf
+Index: libvirt-7.2.0/tools/libvirt-guests.sysconf
 ===================================================================
--- libvirt-7.1.0.orig/tools/libvirt-guests.sysconf
-+++ libvirt-7.1.0/tools/libvirt-guests.sysconf
+--- libvirt-7.2.0.orig/tools/libvirt-guests.sysconf
+++ libvirt-7.2.0/tools/libvirt-guests.sysconf
@@ -1,9 +1,14 @@
 +## Path: System/Virtualization/libvirt-guests
 # Customizations for the libvirt-guests.service systemd unit
--- a/suse-libvirtd-disable-tls.patch
+++ b/suse-libvirtd-disable-tls.patch
@ -3,10 +3,10 @@ Disable TLS by default
 On SUSE distros, the default is for libvirtd to listen only on the
 Unix Domain Socket. The libvirt client still provides remote access
 via a SSH tunnel.
-Index: libvirt-7.1.0/src/remote/remote_daemon_config.c
+Index: libvirt-7.2.0/src/remote/remote_daemon_config.c
 ===================================================================
--- libvirt-7.1.0.orig/src/remote/remote_daemon_config.c
-+++ libvirt-7.1.0/src/remote/remote_daemon_config.c
+--- libvirt-7.2.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-7.2.0/src/remote/remote_daemon_config.c
@@ -98,7 +98,7 @@ daemonConfigNew(bool privileged G_GNUC_U
 
 #ifdef WITH_IP
@ -16,10 +16,10 @@ Index: libvirt-7.1.0/src/remote/remote_daemon_config.c
 # else /* ! LIBVIRTD */
     data->listen_tls = false; /* Always honoured, --listen doesn't exist. */
 # endif /* ! LIBVIRTD */
-Index: libvirt-7.1.0/src/remote/libvirtd.conf.in
+Index: libvirt-7.2.0/src/remote/libvirtd.conf.in
 ===================================================================
--- libvirt-7.1.0.orig/src/remote/libvirtd.conf.in
-+++ libvirt-7.1.0/src/remote/libvirtd.conf.in
+--- libvirt-7.2.0.orig/src/remote/libvirtd.conf.in
+++ libvirt-7.2.0/src/remote/libvirtd.conf.in
@@ -17,8 +17,8 @@
 # It is necessary to setup a CA and issue server certificates before
 # using this capability.
@ -31,10 +31,10 @@ Index: libvirt-7.1.0/src/remote/libvirtd.conf.in
 
 # Listen for unencrypted TCP connections on the public TCP/IP port.
 # NB, must pass the --listen flag to the @DAEMON_NAME@ process for this to
-Index: libvirt-7.1.0/src/remote/test_libvirtd.aug.in
+Index: libvirt-7.2.0/src/remote/test_libvirtd.aug.in
 ===================================================================
--- libvirt-7.1.0.orig/src/remote/test_libvirtd.aug.in
-+++ libvirt-7.1.0/src/remote/test_libvirtd.aug.in
+--- libvirt-7.2.0.orig/src/remote/test_libvirtd.aug.in
+++ libvirt-7.2.0/src/remote/test_libvirtd.aug.in
@@ -3,7 +3,7 @@ module Test_@DAEMON_NAME@ =
 
    test @DAEMON_NAME_UC@.lns get conf =
--- a/suse-libvirtd-sysconfig-settings.patch
+++ b/suse-libvirtd-sysconfig-settings.patch
@ -1,20 +1,19 @@
 Adjust libvirtd sysconfig file to conform to SUSE standards

-Index: libvirt-7.1.0/src/remote/libvirtd.sysconf
+Index: libvirt-7.2.0/src/remote/libvirtd.sysconf
 ===================================================================
--- libvirt-7.1.0.orig/src/remote/libvirtd.sysconf
-+++ libvirt-7.1.0/src/remote/libvirtd.sysconf
-@@ -1,5 +1,9 @@
+--- libvirt-7.2.0.orig/src/remote/libvirtd.sysconf
+++ libvirt-7.2.0/src/remote/libvirtd.sysconf
+@@ -1,5 +1,8 @@
 +## Path: System/Virtualization/libvirt
 # Customizations for the libvirtd.service systemd unit
 
 +## Type: string
 +## Default: "--timeout 120"
-+# Arguments to pass to libvirtd. Not required if using systemd socket activation.
 # Default behaviour is for libvirtd.service to start on boot
 # so that VM autostart can be performed. We then want it to
 # shutdown again if nothing was started and rely on systemd
-@@ -11,6 +15,8 @@ LIBVIRTD_ARGS="--timeout 120"
+@@ -11,6 +14,8 @@ LIBVIRTD_ARGS="--timeout 120"
 # can be used to listen on TCP/TLS sockets
 #LIBVIRTD_ARGS="--listen"
 
--- a/suse-libxl-disable-autoballoon.patch
+++ b/suse-libxl-disable-autoballoon.patch
@ -6,10 +6,10 @@ autoballooning. This patch changes libvirt to also disable autoballooning
 by default. It can only be enabled with the 'autoballoon' setting in
 libxl.conf. See jsc#SLE-3059 for more details.

-Index: libvirt-7.1.0/src/libxl/libxl.conf
+Index: libvirt-7.2.0/src/libxl/libxl.conf
 ===================================================================
--- libvirt-7.1.0.orig/src/libxl/libxl.conf
-+++ libvirt-7.1.0/src/libxl/libxl.conf
+--- libvirt-7.2.0.orig/src/libxl/libxl.conf
+++ libvirt-7.2.0/src/libxl/libxl.conf
@@ -4,12 +4,11 @@
 
 # Enable autoballooning of domain0
@ -27,11 +27,11 @@ Index: libvirt-7.1.0/src/libxl/libxl.conf
 
 
 # In order to prevent accidentally starting two domains that
-Index: libvirt-7.1.0/src/libxl/libxl_conf.c
+Index: libvirt-7.2.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-7.1.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-7.1.0/src/libxl/libxl_conf.c
-@@ -1748,15 +1748,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
+--- libvirt-7.2.0.orig/src/libxl/libxl_conf.c
+++ libvirt-7.2.0/src/libxl/libxl_conf.c
+@@ -1743,15 +1743,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
 /*
  * Get domain0 autoballoon configuration.  Honor user-specified
  * setting in libxl.conf first.  If not specified, autoballooning
@ -48,7 +48,7 @@ Index: libvirt-7.1.0/src/libxl/libxl_conf.c
     int res;
 
     res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon);
-@@ -1765,15 +1762,8 @@ libxlGetAutoballoonConf(libxlDriverConfi
+@@ -1760,15 +1757,8 @@ libxlGetAutoballoonConf(libxlDriverConfi
     else if (res == 1)
         return 0;
 
@ -66,10 +66,10 @@ Index: libvirt-7.1.0/src/libxl/libxl_conf.c
     return 0;
 }
 
-Index: libvirt-7.1.0/src/libxl/test_libvirtd_libxl.aug.in
+Index: libvirt-7.2.0/src/libxl/test_libvirtd_libxl.aug.in
 ===================================================================
--- libvirt-7.1.0.orig/src/libxl/test_libvirtd_libxl.aug.in
-+++ libvirt-7.1.0/src/libxl/test_libvirtd_libxl.aug.in
+--- libvirt-7.2.0.orig/src/libxl/test_libvirtd_libxl.aug.in
+++ libvirt-7.2.0/src/libxl/test_libvirtd_libxl.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd_libxl =
   @CONFIG@
 
--- a/suse-ovmf-paths.patch
+++ b/suse-ovmf-paths.patch
@ -1,9 +1,9 @@
 Adjust paths of OVMF firmwares on SUSE distros

-Index: libvirt-7.1.0/src/qemu/qemu.conf
+Index: libvirt-7.2.0/src/qemu/qemu.conf
 ===================================================================
--- libvirt-7.1.0.orig/src/qemu/qemu.conf
-+++ libvirt-7.1.0/src/qemu/qemu.conf
+--- libvirt-7.2.0.orig/src/qemu/qemu.conf
+++ libvirt-7.2.0/src/qemu/qemu.conf
@@ -858,10 +858,9 @@
 # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
 # follows this scheme.
@ -18,10 +18,10 @@ Index: libvirt-7.1.0/src/qemu/qemu.conf
 #]
 
 # The backend to use for handling stdout/stderr output from
-Index: libvirt-7.1.0/src/qemu/qemu_conf.c
+Index: libvirt-7.2.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-7.1.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-7.1.0/src/qemu/qemu_conf.c
+--- libvirt-7.2.0.orig/src/qemu/qemu_conf.c
+++ libvirt-7.2.0/src/qemu/qemu_conf.c
@@ -98,10 +98,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver
 
 #ifndef DEFAULT_LOADER_NVRAM
@ -36,10 +36,10 @@ Index: libvirt-7.1.0/src/qemu/qemu_conf.c
 #endif
 
 
-Index: libvirt-7.1.0/src/security/virt-aa-helper.c
+Index: libvirt-7.2.0/src/security/virt-aa-helper.c
 ===================================================================
--- libvirt-7.1.0.orig/src/security/virt-aa-helper.c
-+++ libvirt-7.1.0/src/security/virt-aa-helper.c
+--- libvirt-7.2.0.orig/src/security/virt-aa-helper.c
+++ libvirt-7.2.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 */
@ -50,10 +50,10 @@ Index: libvirt-7.1.0/src/security/virt-aa-helper.c
     };
     /* override the above with these */
     const char * const override[] = {
-Index: libvirt-7.1.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-7.2.0/src/qemu/test_libvirtd_qemu.aug.in
 ===================================================================
--- libvirt-7.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-7.1.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-7.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-7.2.0/src/qemu/test_libvirtd_qemu.aug.in
@@ -96,10 +96,9 @@ module Test_libvirtd_qemu =
 { "migration_port_max" = "49215" }
 { "log_timestamp" = "0" }
--- a/suse-qemu-conf.patch
+++ b/suse-qemu-conf.patch
@ -7,10 +7,10 @@ suse-qemu-conf-secdriver.patch, suse-qemu-conf-lockmgr.patch,
 etc.), but for now they are all lumped together in this
 single patch.

-Index: libvirt-7.1.0/src/qemu/qemu.conf
+Index: libvirt-7.2.0/src/qemu/qemu.conf
 ===================================================================
--- libvirt-7.1.0.orig/src/qemu/qemu.conf
-+++ libvirt-7.1.0/src/qemu/qemu.conf
+--- libvirt-7.2.0.orig/src/qemu/qemu.conf
+++ libvirt-7.2.0/src/qemu/qemu.conf
@@ -491,10 +491,19 @@
 # isolation, but it cannot appear in a list of drivers.
 #
@ -60,10 +60,10 @@ Index: libvirt-7.1.0/src/qemu/qemu.conf
 #
 #lock_manager = "lockd"
 
-Index: libvirt-7.1.0/src/qemu/qemu_conf.c
+Index: libvirt-7.2.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-7.1.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-7.1.0/src/qemu/qemu_conf.c
+--- libvirt-7.2.0.orig/src/qemu/qemu_conf.c
+++ libvirt-7.2.0/src/qemu/qemu_conf.c
@@ -272,7 +272,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf
     cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER);
     cfg->dbusDaemonName = g_strdup(QEMU_DBUS_DAEMON);
@ -73,10 +73,10 @@ Index: libvirt-7.1.0/src/qemu/qemu_conf.c
     cfg->securityRequireConfined = false;
 
     cfg->keepAliveInterval = 5;
-Index: libvirt-7.1.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-7.2.0/src/qemu/test_libvirtd_qemu.aug.in
 ===================================================================
--- libvirt-7.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-7.1.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-7.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-7.2.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-virtlockd-sysconfig-settings.patch
+++ b/suse-virtlockd-sysconfig-settings.patch
@ -1,9 +1,9 @@
 Adjust virtlockd sysconfig file to conform to SUSE standards

-Index: libvirt-7.1.0/src/locking/virtlockd.sysconf
+Index: libvirt-7.2.0/src/locking/virtlockd.sysconf
 ===================================================================
--- libvirt-7.1.0.orig/src/locking/virtlockd.sysconf
-+++ libvirt-7.1.0/src/locking/virtlockd.sysconf
+--- libvirt-7.2.0.orig/src/locking/virtlockd.sysconf
+++ libvirt-7.2.0/src/locking/virtlockd.sysconf
@@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlockd
 +
--- a/suse-virtlogd-sysconfig-settings.patch
+++ b/suse-virtlogd-sysconfig-settings.patch
@ -1,9 +1,9 @@
 Adjust virtlogd sysconfig file to conform to SUSE standards

-Index: libvirt-7.1.0/src/logging/virtlogd.sysconf
+Index: libvirt-7.2.0/src/logging/virtlogd.sysconf
 ===================================================================
--- libvirt-7.1.0.orig/src/logging/virtlogd.sysconf
-+++ libvirt-7.1.0/src/logging/virtlogd.sysconf
+--- libvirt-7.2.0.orig/src/logging/virtlogd.sysconf
+++ libvirt-7.2.0/src/logging/virtlogd.sysconf
@@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlogd
 +
--- a/suse-xen-ovmf-loaders.patch
+++ b/suse-xen-ovmf-loaders.patch
@ -5,11 +5,11 @@ upstream support for firmware autoselection in the xen driver. Sadly, the
 upstream efforts to improve firmware handling in the qemu driver broke
 the firmware handling in the xen driver.

-Index: libvirt-7.1.0/src/libxl/libxl_conf.c
+Index: libvirt-7.2.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-7.1.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-7.1.0/src/libxl/libxl_conf.c
-@@ -1788,6 +1788,15 @@ libxlDriverConfigNew(void)
+--- libvirt-7.2.0.orig/src/libxl/libxl_conf.c
+++ libvirt-7.2.0/src/libxl/libxl_conf.c
+@@ -1783,6 +1783,15 @@ libxlDriverConfigNew(void)
     cfg->autoDumpDir = g_strdup(LIBXL_DUMP_DIR);
     cfg->channelDir = g_strdup(LIBXL_CHANNEL_DIR);
 
--- a/virt-create-rootfs.patch
+++ b/virt-create-rootfs.patch
@ -1,7 +1,7 @@
-Index: libvirt-7.1.0/tools/virt-create-rootfs
+Index: libvirt-7.2.0/tools/virt-create-rootfs
 ===================================================================
 --- /dev/null
-+++ libvirt-7.1.0/tools/virt-create-rootfs
+++ libvirt-7.2.0/tools/virt-create-rootfs
@@ -0,0 +1,231 @@
 +#!/bin/sh
 +set -e
@ -234,10 +234,10 @@ Index: libvirt-7.1.0/tools/virt-create-rootfs
 +    echo "pts/0" >> "$ROOT/etc/securetty"
 +    chroot "$ROOT" /usr/bin/passwd
 +fi
-Index: libvirt-7.1.0/docs/manpages/virt-create-rootfs.rst
+Index: libvirt-7.2.0/docs/manpages/virt-create-rootfs.rst
 ===================================================================
 --- /dev/null
-+++ libvirt-7.1.0/docs/manpages/virt-create-rootfs.rst
+++ libvirt-7.2.0/docs/manpages/virt-create-rootfs.rst
@@ -0,0 +1,88 @@
 +==================
 +virt-create-rootfs
@ -327,10 +327,10 @@ Index: libvirt-7.1.0/docs/manpages/virt-create-rootfs.rst
 +========
 +
 +virsh(1), `https://libvirt.org/ <https://libvirt.org/>`_
-Index: libvirt-7.1.0/docs/manpages/meson.build
+Index: libvirt-7.2.0/docs/manpages/meson.build
 ===================================================================
--- libvirt-7.1.0.orig/docs/manpages/meson.build
-+++ libvirt-7.1.0/docs/manpages/meson.build
+--- libvirt-7.2.0.orig/docs/manpages/meson.build
+++ libvirt-7.2.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') },
@ -339,10 +339,10 @@ Index: libvirt-7.1.0/docs/manpages/meson.build
 
   { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') },
   { 'name': 'virt-sanlock-cleanup', 'section': '8', 'install': conf.has('WITH_SANLOCK') },
-Index: libvirt-7.1.0/tools/meson.build
+Index: libvirt-7.2.0/tools/meson.build
 ===================================================================
--- libvirt-7.1.0.orig/tools/meson.build
-+++ libvirt-7.1.0/tools/meson.build
+--- libvirt-7.2.0.orig/tools/meson.build
+++ libvirt-7.2.0/tools/meson.build
@@ -149,6 +149,8 @@ else
   virsh_icon_res = []
 endif