Accepting request 845769 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/845769 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=315
2020-11-05 20:54:28 +00:00 · 2020-11-05 20:54:28 +00:00 · 61cf52ec86
commit 61cf52ec86
parent a8ffec7d9f 429284b0e2
31 changed files with 315 additions and 345 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-6.8.0/src/conf/domain_stats.c
+Index: libvirt-6.9.0/src/conf/domain_stats.c
 ===================================================================
 --- /dev/null
-+++ libvirt-6.8.0/src/conf/domain_stats.c
+++ libvirt-6.9.0/src/conf/domain_stats.c
@@ -0,0 +1,119 @@
 +/*
 + * domain_stats.c: domain stats extraction helpers
@ -142,10 +142,10 @@ Index: libvirt-6.8.0/src/conf/domain_stats.c
 +}
 +
 +#undef STATS_ADD_NET_PARAM
-Index: libvirt-6.8.0/src/conf/domain_stats.h
+Index: libvirt-6.9.0/src/conf/domain_stats.h
 ===================================================================
 --- /dev/null
-+++ libvirt-6.8.0/src/conf/domain_stats.h
+++ libvirt-6.9.0/src/conf/domain_stats.h
@@ -0,0 +1,62 @@
 +/*
 + * domain_stats.h: domain stats extraction helpers
@ -209,11 +209,11 @@ Index: libvirt-6.8.0/src/conf/domain_stats.h
 +                           virTypedParamListPtr params);
 +
 +#endif /* __DOMAIN_STATS_H */
-Index: libvirt-6.8.0/src/libvirt_private.syms
+Index: libvirt-6.9.0/src/libvirt_private.syms
 ===================================================================
--- libvirt-6.8.0.orig/src/libvirt_private.syms
-+++ libvirt-6.8.0/src/libvirt_private.syms
-@@ -741,6 +741,9 @@ virDomainConfNWFilterInstantiate;
+--- libvirt-6.9.0.orig/src/libvirt_private.syms
+++ libvirt-6.9.0/src/libvirt_private.syms
+@@ -743,6 +743,9 @@ virDomainConfNWFilterInstantiate;
 virDomainConfNWFilterTeardown;
 virDomainConfVMNWFilterTeardown;
 
@ -223,7 +223,7 @@ Index: libvirt-6.8.0/src/libvirt_private.syms
 
 # conf/interface_conf.h
 virInterfaceDefFormat;
-@@ -1790,6 +1793,7 @@ virCgroupGetMemoryUsage;
+@@ -1787,6 +1790,7 @@ virCgroupGetMemoryUsage;
 virCgroupGetMemSwapHardLimit;
 virCgroupGetMemSwapUsage;
 virCgroupGetPercpuStats;
@ -231,10 +231,10 @@ Index: libvirt-6.8.0/src/libvirt_private.syms
 virCgroupHasController;
 virCgroupHasEmptyTasks;
 virCgroupKillPainfully;
-Index: libvirt-6.8.0/src/qemu/qemu_driver.c
+Index: libvirt-6.9.0/src/qemu/qemu_driver.c
 ===================================================================
--- libvirt-6.8.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-6.8.0/src/qemu/qemu_driver.c
+--- libvirt-6.9.0.orig/src/qemu/qemu_driver.c
+++ libvirt-6.9.0/src/qemu/qemu_driver.c
@@ -67,6 +67,7 @@
 #include "virarptable.h"
 #include "viruuid.h"
@ -243,7 +243,7 @@ Index: libvirt-6.8.0/src/qemu/qemu_driver.c
 #include "domain_audit.h"
 #include "domain_cgroup.h"
 #include "domain_driver.h"
-@@ -17611,13 +17612,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
+@@ -17623,13 +17624,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
                         virTypedParamListPtr params,
                         unsigned int privflags G_GNUC_UNUSED)
 {
@ -258,7 +258,7 @@ Index: libvirt-6.8.0/src/qemu/qemu_driver.c
 }
 
 
-@@ -17912,25 +17907,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
+@@ -17923,25 +17918,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
                             virTypedParamListPtr params)
 {
     qemuDomainObjPrivatePtr priv = dom->privateData;
@ -285,7 +285,7 @@ Index: libvirt-6.8.0/src/qemu/qemu_driver.c
 }
 
 
-@@ -18098,76 +18079,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
+@@ -18108,76 +18089,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
     return ret;
 }
 
@ -363,12 +363,12 @@ Index: libvirt-6.8.0/src/qemu/qemu_driver.c
 
 /* refresh information by opening images on the disk */
 static int
-Index: libvirt-6.8.0/src/util/vircgroup.c
+Index: libvirt-6.9.0/src/util/vircgroup.c
 ===================================================================
--- libvirt-6.8.0.orig/src/util/vircgroup.c
-+++ libvirt-6.8.0/src/util/vircgroup.c
-@@ -2776,6 +2776,31 @@ virCgroupControllerAvailable(int control
-     return ret;
+--- libvirt-6.9.0.orig/src/util/vircgroup.c
+++ libvirt-6.9.0/src/util/vircgroup.c
+@@ -2719,6 +2719,31 @@ virCgroupControllerAvailable(int control
+     return virCgroupHasController(cgroup, controller);
 }
 
 +int
@ -399,7 +399,7 @@ Index: libvirt-6.8.0/src/util/vircgroup.c
 #else /* !__linux__ */
 
 bool
-@@ -2785,6 +2810,14 @@ virCgroupAvailable(void)
+@@ -2728,6 +2753,14 @@ virCgroupAvailable(void)
 }
 
 
