Accepting request 746034 from home:jfehlig:branches:Virtualization

- Update to libvirt 5.9.0 - jsc#SLE-7440 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html OBS-URL: https://build.opensuse.org/request/show/746034 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=779
2019-11-06 15:48:56 +00:00 · 2019-11-06 15:48:56 +00:00 · 9c7535d575
commit 9c7535d575
parent 6d0cf4b109
29 changed files with 266 additions and 229 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-5.8.0/src/conf/domain_stats.c
+Index: libvirt-5.9.0/src/conf/domain_stats.c
 ===================================================================
 --- /dev/null
-+++ libvirt-5.8.0/src/conf/domain_stats.c
+++ libvirt-5.9.0/src/conf/domain_stats.c
@@ -0,0 +1,119 @@
 +/*
 + * domain_stats.c: domain stats extraction helpers
@ -142,10 +142,10 @@ Index: libvirt-5.8.0/src/conf/domain_stats.c
 +}
 +
 +#undef STATS_ADD_NET_PARAM
-Index: libvirt-5.8.0/src/conf/domain_stats.h
+Index: libvirt-5.9.0/src/conf/domain_stats.h
 ===================================================================
 --- /dev/null
-+++ libvirt-5.8.0/src/conf/domain_stats.h
+++ libvirt-5.9.0/src/conf/domain_stats.h
@@ -0,0 +1,62 @@
 +/*
 + * domain_stats.h: domain stats extraction helpers
@ -209,10 +209,10 @@ Index: libvirt-5.8.0/src/conf/domain_stats.h
 +                           virTypedParamListPtr params);
 +
 +#endif /* __DOMAIN_STATS_H */
-Index: libvirt-5.8.0/src/libvirt_private.syms
+Index: libvirt-5.9.0/src/libvirt_private.syms
 ===================================================================
--- libvirt-5.8.0.orig/src/libvirt_private.syms
-+++ libvirt-5.8.0/src/libvirt_private.syms
+--- libvirt-5.9.0.orig/src/libvirt_private.syms
+++ libvirt-5.9.0/src/libvirt_private.syms
@@ -697,6 +697,9 @@ virDomainConfNWFilterInstantiate;
 virDomainConfNWFilterTeardown;
 virDomainConfVMNWFilterTeardown;
@ -223,7 +223,7 @@ Index: libvirt-5.8.0/src/libvirt_private.syms
 
 # conf/interface_conf.h
 virInterfaceDefFormat;
-@@ -1648,6 +1651,7 @@ virCgroupGetMemoryUsage;
+@@ -1653,6 +1656,7 @@ virCgroupGetMemoryUsage;
 virCgroupGetMemSwapHardLimit;
 virCgroupGetMemSwapUsage;
 virCgroupGetPercpuStats;
@ -231,10 +231,10 @@ Index: libvirt-5.8.0/src/libvirt_private.syms
 virCgroupHasController;
 virCgroupHasEmptyTasks;
 virCgroupKillPainfully;
-Index: libvirt-5.8.0/src/qemu/qemu_driver.c
+Index: libvirt-5.9.0/src/qemu/qemu_driver.c
 ===================================================================
--- libvirt-5.8.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-5.8.0/src/qemu/qemu_driver.c
+--- libvirt-5.9.0.orig/src/qemu/qemu_driver.c
+++ libvirt-5.9.0/src/qemu/qemu_driver.c
@@ -67,6 +67,7 @@
 #include "virarptable.h"
 #include "viruuid.h"
@ -243,9 +243,9 @@ Index: libvirt-5.8.0/src/qemu/qemu_driver.c
 #include "domain_audit.h"
 #include "node_device_conf.h"
 #include "virpci.h"
-@@ -20451,13 +20452,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
+@@ -20394,13 +20395,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
                         virTypedParamListPtr params,
-                         unsigned int privflags ATTRIBUTE_UNUSED)
+                         unsigned int privflags G_GNUC_UNUSED)
 {
 -    if (virTypedParamListAddInt(params, dom->state.state, "state.state") < 0)
 -        return -1;
@ -258,7 +258,7 @@ Index: libvirt-5.8.0/src/qemu/qemu_driver.c
 }
 
 
-@@ -20659,17 +20654,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
+@@ -20601,17 +20596,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
     if (!priv->cgroup)
         return 0;
 
@ -277,7 +277,7 @@ Index: libvirt-5.8.0/src/qemu/qemu_driver.c
 }
 
 
-@@ -20827,79 +20812,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
+@@ -20768,79 +20753,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
     return ret;
 }
 
@ -287,10 +287,10 @@ Index: libvirt-5.8.0/src/qemu/qemu_driver.c
 -        return -1;
 -
 static int
- qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
+ qemuDomainGetStatsInterface(virQEMUDriverPtr driver G_GNUC_UNUSED,
                             virDomainObjPtr dom,
                             virTypedParamListPtr params,
-                             unsigned int privflags ATTRIBUTE_UNUSED)
+                             unsigned int privflags G_GNUC_UNUSED)
 {
 -    size_t i;
 -    struct _virDomainInterfaceStats tmp;
@ -358,11 +358,11 @@ Index: libvirt-5.8.0/src/qemu/qemu_driver.c
 
 /* refresh information by opening images on the disk */
 static int
-Index: libvirt-5.8.0/src/util/vircgroup.c
+Index: libvirt-5.9.0/src/util/vircgroup.c
 ===================================================================
--- libvirt-5.8.0.orig/src/util/vircgroup.c
-+++ libvirt-5.8.0/src/util/vircgroup.c
-@@ -2792,6 +2792,31 @@ virCgroupControllerAvailable(int control
+--- libvirt-5.9.0.orig/src/util/vircgroup.c
+++ libvirt-5.9.0/src/util/vircgroup.c
+@@ -2785,6 +2785,31 @@ virCgroupControllerAvailable(int control
     return ret;
 }
 
@ -394,7 +394,7 @@ Index: libvirt-5.8.0/src/util/vircgroup.c
 #else /* !__linux__ */
 
 bool
-@@ -2801,6 +2826,14 @@ virCgroupAvailable(void)
+@@ -2794,6 +2819,14 @@ virCgroupAvailable(void)
 }
 
 
@ -407,12 +407,12 @@ Index: libvirt-5.8.0/src/util/vircgroup.c
 +
 +
 int
- virCgroupNewPartition(const char *path ATTRIBUTE_UNUSED,
-                       bool create ATTRIBUTE_UNUSED,
-Index: libvirt-5.8.0/src/util/vircgroup.h
+ virCgroupNewPartition(const char *path G_GNUC_UNUSED,
+                       bool create G_GNUC_UNUSED,
+Index: libvirt-5.9.0/src/util/vircgroup.h
 ===================================================================
--- libvirt-5.8.0.orig/src/util/vircgroup.h
-+++ libvirt-5.8.0/src/util/vircgroup.h
+--- libvirt-5.9.0.orig/src/util/vircgroup.h
+++ libvirt-5.9.0/src/util/vircgroup.h
@@ -24,6 +24,7 @@
 #include "virutil.h"
 #include "virbitmap.h"
@ -428,10 +428,10 @@ Index: libvirt-5.8.0/src/util/vircgroup.h
 +
 +int virCgroupGetStatsCpu(virCgroupPtr cgroup,
 +                         virTypedParamListPtr params);
-Index: libvirt-5.8.0/src/conf/Makefile.inc.am
+Index: libvirt-5.9.0/src/conf/Makefile.inc.am
 ===================================================================
--- libvirt-5.8.0.orig/src/conf/Makefile.inc.am
-+++ libvirt-5.8.0/src/conf/Makefile.inc.am
+--- libvirt-5.9.0.orig/src/conf/Makefile.inc.am
+++ libvirt-5.9.0/src/conf/Makefile.inc.am
@@ -26,6 +26,8 @@ DOMAIN_CONF_SOURCES = \
 	conf/domain_audit.h \
 	conf/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-5.8.0/src/libxl/libxl_driver.c
+Index: libvirt-5.9.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-5.8.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-5.8.0/src/libxl/libxl_driver.c
-@@ -5289,6 +5289,97 @@ libxlDomainMemoryStats(virDomainPtr dom,
+--- libvirt-5.9.0.orig/src/libxl/libxl_driver.c
+++ libvirt-5.9.0/src/libxl/libxl_driver.c
+@@ -5283,6 +5283,97 @@ libxlDomainMemoryStats(virDomainPtr dom,
 
 #undef LIBXL_SET_MEMSTAT
 
@ -121,7 +121,7 @@ Index: libvirt-5.8.0/src/libxl/libxl_driver.c
 static int
 libxlDomainGetJobInfo(virDomainPtr dom,
                       virDomainJobInfoPtr info)
-@@ -6737,6 +6828,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6724,6 +6815,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-5.8.0/src/lxc/lxc_driver.c
+Index: libvirt-5.9.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-5.8.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-5.8.0/src/lxc/lxc_driver.c
+--- libvirt-5.9.0.orig/src/lxc/lxc_driver.c
+++ libvirt-5.9.0/src/lxc/lxc_driver.c
@@ -75,6 +75,7 @@
 #include "viraccessapichecklxc.h"
 #include "virhostdev.h"
@ -21,7 +21,7 @@ Index: libvirt-5.8.0/src/lxc/lxc_driver.c
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
-@@ -5404,6 +5405,135 @@ lxcDomainHasManagedSaveImage(virDomainPt
+@@ -5394,6 +5395,135 @@ lxcDomainHasManagedSaveImage(virDomainPt
     return ret;
 }
 
@ -56,8 +56,8 @@ Index: libvirt-5.8.0/src/lxc/lxc_driver.c
 +                  unsigned int stats,
 +                  virDomainStatsRecordPtr *record)
 +{
-+    VIR_AUTOFREE(virDomainStatsRecordPtr) tmp = NULL;
-+    VIR_AUTOPTR(virTypedParamList) params = NULL;
+    g_autofree virDomainStatsRecordPtr tmp = NULL;
+    g_autoptr(virTypedParamList) params = NULL;
 +    size_t i;
 +
 +    if (VIR_ALLOC(params) < 0)
@ -78,7 +78,7 @@ Index: libvirt-5.8.0/src/lxc/lxc_driver.c
 +        return -1;
 +
 +    tmp->nparams = virTypedParamListStealParams(params, &tmp->params);
-+    VIR_STEAL_PTR(*record, tmp);
+    *record = g_steal_pointer(&tmp);
 +    return 0;
 +}
 +
@ -157,7 +157,7 @@ Index: libvirt-5.8.0/src/lxc/lxc_driver.c
 
 /* Function Tables */
 static virHypervisorDriver lxcHypervisorDriver = {
-@@ -5499,6 +5629,7 @@ static virHypervisorDriver lxcHypervisor
+@@ -5489,6 +5619,7 @@ static virHypervisorDriver lxcHypervisor
     .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */
     .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */
     .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */
--- a/libvirt-5.8.0.tar.xz
+++ b/libvirt-5.8.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e23328289b18bdedc1e966f6c26402b2983149c660ed8bd52cda6feab0c20c55
-size 13129328
--- a/libvirt-5.8.0.tar.xz.asc
+++ b/libvirt-5.8.0.tar.xz.asc
@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAl2YSzwACgkQFViLJllr
-6l3vqwf/TdeKwVlG7R5gi+A013LqGM/oVyoIIBeFdoqTR/ei9Kg/glZhU/9Gjdmo
-szRZ5Qi8rwD6UvFkhX1ZhCybbB5neHR5hhC4og/gvM4Ly7gLC8wwNYLw0QnCTjpm
-BDDcGP46FYZA/F9a2BpsPd1iaDz+v4G2UAXPtB1QAm0FwZnWaP1Z3y8UGk6naH4o
-yRO9DnJ8Mx3XF9MuBN5aCUgf+bm6F6k4s3/xWLRU3qfAP2SGfeVOqsWykPCOiVm+
-7HoczIzn1ssyi9pRIkhn7w43Fe3qvamCOpO3Z67r9tvbljw12CUkjUM0DsErSwtz
-e1/kR/vuYtHvPqZM513kBa1VuKovPg==
-=m3we
-----END PGP SIGNATURE-----
--- a/libvirt-5.9.0.tar.xz
+++ b/libvirt-5.9.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3496d2e1d988185de013b2a9d2e8824458afd85aa7cd050283a59b3d78978939
+size 12394784
--- a/libvirt-5.9.0.tar.xz.asc
+++ b/libvirt-5.9.0.tar.xz.asc
@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAl3BgfoACgkQFViLJllr
+6l1PgggArP0WQI27JotDf+vvxoe21FwmtGJhsSC3l72yr4LZM8Ul45dD95j6RXVs
+3t0SG6CIatQMqkrIRKqSMoT1cG3Y0fmpnmXfMutAp7q7TbuZ7z5fHTcDrgw2kBYE
+GA+nxVM7/s1wOv2uivjPIFg3dbGpWwCcnXmrlZqiLuMuY1NcuOrez7iOIjnYJBe6
+D5A8JDNueZhsddG2YUwbk8XbQGJe1Q/Gb+HlA6nm0Vwrlfrziz5Nz3QRI8pZ+5+Y
+CK+6MmOqFcb5rmMwmEFmrhFG1ASg33x3rVJBCovyDO+2w3Lru91OYNx5AFyvLH0A
+5KS1R6NyV6Vn9toeMowm9I2iXMyF3A==
+=JGL6
+-----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-5.8.0/src/cpu_map/ppc64_POWER8.xml
+Index: libvirt-5.9.0/src/cpu_map/ppc64_POWER8.xml
 ===================================================================
--- libvirt-5.8.0.orig/src/cpu_map/ppc64_POWER8.xml
-+++ libvirt-5.8.0/src/cpu_map/ppc64_POWER8.xml
+--- libvirt-5.9.0.orig/src/cpu_map/ppc64_POWER8.xml
+++ libvirt-5.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,8 +1,8 @@
-Index: libvirt-5.8.0/configure.ac
+Index: libvirt-5.9.0/configure.ac
 ===================================================================
--- libvirt-5.8.0.orig/configure.ac
-+++ libvirt-5.8.0/configure.ac
-@@ -285,6 +285,7 @@ LIBVIRT_ARG_LIBSSH
+--- libvirt-5.9.0.orig/configure.ac
+++ libvirt-5.9.0/configure.ac
+@@ -279,6 +279,7 @@ LIBVIRT_ARG_LIBSSH
 LIBVIRT_ARG_LIBXML
 LIBVIRT_ARG_MACVTAP
 LIBVIRT_ARG_NETCF
@ -10,7 +10,7 @@ Index: libvirt-5.8.0/configure.ac
 LIBVIRT_ARG_NLS
 LIBVIRT_ARG_NSS
 LIBVIRT_ARG_NUMACTL
-@@ -328,6 +329,7 @@ LIBVIRT_CHECK_LIBSSH
+@@ -323,6 +324,7 @@ LIBVIRT_CHECK_LIBSSH
 LIBVIRT_CHECK_LIBXML
 LIBVIRT_CHECK_MACVTAP
 LIBVIRT_CHECK_NETCF
@ -18,7 +18,7 @@ Index: libvirt-5.8.0/configure.ac
 LIBVIRT_CHECK_NLS
 LIBVIRT_CHECK_NUMACTL
 LIBVIRT_CHECK_NWFILTER
-@@ -1018,6 +1020,7 @@ LIBVIRT_RESULT_LIBXL
+@@ -1003,6 +1005,7 @@ LIBVIRT_RESULT_LIBXL
 LIBVIRT_RESULT_LIBXML
 LIBVIRT_RESULT_MACVTAP
 LIBVIRT_RESULT_NETCF
@ -26,11 +26,11 @@ Index: libvirt-5.8.0/configure.ac
 LIBVIRT_RESULT_NLS
 LIBVIRT_RESULT_NSS
 LIBVIRT_RESULT_NUMACTL
-Index: libvirt-5.8.0/tools/virsh.c
+Index: libvirt-5.9.0/tools/virsh.c
 ===================================================================
--- libvirt-5.8.0.orig/tools/virsh.c
-+++ libvirt-5.8.0/tools/virsh.c
-@@ -558,6 +558,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
+--- libvirt-5.9.0.orig/tools/virsh.c
+++ libvirt-5.9.0/tools/virsh.c
+@@ -555,6 +555,8 @@ virshShowVersion(vshControl *ctl G_GNUC_
     vshPrint(ctl, " Interface");
 # if defined(WITH_NETCF)
     vshPrint(ctl, " netcf");
@ -39,10 +39,10 @@ Index: libvirt-5.8.0/tools/virsh.c
 # elif defined(WITH_UDEV)
     vshPrint(ctl, " udev");
 # endif
-Index: libvirt-5.8.0/src/interface/interface_backend_netcf.c
+Index: libvirt-5.9.0/src/interface/interface_backend_netcf.c
 ===================================================================
--- libvirt-5.8.0.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-5.8.0/src/interface/interface_backend_netcf.c
+--- libvirt-5.9.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-5.9.0/src/interface/interface_backend_netcf.c
@@ -21,7 +21,12 @@
 
 #include <config.h>
@ -106,7 +106,35 @@ Index: libvirt-5.8.0/src/interface/interface_backend_netcf.c
     /* open netcf */
     if (ncf_init(&driver->netcf, NULL) != 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-@@ -1251,6 +1291,19 @@ static virStateDriver interfaceStateDriv
+@@ -1117,6 +1157,7 @@ static int netcfInterfaceIsActive(virInt
+     return ret;
+ }
+ 
+#ifdef HAVE_NETCF_TRANSACTIONS
+ static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags)
+ {
+     int ret;
+@@ -1191,6 +1232,7 @@ static int netcfInterfaceChangeRollback(
+     virObjectUnlock(driver);
+     return ret;
+ }
+#endif /* HAVE_NETCF_TRANSACTIONS */
+ 
+ static virInterfaceDriver interfaceDriver = {
+     .name = INTERFACE_DRIVER_NAME,
+@@ -1207,9 +1249,11 @@ static virInterfaceDriver interfaceDrive
+     .interfaceCreate = netcfInterfaceCreate, /* 0.7.0 */
+     .interfaceDestroy = netcfInterfaceDestroy, /* 0.7.0 */
+     .interfaceIsActive = netcfInterfaceIsActive, /* 0.7.3 */
+#ifdef HAVE_NETCF_TRANSACTIONS
+     .interfaceChangeBegin = netcfInterfaceChangeBegin, /* 0.9.2 */
+     .interfaceChangeCommit = netcfInterfaceChangeCommit, /* 0.9.2 */
+     .interfaceChangeRollback = netcfInterfaceChangeRollback, /* 0.9.2 */
+#endif /* HAVE_NETCF_TRANSACTIONS */
+ };
+ 
+ 
+@@ -1240,6 +1284,19 @@ static virStateDriver interfaceStateDriv
 
 int netcfIfaceRegister(void)
 {
@ -126,10 +154,10 @@ Index: libvirt-5.8.0/src/interface/interface_backend_netcf.c
     if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
         return -1;
     if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
-Index: libvirt-5.8.0/src/interface/interface_driver.c
+Index: libvirt-5.9.0/src/interface/interface_driver.c
 ===================================================================
--- libvirt-5.8.0.orig/src/interface/interface_driver.c
-+++ libvirt-5.8.0/src/interface/interface_driver.c
+--- libvirt-5.9.0.orig/src/interface/interface_driver.c
+++ libvirt-5.9.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
     if (netcfIfaceRegister() == 0)
         return 0;
@ -147,10 +175,10 @@ Index: libvirt-5.8.0/src/interface/interface_driver.c
     if (udevIfaceRegister() == 0)
         return 0;
 #endif /* WITH_UDEV */
-Index: libvirt-5.8.0/m4/virt-netcontrol.m4
+Index: libvirt-5.9.0/m4/virt-netcontrol.m4
 ===================================================================
 --- /dev/null
-+++ libvirt-5.8.0/m4/virt-netcontrol.m4
+++ libvirt-5.9.0/m4/virt-netcontrol.m4
@@ -0,0 +1,39 @@
 +dnl The libnetcontrol library
 +dnl
@ -191,10 +219,10 @@ Index: libvirt-5.8.0/m4/virt-netcontrol.m4
 +AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[
 +  LIBVIRT_RESULT_LIB([NETCONTROL])
 +])
-Index: libvirt-5.8.0/src/interface/Makefile.inc.am
+Index: libvirt-5.9.0/src/interface/Makefile.inc.am
 ===================================================================
--- libvirt-5.8.0.orig/src/interface/Makefile.inc.am
-+++ libvirt-5.8.0/src/interface/Makefile.inc.am
+--- libvirt-5.9.0.orig/src/interface/Makefile.inc.am
+++ libvirt-5.9.0/src/interface/Makefile.inc.am
@@ -6,6 +6,7 @@ INTERFACE_DRIVER_SOURCES = \
 	$(NULL)
 
@ -203,7 +231,7 @@ Index: libvirt-5.8.0/src/interface/Makefile.inc.am
 INTERFACE_DRIVER_UDEV_SOURCES = interface/interface_backend_udev.c
 
 DRIVER_SOURCE_FILES += $(INTERFACE_DRIVER_SOURCES)
-@@ -35,6 +36,11 @@ libvirt_driver_interface_la_CFLAGS += $(
+@@ -36,6 +37,11 @@ libvirt_driver_interface_la_CFLAGS += $(
 libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
 libvirt_driver_interface_la_SOURCES += $(INTERFACE_DRIVER_NETCF_SOURCES)
 endif WITH_NETCF
--- a/libvirt.changes
+++ b/libvirt.changes
@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Nov  6 14:55:39 UTC 2019 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 5.9.0
+  - jsc#SLE-7440
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html
+
 -------------------------------------------------------------------
 Tue Oct  8 17:07:03 UTC 2019 - James Fehlig <jfehlig@suse.com>

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

 Name:           libvirt
 Url:            http://libvirt.org/
-Version:        5.8.0
+Version:        5.9.0
 Release:        0
 Summary:        Library providing a virtualization API
 License:        LGPL-2.1-or-later
@ -233,6 +233,7 @@ BuildRequires:  libacl-devel
 BuildRequires:  bash-completion-devel >= 2.0
 %endif
 BuildRequires:  fdupes
+BuildRequires:  glib2-devel >= 2.48
 BuildRequires:  libattr-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgnutls-devel
--- 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-5.8.0/src/libxl/libxl_driver.c
+Index: libvirt-5.9.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-5.8.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-5.8.0/src/libxl/libxl_driver.c
-@@ -1367,6 +1367,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
+--- libvirt-5.9.0.orig/src/libxl/libxl_driver.c
+++ libvirt-5.9.0/src/libxl/libxl_driver.c
+@@ -1365,6 +1365,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
 }
 
 static int
@ -74,7 +74,7 @@ Index: libvirt-5.8.0/src/libxl/libxl_driver.c
 libxlDomainDestroyFlags(virDomainPtr dom,
                         unsigned int flags)
 {
-@@ -6612,6 +6667,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6599,6 +6654,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-5.8.0/src/libxl/libxl_conf.c
+Index: libvirt-5.9.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-5.8.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-5.8.0/src/libxl/libxl_conf.c
-@@ -897,6 +897,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
+--- libvirt-5.9.0.orig/src/libxl/libxl_conf.c
+++ libvirt-5.9.0/src/libxl/libxl_conf.c
+@@ -880,6 +880,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
 #endif
 }
 
@ -38,7 +38,7 @@ Index: libvirt-5.8.0/src/libxl/libxl_conf.c
 static char *
 libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src,
                            const char *username,
-@@ -1144,6 +1168,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -1121,6 +1145,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-5.8.0/include/libvirt/libvirt-domain.h
+Index: libvirt-5.9.0/include/libvirt/libvirt-domain.h
 ===================================================================
--- libvirt-5.8.0.orig/include/libvirt/libvirt-domain.h
-+++ libvirt-5.8.0/include/libvirt/libvirt-domain.h
+--- libvirt-5.9.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-5.9.0/include/libvirt/libvirt-domain.h
@@ -1051,6 +1051,31 @@ typedef enum {
  */
 # define VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS     "parallel.connections"
@ -52,11 +52,11 @@ Index: libvirt-5.8.0/include/libvirt/libvirt-domain.h
 /* Domain migration. */
 virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
                                unsigned long flags, const char *dname,
-Index: libvirt-5.8.0/src/libxl/libxl_driver.c
+Index: libvirt-5.9.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-5.8.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-5.8.0/src/libxl/libxl_driver.c
-@@ -6155,6 +6155,9 @@ libxlDomainMigratePerform3Params(virDoma
+--- libvirt-5.9.0.orig/src/libxl/libxl_driver.c
+++ libvirt-5.9.0/src/libxl/libxl_driver.c
+@@ -6145,6 +6145,9 @@ libxlDomainMigratePerform3Params(virDoma
     const char *dname = NULL;
     const char *uri = NULL;
     int ret = -1;
@ -66,7 +66,7 @@ Index: libvirt-5.8.0/src/libxl/libxl_driver.c
 
 #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
     virReportUnsupportedError();
-@@ -6171,6 +6174,18 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6161,6 +6164,18 @@ libxlDomainMigratePerform3Params(virDoma
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_DEST_NAME,
                                 &dname) < 0 ||
@ -85,7 +85,7 @@ Index: libvirt-5.8.0/src/libxl/libxl_driver.c
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_URI,
                                 &uri) < 0)
-@@ -6185,11 +6200,11 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6175,11 +6190,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-5.8.0/src/libxl/libxl_driver.c
             goto cleanup;
     }
 
-Index: libvirt-5.8.0/src/libxl/libxl_migration.c
+Index: libvirt-5.9.0/src/libxl/libxl_migration.c
 ===================================================================
--- libvirt-5.8.0.orig/src/libxl/libxl_migration.c
-+++ libvirt-5.8.0/src/libxl/libxl_migration.c
-@@ -342,18 +342,39 @@ libxlMigrateDstReceive(virNetSocketPtr s
+--- libvirt-5.9.0.orig/src/libxl/libxl_migration.c
+++ libvirt-5.9.0/src/libxl/libxl_migration.c
+@@ -338,18 +338,39 @@ libxlMigrateDstReceive(virNetSocketPtr s
 static int
 libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver,
                       virDomainObjPtr vm,
@ -145,7 +145,7 @@ Index: libvirt-5.8.0/src/libxl/libxl_migration.c
     if (ret != 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("Failed to send migration data to destination host"));
-@@ -913,7 +934,7 @@ struct libxlTunnelControl {
+@@ -906,7 +927,7 @@ struct libxlTunnelControl {
 static int
 libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver,
                              virDomainObjPtr vm,
@ -154,7 +154,7 @@ Index: libvirt-5.8.0/src/libxl/libxl_migration.c
                              virStreamPtr st,
                              struct libxlTunnelControl **tnl)
 {
-@@ -946,7 +967,7 @@ libxlMigrationSrcStartTunnel(libxlDriver
+@@ -939,7 +960,7 @@ libxlMigrationSrcStartTunnel(libxlDriver
 
     virObjectUnlock(vm);
     /* Send data to pipe */
@ -163,8 +163,8 @@ Index: libvirt-5.8.0/src/libxl/libxl_migration.c
     virObjectLock(vm);
 
  out:
-@@ -982,7 +1003,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
-                      const char *dconnuri ATTRIBUTE_UNUSED,
+@@ -975,7 +996,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+                      const char *dconnuri G_GNUC_UNUSED,
                      const char *dname,
                      const char *uri,
 -                     unsigned int flags)
@ -172,7 +172,7 @@ Index: libvirt-5.8.0/src/libxl/libxl_migration.c
 {
     virDomainPtr ddomain = NULL;
     virTypedParameterPtr params = NULL;
-@@ -1027,11 +1048,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1020,11 +1041,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-5.8.0/src/libxl/libxl_migration.c
         if (!(st = virStreamNew(dconn, 0)))
             goto confirm;
         ret = dconn->driver->domainMigratePrepareTunnel3Params
-@@ -1045,7 +1066,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1038,7 +1059,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
     if (ret == -1)
         goto confirm;
 
@ -195,7 +195,7 @@ Index: libvirt-5.8.0/src/libxl/libxl_migration.c
         if (uri_out) {
             if (virTypedParamsReplaceString(&params, &nparams,
                                             VIR_MIGRATE_PARAM_URI, uri_out) < 0) {
-@@ -1060,11 +1081,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1053,11 +1074,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
     }
 
     VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out));
@ -209,8 +209,8 @@ Index: libvirt-5.8.0/src/libxl/libxl_migration.c
 +                                             uri_out, NULL, props);
     if (ret < 0) {
         notify_source = false;
-         orig_err = virSaveLastError();
-@@ -1099,7 +1120,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+         virErrorPreserveLast(&orig_err);
+@@ -1092,7 +1113,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
  confirm:
     if (notify_source) {
         VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm);
@ -219,7 +219,7 @@ Index: libvirt-5.8.0/src/libxl/libxl_migration.c
 
         if (ret < 0)
             VIR_WARN("Guest %s probably left in 'paused' state on source",
-@@ -1107,7 +1128,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
+@@ -1100,7 +1121,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
     }
 
  cleanup:
@ -228,16 +228,16 @@ Index: libvirt-5.8.0/src/libxl/libxl_migration.c
         libxlMigrationSrcStopTunnel(tc);
         virObjectUnref(st);
     }
-@@ -1154,7 +1175,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
+@@ -1144,7 +1165,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
                                   const char *dconnuri,
-                                   const char *uri_str ATTRIBUTE_UNUSED,
+                                   const char *uri_str G_GNUC_UNUSED,
                                   const char *dname,
 -                                  unsigned int flags)
 +                                  const libxlDomainMigrationProps *props)
 {
     int ret = -1;
     bool useParams;
-@@ -1189,7 +1210,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
+@@ -1179,7 +1200,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
     }
 
     ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri,
@ -246,16 +246,16 @@ Index: libvirt-5.8.0/src/libxl/libxl_migration.c
 
     if (ret < 0) {
         /*
-@@ -1219,7 +1240,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
-                                const char *dconnuri ATTRIBUTE_UNUSED,
+@@ -1206,7 +1227,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
+                                const char *dconnuri G_GNUC_UNUSED,
                                const char *uri_str,
-                                const char *dname ATTRIBUTE_UNUSED,
+                                const char *dname G_GNUC_UNUSED,
 -                               unsigned int flags)
 +                               const libxlDomainMigrationProps *props)
 {
     libxlDomainObjPrivatePtr priv = vm->privateData;
     char *hostname = NULL;
-@@ -1259,7 +1280,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
+@@ -1246,7 +1267,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
 
     /* suspend vm and send saved data to dst through socket fd */
     virObjectUnlock(vm);
@ -264,10 +264,10 @@ Index: libvirt-5.8.0/src/libxl/libxl_migration.c
     virObjectLock(vm);
 
     if (ret < 0) {
-Index: libvirt-5.8.0/src/libxl/libxl_migration.h
+Index: libvirt-5.9.0/src/libxl/libxl_migration.h
 ===================================================================
--- libvirt-5.8.0.orig/src/libxl/libxl_migration.h
-+++ libvirt-5.8.0/src/libxl/libxl_migration.h
+--- libvirt-5.9.0.orig/src/libxl/libxl_migration.h
+++ libvirt-5.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,11 +312,11 @@ Index: libvirt-5.8.0/src/libxl/libxl_migration.h
 
 virDomainPtr
 libxlDomainMigrationDstFinish(virConnectPtr dconn,
-Index: libvirt-5.8.0/tools/virsh-domain.c
+Index: libvirt-5.9.0/tools/virsh-domain.c
 ===================================================================
--- libvirt-5.8.0.orig/tools/virsh-domain.c
-+++ libvirt-5.8.0/tools/virsh-domain.c
-@@ -10572,6 +10572,22 @@ static const vshCmdOptDef opts_migrate[]
+--- libvirt-5.9.0.orig/tools/virsh-domain.c
+++ libvirt-5.9.0/tools/virsh-domain.c
+@@ -10542,6 +10542,22 @@ static const vshCmdOptDef opts_migrate[]
      .type = VSH_OT_INT,
      .help = N_("migration bandwidth limit in MiB/s")
     },
@ -339,7 +339,7 @@ Index: libvirt-5.8.0/tools/virsh-domain.c
     {.name = NULL}
 };
 
-@@ -10595,6 +10611,7 @@ doMigrate(void *opaque)
+@@ -10565,6 +10581,7 @@ doMigrate(void *opaque)
     unsigned long long ullOpt = 0;
     int rv;
     virConnectPtr dconn = data->dconn;
@ -347,7 +347,7 @@ Index: libvirt-5.8.0/tools/virsh-domain.c
 
     sigemptyset(&sigmask);
     sigaddset(&sigmask, SIGINT);
-@@ -10714,6 +10731,27 @@ doMigrate(void *opaque)
+@@ -10684,6 +10701,27 @@ doMigrate(void *opaque)
             goto save_error;
     }
 
@ -375,10 +375,10 @@ Index: libvirt-5.8.0/tools/virsh-domain.c
     if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0)
         goto out;
     if (opt) {
-Index: libvirt-5.8.0/tools/virsh.pod
+Index: libvirt-5.9.0/tools/virsh.pod
 ===================================================================
--- libvirt-5.8.0.orig/tools/virsh.pod
-+++ libvirt-5.8.0/tools/virsh.pod
+--- libvirt-5.9.0.orig/tools/virsh.pod
+++ libvirt-5.9.0/tools/virsh.pod
@@ -2254,6 +2254,14 @@ I<--parallel-connections>. Parallel conn
 network link between the source and the target and thus speeding up the
 migration.
--- 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-5.8.0/src/libxl/libxl_conf.c
+Index: libvirt-5.9.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-5.8.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-5.8.0/src/libxl/libxl_conf.c
-@@ -897,6 +897,25 @@ libxlDiskSetDiscard(libxl_device_disk *x
+--- libvirt-5.9.0.orig/src/libxl/libxl_conf.c
+++ libvirt-5.9.0/src/libxl/libxl_conf.c
+@@ -880,6 +880,25 @@ libxlDiskSetDiscard(libxl_device_disk *x
 #endif
 }
 
@ -37,7 +37,7 @@ Index: libvirt-5.8.0/src/libxl/libxl_conf.c
 static void
 libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode)
 {
-@@ -1041,6 +1060,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
+@@ -1020,6 +1039,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
 int
 libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)
 {
@ -45,16 +45,16 @@ Index: libvirt-5.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);
-@@ -1056,7 +1076,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -1035,7 +1055,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
         if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0)
             return -1;
     } else {
-        if (VIR_STRDUP(x_disk->pdev_path, virDomainDiskGetSource(l_disk)) < 0)
-+        if (VIR_STRDUP(x_disk->pdev_path, src) < 0)
-         return -1;
+-        x_disk->pdev_path = g_strdup(virDomainDiskGetSource(l_disk));
+        x_disk->pdev_path = g_strdup(src);
     }
 
-@@ -1169,6 +1189,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+     x_disk->vdev = g_strdup(l_disk->dst);
+@@ -1146,6 +1166,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,10 +13,10 @@ device with the same name that is being created.
 src/lxc/lxc_process.c    | 1 +
 3 files changed, 4 insertions(+)

-Index: libvirt-5.8.0/src/lxc/lxc_controller.c
+Index: libvirt-5.9.0/src/lxc/lxc_controller.c
 ===================================================================
--- libvirt-5.8.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-5.8.0/src/lxc/lxc_controller.c
+--- libvirt-5.9.0.orig/src/lxc/lxc_controller.c
+++ libvirt-5.9.0/src/lxc/lxc_controller.c
@@ -69,6 +69,7 @@
 #include "rpc/virnetdaemon.h"
 #include "virstring.h"
@ -25,7 +25,7 @@ Index: libvirt-5.8.0/src/lxc/lxc_controller.c
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
-@@ -2016,6 +2017,7 @@ static int virLXCControllerDeleteInterfa
+@@ -2010,6 +2011,7 @@ static int virLXCControllerDeleteInterfa
         if (virNetDevVethDelete(ctrl->veths[i]) < 0)
             ret = -1;
     }
@ -33,10 +33,10 @@ Index: libvirt-5.8.0/src/lxc/lxc_controller.c
 
     return ret;
 }
-Index: libvirt-5.8.0/src/lxc/lxc_driver.c
+Index: libvirt-5.9.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-5.8.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-5.8.0/src/lxc/lxc_driver.c
+--- libvirt-5.9.0.orig/src/lxc/lxc_driver.c
+++ libvirt-5.9.0/src/lxc/lxc_driver.c
@@ -70,6 +70,7 @@
 #include "virtime.h"
 #include "virtypedparam.h"
@ -45,7 +45,7 @@ Index: libvirt-5.8.0/src/lxc/lxc_driver.c
 #include "virstring.h"
 #include "viraccessapicheck.h"
 #include "viraccessapichecklxc.h"
-@@ -3927,6 +3928,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
+@@ -3919,6 +3920,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
         case VIR_DOMAIN_NET_TYPE_NETWORK:
         case VIR_DOMAIN_NET_TYPE_ETHERNET:
             ignore_value(virNetDevVethDelete(veth));
@ -53,7 +53,7 @@ Index: libvirt-5.8.0/src/lxc/lxc_driver.c
             break;
 
         case VIR_DOMAIN_NET_TYPE_DIRECT:
-@@ -4371,6 +4373,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
+@@ -4363,6 +4365,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
             virDomainAuditNet(vm, detach, NULL, "detach", false);
             goto cleanup;
         }
@ -61,10 +61,10 @@ Index: libvirt-5.8.0/src/lxc/lxc_driver.c
         break;
 
         /* It'd be nice to support this, but with macvlan
-Index: libvirt-5.8.0/src/lxc/lxc_process.c
+Index: libvirt-5.9.0/src/lxc/lxc_process.c
 ===================================================================
--- libvirt-5.8.0.orig/src/lxc/lxc_process.c
-+++ libvirt-5.8.0/src/lxc/lxc_process.c
+--- libvirt-5.9.0.orig/src/lxc/lxc_process.c
+++ libvirt-5.9.0/src/lxc/lxc_process.c
@@ -51,6 +51,7 @@
 #include "viratomic.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,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-5.8.0/src/network/bridge_driver.c
+Index: libvirt-5.9.0/src/network/bridge_driver.c
 ===================================================================
--- libvirt-5.8.0.orig/src/network/bridge_driver.c
-+++ libvirt-5.8.0/src/network/bridge_driver.c
-@@ -1516,7 +1516,14 @@ networkDnsmasqConfContents(virNetworkObj
+--- libvirt-5.9.0.orig/src/network/bridge_driver.c
+++ libvirt-5.9.0/src/network/bridge_driver.c
+@@ -1512,7 +1512,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-5.8.0/src/network/bridge_driver.c
             }
 
             if (ipdef->tftproot) {
-Index: libvirt-5.8.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+Index: libvirt-5.9.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
 ===================================================================
--- libvirt-5.8.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
-+++ libvirt-5.8.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+--- libvirt-5.9.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-5.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-5.8.0/src/util/virarch.c
+Index: libvirt-5.9.0/src/util/virarch.c
 ===================================================================
--- libvirt-5.8.0.orig/src/util/virarch.c
-+++ libvirt-5.8.0/src/util/virarch.c
+--- libvirt-5.9.0.orig/src/util/virarch.c
+++ libvirt-5.9.0/src/util/virarch.c
@@ -172,6 +172,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-5.8.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-5.9.0/src/security/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-5.8.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-5.8.0/src/security/apparmor/libvirt-qemu
+--- libvirt-5.9.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-5.9.0/src/security/apparmor/libvirt-qemu
@@ -228,3 +228,6 @@
   # required for sasl GSSAPI plugin
   /etc/gss/mech.d/ r,
--- a/support-managed-pci-xen-driver.patch
+++ b/support-managed-pci-xen-driver.patch
@ -8,11 +8,11 @@ Subject: [PATCH] support managed pci devices in xen driver
 src/xenxs/xen_xm.c   |   28 +++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 15 deletions(-)

-Index: libvirt-5.8.0/src/libxl/xen_common.c
+Index: libvirt-5.9.0/src/libxl/xen_common.c
 ===================================================================
--- libvirt-5.8.0.orig/src/libxl/xen_common.c
-+++ libvirt-5.8.0/src/libxl/xen_common.c
-@@ -388,12 +388,19 @@ xenParsePCI(char *entry)
+--- libvirt-5.9.0.orig/src/libxl/xen_common.c
+++ libvirt-5.9.0/src/libxl/xen_common.c
+@@ -383,12 +383,19 @@ xenParsePCI(char *entry)
     int busID;
     int slotID;
     int funcID;
@ -32,7 +32,7 @@ Index: libvirt-5.8.0/src/libxl/xen_common.c
     if (!(nextkey = strchr(key, ':')))
         return NULL;
     if (virStrncpy(domain, key, (nextkey - key), sizeof(domain)) < 0) {
-@@ -438,10 +445,30 @@ xenParsePCI(char *entry)
+@@ -433,10 +440,30 @@ xenParsePCI(char *entry)
     if (virStrToLong_i(func, NULL, 16, &funcID) < 0)
         return NULL;
 
--- 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-5.8.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-5.9.0/src/security/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-5.8.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-5.8.0/src/security/apparmor/libvirt-qemu
+--- libvirt-5.9.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-5.9.0/src/security/apparmor/libvirt-qemu
@@ -63,6 +63,7 @@
   #/dev/fb* rw,
 
@ -20,10 +20,10 @@ Index: libvirt-5.8.0/src/security/apparmor/libvirt-qemu
   @{HOME}/.pulse-cookie rwk,
   owner /root/.pulse-cookie rwk,
   owner /root/.pulse/ rw,
-Index: libvirt-5.8.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
+Index: libvirt-5.9.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
 ===================================================================
--- libvirt-5.8.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
-+++ libvirt-5.8.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
+--- libvirt-5.9.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
+++ libvirt-5.9.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
@@ -20,7 +20,7 @@ profile virt-aa-helper /usr/{lib,lib64}/
   # Used when internally running another command (namely apparmor_parser)
   @{PROC}/@{pid}/fd/ r,
--- 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-5.8.0/tools/libvirt-guests.sh.in
+Index: libvirt-5.9.0/tools/libvirt-guests.sh.in
 ===================================================================
--- libvirt-5.8.0.orig/tools/libvirt-guests.sh.in
-+++ libvirt-5.8.0/tools/libvirt-guests.sh.in
+--- libvirt-5.9.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-5.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-5.8.0/tools/libvirt-guests.sh.in
 esac
 -exit $RETVAL
 +rc_exit
-Index: libvirt-5.8.0/tools/libvirt-guests.sysconf
+Index: libvirt-5.9.0/tools/libvirt-guests.sysconf
 ===================================================================
--- libvirt-5.8.0.orig/tools/libvirt-guests.sysconf
-+++ libvirt-5.8.0/tools/libvirt-guests.sysconf
+--- libvirt-5.9.0.orig/tools/libvirt-guests.sysconf
+++ libvirt-5.9.0/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
 +## Path: System/Virtualization/libvirt-guests
 +
--- 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-5.8.0/src/remote/remote_daemon_config.c
+Index: libvirt-5.9.0/src/remote/remote_daemon_config.c
 ===================================================================
--- libvirt-5.8.0.orig/src/remote/remote_daemon_config.c
-+++ libvirt-5.8.0/src/remote/remote_daemon_config.c
-@@ -109,7 +109,7 @@ daemonConfigNew(bool privileged ATTRIBUT
+--- libvirt-5.9.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-5.9.0/src/remote/remote_daemon_config.c
+@@ -107,7 +107,7 @@ daemonConfigNew(bool privileged G_GNUC_U
 
 #ifdef WITH_IP
 # ifdef LIBVIRTD
@ -16,10 +16,10 @@ Index: libvirt-5.8.0/src/remote/remote_daemon_config.c
 # else /* ! LIBVIRTD */
     data->listen_tls = 0; /* Always honoured, --listen doesn't exist. */
 # endif /* ! LIBVIRTD */
-Index: libvirt-5.8.0/src/remote/libvirtd.conf.in
+Index: libvirt-5.9.0/src/remote/libvirtd.conf.in
 ===================================================================
--- libvirt-5.8.0.orig/src/remote/libvirtd.conf.in
-+++ libvirt-5.8.0/src/remote/libvirtd.conf.in
+--- libvirt-5.9.0.orig/src/remote/libvirtd.conf.in
+++ libvirt-5.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.
--- 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-5.8.0/src/remote/libvirtd.sysconf
+Index: libvirt-5.9.0/src/remote/libvirtd.sysconf
 ===================================================================
--- libvirt-5.8.0.orig/src/remote/libvirtd.sysconf
-+++ libvirt-5.8.0/src/remote/libvirtd.sysconf
+--- libvirt-5.9.0.orig/src/remote/libvirtd.sysconf
+++ libvirt-5.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-5.8.0/src/libxl/libxl.conf
+Index: libvirt-5.9.0/src/libxl/libxl.conf
 ===================================================================
--- libvirt-5.8.0.orig/src/libxl/libxl.conf
-+++ libvirt-5.8.0/src/libxl/libxl.conf
+--- libvirt-5.9.0.orig/src/libxl/libxl.conf
+++ libvirt-5.9.0/src/libxl/libxl.conf
@@ -4,12 +4,11 @@
 
 # Enable autoballooning of domain0
@ -27,10 +27,10 @@ Index: libvirt-5.8.0/src/libxl/libxl.conf
 
 
 # In order to prevent accidentally starting two domains that
-Index: libvirt-5.8.0/src/libxl/libxl_conf.c
+Index: libvirt-5.9.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-5.8.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-5.8.0/src/libxl/libxl_conf.c
+--- libvirt-5.9.0.orig/src/libxl/libxl_conf.c
+++ libvirt-5.9.0/src/libxl/libxl_conf.c
@@ -22,7 +22,6 @@
 
 #include <config.h>
@ -39,7 +39,7 @@ Index: libvirt-5.8.0/src/libxl/libxl_conf.c
 #include <libxl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-@@ -1763,14 +1762,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
+@@ -1715,14 +1714,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
 /*
  * Get domain0 autoballoon configuration.  Honor user-specified
  * setting in libxl.conf first.  If not specified, autoballooning
@ -55,7 +55,7 @@ Index: libvirt-5.8.0/src/libxl/libxl_conf.c
     int res;
 
     res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon);
-@@ -1779,21 +1776,8 @@ libxlGetAutoballoonConf(libxlDriverConfi
+@@ -1731,21 +1728,8 @@ libxlGetAutoballoonConf(libxlDriverConfi
     else if (res == 1)
         return 0;
 
--- a/suse-ovmf-paths.patch
+++ b/suse-ovmf-paths.patch
@ -1,9 +1,9 @@
 Adjust paths of OVMF firmwares on SUSE distros

-Index: libvirt-5.8.0/src/qemu/qemu.conf
+Index: libvirt-5.9.0/src/qemu/qemu.conf
 ===================================================================
--- libvirt-5.8.0.orig/src/qemu/qemu.conf
-+++ libvirt-5.8.0/src/qemu/qemu.conf
+--- libvirt-5.9.0.orig/src/qemu/qemu.conf
+++ libvirt-5.9.0/src/qemu/qemu.conf
@@ -796,10 +796,9 @@
 # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
 # follows this scheme.
@ -18,10 +18,10 @@ Index: libvirt-5.8.0/src/qemu/qemu.conf
 #]
 
 # The backend to use for handling stdout/stderr output from
-Index: libvirt-5.8.0/src/qemu/qemu_conf.c
+Index: libvirt-5.9.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-5.8.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-5.8.0/src/qemu/qemu_conf.c
+--- libvirt-5.9.0.orig/src/qemu/qemu_conf.c
+++ libvirt-5.9.0/src/qemu/qemu_conf.c
@@ -96,10 +96,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver
 
 #ifndef DEFAULT_LOADER_NVRAM
@ -36,11 +36,11 @@ Index: libvirt-5.8.0/src/qemu/qemu_conf.c
 #endif
 
 
-Index: libvirt-5.8.0/src/security/virt-aa-helper.c
+Index: libvirt-5.9.0/src/security/virt-aa-helper.c
 ===================================================================
--- libvirt-5.8.0.orig/src/security/virt-aa-helper.c
-+++ libvirt-5.8.0/src/security/virt-aa-helper.c
-@@ -509,7 +509,8 @@ valid_path(const char *path, const bool
+--- libvirt-5.9.0.orig/src/security/virt-aa-helper.c
+++ libvirt-5.9.0/src/security/virt-aa-helper.c
+@@ -510,7 +510,8 @@ valid_path(const char *path, const bool
         "/usr/share/ovmf/",              /* for OVMF images */
         "/usr/share/AAVMF/",             /* for AAVMF images */
         "/usr/share/qemu-efi/",          /* for AAVMF images */
--- 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-5.8.0/src/qemu/qemu.conf
+Index: libvirt-5.9.0/src/qemu/qemu.conf
 ===================================================================
--- libvirt-5.8.0.orig/src/qemu/qemu.conf
-+++ libvirt-5.8.0/src/qemu/qemu.conf
+--- libvirt-5.9.0.orig/src/qemu/qemu.conf
+++ libvirt-5.9.0/src/qemu/qemu.conf
@@ -420,10 +420,19 @@
 # isolation, but it cannot appear in a list of drivers.
 #
@ -60,11 +60,11 @@ Index: libvirt-5.8.0/src/qemu/qemu.conf
 #
 #lock_manager = "lockd"
 
-Index: libvirt-5.8.0/src/qemu/qemu_conf.c
+Index: libvirt-5.9.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-5.8.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-5.8.0/src/qemu/qemu_conf.c
-@@ -278,7 +278,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf
+--- libvirt-5.9.0.orig/src/qemu/qemu_conf.c
+++ libvirt-5.9.0/src/qemu/qemu_conf.c
+@@ -271,7 +271,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf
 
     cfg->clearEmulatorCapabilities = true;
 
--- 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-5.8.0/src/locking/virtlockd.sysconf
+Index: libvirt-5.9.0/src/locking/virtlockd.sysconf
 ===================================================================
--- libvirt-5.8.0.orig/src/locking/virtlockd.sysconf
-+++ libvirt-5.8.0/src/locking/virtlockd.sysconf
+--- libvirt-5.9.0.orig/src/locking/virtlockd.sysconf
+++ libvirt-5.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-5.8.0/src/logging/virtlogd.sysconf
+Index: libvirt-5.9.0/src/logging/virtlogd.sysconf
 ===================================================================
--- libvirt-5.8.0.orig/src/logging/virtlogd.sysconf
-+++ libvirt-5.8.0/src/logging/virtlogd.sysconf
+--- libvirt-5.9.0.orig/src/logging/virtlogd.sysconf
+++ libvirt-5.9.0/src/logging/virtlogd.sysconf
@@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlogd
 +