@ -414,10 +414,10 @@ Index: libvirt-6.8.0/src/util/vircgroup.c
 int
 virCgroupNewPartition(const char *path G_GNUC_UNUSED,
                       bool create G_GNUC_UNUSED,
-Index: libvirt-6.8.0/src/util/vircgroup.h
+Index: libvirt-6.9.0/src/util/vircgroup.h
 ===================================================================
--- libvirt-6.8.0.orig/src/util/vircgroup.h
-+++ libvirt-6.8.0/src/util/vircgroup.h
+--- libvirt-6.9.0.orig/src/util/vircgroup.h
+++ libvirt-6.9.0/src/util/vircgroup.h
@@ -23,6 +23,7 @@
 
 #include "virbitmap.h"
@ -426,17 +426,17 @@ Index: libvirt-6.8.0/src/util/vircgroup.h
 
 struct _virCgroup;
 typedef struct _virCgroup virCgroup;
-@@ -271,3 +272,6 @@ int virCgroupSetOwner(virCgroupPtr cgrou
+@@ -273,3 +274,6 @@ int virCgroupSetOwner(virCgroupPtr cgrou
 int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller);
 
 bool virCgroupControllerAvailable(int controller);
 +
 +int virCgroupGetStatsCpu(virCgroupPtr cgroup,
 +                         virTypedParamListPtr params);
-Index: libvirt-6.8.0/src/conf/meson.build
+Index: libvirt-6.9.0/src/conf/meson.build
 ===================================================================
--- libvirt-6.8.0.orig/src/conf/meson.build
-+++ libvirt-6.8.0/src/conf/meson.build
+--- libvirt-6.9.0.orig/src/conf/meson.build
+++ libvirt-6.9.0/src/conf/meson.build
@@ -14,6 +14,7 @@ domain_conf_sources = [
   'domain_capabilities.c',
   'domain_conf.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-6.8.0/src/libxl/libxl_driver.c
+Index: libvirt-6.9.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-6.8.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-6.8.0/src/libxl/libxl_driver.c
-@@ -5334,6 +5334,96 @@ libxlDomainMemoryStats(virDomainPtr dom,
+--- libvirt-6.9.0.orig/src/libxl/libxl_driver.c
+++ libvirt-6.9.0/src/libxl/libxl_driver.c
+@@ -5327,6 +5327,96 @@ libxlDomainMemoryStats(virDomainPtr dom,
 
 #undef LIBXL_SET_MEMSTAT
 
@ -120,7 +120,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_driver.c
 static int
 libxlDomainGetJobInfo(virDomainPtr dom,
                       virDomainJobInfoPtr info)
-@@ -6803,6 +6893,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6799,6 +6889,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-6.8.0/src/lxc/lxc_driver.c
+Index: libvirt-6.9.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-6.8.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-6.8.0/src/lxc/lxc_driver.c
+--- libvirt-6.9.0.orig/src/lxc/lxc_driver.c
+++ libvirt-6.9.0/src/lxc/lxc_driver.c
@@ -73,6 +73,8 @@
 #include "netdev_bandwidth_conf.h"
 #include "virsocket.h"
@ -22,7 +22,7 @@ Index: libvirt-6.8.0/src/lxc/lxc_driver.c
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
-@@ -5066,6 +5068,129 @@ lxcDomainHasManagedSaveImage(virDomainPt
+@@ -5069,6 +5071,128 @@ lxcDomainHasManagedSaveImage(virDomainPt
     return ret;
 }
 
@ -118,8 +118,7 @@ Index: libvirt-6.8.0/src/lxc/lxc_driver.c
 +            return -1;
 +    }
 +
-+    if (VIR_ALLOC_N(tmpstats, nvms + 1) < 0)
-+        goto cleanup;
+    tmpstats = g_new0(virDomainStatsRecordPtr, nvms + 1);
 +
 +    for (i = 0; i < nvms; i++) {
 +        virDomainStatsRecordPtr tmp = NULL;
@ -152,7 +151,7 @@ Index: libvirt-6.8.0/src/lxc/lxc_driver.c
 
 /* Function Tables */
 static virHypervisorDriver lxcHypervisorDriver = {
-@@ -5163,6 +5288,7 @@ static virHypervisorDriver lxcHypervisor
+@@ -5166,6 +5290,7 @@ static virHypervisorDriver lxcHypervisor
     .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */
     .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */
     .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */
--- a/libvirt-6.8.0.tar.xz
+++ b/libvirt-6.8.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c2d7f6ed8bc4956bf7f0c8ca2897c6c82ddb91e3118ab7a588b25eedd16ef69
-size 8412092
--- a/libvirt-6.8.0.tar.xz.asc
+++ b/libvirt-6.8.0.tar.xz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAl91iyMACgkQymi+gBAI
-TJyZ7RAAguxlYBvKkG6Q3PBrJc67pyQdB1hi+42CLcR0V2GdiPtoC1UL77wwDO6b
-xkXn4D9QJQ70uVDJ/HivuA8uSVdj9qJsbFe5SsHTTeHz6HE+k+tbhWM1O0ALilfl
-EaDQl5GF+00IwGyxLBABvg5dcqhLcPfdCAu+tuFDy8b7x8PkgN1XlMyucddYcCeY
-YXX7JCJ/ckrCaC+OfGzurZOTLrz2k3u55ezSEsQ6VjxAegEz5kGb7sXKSgbRxd/L
-xozHJcJwccRXirjNVtnSdn9zJwqzjys+yeyxVuNs2MM9Vd8urUW8TnE4L2DN9ojM
-pMt/xmItZGoMMeamc9IfH/9AfMYy3Z/lYxHO7cu+xw7EOtAqHQOl2yWuE8ukKXVu
-PYU6zfupfAYn7EgsNFVgeYQPpK6p0lG72+G+KiaJ3iHzTJXz7478rQTdSCrcdIYP
-60JoLePSXt5+VsHVCR1zGS2e4NG8HfZ8JJ7fIfF4AsaHwbF3lfp+tT4db1zfeP+B
-URQOebXHjLgh5ytZY5i2MSa4E31dHSpWx0RLYOfziPss8IqtE+OUKjHFLlzdwMq5
-eMVnrgnb5B1jN0dfpGHQcrkAb3uVQ0A0+A8TGIvVrksKO+Oie385lkbUGwak4s0k
-2rv+77qK8cVLw6TZE6RXPhjHT3/8zMKuXRsIyhX6ofItG5x2BK4=
-=eHB4
-----END PGP SIGNATURE-----
--- a/libvirt-6.9.0.tar.xz
+++ b/libvirt-6.9.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d8427ee1d0f448fb339f847838f63b1e7ca0c4acbd14f1faacb129c795cc0c1
+size 8432360
--- a/libvirt-6.9.0.tar.xz.asc
+++ b/libvirt-6.9.0.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAl+f3RQACgkQymi+gBAI
+TJz/YA/9GcwjRXvtV1JpYweIGsXc3DKEcXRxLjEC9SVMfaNxUMvlLWhJH3xuMpYJ
+6zkY/s5UDK5+cR3/uENqPhVVJbgnOk2QsTtKOlv6mqeisopyV3B+QzSYBbPTpYzP
+Z5gc2ym7ORbdRgs1FdyKnDhUAvna02MKz8/p2uppfCWnZ9zsrg+SWSloI1Cp+sB4
+pcyGNFxYhHC0dm/fvuLexxt/XWywsV6dvhUSwG9Ww9a+JckW+Z07D+Ga19BLYawv
+oOZZ/9nx77ojjsqGedYJsbr0jn++qczhTPgOmt1Ii0oKAEjYzXp5noETFl8DWKuN
+nx0h6Mo36c+79u9mamiZyK/LIbW4c4W2EfLjD8vWSn6+RyXig5CEU6KEPOKvxi35
+5k/PlDyQQtboGxLtZCPcBIjXufKt+j8r5yEmEV5zHNhHRqii8B67l9OhJircUGgv
+ZYwgL0fse+PO2mFEQUBXMyv5eI3rCfXPPOAsZXygLgguzLFsapK8tS7pjePUX4K8
+ZApbPKIMHacukz8RwS09I8a0e7UquYDbZk4gSMwpMZ6Cqp8CLM38owGBd3p3oatH
+CBW1SHbxehYVFiMx9S5EooUDf1+CJt6g85je+ytCn3itUR6AlsMnU83yAOLaDJHM
+XvOCSWuXD+JUXFBHOYaj5Kg7D2RNUgbkssXJz8uLGp6vyfxiVuk=
+=9w27
+-----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-6.8.0/src/cpu_map/ppc64_POWER8.xml
+Index: libvirt-6.9.0/src/cpu_map/ppc64_POWER8.xml
 ===================================================================
--- libvirt-6.8.0.orig/src/cpu_map/ppc64_POWER8.xml
-+++ libvirt-6.8.0/src/cpu_map/ppc64_POWER8.xml
+--- libvirt-6.9.0.orig/src/cpu_map/ppc64_POWER8.xml
+++ libvirt-6.9.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-6.8.0/tools/virsh.c
+Index: libvirt-6.9.0/tools/virsh.c
 ===================================================================
--- libvirt-6.8.0.orig/tools/virsh.c
-+++ libvirt-6.8.0/tools/virsh.c
+--- libvirt-6.9.0.orig/tools/virsh.c
+++ libvirt-6.9.0/tools/virsh.c
@@ -542,6 +542,8 @@ virshShowVersion(vshControl *ctl G_GNUC_
     vshPrint(ctl, " Interface");
 # if defined(WITH_NETCF)
@ -11,10 +11,10 @@ Index: libvirt-6.8.0/tools/virsh.c
 # elif defined(WITH_UDEV)
     vshPrint(ctl, " udev");
 # endif
-Index: libvirt-6.8.0/src/interface/interface_backend_netcf.c
+Index: libvirt-6.9.0/src/interface/interface_backend_netcf.c
 ===================================================================
--- libvirt-6.8.0.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-6.8.0/src/interface/interface_backend_netcf.c
+--- libvirt-6.9.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-6.9.0/src/interface/interface_backend_netcf.c
@@ -21,7 +21,12 @@
 
 #include <config.h>
@ -78,7 +78,7 @@ Index: libvirt-6.8.0/src/interface/interface_backend_netcf.c
     /* open netcf */
     if (ncf_init(&driver->netcf, NULL) != 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-@@ -1116,6 +1156,7 @@ static int netcfInterfaceIsActive(virInt
+@@ -1112,6 +1152,7 @@ static int netcfInterfaceIsActive(virInt
     return ret;
 }
 
@ -86,7 +86,7 @@ Index: libvirt-6.8.0/src/interface/interface_backend_netcf.c
 static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags)
 {
     int ret;
-@@ -1190,6 +1231,7 @@ static int netcfInterfaceChangeRollback(
+@@ -1186,6 +1227,7 @@ static int netcfInterfaceChangeRollback(
     virObjectUnlock(driver);
     return ret;
 }
@ -94,7 +94,7 @@ Index: libvirt-6.8.0/src/interface/interface_backend_netcf.c
 
 static virInterfaceDriver interfaceDriver = {
     .name = INTERFACE_DRIVER_NAME,
-@@ -1206,9 +1248,11 @@ static virInterfaceDriver interfaceDrive
+@@ -1202,9 +1244,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-6.8.0/src/interface/interface_backend_netcf.c
 };
 
 
-@@ -1239,6 +1283,19 @@ static virStateDriver interfaceStateDriv
+@@ -1235,6 +1279,19 @@ static virStateDriver interfaceStateDriv
 
 int netcfIfaceRegister(void)
 {
@ -126,10 +126,10 @@ Index: libvirt-6.8.0/src/interface/interface_backend_netcf.c
     if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
         return -1;
     if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
-Index: libvirt-6.8.0/src/interface/interface_driver.c
+Index: libvirt-6.9.0/src/interface/interface_driver.c
 ===================================================================
--- libvirt-6.8.0.orig/src/interface/interface_driver.c
-+++ libvirt-6.8.0/src/interface/interface_driver.c
+--- libvirt-6.9.0.orig/src/interface/interface_driver.c
+++ libvirt-6.9.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
     if (netcfIfaceRegister() == 0)
         return 0;
@ -147,11 +147,11 @@ Index: libvirt-6.8.0/src/interface/interface_driver.c
     if (udevIfaceRegister() == 0)
         return 0;
 #endif /* WITH_UDEV */
-Index: libvirt-6.8.0/meson.build
+Index: libvirt-6.9.0/meson.build
 ===================================================================
--- libvirt-6.8.0.orig/meson.build
-+++ libvirt-6.8.0/meson.build
-@@ -1184,6 +1184,12 @@ if netcf_dep.found()
+--- libvirt-6.9.0.orig/meson.build
+++ libvirt-6.9.0/meson.build
+@@ -1173,6 +1173,12 @@ if netcf_dep.found()
   conf.set('WITH_NETCF', 1)
 endif
 
@ -164,7 +164,7 @@ Index: libvirt-6.8.0/meson.build
 have_gnu_gettext_tools = false
 if not get_option('nls').disabled()
   have_gettext = cc.has_function('gettext')
-@@ -1612,10 +1618,10 @@ elif get_option('driver_hyperv').enabled
+@@ -1589,10 +1595,10 @@ elif get_option('driver_hyperv').enabled
   error('openwsman is required for the Hyper-V driver')
 endif
 
@ -177,18 +177,18 @@ Index: libvirt-6.8.0/meson.build
 endif
 
 if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD')
-@@ -2420,6 +2426,7 @@ libs_summary = {
-   'libxml': libxml_dep.found(),
-   'macvtap': conf.has('WITH_MACVTAP'),
+@@ -2402,6 +2408,7 @@ libs_summary = {
+   'libssh2': libssh2_dep.found(),
+   'libutil': libutil_dep.found(),
   'netcf': netcf_dep.found(),
 +  'netcontrol': netcontrol_dep.found(),
   'NLS': have_gnu_gettext_tools,
-   'nss': conf.has('WITH_NSS'),
   'numactl': numactl_dep.found(),
-Index: libvirt-6.8.0/src/interface/meson.build
+   'openwsman': openwsman_dep.found(),
+Index: libvirt-6.9.0/src/interface/meson.build
 ===================================================================
--- libvirt-6.8.0.orig/src/interface/meson.build
-+++ libvirt-6.8.0/src/interface/meson.build
+--- libvirt-6.9.0.orig/src/interface/meson.build
+++ libvirt-6.9.0/src/interface/meson.build
@@ -2,7 +2,7 @@ interface_driver_sources = [
   'interface_driver.c',
 ]
@ -206,13 +206,13 @@ Index: libvirt-6.8.0/src/interface/meson.build
       udev_dep,
     ],
     'link_args': [
-Index: libvirt-6.8.0/meson_options.txt
+Index: libvirt-6.9.0/meson_options.txt
 ===================================================================
--- libvirt-6.8.0.orig/meson_options.txt
-+++ libvirt-6.8.0/meson_options.txt
-@@ -28,6 +28,7 @@ option('libssh', type: 'feature', value:
+--- libvirt-6.9.0.orig/meson_options.txt
+++ libvirt-6.9.0/meson_options.txt
+@@ -28,6 +28,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('macvtap', type: 'feature', value: 'auto', description: 'enable macvtap device')
 option('netcf', type: 'feature', value: 'auto', description: 'netcf support')
 +option('netcontrol', type: 'feature', value: 'auto', description: 'netcontrol support')
 option('nls', type: 'feature', value: 'auto', description: 'nls support')
--- a/libvirt.changes
+++ b/libvirt.changes
@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Nov  3 14:27:41 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Replace  '%service_del_postun -n' with '%service_del_postun_without_restart'
+
+  '-n' is deprecated and will be removed in the future.
+
+-------------------------------------------------------------------
+Mon Nov  2 17:41:55 UTC 2020 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 6.9.0
+  - jsc#SLE-13688, jsc#SLE-16754
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html
+
+-------------------------------------------------------------------
+Mon Nov  2 11:11:11 UTC 2020 - ohering@suse.de
+
+- bsc#1177950 - adjust help for --max_iters, default is 5
+  libxl-set-migration-constraints.patch
+
 -------------------------------------------------------------------
 Wed Oct 28 06:37:22 UTC 2020 - Franck Bui <fbui@suse.com>

--- a/libvirt.spec
+++ b/libvirt.spec
@ -55,10 +55,8 @@

 # A few optional bits off by default, we enable later
 %define with_numad         0%{!?_without_numad:0}
-%define with_firewalld     0%{!?_without_firewalld:0}
 %define with_firewalld_zone 0%{!?_without_firewalld_zone:0}
 %define with_libssh        0%{!?_without_libssh:0}
-%define with_bash_completion 0%{!?_without_bash_completion:0}

 # Set the OS / architecture specific special cases

@ -77,11 +75,6 @@
    %define with_vbox      0
 %endif

-# Enable firewalld support in newer code bases
-%if 0%{?suse_version} >= 1500
-    %define with_firewalld 1
-%endif
-
 # The 'libvirt' zone must be used with firewalld >= 0.7.0
 %if 0%{?suse_version} >= 1550
    %define with_firewalld_zone 1
@ -92,10 +85,6 @@
    %define with_libssh    1
 %endif

-%if 0%{?suse_version} >= 1500
-    %define with_bash_completion  0%{!?_without_bash_completion:1}
-%endif
-
 # rbd enablement is a bit tricky. For x86_64
 %ifarch x86_64
 # enable on anything newer than 1320, or SLE12 family newer than 120100
@ -144,11 +133,7 @@
 %define qemu_user          qemu
 %define qemu_group         qemu

-%if %{with_firewalld}
 %define _fwdefdir %{_prefix}/lib/firewalld/services
-%else
-    %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
-%endif

 %if %{with_wireshark}
    %define wireshark_plugindir %(pkg-config --variable plugindir wireshark)/epan
@ -156,7 +141,7 @@

 Name:           libvirt
 URL:            http://libvirt.org/
-Version:        6.8.0
+Version:        6.9.0
 Release:        0
 Summary:        Library providing a virtualization API
 License:        LGPL-2.1-or-later
@ -203,9 +188,7 @@ BuildRequires:  libacl-devel
 # For qemu-bridge-helper, qemu-pr-helper
 BuildRequires:  qemu-tools
 %endif
-%if %{with_bash_completion}
 BuildRequires:  bash-completion-devel >= 2.0
-%endif
 BuildRequires:  fdupes
 BuildRequires:  glib2-devel >= 2.48
 BuildRequires:  libattr-devel
@ -279,7 +262,7 @@ BuildRequires:  libssh2-devel
 BuildRequires:  libcurl-devel
 %endif
 %if %{with_hyperv}
-BuildRequires:  libwsman-devel >= 2.2.3
+BuildRequires:  libwsman-devel >= 2.6.3
 %endif
 BuildRequires:  audit-devel
 # we need /usr/sbin/dtrace
@ -293,7 +276,8 @@ BuildRequires:  wireshark-devel >= 2.4.0
 %if %{with_libssh}
 BuildRequires:  libssh-devel >= 0.7.0
 %endif
-%if %{with_firewalld}
+# Needed for the firewalld_reload macro
+%if %{with_firewalld_zone}
 BuildRequires:  firewall-macros
 %endif

@ -760,9 +744,7 @@ Requires:       gettext-runtime
 # Needed by virt-pki-validate script.
 Requires:       cyrus-sasl
 Requires:       gnutls
-%if %{with_bash_completion}
 Recommends:     %{name}-bash-completion = %{version}-%{release}
-%endif

 %description client
 The client binaries needed to access the virtualization
@ -785,9 +767,7 @@ Shared libraries for accessing the libvirt daemon.
 Summary:        Set of tools to control libvirt daemon
 Group:          System/Management
 Requires:       %{name}-libs = %{version}-%{release}
-%if %{with_bash_completion}
 Recommends:     %{name}-bash-completion = %{version}-%{release}
-%endif

 %description admin
 The client side utilities to control the libvirt daemon.
@ -930,6 +910,16 @@ libvirt plugin for NSS for translating domain names into IP addresses.
 %else
    %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=disabled
 %endif
+%if %{with_libssh}
+    %define arg_libssh -Dlibssh=enabled
+%else
+    %define arg_libssh -Dlibssh=disabled
+%endif
+%if %{with_libssh2}
+    %define arg_libssh2 -Dlibssh2=enabled
+%else
+    %define arg_libssh2 -Dlibssh2=disabled
+%endif
 %if %{with_numactl}
    %define arg_numactl -Dnumactl=enabled
 %else
@ -952,11 +942,6 @@ libvirt plugin for NSS for translating domain names into IP addresses.
 %else
    %define arg_sanlock -Dsanlock=disabled
 %endif
-%if %{with_firewalld}
-    %define arg_firewalld -Dfirewalld=enabled
-%else
-    %define arg_firewalld -Dfirewalld=disabled
-%endif
 %if %{with_firewalld_zone}
    %define arg_firewalld_zone -Dfirewalld_zone=enabled
 %else
@ -1022,6 +1007,8 @@ libvirt plugin for NSS for translating domain names into IP addresses.
           %{?arg_storage_iscsi_direct} \
           -Dstorage_zfs=disabled \
           -Dstorage_vstorage=disabled \
+           %{?arg_libssh} \
+           %{?arg_libssh2} \
           %{?arg_numactl} \
           %{?arg_numad} \
           -Dcapng=enabled \
@ -1036,10 +1023,9 @@ libvirt plugin for NSS for translating domain names into IP addresses.
           -Dyajl=enabled \
           %{?arg_sanlock} \
           -Dlibpcap=enabled \
-           -Dmacvtap=enabled \
           -Daudit=enabled \
           -Ddtrace=enabled \
-           %{?arg_firewalld} \
+           -Dfirewalld=enabled \
           %{?arg_firewalld_zone} \
           %{?arg_wireshark} \
           -Dnss=enabled \
@ -1048,6 +1034,9 @@ libvirt plugin for NSS for translating domain names into IP addresses.
           %{?arg_loader_nvram} \
           -Dlogin_shell=disabled \
           -Dinit_script=systemd \
+           -Ddocs=enabled \
+           -Dtests=enabled \
+           -Drpath=disabled \
 	   %{nil}

 %meson_build
@ -1155,12 +1144,7 @@ ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtvboxd

 # install firewall services for migration ports
 mkdir -p %{buildroot}/%{_fwdefdir}
-%if %{with_firewalld}
 install -m 644 %{S:6} %{buildroot}/%{_fwdefdir}/libvirtd-relocation-server.xml
-%else
-# Format described in /usr/share/SuSEfirewall2/services/TEMPLATE
-install -m 644 %{S:3} %{buildroot}/%{_fwdefdir}/libvirtd-relocation-server
-%endif

 # install supportconfig plugin
 mkdir -p %{buildroot}/usr/lib/supportconfig/plugins
@ -1191,9 +1175,6 @@ VIR_TEST_DEBUG=1 %meson_test -t 5 --no-suite syntax-check
 %if %{with_apparmor}
 %apparmor_reload /etc/apparmor.d/usr.sbin.libvirtd
 %endif
-%if %{with_firewalld}
-%firewalld_reload
-%endif
 %service_add_post libvirtd.service libvirtd.socket libvirtd-ro.socket 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 virt-guest-shutdown.target
 %{fillup_only -n libvirtd}
 %{fillup_only -n virtlockd}
@ -1389,7 +1370,7 @@ if [ $1 = 0 ]; then
 fi

 %postun client
-%service_del_postun -n libvirt-guests.service
+%service_del_postun_without_restart libvirt-guests.service

 %post libs -p /sbin/ldconfig

@ -1494,13 +1475,9 @@ fi
 %config(noreplace) %{_sysconfdir}/apparmor.d/local/usr.lib.libvirt.virt-aa-helper
 %{_libdir}/%{name}/virt-aa-helper
 %endif
-%if %{with_firewalld}
 %dir %{_prefix}/lib/firewalld
 %dir %{_fwdefdir}
 %{_fwdefdir}/libvirtd-relocation-server.xml
-%else
-%config %{_fwdefdir}/libvirtd-relocation-server
-%endif
 %dir /usr/lib/supportconfig
 %dir /usr/lib/supportconfig/plugins
 /usr/lib/supportconfig/plugins/libvirt
@ -1780,9 +1757,7 @@ fi
 %{_bindir}/virt-xml-validate
 %{_bindir}/virt-pki-validate
 %{_bindir}/virt-host-validate
-%if %{with_bash_completion}
 %{_datadir}/bash-completion/completions/virsh
-%endif
 %dir %{_libdir}/%{name}
 %attr(0755, root, root) %{_libdir}/%{name}/libvirt-guests.sh
 %{_fillupdir}/sysconfig.libvirt-guests
@ -1801,42 +1776,17 @@ fi
 %dir %{_datadir}/%{name}/cpu_map/
 %dir %attr(0755, root, root) %{_localstatedir}/lib/%{name}/

-%{_datadir}/%{name}/schemas/basictypes.rng
-%{_datadir}/%{name}/schemas/capability.rng
-%{_datadir}/%{name}/schemas/cputypes.rng
-%{_datadir}/%{name}/schemas/domain.rng
-%{_datadir}/libvirt/schemas/domainbackup.rng
-%{_datadir}/%{name}/schemas/domaincaps.rng
-%{_datadir}/%{name}/schemas/domaincheckpoint.rng
-%{_datadir}/%{name}/schemas/domaincommon.rng
-%{_datadir}/%{name}/schemas/domainsnapshot.rng
-%{_datadir}/%{name}/schemas/interface.rng
-%{_datadir}/%{name}/schemas/network.rng
-%{_datadir}/%{name}/schemas/networkcommon.rng
-%{_datadir}/%{name}/schemas/networkport.rng
-%{_datadir}/%{name}/schemas/nodedev.rng
-%{_datadir}/%{name}/schemas/nwfilter.rng
-%{_datadir}/%{name}/schemas/nwfilter_params.rng
-%{_datadir}/%{name}/schemas/nwfilterbinding.rng
-%{_datadir}/%{name}/schemas/secret.rng
-%{_datadir}/%{name}/schemas/storagecommon.rng
-%{_datadir}/%{name}/schemas/storagepool.rng
-%{_datadir}/%{name}/schemas/storagepoolcaps.rng
-%{_datadir}/%{name}/schemas/storagevol.rng
+%{_datadir}/%{name}/schemas/*.rng
 %{_datadir}/%{name}/cpu_map/*.xml
 %{_datadir}/%{name}/test-screenshot.png

 %files admin
 %doc %{_mandir}/man1/virt-admin.1*
 %{_bindir}/virt-admin
-%if %{with_bash_completion}
 %{_datadir}/bash-completion/completions/virt-admin
-%endif

-%if %{with_bash_completion}
 %files bash-completion
 %{_datadir}/bash-completion/completions/vsh
-%endif

 %files devel
 %{_libdir}/libvirt.so
--- a/libxl-dom-reset.patch
+++ b/libxl-dom-reset.patch
@ -8,11 +8,11 @@ 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-6.8.0/src/libxl/libxl_driver.c
+Index: libvirt-6.9.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-6.8.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-6.8.0/src/libxl/libxl_driver.c
-@@ -1377,6 +1377,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
+--- libvirt-6.9.0.orig/src/libxl/libxl_driver.c
+++ libvirt-6.9.0/src/libxl/libxl_driver.c
+@@ -1374,6 +1374,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
 }
 
 static int
@ -74,7 +74,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_driver.c
 libxlDomainDestroyFlags(virDomainPtr dom,
                         unsigned int flags)
 {
-@@ -6678,6 +6733,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6674,6 +6729,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-6.8.0/src/libxl/libxl_conf.c
+Index: libvirt-6.9.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-6.8.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.8.0/src/libxl/libxl_conf.c
-@@ -925,6 +925,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
+--- libvirt-6.9.0.orig/src/libxl/libxl_conf.c
+++ libvirt-6.9.0/src/libxl/libxl_conf.c
+@@ -921,6 +921,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
 #endif
 }
 
@ -38,7 +38,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_conf.c
 static char *
 libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src,
                            const char *username,
-@@ -1162,6 +1186,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,10 +16,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 tools/virsh.pod                  |    8 ++++++++
 6 files changed, 125 insertions(+), 6 deletions(-)

-Index: libvirt-6.8.0/include/libvirt/libvirt-domain.h
+Index: libvirt-6.9.0/include/libvirt/libvirt-domain.h
 ===================================================================
--- libvirt-6.8.0.orig/include/libvirt/libvirt-domain.h
-+++ libvirt-6.8.0/include/libvirt/libvirt-domain.h
+--- libvirt-6.9.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-6.9.0/include/libvirt/libvirt-domain.h
@@ -1078,6 +1078,31 @@ typedef enum {
  */
 # define VIR_MIGRATE_PARAM_TLS_DESTINATION          "tls.destination"
@ -52,11 +52,11 @@ Index: libvirt-6.8.0/include/libvirt/libvirt-domain.h
 /* Domain migration. */
 virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
                                unsigned long flags, const char *dname,
-Index: libvirt-6.8.0/src/libxl/libxl_driver.c
+Index: libvirt-6.9.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-6.8.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-6.8.0/src/libxl/libxl_driver.c
-@@ -6243,6 +6243,9 @@ libxlDomainMigratePerform3Params(virDoma
+--- libvirt-6.9.0.orig/src/libxl/libxl_driver.c
+++ libvirt-6.9.0/src/libxl/libxl_driver.c
+@@ -6236,6 +6236,9 @@ libxlDomainMigratePerform3Params(virDoma
     const char *dname = NULL;
     const char *uri = NULL;
     int ret = -1;
@ -66,7 +66,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_driver.c
 
 #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
     virReportUnsupportedError();
-@@ -6259,6 +6262,18 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6252,6 +6255,18 @@ libxlDomainMigratePerform3Params(virDoma
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_DEST_NAME,
                                 &dname) < 0 ||
@ -85,7 +85,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_driver.c
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_URI,
                                 &uri) < 0)
-@@ -6273,11 +6288,11 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6266,11 +6281,11 @@ libxlDomainMigratePerform3Params(virDoma
 
     if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
         if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml,
@ -99,11 +99,11 @@ Index: libvirt-6.8.0/src/libxl/libxl_driver.c
             goto cleanup;
     }
 
-Index: libvirt-6.8.0/src/libxl/libxl_migration.c
+Index: libvirt-6.9.0/src/libxl/libxl_migration.c
 ===================================================================
--- libvirt-6.8.0.orig/src/libxl/libxl_migration.c
-+++ libvirt-6.8.0/src/libxl/libxl_migration.c
-@@ -345,18 +345,39 @@ libxlMigrateDstReceive(virNetSocketPtr s
+--- libvirt-6.9.0.orig/src/libxl/libxl_migration.c
+++ libvirt-6.9.0/src/libxl/libxl_migration.c
+@@ -341,18 +341,39 @@ libxlMigrateDstReceive(virNetSocketPtr s
 static int
 libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver,
                       virDomainObjPtr vm,
@ -145,7 +145,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_migration.c
     if (ret != 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("Failed to send migration data to destination host"));
-@@ -911,7 +932,7 @@ struct libxlTunnelControl {
+@@ -905,7 +926,7 @@ struct libxlTunnelControl {
 static int
 libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver,
                              virDomainObjPtr vm,
@ -154,7 +154,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_migration.c
                              virStreamPtr st,
                              struct libxlTunnelControl **tnl)
 {
-@@ -945,7 +966,7 @@ libxlMigrationSrcStartTunnel(libxlDriver
+@@ -938,7 +959,7 @@ libxlMigrationSrcStartTunnel(libxlDriver
 
     virObjectUnlock(vm);
     /* Send data to pipe */
@ -163,7 +163,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_migration.c
     virObjectLock(vm);
 
  out:
-@@ -981,7 +1002,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -974,7 +995,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
                      const char *dconnuri G_GNUC_UNUSED,
                      const char *dname,
                      const char *uri,
@ -172,7 +172,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_migration.c
 {
     virDomainPtr ddomain = NULL;
     virTypedParameterPtr params = NULL;
-@@ -1026,11 +1047,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1019,11 +1040,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
     /* We don't require the destination to have P2P support
      * as it looks to be normal migration from the receiver perspective.
      */
@ -186,7 +186,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_migration.c
         if (!(st = virStreamNew(dconn, 0)))
             goto confirm;
         ret = dconn->driver->domainMigratePrepareTunnel3Params
-@@ -1044,7 +1065,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1037,7 +1058,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
     if (ret == -1)
         goto confirm;
 
@ -195,7 +195,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_migration.c
         if (uri_out) {
             if (virTypedParamsReplaceString(&params, &nparams,
                                             VIR_MIGRATE_PARAM_URI, uri_out) < 0) {
-@@ -1059,11 +1080,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1052,11 +1073,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
     }
 
     VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out));
@ -210,7 +210,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_migration.c
     if (ret < 0) {
         notify_source = false;
         virErrorPreserveLast(&orig_err);
-@@ -1098,7 +1119,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1091,7 +1112,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
  confirm:
     if (notify_source) {
         VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm);
@ -219,7 +219,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_migration.c
 
         if (ret < 0)
             VIR_WARN("Guest %s probably left in 'paused' state on source",
-@@ -1106,7 +1127,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1099,7 +1120,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
     }
 
  cleanup:
@ -228,7 +228,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_migration.c
         libxlMigrationSrcStopTunnel(tc);
         virObjectUnref(st);
     }
-@@ -1150,7 +1171,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
+@@ -1143,7 +1164,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
                                   const char *dconnuri,
                                   const char *uri_str G_GNUC_UNUSED,
                                   const char *dname,
@ -237,7 +237,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_migration.c
 {
     int ret = -1;
     bool useParams;
-@@ -1185,7 +1206,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
+@@ -1178,7 +1199,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
     }
 
     ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri,
@ -246,7 +246,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_migration.c
 
     if (ret < 0) {
         /*
-@@ -1212,7 +1233,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
+@@ -1205,7 +1226,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
                                const char *dconnuri G_GNUC_UNUSED,
                                const char *uri_str,
                                const char *dname G_GNUC_UNUSED,
@ -255,7 +255,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_migration.c
 {
     libxlDomainObjPrivatePtr priv = vm->privateData;
     char *hostname = NULL;
-@@ -1248,7 +1269,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
+@@ -1241,7 +1262,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
 
     /* suspend vm and send saved data to dst through socket fd */
     virObjectUnlock(vm);
@ -264,10 +264,10 @@ Index: libvirt-6.8.0/src/libxl/libxl_migration.c
     virObjectLock(vm);
 
     if (ret == 0) {
-Index: libvirt-6.8.0/src/libxl/libxl_migration.h
+Index: libvirt-6.9.0/src/libxl/libxl_migration.h
 ===================================================================
--- libvirt-6.8.0.orig/src/libxl/libxl_migration.h
-+++ libvirt-6.8.0/src/libxl/libxl_migration.h
+--- libvirt-6.9.0.orig/src/libxl/libxl_migration.h
+++ libvirt-6.9.0/src/libxl/libxl_migration.h
@@ -35,6 +35,10 @@
     VIR_MIGRATE_PARAM_URI,              VIR_TYPED_PARAM_STRING, \
     VIR_MIGRATE_PARAM_DEST_NAME,        VIR_TYPED_PARAM_STRING, \
@ -312,17 +312,17 @@ Index: libvirt-6.8.0/src/libxl/libxl_migration.h
 
 virDomainPtr
 libxlDomainMigrationDstFinish(virConnectPtr dconn,
-Index: libvirt-6.8.0/tools/virsh-domain.c
+Index: libvirt-6.9.0/tools/virsh-domain.c
 ===================================================================
--- libvirt-6.8.0.orig/tools/virsh-domain.c
-+++ libvirt-6.8.0/tools/virsh-domain.c
-@@ -10722,6 +10722,22 @@ static const vshCmdOptDef opts_migrate[]
+--- libvirt-6.9.0.orig/tools/virsh-domain.c
+++ libvirt-6.9.0/tools/virsh-domain.c
+@@ -10713,6 +10713,22 @@ static const vshCmdOptDef opts_migrate[]
      .type = VSH_OT_STRING,
      .help = N_("override the destination host name used for TLS verification")
     },
 +    {.name = "max_iters",
 +     .type = VSH_OT_INT,
-+     .help = N_("SUSE libxl: Number of iterations before final suspend (default: 30).")
+     .help = N_("SUSE libxl: Number of iterations before final suspend (default: 5).")
 +    },
 +    {.name = "max_factor",
 +     .type = VSH_OT_INT,
@ -339,7 +339,7 @@ Index: libvirt-6.8.0/tools/virsh-domain.c
     {.name = NULL}
 };
 
-@@ -10742,6 +10758,7 @@ doMigrate(void *opaque)
+@@ -10733,6 +10749,7 @@ doMigrate(void *opaque)
     unsigned long long ullOpt = 0;
     int rv;
     virConnectPtr dconn = data->dconn;
@ -347,7 +347,7 @@ Index: libvirt-6.8.0/tools/virsh-domain.c
 #ifndef WIN32
     sigset_t sigmask, oldsigmask;
 
-@@ -10872,6 +10889,27 @@ doMigrate(void *opaque)
+@@ -10863,6 +10880,27 @@ doMigrate(void *opaque)
             goto save_error;
     }
 
@ -375,11 +375,11 @@ Index: libvirt-6.8.0/tools/virsh-domain.c
     if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0)
         goto out;
     if (opt) {
-Index: libvirt-6.8.0/docs/manpages/virsh.rst
+Index: libvirt-6.9.0/docs/manpages/virsh.rst
 ===================================================================
--- libvirt-6.8.0.orig/docs/manpages/virsh.rst
-+++ libvirt-6.8.0/docs/manpages/virsh.rst
-@@ -3113,7 +3113,8 @@ migrate
+--- libvirt-6.9.0.orig/docs/manpages/virsh.rst
+++ libvirt-6.9.0/docs/manpages/virsh.rst
+@@ -3117,7 +3117,8 @@ migrate
       [--postcopy-bandwidth bandwidth]
       [--parallel [--parallel-connections connections]]
       [--bandwidth bandwidth] [--tls-destination hostname]
@ -389,12 +389,12 @@ Index: libvirt-6.8.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*
-@@ -3219,6 +3220,14 @@ parallel connections. The number of such
+@@ -3223,6 +3224,14 @@ parallel connections. The number of such
 network link between the source and the target and thus speeding up the
 migration.
 
 +SUSE-specific options for Xen: *--max_iters* allows specifying the maximum
-+number of iterations before final suspend. Default is 30. *--max_factor*
+number of iterations before final suspend. Default is 5. *--max_factor*
 +allows specifying the maximum amount of memory to transfer before final suspend.
 +Default is (3*VM memory size). *--min_remaining* allows specifying the
 +number of dirty pages before final suspend.  Default is 50. *--abort_if_busy*
--- 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-6.8.0/src/libxl/libxl_conf.c
+Index: libvirt-6.9.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-6.8.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.8.0/src/libxl/libxl_conf.c
-@@ -925,6 +925,22 @@ libxlDiskSetDiscard(libxl_device_disk *x
+--- libvirt-6.9.0.orig/src/libxl/libxl_conf.c
+++ libvirt-6.9.0/src/libxl/libxl_conf.c
+@@ -921,6 +921,22 @@ libxlDiskSetDiscard(libxl_device_disk *x
 #endif
 }
 
@ -34,7 +34,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_conf.c
 static void
 libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode)
 {
-@@ -1061,6 +1077,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-6.8.0/src/libxl/libxl_conf.c
     const char *driver = virDomainDiskGetDriver(l_disk);
     int format = virDomainDiskGetFormat(l_disk);
     int actual_type = virStorageSourceGetActualType(l_disk->src);
-@@ -1076,7 +1093,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-6.8.0/src/libxl/libxl_conf.c
     }
 
     x_disk->vdev = g_strdup(l_disk->dst);
-@@ -1187,6 +1204,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-6.8.0/src/lxc/lxc_controller.c
+Index: libvirt-6.9.0/src/lxc/lxc_controller.c
 ===================================================================
--- libvirt-6.8.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-6.8.0/src/lxc/lxc_controller.c
-@@ -2026,6 +2026,7 @@ static int virLXCControllerDeleteInterfa
+--- libvirt-6.9.0.orig/src/lxc/lxc_controller.c
+++ libvirt-6.9.0/src/lxc/lxc_controller.c
+@@ -2024,6 +2024,7 @@ static int virLXCControllerDeleteInterfa
         if (virNetDevVethDelete(ctrl->veths[i]) < 0)
             ret = -1;
     }
@ -25,10 +25,10 @@ Index: libvirt-6.8.0/src/lxc/lxc_controller.c
 
     return ret;
 }
-Index: libvirt-6.8.0/src/lxc/lxc_driver.c
+Index: libvirt-6.9.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-6.8.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-6.8.0/src/lxc/lxc_driver.c
+--- libvirt-6.9.0.orig/src/lxc/lxc_driver.c
+++ libvirt-6.9.0/src/lxc/lxc_driver.c
@@ -66,6 +66,7 @@
 #include "virtime.h"
 #include "virtypedparam.h"
@ -37,7 +37,7 @@ Index: libvirt-6.8.0/src/lxc/lxc_driver.c
 #include "virstring.h"
 #include "viraccessapicheck.h"
 #include "viraccessapichecklxc.h"
-@@ -3546,6 +3547,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive
+@@ -3547,6 +3548,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-6.8.0/src/lxc/lxc_driver.c
             break;
 
         case VIR_DOMAIN_NET_TYPE_DIRECT:
-@@ -3984,6 +3986,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
+@@ -3986,6 +3988,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
             virDomainAuditNet(vm, detach, NULL, "detach", false);
             goto cleanup;
         }
@ -53,10 +53,10 @@ Index: libvirt-6.8.0/src/lxc/lxc_driver.c
         break;
 
         /* It'd be nice to support this, but with macvlan
-Index: libvirt-6.8.0/src/lxc/lxc_process.c
+Index: libvirt-6.9.0/src/lxc/lxc_process.c
 ===================================================================
--- libvirt-6.8.0.orig/src/lxc/lxc_process.c
-+++ libvirt-6.8.0/src/lxc/lxc_process.c
+--- libvirt-6.9.0.orig/src/lxc/lxc_process.c
+++ libvirt-6.9.0/src/lxc/lxc_process.c
@@ -50,6 +50,7 @@
 #include "virstring.h"
 #include "virprocess.h"
--- a/network-don-t-use-dhcp-authoritative-on-static-netwo.patch
+++ b/network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@ -17,10 +17,10 @@ Signed-off-by: Martin Wilck <mwilck@suse.com>
 tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 -
 2 files changed, 8 insertions(+), 2 deletions(-)

-Index: libvirt-6.8.0/src/network/bridge_driver.c
+Index: libvirt-6.9.0/src/network/bridge_driver.c
 ===================================================================
--- libvirt-6.8.0.orig/src/network/bridge_driver.c
-+++ libvirt-6.8.0/src/network/bridge_driver.c
+--- libvirt-6.9.0.orig/src/network/bridge_driver.c
+++ libvirt-6.9.0/src/network/bridge_driver.c
@@ -1445,7 +1445,14 @@ networkDnsmasqConfContents(virNetworkObj
         if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
             if (ipdef->nranges || ipdef->nhosts) {
@ -37,10 +37,10 @@ Index: libvirt-6.8.0/src/network/bridge_driver.c
             }
 
             if (ipdef->tftproot) {
-Index: libvirt-6.8.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+Index: libvirt-6.9.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
 ===================================================================
--- libvirt-6.8.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
-+++ libvirt-6.8.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+--- libvirt-6.9.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-6.9.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-6.8.0/src/util/virarch.c
+Index: libvirt-6.9.0/src/util/virarch.c
 ===================================================================
--- libvirt-6.8.0.orig/src/util/virarch.c
-+++ libvirt-6.8.0/src/util/virarch.c
+--- libvirt-6.9.0.orig/src/util/virarch.c
+++ libvirt-6.9.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-6.8.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-6.9.0/src/security/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-6.8.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-6.8.0/src/security/apparmor/libvirt-qemu
+--- libvirt-6.9.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-6.9.0/src/security/apparmor/libvirt-qemu
@@ -243,3 +243,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-6.8.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-6.9.0/src/security/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-6.8.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-6.8.0/src/security/apparmor/libvirt-qemu
+--- libvirt-6.9.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-6.9.0/src/security/apparmor/libvirt-qemu
@@ -64,6 +64,7 @@
   #/dev/fb* rw,
 
@ -20,10 +20,10 @@ Index: libvirt-6.8.0/src/security/apparmor/libvirt-qemu
   @{HOME}/.pulse-cookie rwk,
   owner /root/.pulse-cookie rwk,
   owner /root/.pulse/ rw,
-Index: libvirt-6.8.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+Index: libvirt-6.9.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
 ===================================================================
--- libvirt-6.8.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
-+++ libvirt-6.8.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+--- libvirt-6.9.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+++ libvirt-6.9.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,11 +9,11 @@ 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-6.8.0/src/libxl/libxl_conf.c
+Index: libvirt-6.9.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-6.8.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.8.0/src/libxl/libxl_conf.c
-@@ -1838,7 +1838,7 @@ libxlDriverConfigNew(void)
+--- libvirt-6.9.0.orig/src/libxl/libxl_conf.c
+++ libvirt-6.9.0/src/libxl/libxl_conf.c
+@@ -1826,7 +1826,7 @@ libxlDriverConfigNew(void)
 int
 libxlDriverConfigInit(libxlDriverConfigPtr cfg)
 {
@ -22,11 +22,11 @@ Index: libvirt-6.8.0/src/libxl/libxl_conf.c
 
     if (virFileMakePath(cfg->logDir) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
-Index: libvirt-6.8.0/src/libxl/libxl_domain.c
+Index: libvirt-6.9.0/src/libxl/libxl_domain.c
 ===================================================================
--- libvirt-6.8.0.orig/src/libxl/libxl_domain.c
-+++ libvirt-6.8.0/src/libxl/libxl_domain.c
-@@ -1020,8 +1020,8 @@ libxlDomainSetVcpuAffinities(libxlDriver
+--- libvirt-6.9.0.orig/src/libxl/libxl_domain.c
+++ libvirt-6.9.0/src/libxl/libxl_domain.c
+@@ -1013,8 +1013,8 @@ libxlDomainSetVcpuAffinities(libxlDriver
 static int
 libxlDomainFreeMem(libxl_ctx *ctx, libxl_domain_config *d_config)
 {
@ -37,7 +37,7 @@ Index: libvirt-6.8.0/src/libxl/libxl_domain.c
     int32_t target_mem;
     int tries = 3;
     int wait_secs = 10;
-@@ -1415,7 +1415,7 @@ libxlDomainStart(libxlDriverPrivatePtr d
+@@ -1408,7 +1408,7 @@ libxlDomainStart(libxlDriverPrivatePtr d
         params.stream_version = restore_ver;
 #endif
         ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid,
@ -46,10 +46,10 @@ Index: libvirt-6.8.0/src/libxl/libxl_domain.c
                                           &aop_console_how);
         libxl_domain_restore_params_dispose(&params);
     }
-Index: libvirt-6.8.0/tests/libxlmock.c
+Index: libvirt-6.9.0/tests/libxlmock.c
 ===================================================================
--- libvirt-6.8.0.orig/tests/libxlmock.c
-+++ libvirt-6.8.0/tests/libxlmock.c
+--- libvirt-6.9.0.orig/tests/libxlmock.c
+++ libvirt-6.9.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-6.8.0/tests/libxlmock.c
 
 VIR_MOCK_STUB_RET_ARGS(xc_interface_close,
                        int, 0,
-Index: libvirt-6.8.0/meson.build
+Index: libvirt-6.9.0/meson.build
 ===================================================================
--- libvirt-6.8.0.orig/meson.build
-+++ libvirt-6.8.0/meson.build
-@@ -1625,7 +1625,7 @@ elif get_option('driver_interface').enab
+--- libvirt-6.9.0.orig/meson.build
+++ libvirt-6.9.0/meson.build
+@@ -1602,7 +1602,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-6.8.0/meson.build
   libxl_dep = dependency('xenlight', version: '>=' + libxl_version, required: get_option('driver_libxl'))
 
   if libxl_dep.found()
-@@ -1655,7 +1655,7 @@ if not get_option('driver_libxl').disabl
+@@ -1632,7 +1632,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-6.8.0/tools/libvirt-guests.sh.in
+Index: libvirt-6.9.0/tools/libvirt-guests.sh.in
 ===================================================================
--- libvirt-6.8.0.orig/tools/libvirt-guests.sh.in
-+++ libvirt-6.8.0/tools/libvirt-guests.sh.in
+--- libvirt-6.9.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-6.9.0/tools/libvirt-guests.sh.in
@@ -16,14 +16,13 @@
 # License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
@ -163,10 +163,10 @@ Index: libvirt-6.8.0/tools/libvirt-guests.sh.in
 esac
 -exit $RETVAL
 +rc_exit
-Index: libvirt-6.8.0/tools/libvirt-guests.sysconf
+Index: libvirt-6.9.0/tools/libvirt-guests.sysconf
 ===================================================================
--- libvirt-6.8.0.orig/tools/libvirt-guests.sysconf
-+++ libvirt-6.8.0/tools/libvirt-guests.sysconf
+--- libvirt-6.9.0.orig/tools/libvirt-guests.sysconf
+++ libvirt-6.9.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,11 +3,11 @@ 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-6.8.0/src/remote/remote_daemon_config.c
+Index: libvirt-6.9.0/src/remote/remote_daemon_config.c
 ===================================================================
--- libvirt-6.8.0.orig/src/remote/remote_daemon_config.c
-+++ libvirt-6.8.0/src/remote/remote_daemon_config.c
-@@ -99,7 +99,7 @@ daemonConfigNew(bool privileged G_GNUC_U
+--- libvirt-6.9.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-6.9.0/src/remote/remote_daemon_config.c
+@@ -98,7 +98,7 @@ daemonConfigNew(bool privileged G_GNUC_U
 
 #ifdef WITH_IP
 # ifdef LIBVIRTD
@ -16,10 +16,10 @@ Index: libvirt-6.8.0/src/remote/remote_daemon_config.c
 # else /* ! LIBVIRTD */
     data->listen_tls = false; /* Always honoured, --listen doesn't exist. */
 # endif /* ! LIBVIRTD */
-Index: libvirt-6.8.0/src/remote/libvirtd.conf.in
+Index: libvirt-6.9.0/src/remote/libvirtd.conf.in
 ===================================================================
--- libvirt-6.8.0.orig/src/remote/libvirtd.conf.in
-+++ libvirt-6.8.0/src/remote/libvirtd.conf.in
+--- libvirt-6.9.0.orig/src/remote/libvirtd.conf.in
+++ libvirt-6.9.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-6.8.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-6.8.0/src/remote/test_libvirtd.aug.in
+Index: libvirt-6.9.0/src/remote/test_libvirtd.aug.in
 ===================================================================
--- libvirt-6.8.0.orig/src/remote/test_libvirtd.aug.in
-+++ libvirt-6.8.0/src/remote/test_libvirtd.aug.in
+--- libvirt-6.9.0.orig/src/remote/test_libvirtd.aug.in
+++ libvirt-6.9.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,9 +1,9 @@
 Adjust libvirtd sysconfig file to conform to SUSE standards

-Index: libvirt-6.8.0/src/remote/libvirtd.sysconf
+Index: libvirt-6.9.0/src/remote/libvirtd.sysconf
 ===================================================================
--- libvirt-6.8.0.orig/src/remote/libvirtd.sysconf
-+++ libvirt-6.8.0/src/remote/libvirtd.sysconf
+--- libvirt-6.9.0.orig/src/remote/libvirtd.sysconf
+++ libvirt-6.9.0/src/remote/libvirtd.sysconf
@@ -1,5 +1,9 @@
 +## Path: System/Virtualization/libvirt
 # Customizations for the libvirtd.service systemd unit
--- 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-6.8.0/src/libxl/libxl.conf
+Index: libvirt-6.9.0/src/libxl/libxl.conf
 ===================================================================
--- libvirt-6.8.0.orig/src/libxl/libxl.conf
-+++ libvirt-6.8.0/src/libxl/libxl.conf
+--- libvirt-6.9.0.orig/src/libxl/libxl.conf
+++ libvirt-6.9.0/src/libxl/libxl.conf
@@ -4,12 +4,11 @@
 
 # Enable autoballooning of domain0
@ -27,11 +27,11 @@ Index: libvirt-6.8.0/src/libxl/libxl.conf
 
 
 # In order to prevent accidentally starting two domains that
-Index: libvirt-6.8.0/src/libxl/libxl_conf.c
+Index: libvirt-6.9.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-6.8.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.8.0/src/libxl/libxl_conf.c
-@@ -1752,15 +1752,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
+--- libvirt-6.9.0.orig/src/libxl/libxl_conf.c
+++ libvirt-6.9.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-6.8.0/src/libxl/libxl_conf.c
     int res;
 
     res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon);
-@@ -1769,15 +1766,8 @@ libxlGetAutoballoonConf(libxlDriverConfi
+@@ -1760,15 +1757,8 @@ libxlGetAutoballoonConf(libxlDriverConfi
     else if (res == 1)
         return 0;
 
@ -66,10 +66,10 @@ Index: libvirt-6.8.0/src/libxl/libxl_conf.c
     return 0;
 }
 
-Index: libvirt-6.8.0/src/libxl/test_libvirtd_libxl.aug.in
+Index: libvirt-6.9.0/src/libxl/test_libvirtd_libxl.aug.in
 ===================================================================
--- libvirt-6.8.0.orig/src/libxl/test_libvirtd_libxl.aug.in
-+++ libvirt-6.8.0/src/libxl/test_libvirtd_libxl.aug.in
+--- libvirt-6.9.0.orig/src/libxl/test_libvirtd_libxl.aug.in
+++ libvirt-6.9.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,10 +1,10 @@
 Adjust paths of OVMF firmwares on SUSE distros

-Index: libvirt-6.8.0/src/qemu/qemu.conf
+Index: libvirt-6.9.0/src/qemu/qemu.conf
 ===================================================================
--- libvirt-6.8.0.orig/src/qemu/qemu.conf
-+++ libvirt-6.8.0/src/qemu/qemu.conf
-@@ -844,10 +844,9 @@
+--- libvirt-6.9.0.orig/src/qemu/qemu.conf
+++ libvirt-6.9.0/src/qemu/qemu.conf
+@@ -840,10 +840,9 @@
 # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
 # follows this scheme.
 #nvram = [
@ -18,10 +18,10 @@ Index: libvirt-6.8.0/src/qemu/qemu.conf
 #]
 
 # The backend to use for handling stdout/stderr output from
-Index: libvirt-6.8.0/src/qemu/qemu_conf.c
+Index: libvirt-6.9.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-6.8.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-6.8.0/src/qemu/qemu_conf.c
+--- libvirt-6.9.0.orig/src/qemu/qemu_conf.c
+++ libvirt-6.9.0/src/qemu/qemu_conf.c
@@ -97,10 +97,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver
 
 #ifndef DEFAULT_LOADER_NVRAM
@ -36,10 +36,10 @@ Index: libvirt-6.8.0/src/qemu/qemu_conf.c
 #endif
 
 
-Index: libvirt-6.8.0/src/security/virt-aa-helper.c
+Index: libvirt-6.9.0/src/security/virt-aa-helper.c
 ===================================================================
--- libvirt-6.8.0.orig/src/security/virt-aa-helper.c
-+++ libvirt-6.8.0/src/security/virt-aa-helper.c
+--- libvirt-6.9.0.orig/src/security/virt-aa-helper.c
+++ libvirt-6.9.0/src/security/virt-aa-helper.c
@@ -479,7 +479,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-6.8.0/src/security/virt-aa-helper.c
     };
     /* override the above with these */
     const char * const override[] = {
-Index: libvirt-6.8.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-6.9.0/src/qemu/test_libvirtd_qemu.aug.in
 ===================================================================
--- libvirt-6.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-6.8.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-6.9.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-6.9.0/src/qemu/test_libvirtd_qemu.aug.in
@@ -95,10 +95,9 @@ module Test_libvirtd_qemu =
 { "migration_port_max" = "49215" }
 { "log_timestamp" = "0" }
--- a/suse-qemu-conf.patch
+++ b/suse-qemu-conf.patch
@ -7,11 +7,11 @@ 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-6.8.0/src/qemu/qemu.conf
+Index: libvirt-6.9.0/src/qemu/qemu.conf
 ===================================================================
--- libvirt-6.8.0.orig/src/qemu/qemu.conf
-+++ libvirt-6.8.0/src/qemu/qemu.conf
-@@ -477,10 +477,19 @@
+--- libvirt-6.9.0.orig/src/qemu/qemu.conf
+++ libvirt-6.9.0/src/qemu/qemu.conf
+@@ -473,10 +473,19 @@
 # isolation, but it cannot appear in a list of drivers.
 #
 #security_driver = "selinux"
@ -32,7 +32,7 @@ Index: libvirt-6.8.0/src/qemu/qemu.conf
 #security_default_confined = 1
 
 # If set to non-zero, then attempts to create unconfined
-@@ -715,11 +724,22 @@
+@@ -711,11 +720,22 @@
 #relaxed_acs_check = 1
 
 
@ -60,10 +60,10 @@ Index: libvirt-6.8.0/src/qemu/qemu.conf
 #
 #lock_manager = "lockd"
 
-Index: libvirt-6.8.0/src/qemu/qemu_conf.c
+Index: libvirt-6.9.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-6.8.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-6.8.0/src/qemu/qemu_conf.c
+--- libvirt-6.9.0.orig/src/qemu/qemu_conf.c
+++ libvirt-6.9.0/src/qemu/qemu_conf.c
@@ -267,7 +267,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf
     cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER);
     cfg->dbusDaemonName = g_strdup(QEMU_DBUS_DAEMON);
@ -73,10 +73,10 @@ Index: libvirt-6.8.0/src/qemu/qemu_conf.c
     cfg->securityRequireConfined = false;
 
     cfg->keepAliveInterval = 5;
-Index: libvirt-6.8.0/src/qemu/test_libvirtd_qemu.aug.in
+Index: libvirt-6.9.0/src/qemu/test_libvirtd_qemu.aug.in
 ===================================================================
--- libvirt-6.8.0.orig/src/qemu/test_libvirtd_qemu.aug.in
-+++ libvirt-6.8.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-6.9.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-6.9.0/src/qemu/test_libvirtd_qemu.aug.in
@@ -44,6 +44,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-6.8.0/src/locking/virtlockd.sysconf
+Index: libvirt-6.9.0/src/locking/virtlockd.sysconf
 ===================================================================
--- libvirt-6.8.0.orig/src/locking/virtlockd.sysconf
-+++ libvirt-6.8.0/src/locking/virtlockd.sysconf
+--- libvirt-6.9.0.orig/src/locking/virtlockd.sysconf
+++ libvirt-6.9.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-6.8.0/src/logging/virtlogd.sysconf
+Index: libvirt-6.9.0/src/logging/virtlogd.sysconf
 ===================================================================
--- libvirt-6.8.0.orig/src/logging/virtlogd.sysconf
-+++ libvirt-6.8.0/src/logging/virtlogd.sysconf
+--- libvirt-6.9.0.orig/src/logging/virtlogd.sysconf
+++ libvirt-6.9.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-6.8.0/src/libxl/libxl_conf.c
+Index: libvirt-6.9.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-6.8.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.8.0/src/libxl/libxl_conf.c
-@@ -1792,6 +1792,15 @@ libxlDriverConfigNew(void)
+--- libvirt-6.9.0.orig/src/libxl/libxl_conf.c
+++ libvirt-6.9.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-6.8.0/tools/virt-create-rootfs
+Index: libvirt-6.9.0/tools/virt-create-rootfs
 ===================================================================
 --- /dev/null
-+++ libvirt-6.8.0/tools/virt-create-rootfs
+++ libvirt-6.9.0/tools/virt-create-rootfs
@@ -0,0 +1,231 @@
 +#!/bin/sh
 +set -e
@ -234,10 +234,10 @@ Index: libvirt-6.8.0/tools/virt-create-rootfs
 +    echo "pts/0" >> "$ROOT/etc/securetty"
 +    chroot "$ROOT" /usr/bin/passwd
 +fi
-Index: libvirt-6.8.0/docs/manpages/virt-create-rootfs.rst
+Index: libvirt-6.9.0/docs/manpages/virt-create-rootfs.rst
 ===================================================================
 --- /dev/null
-+++ libvirt-6.8.0/docs/manpages/virt-create-rootfs.rst
+++ libvirt-6.9.0/docs/manpages/virt-create-rootfs.rst
@@ -0,0 +1,88 @@
 +==================
 +virt-create-rootfs
@ -327,11 +327,11 @@ Index: libvirt-6.8.0/docs/manpages/virt-create-rootfs.rst
 +========
 +
 +virsh(1), `https://libvirt.org/ <https://libvirt.org/>`_
-Index: libvirt-6.8.0/docs/manpages/meson.build
+Index: libvirt-6.9.0/docs/manpages/meson.build
 ===================================================================
--- libvirt-6.8.0.orig/docs/manpages/meson.build
-+++ libvirt-6.8.0/docs/manpages/meson.build
-@@ -15,6 +15,7 @@ docs_man_files = [
+--- libvirt-6.9.0.orig/docs/manpages/meson.build
+++ libvirt-6.9.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') },
   { 'name': 'virt-xml-validate', 'section': '1', 'install': true },
@ -339,10 +339,10 @@ Index: libvirt-6.8.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-6.8.0/tools/meson.build
+Index: libvirt-6.9.0/tools/meson.build
 ===================================================================
--- libvirt-6.8.0.orig/tools/meson.build
-+++ libvirt-6.8.0/tools/meson.build
+--- libvirt-6.9.0.orig/tools/meson.build
+++ libvirt-6.9.0/tools/meson.build
@@ -149,6 +149,8 @@ else
   virsh_icon_res = []
 endif