Accepting request 723846 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/723846 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=288
2019-08-16 13:30:47 +00:00 · 2019-08-16 13:30:47 +00:00 · d6eb84d848
commit d6eb84d848
parent a68d6af3ff e039ebe6dc
35 changed files with 336 additions and 403 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.5.0/src/conf/domain_stats.c
+Index: libvirt-5.6.0/src/conf/domain_stats.c
 ===================================================================
 --- /dev/null
-+++ libvirt-5.5.0/src/conf/domain_stats.c
+++ libvirt-5.6.0/src/conf/domain_stats.c
@@ -0,0 +1,139 @@
 +/*
 + * domain_stats.c: domain stats extraction helpers
@ -162,10 +162,10 @@ Index: libvirt-5.5.0/src/conf/domain_stats.c
 +}
 +
 +#undef STATS_ADD_NET_PARAM
-Index: libvirt-5.5.0/src/conf/domain_stats.h
+Index: libvirt-5.6.0/src/conf/domain_stats.h
 ===================================================================
 --- /dev/null
-+++ libvirt-5.5.0/src/conf/domain_stats.h
+++ libvirt-5.6.0/src/conf/domain_stats.h
@@ -0,0 +1,64 @@
 +/*
 + * domain_stats.h: domain stats extraction helpers
@ -231,11 +231,11 @@ Index: libvirt-5.5.0/src/conf/domain_stats.h
 +                               int *maxparams);
 +
 +#endif /* __DOMAIN_STATS_H */
-Index: libvirt-5.5.0/src/libvirt_private.syms
+Index: libvirt-5.6.0/src/libvirt_private.syms
 ===================================================================
--- libvirt-5.5.0.orig/src/libvirt_private.syms
-+++ libvirt-5.5.0/src/libvirt_private.syms
-@@ -680,6 +680,9 @@ virDomainConfNWFilterInstantiate;
+--- libvirt-5.6.0.orig/src/libvirt_private.syms
+++ libvirt-5.6.0/src/libvirt_private.syms
+@@ -694,6 +694,9 @@ virDomainConfNWFilterInstantiate;
 virDomainConfNWFilterTeardown;
 virDomainConfVMNWFilterTeardown;
 
@ -245,7 +245,7 @@ Index: libvirt-5.5.0/src/libvirt_private.syms
 
 # conf/interface_conf.h
 virInterfaceDefFormat;
-@@ -1613,6 +1616,7 @@ virCgroupGetMemoryUsage;
+@@ -1645,6 +1648,7 @@ virCgroupGetMemoryUsage;
 virCgroupGetMemSwapHardLimit;
 virCgroupGetMemSwapUsage;
 virCgroupGetPercpuStats;
@ -253,11 +253,11 @@ Index: libvirt-5.5.0/src/libvirt_private.syms
 virCgroupHasController;
 virCgroupHasEmptyTasks;
 virCgroupKillPainfully;
-Index: libvirt-5.5.0/src/qemu/qemu_driver.c
+Index: libvirt-5.6.0/src/qemu/qemu_driver.c
 ===================================================================
--- libvirt-5.5.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-5.5.0/src/qemu/qemu_driver.c
-@@ -66,6 +66,7 @@
+--- libvirt-5.6.0.orig/src/qemu/qemu_driver.c
+++ libvirt-5.6.0/src/qemu/qemu_driver.c
+@@ -68,6 +68,7 @@
 #include "virarptable.h"
 #include "viruuid.h"
 #include "domain_conf.h"
@ -265,7 +265,7 @@ Index: libvirt-5.5.0/src/qemu/qemu_driver.c
 #include "domain_audit.h"
 #include "node_device_conf.h"
 #include "virpci.h"
-@@ -19780,21 +19781,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
+@@ -20662,21 +20663,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
                         int *maxparams,
                         unsigned int privflags ATTRIBUTE_UNUSED)
 {
@ -288,7 +288,7 @@ Index: libvirt-5.5.0/src/qemu/qemu_driver.c
 }
 
 
-@@ -19984,37 +19971,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
+@@ -20866,37 +20853,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
                             int *maxparams)
 {
     qemuDomainObjPrivatePtr priv = dom->privateData;
@ -327,7 +327,7 @@ Index: libvirt-5.5.0/src/qemu/qemu_driver.c
 }
 
 
-@@ -20210,44 +20167,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
+@@ -21092,44 +21049,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
     return ret;
 }
 
@ -372,7 +372,7 @@ Index: libvirt-5.5.0/src/qemu/qemu_driver.c
 static int
 qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
                             virDomainObjPtr dom,
-@@ -20255,68 +20174,9 @@ qemuDomainGetStatsInterface(virQEMUDrive
+@@ -21137,68 +21056,9 @@ qemuDomainGetStatsInterface(virQEMUDrive
                             int *maxparams,
                             unsigned int privflags ATTRIBUTE_UNUSED)
 {
@ -442,7 +442,7 @@ Index: libvirt-5.5.0/src/qemu/qemu_driver.c
 #define QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, num, name, value) \
     do { \
         char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \
-@@ -20549,10 +20409,10 @@ qemuDomainGetStatsBlockExportHeader(virD
+@@ -21431,10 +21291,10 @@ qemuDomainGetStatsBlockExportHeader(virD
 {
     int ret = -1;
 
@ -455,7 +455,7 @@ Index: libvirt-5.5.0/src/qemu/qemu_driver.c
     if (src->id)
         QEMU_ADD_BLOCK_PARAM_UI(records, nrecords, recordnr, "backingIndex",
                                 src->id);
-@@ -20706,7 +20566,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
+@@ -21588,7 +21448,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
      * after the iteration than it is to iterate twice; but we still
      * want count listed first.  */
     count_index = record->nparams;
@ -464,7 +464,7 @@ Index: libvirt-5.5.0/src/qemu/qemu_driver.c
 
     for (i = 0; i < dom->def->ndisks; i++) {
         if (qemuDomainGetStatsBlockExportDisk(dom->def->disks[i], stats, nodestats,
-@@ -20731,8 +20591,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
+@@ -21613,8 +21473,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
 
 #undef QEMU_ADD_BLOCK_PARAM_ULL
 
@ -473,7 +473,7 @@ Index: libvirt-5.5.0/src/qemu/qemu_driver.c
 #define QEMU_ADD_IOTHREAD_PARAM_UI(record, maxparams, id, name, value) \
     do { \
         char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \
-@@ -20784,7 +20642,7 @@ qemuDomainGetStatsIOThread(virQEMUDriver
+@@ -21666,7 +21524,7 @@ qemuDomainGetStatsIOThread(virQEMUDriver
     if (niothreads == 0)
         return 0;
 
@ -482,7 +482,7 @@ Index: libvirt-5.5.0/src/qemu/qemu_driver.c
 
     for (i = 0; i < niothreads; i++) {
         if (iothreads[i]->poll_valid) {
-@@ -20817,8 +20675,6 @@ qemuDomainGetStatsIOThread(virQEMUDriver
+@@ -21699,8 +21557,6 @@ qemuDomainGetStatsIOThread(virQEMUDriver
 
 #undef QEMU_ADD_IOTHREAD_PARAM_ULL
 
@ -491,11 +491,11 @@ Index: libvirt-5.5.0/src/qemu/qemu_driver.c
 static int
 qemuDomainGetStatsPerfOneEvent(virPerfPtr perf,
                                virPerfEventType type,
-Index: libvirt-5.5.0/src/util/vircgroup.c
+Index: libvirt-5.6.0/src/util/vircgroup.c
 ===================================================================
--- libvirt-5.5.0.orig/src/util/vircgroup.c
-+++ libvirt-5.5.0/src/util/vircgroup.c
-@@ -2786,6 +2786,44 @@ virCgroupControllerAvailable(int control
+--- libvirt-5.6.0.orig/src/util/vircgroup.c
+++ libvirt-5.6.0/src/util/vircgroup.c
+@@ -2791,6 +2791,44 @@ virCgroupControllerAvailable(int control
     return ret;
 }
 
@ -540,7 +540,7 @@ Index: libvirt-5.5.0/src/util/vircgroup.c
 #else /* !__linux__ */
 
 bool
-@@ -2795,6 +2833,15 @@ virCgroupAvailable(void)
+@@ -2800,6 +2838,15 @@ virCgroupAvailable(void)
 }
 
 
@ -556,11 +556,11 @@ Index: libvirt-5.5.0/src/util/vircgroup.c
 int
 virCgroupNewPartition(const char *path ATTRIBUTE_UNUSED,
                       bool create ATTRIBUTE_UNUSED,
-Index: libvirt-5.5.0/src/util/vircgroup.h
+Index: libvirt-5.6.0/src/util/vircgroup.h
 ===================================================================
--- libvirt-5.5.0.orig/src/util/vircgroup.h
-+++ libvirt-5.5.0/src/util/vircgroup.h
-@@ -284,3 +284,7 @@ int virCgroupSetOwner(virCgroupPtr cgrou
+--- libvirt-5.6.0.orig/src/util/vircgroup.h
+++ libvirt-5.6.0/src/util/vircgroup.h
+@@ -285,3 +285,7 @@ int virCgroupSetOwner(virCgroupPtr cgrou
 int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller);
 
 bool virCgroupControllerAvailable(int controller);
@ -568,11 +568,11 @@ Index: libvirt-5.5.0/src/util/vircgroup.h
 +int virCgroupGetStatsCpu(virCgroupPtr cgroup,
 +                         virDomainStatsRecordPtr record,
 +                         int *maxparams);
-Index: libvirt-5.5.0/src/conf/Makefile.inc.am
+Index: libvirt-5.6.0/src/conf/Makefile.inc.am
 ===================================================================
--- libvirt-5.5.0.orig/src/conf/Makefile.inc.am
-+++ libvirt-5.5.0/src/conf/Makefile.inc.am
-@@ -24,6 +24,8 @@ DOMAIN_CONF_SOURCES = \
+--- libvirt-5.6.0.orig/src/conf/Makefile.inc.am
+++ libvirt-5.6.0/src/conf/Makefile.inc.am
+@@ -26,6 +26,8 @@ DOMAIN_CONF_SOURCES = \
 	conf/domain_audit.h \
 	conf/domain_nwfilter.c \
 	conf/domain_nwfilter.h \
--- 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.5.0/src/libxl/libxl_driver.c
+Index: libvirt-5.6.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-5.5.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-5.5.0/src/libxl/libxl_driver.c
-@@ -5299,6 +5299,97 @@ libxlDomainMemoryStats(virDomainPtr dom,
+--- libvirt-5.6.0.orig/src/libxl/libxl_driver.c
+++ libvirt-5.6.0/src/libxl/libxl_driver.c
+@@ -5280,6 +5280,97 @@ libxlDomainMemoryStats(virDomainPtr dom,
 
 #undef LIBXL_SET_MEMSTAT
 
@ -121,7 +121,7 @@ Index: libvirt-5.5.0/src/libxl/libxl_driver.c
 static int
 libxlDomainGetJobInfo(virDomainPtr dom,
                       virDomainJobInfoPtr info)
-@@ -6683,6 +6774,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6664,6 +6755,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.5.0/src/lxc/lxc_driver.c
+Index: libvirt-5.6.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-5.5.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-5.5.0/src/lxc/lxc_driver.c
+--- libvirt-5.6.0.orig/src/lxc/lxc_driver.c
+++ libvirt-5.6.0/src/lxc/lxc_driver.c
@@ -75,6 +75,7 @@
 #include "viraccessapichecklxc.h"
 #include "virhostdev.h"
@ -21,7 +21,7 @@ Index: libvirt-5.5.0/src/lxc/lxc_driver.c
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
-@@ -5393,6 +5394,142 @@ lxcDomainHasManagedSaveImage(virDomainPt
+@@ -5402,6 +5403,142 @@ lxcDomainHasManagedSaveImage(virDomainPt
     return ret;
 }
 
@ -164,7 +164,7 @@ Index: libvirt-5.5.0/src/lxc/lxc_driver.c
 
 /* Function Tables */
 static virHypervisorDriver lxcHypervisorDriver = {
-@@ -5488,6 +5625,7 @@ static virHypervisorDriver lxcHypervisor
+@@ -5497,6 +5634,7 @@ static virHypervisorDriver lxcHypervisor
     .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */
     .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */
     .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */
--- a/93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch
+++ b/93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch
@ -0,0 +1,39 @@
+From 93c1d5fe7bb7a62ef884eb41b505b2809d1704b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Thu, 8 Aug 2019 13:42:24 +0100
+Subject: [PATCH] network: fix ability to use openvswitch with vlans
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use the correct enum constant when validating vlan usage.
+This fixes a merge error in
+
+  commit 6cb0ec48bd95c95489a987e05a88e8bcf1f9109c
+  Author: Daniel P. Berrangé <berrange@redhat.com>
+  Date:   Mon Sep 3 17:34:22 2018 +0100
+
+    network: convert networkAllocateActualDevice to virNetworkPortDef
+
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ src/network/bridge_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
+index 41fa89a..72e1186 100644
+--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
+@@ -4814,7 +4814,7 @@ networkAllocatePort(virNetworkObjPtr obj,
+         if (!(port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI ||
+               (port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_DIRECT &&
+                port->plug.direct.mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) ||
+-              (port->plugtype == VIR_DOMAIN_NET_TYPE_BRIDGE &&
+              (port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_BRIDGE &&
+                port->virtPortProfile &&
+                port->virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH))) {
+             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+-- 
+2.22.0
+
--- a/blockcopy-check-dst-identical-device.patch
+++ b/blockcopy-check-dst-identical-device.patch
@ -11,11 +11,11 @@ Signed-off-by: Chunyan Liu <cyliu@suse.com>
 src/qemu/qemu_driver.c | 7 +++++++
 1 file changed, 7 insertions(+)

-Index: libvirt-5.5.0/src/qemu/qemu_driver.c
+Index: libvirt-5.6.0/src/qemu/qemu_driver.c
 ===================================================================
--- libvirt-5.5.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-5.5.0/src/qemu/qemu_driver.c
-@@ -17556,6 +17556,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt
+--- libvirt-5.6.0.orig/src/qemu/qemu_driver.c
+++ libvirt-5.6.0/src/qemu/qemu_driver.c
+@@ -18403,6 +18403,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt
         goto endjob;
     }
 
--- a/libvirt-5.5.0.tar.xz
+++ b/libvirt-5.5.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2306ef0947a594f91ec9da4b8b0307bdb54b897f17de19f48e8ecdca08ff35e8
-size 12930224
--- a/libvirt-5.5.0.tar.xz.asc
+++ b/libvirt-5.5.0.tar.xz.asc
@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAl0bu28ACgkQFViLJllr
-6l1TGwgAjmHjsmQ4Yu1JlKBiYWADvMf2pGS9LnrZMO9W8fC6veMmPvrk8ooePhgg
-ccOn990Me4bVPmscA+pOQ89OgbXP4NziJCz8Rg/baZHQnQn4u8wML/rSupYXgI3V
-Xypbluq5lBXPj7364P3k4mjhmdYhCVU3WbCkcMeBHJICV3p/RCON08kdDM6aUThf
-PE3nQAWYWs1N5wTENnhb2omiMOKOa/C1vUUuXw1TxFFS4m1dzGsAQlPep0kN+uwU
-mhJFUE9LgO7GgMFNhvntNE2++GFANFa3gjHzXgu0OnAhlEuu/xMfcSHYTV5/h5Se
-CoYCiF7qdSjly29lu5MwJThF6MjraQ==
-=VZ8+
-----END PGP SIGNATURE-----
--- a/libvirt-5.6.0.tar.xz
+++ b/libvirt-5.6.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:65f4f9924e10135aa694ca8bcb0b55725883d08e0b32c42111603d573aabb9b4
+size 13147976
--- a/libvirt-5.6.0.tar.xz.asc
+++ b/libvirt-5.6.0.tar.xz.asc
@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAl1IZMkACgkQFViLJllr
+6l377ggA0/nhSYP9gyfo/KD4jvwuwEVDWMD96kjqxHV9N/Sc8jN03T0k0BUIYJvC
+gEFeMIm/e4pxEmQO/fHwTQabM4raccVV/dXMP3FIK7oPJz7lf+x/qCeE15umgmjY
+OcGKOy/6pco04MBFUu3ULnC6dZZLTSVrS+yw27vJNRJoB74TqbpvXGOUDkdlDvJP
+eWlc2ssBo0st1Ew0tH+Gp9Wmk4tE9ygN2OU2nlxS/V9s1XAGLi+nuj2SNU9FX6pr
+3E7xv52FnwOddMnPwUJTT5LByDW+WL3ci5XcQ/JMXj74k3U70mrKKiEeCsNkFPoH
+PIX+frHu9OXEyjy2MlljH6bST1G9Wg==
+=YV5i
+-----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.5.0/src/cpu_map/ppc64_POWER8.xml
+Index: libvirt-5.6.0/src/cpu_map/ppc64_POWER8.xml
 ===================================================================
--- libvirt-5.5.0.orig/src/cpu_map/ppc64_POWER8.xml
-+++ libvirt-5.5.0/src/cpu_map/ppc64_POWER8.xml
+--- libvirt-5.6.0.orig/src/cpu_map/ppc64_POWER8.xml
+++ libvirt-5.6.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-5.5.0/configure.ac
+Index: libvirt-5.6.0/configure.ac
 ===================================================================
--- libvirt-5.5.0.orig/configure.ac
-+++ libvirt-5.5.0/configure.ac
+--- libvirt-5.6.0.orig/configure.ac
+++ libvirt-5.6.0/configure.ac
@@ -261,6 +261,7 @@ LIBVIRT_ARG_LIBSSH
 LIBVIRT_ARG_LIBXML
 LIBVIRT_ARG_MACVTAP
@ -26,11 +26,11 @@ Index: libvirt-5.5.0/configure.ac
 LIBVIRT_RESULT_NLS
 LIBVIRT_RESULT_NSS
 LIBVIRT_RESULT_NUMACTL
-Index: libvirt-5.5.0/tools/virsh.c
+Index: libvirt-5.6.0/tools/virsh.c
 ===================================================================
--- libvirt-5.5.0.orig/tools/virsh.c
-+++ libvirt-5.5.0/tools/virsh.c
-@@ -563,6 +563,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
+--- libvirt-5.6.0.orig/tools/virsh.c
+++ libvirt-5.6.0/tools/virsh.c
+@@ -561,6 +561,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
     vshPrint(ctl, " Interface");
 # if defined(WITH_NETCF)
     vshPrint(ctl, " netcf");
@ -39,10 +39,10 @@ Index: libvirt-5.5.0/tools/virsh.c
 # elif defined(WITH_UDEV)
     vshPrint(ctl, " udev");
 # endif
-Index: libvirt-5.5.0/src/interface/interface_backend_netcf.c
+Index: libvirt-5.6.0/src/interface/interface_backend_netcf.c
 ===================================================================
--- libvirt-5.5.0.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-5.5.0/src/interface/interface_backend_netcf.c
+--- libvirt-5.6.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-5.6.0/src/interface/interface_backend_netcf.c
@@ -21,7 +21,12 @@
 
 #include <config.h>
@ -57,7 +57,7 @@ Index: libvirt-5.5.0/src/interface/interface_backend_netcf.c
 
 #include "virerror.h"
 #include "datatypes.h"
-@@ -63,6 +68,37 @@ VIR_ONCE_GLOBAL_INIT(virNetcfDriverState
+@@ -71,6 +76,37 @@ VIR_ONCE_GLOBAL_INIT(virNetcfDriverState
 
 static virNetcfDriverStatePtr driver;
 
@ -95,9 +95,9 @@ Index: libvirt-5.5.0/src/interface/interface_backend_netcf.c
 
 static void
 virNetcfDriverStateDispose(void *obj)
-@@ -87,6 +123,10 @@ netcfStateInitialize(bool privileged,
- 
-     driver->privileged = privileged;
+@@ -123,6 +159,10 @@ netcfStateInitialize(bool privileged,
+          virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0)
+         goto error;
 
 +#ifdef WITH_NETCONTROL
 +    nc_logger_redirect_to(interface_nc_log_driver);
@ -106,7 +106,7 @@ Index: libvirt-5.5.0/src/interface/interface_backend_netcf.c
     /* open netcf */
     if (ncf_init(&driver->netcf, NULL) != 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-@@ -1223,6 +1263,19 @@ static virStateDriver interfaceStateDriv
+@@ -1262,6 +1302,19 @@ static virStateDriver interfaceStateDriv
 
 int netcfIfaceRegister(void)
 {
@ -126,10 +126,10 @@ Index: libvirt-5.5.0/src/interface/interface_backend_netcf.c
     if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
         return -1;
     if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
-Index: libvirt-5.5.0/src/interface/interface_driver.c
+Index: libvirt-5.6.0/src/interface/interface_driver.c
 ===================================================================
--- libvirt-5.5.0.orig/src/interface/interface_driver.c
-+++ libvirt-5.5.0/src/interface/interface_driver.c
+--- libvirt-5.6.0.orig/src/interface/interface_driver.c
+++ libvirt-5.6.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
     if (netcfIfaceRegister() == 0)
         return 0;
@ -147,10 +147,10 @@ Index: libvirt-5.5.0/src/interface/interface_driver.c
     if (udevIfaceRegister() == 0)
         return 0;
 #endif /* WITH_UDEV */
-Index: libvirt-5.5.0/m4/virt-netcontrol.m4
+Index: libvirt-5.6.0/m4/virt-netcontrol.m4
 ===================================================================
 --- /dev/null
-+++ libvirt-5.5.0/m4/virt-netcontrol.m4
+++ libvirt-5.6.0/m4/virt-netcontrol.m4
@@ -0,0 +1,39 @@
 +dnl The libnetcontrol library
 +dnl
@ -191,10 +191,10 @@ Index: libvirt-5.5.0/m4/virt-netcontrol.m4
 +AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[
 +  LIBVIRT_RESULT_LIB([NETCONTROL])
 +])
-Index: libvirt-5.5.0/src/interface/Makefile.inc.am
+Index: libvirt-5.6.0/src/interface/Makefile.inc.am
 ===================================================================
--- libvirt-5.5.0.orig/src/interface/Makefile.inc.am
-+++ libvirt-5.5.0/src/interface/Makefile.inc.am
+--- libvirt-5.6.0.orig/src/interface/Makefile.inc.am
+++ libvirt-5.6.0/src/interface/Makefile.inc.am
@@ -6,6 +6,7 @@ INTERFACE_DRIVER_SOURCES = \
 	$(NULL)
 
--- a/libvirt.changes
+++ b/libvirt.changes
@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Thu Aug 15 19:54:20 UTC 2019 - Martin Wilck <mwilck@suse.com>
+
+- network: fix ability to use openvswitch with vlans (bsc#1145651)
+  - Added patch:
+    93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch
+
+-------------------------------------------------------------------
+Mon Aug  5 19:24:35 UTC 2019 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 5.6.0
+  - Enable proper use of systemd socket	activation with libvirtd
+  - bsc#1133719
+  - Many incremental improvements and bug fixes, see
+    http://libvirt.org/news.html
+  - Dropped patches:
+    xen-pv-cdrom.patch, xen-sxpr-disk-type.patch
+- qemu: fix default value of security_default_confined
+  Updated suse-qemu-conf.patch
+  bsc#1143871
+
 -------------------------------------------------------------------
 Tue Jul  2 21:24:26 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.5.0
+Version:        5.6.0
 Release:        0
 Summary:        Library providing a virtualization API
 License:        LGPL-2.1-or-later
@ -337,19 +337,19 @@ Source6:        libvirtd-relocation-server.xml
 Source99:       baselibs.conf
 Source100:      %{name}-rpmlintrc
 # Upstream patches
+Patch0:         93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch
 # Patches pending upstream review
 Patch100:       libxl-dom-reset.patch
 Patch101:       network-don-t-use-dhcp-authoritative-on-static-netwo.patch
 # Need to go upstream
-Patch150:       xen-pv-cdrom.patch
-Patch151:       blockcopy-check-dst-identical-device.patch
-Patch152:       libvirt-power8-models.patch
-Patch153:       ppc64le-canonical-name.patch
-Patch154:       libxl-set-migration-constraints.patch
-Patch155:       libxl-set-cach-mode.patch
-Patch156:       0001-Extract-stats-functions-from-the-qemu-driver.patch
-Patch157:       0002-lxc-implement-connectGetAllDomainStats.patch
-Patch158:       0001-libxl-add-support-for-BlockResize-API.patch
+Patch150:       blockcopy-check-dst-identical-device.patch
+Patch151:       libvirt-power8-models.patch
+Patch152:       ppc64le-canonical-name.patch
+Patch153:       libxl-set-migration-constraints.patch
+Patch154:       libxl-set-cach-mode.patch
+Patch155:       0001-Extract-stats-functions-from-the-qemu-driver.patch
+Patch156:       0002-lxc-implement-connectGetAllDomainStats.patch
+Patch157:       0001-libxl-add-support-for-BlockResize-API.patch
 # Our patches
 Patch200:       suse-libvirtd-disable-tls.patch
 Patch201:       suse-libvirtd-sysconfig-settings.patch
@ -361,12 +361,11 @@ Patch206:       suse-qemu-conf.patch
 Patch207:       suse-ovmf-paths.patch
 Patch208:       suse-apparmor-libnl-paths.patch
 Patch209:       support-managed-pci-xen-driver.patch
-Patch210:       xen-sxpr-disk-type.patch
-Patch211:       libxl-support-block-script.patch
-Patch212:       qemu-apparmor-screenshot.patch
-Patch213:       libvirt-suse-netcontrol.patch
-Patch214:       lxc-wait-after-eth-del.patch
-Patch215:       suse-libxl-disable-autoballoon.patch
+Patch210:       libxl-support-block-script.patch
+Patch211:       qemu-apparmor-screenshot.patch
+Patch212:       libvirt-suse-netcontrol.patch
+Patch213:       lxc-wait-after-eth-del.patch
+Patch214:       suse-libxl-disable-autoballoon.patch
 # SLES-Only patches
 %if ! 0%{?is_opensuse}
 Patch400:       virt-create-rootfs.patch
@ -871,6 +870,7 @@ libvirt plugin for NSS for translating domain names into IP addresses.

 %prep
 %setup -q
+%patch0 -p1
 %patch100 -p1
 %patch101 -p1
 %patch150 -p1
@ -881,7 +881,6 @@ libvirt plugin for NSS for translating domain names into IP addresses.
 %patch155 -p1
 %patch156 -p1
 %patch157 -p1
-%patch158 -p1
 %patch200 -p1
 %patch201 -p1
 %patch202 -p1
@ -897,7 +896,6 @@ libvirt plugin for NSS for translating domain names into IP addresses.
 %patch212 -p1
 %patch213 -p1
 %patch214 -p1
-%patch215 -p1
 %if ! 0%{?is_opensuse}
 %patch400 -p1
 %endif
@ -1251,13 +1249,13 @@ fi
 %if %{with_firewalld}
 %firewalld_reload
 %endif
-%service_add_post libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket
+%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
 %{fillup_only -n libvirtd}
 %{fillup_only -n virtlockd}
 %{fillup_only -n virtlogd}

 %preun daemon
-%service_del_preun libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket
+%service_del_preun 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

 %postun daemon
 /sbin/ldconfig
@ -1272,11 +1270,21 @@ fi

 %posttrans daemon
 # All connection drivers should be installed post transaction.
-# Time to restart daemons.
+# Time to restart libvirtd. With new socket activation we need to be a bit
+# smarter on update. Old libvirtd owns the sockets and will delete them on
+# shutdown. We can't use try-restart as libvirtd will one the sockets again
+# after restart. So we must instead shutdown libvirtd, start the sockets,
+# then start libvirtd.
 if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then
-    for service in libvirtd virtlockd virtlogd ; do
-        /usr/bin/systemctl try-restart ${service}.service >/dev/null 2>&1 || :
-    done
+    /usr/bin/systemctl is-active libvirtd.service >/dev/null 2>&1
+    if test $? = 0 ; then
+        /usr/bin/systemctl stop libvirtd.service >/dev/null 2>&1 || :
+
+        /usr/bin/systemctl try-restart libvirtd.socket >/dev/null 2>&1 || :
+        /usr/bin/systemctl try-restart libvirtd-ro.socket >/dev/null 2>&1 || :
+
+        /usr/bin/systemctl start libvirtd.service >/dev/null 2>&1 || :
+    fi
 fi

 %if %{with_firewalld_zone}
@ -1336,6 +1344,11 @@ fi
 %{_fillupdir}/sysconfig.virtlogd
 %{_fillupdir}/sysconfig.virtlockd
 %{_unitdir}/libvirtd.service
+%{_unitdir}/libvirtd.socket
+%{_unitdir}/libvirtd-ro.socket
+%{_unitdir}/libvirtd-admin.socket
+%{_unitdir}/libvirtd-tcp.socket
+%{_unitdir}/libvirtd-tls.socket
 %{_unitdir}/virt-guest-shutdown.target
 %{_unitdir}/virtlogd.service
 %{_unitdir}/virtlogd.socket
@ -1617,6 +1630,7 @@ fi
 %{_datadir}/%{name}/schemas/domain.rng
 %{_datadir}/%{name}/schemas/cputypes.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
@ -1672,6 +1686,7 @@ fi
 %doc %{_docdir}/%{name}/*.css
 %doc %{_docdir}/%{name}/html
 %doc %{_docdir}/%{name}/internals
+%doc %{_docdir}/%{name}/kbase
 %doc %{_docdir}/%{name}/logos
 %doc %{_docdir}/%{name}/fonts
 %doc %{_docdir}/%{name}/js
--- 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.5.0/src/libxl/libxl_driver.c
+Index: libvirt-5.6.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-5.5.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-5.5.0/src/libxl/libxl_driver.c
-@@ -1376,6 +1376,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
+--- libvirt-5.6.0.orig/src/libxl/libxl_driver.c
+++ libvirt-5.6.0/src/libxl/libxl_driver.c
+@@ -1364,6 +1364,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
 }
 
 static int
@ -74,7 +74,7 @@ Index: libvirt-5.5.0/src/libxl/libxl_driver.c
 libxlDomainDestroyFlags(virDomainPtr dom,
                         unsigned int flags)
 {
-@@ -6558,6 +6613,7 @@ static virHypervisorDriver libxlHypervis
+@@ -6539,6 +6594,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,10 +3,10 @@ https://bugzilla.novell.com/show_bug.cgi?id=879425
 src/libxl/libxl_conf.c |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

-Index: libvirt-5.5.0/src/libxl/libxl_conf.c
+Index: libvirt-5.6.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-5.5.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-5.5.0/src/libxl/libxl_conf.c
+--- libvirt-5.6.0.orig/src/libxl/libxl_conf.c
+++ libvirt-5.6.0/src/libxl/libxl_conf.c
@@ -897,6 +897,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
 #endif
 }
--- 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.5.0/include/libvirt/libvirt-domain.h
+Index: libvirt-5.6.0/include/libvirt/libvirt-domain.h
 ===================================================================
--- libvirt-5.5.0.orig/include/libvirt/libvirt-domain.h
-+++ libvirt-5.5.0/include/libvirt/libvirt-domain.h
+--- libvirt-5.6.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-5.6.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.5.0/include/libvirt/libvirt-domain.h
 /* Domain migration. */
 virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
                                unsigned long flags, const char *dname,
-Index: libvirt-5.5.0/src/libxl/libxl_driver.c
+Index: libvirt-5.6.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-5.5.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-5.5.0/src/libxl/libxl_driver.c
-@@ -6165,6 +6165,9 @@ libxlDomainMigratePerform3Params(virDoma
+--- libvirt-5.6.0.orig/src/libxl/libxl_driver.c
+++ libvirt-5.6.0/src/libxl/libxl_driver.c
+@@ -6146,6 +6146,9 @@ libxlDomainMigratePerform3Params(virDoma
     const char *dname = NULL;
     const char *uri = NULL;
     int ret = -1;
@ -66,7 +66,7 @@ Index: libvirt-5.5.0/src/libxl/libxl_driver.c
 
 #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
     virReportUnsupportedError();
-@@ -6181,6 +6184,18 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6162,6 +6165,18 @@ libxlDomainMigratePerform3Params(virDoma
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_DEST_NAME,
                                 &dname) < 0 ||
@ -85,7 +85,7 @@ Index: libvirt-5.5.0/src/libxl/libxl_driver.c
         virTypedParamsGetString(params, nparams,
                                 VIR_MIGRATE_PARAM_URI,
                                 &uri) < 0)
-@@ -6195,11 +6210,11 @@ libxlDomainMigratePerform3Params(virDoma
+@@ -6176,11 +6191,11 @@ libxlDomainMigratePerform3Params(virDoma
 
     if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
         if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml,
@ -99,10 +99,10 @@ Index: libvirt-5.5.0/src/libxl/libxl_driver.c
             goto cleanup;
     }
 
-Index: libvirt-5.5.0/src/libxl/libxl_migration.c
+Index: libvirt-5.6.0/src/libxl/libxl_migration.c
 ===================================================================
--- libvirt-5.5.0.orig/src/libxl/libxl_migration.c
-+++ libvirt-5.5.0/src/libxl/libxl_migration.c
+--- libvirt-5.6.0.orig/src/libxl/libxl_migration.c
+++ libvirt-5.6.0/src/libxl/libxl_migration.c
@@ -342,18 +342,39 @@ libxlMigrateDstReceive(virNetSocketPtr s
 static int
 libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver,
@ -264,10 +264,10 @@ Index: libvirt-5.5.0/src/libxl/libxl_migration.c
     virObjectLock(vm);
 
     if (ret < 0) {
-Index: libvirt-5.5.0/src/libxl/libxl_migration.h
+Index: libvirt-5.6.0/src/libxl/libxl_migration.h
 ===================================================================
--- libvirt-5.5.0.orig/src/libxl/libxl_migration.h
-+++ libvirt-5.5.0/src/libxl/libxl_migration.h
+--- libvirt-5.6.0.orig/src/libxl/libxl_migration.h
+++ libvirt-5.6.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.5.0/src/libxl/libxl_migration.h
 
 virDomainPtr
 libxlDomainMigrationDstFinish(virConnectPtr dconn,
-Index: libvirt-5.5.0/tools/virsh-domain.c
+Index: libvirt-5.6.0/tools/virsh-domain.c
 ===================================================================
--- libvirt-5.5.0.orig/tools/virsh-domain.c
-+++ libvirt-5.5.0/tools/virsh-domain.c
-@@ -10580,6 +10580,22 @@ static const vshCmdOptDef opts_migrate[]
+--- libvirt-5.6.0.orig/tools/virsh-domain.c
+++ libvirt-5.6.0/tools/virsh-domain.c
+@@ -10587,6 +10587,22 @@ static const vshCmdOptDef opts_migrate[]
      .type = VSH_OT_INT,
      .help = N_("number of connections for parallel migration")
     },
@ -339,7 +339,7 @@ Index: libvirt-5.5.0/tools/virsh-domain.c
     {.name = NULL}
 };
 
-@@ -10603,6 +10619,7 @@ doMigrate(void *opaque)
+@@ -10610,6 +10626,7 @@ doMigrate(void *opaque)
     unsigned long long ullOpt = 0;
     int rv;
     virConnectPtr dconn = data->dconn;
@ -347,7 +347,7 @@ Index: libvirt-5.5.0/tools/virsh-domain.c
 
     sigemptyset(&sigmask);
     sigaddset(&sigmask, SIGINT);
-@@ -10722,6 +10739,27 @@ doMigrate(void *opaque)
+@@ -10729,6 +10746,27 @@ doMigrate(void *opaque)
             goto save_error;
     }
 
@ -375,11 +375,11 @@ Index: libvirt-5.5.0/tools/virsh-domain.c
     if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0)
         goto out;
     if (opt) {
-Index: libvirt-5.5.0/tools/virsh.pod
+Index: libvirt-5.6.0/tools/virsh.pod
 ===================================================================
--- libvirt-5.5.0.orig/tools/virsh.pod
-+++ libvirt-5.5.0/tools/virsh.pod
-@@ -2019,6 +2019,14 @@ I<--parallel-connections>. Parallel conn
+--- libvirt-5.6.0.orig/tools/virsh.pod
+++ libvirt-5.6.0/tools/virsh.pod
+@@ -2026,6 +2026,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,10 +7,10 @@ and npiv.

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

-Index: libvirt-5.5.0/src/libxl/libxl_conf.c
+Index: libvirt-5.6.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-5.5.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-5.5.0/src/libxl/libxl_conf.c
+--- libvirt-5.6.0.orig/src/libxl/libxl_conf.c
+++ libvirt-5.6.0/src/libxl/libxl_conf.c
@@ -897,6 +897,25 @@ libxlDiskSetDiscard(libxl_device_disk *x
 #endif
 }
--- 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.5.0/src/lxc/lxc_controller.c
+Index: libvirt-5.6.0/src/lxc/lxc_controller.c
 ===================================================================
--- libvirt-5.5.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-5.5.0/src/lxc/lxc_controller.c
+--- libvirt-5.6.0.orig/src/lxc/lxc_controller.c
+++ libvirt-5.6.0/src/lxc/lxc_controller.c
@@ -69,6 +69,7 @@
 #include "rpc/virnetdaemon.h"
 #include "virstring.h"
@ -33,10 +33,10 @@ Index: libvirt-5.5.0/src/lxc/lxc_controller.c
 
     return ret;
 }
-Index: libvirt-5.5.0/src/lxc/lxc_driver.c
+Index: libvirt-5.6.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-5.5.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-5.5.0/src/lxc/lxc_driver.c
+--- libvirt-5.6.0.orig/src/lxc/lxc_driver.c
+++ libvirt-5.6.0/src/lxc/lxc_driver.c
@@ -70,6 +70,7 @@
 #include "virtime.h"
 #include "virtypedparam.h"
@ -45,7 +45,7 @@ Index: libvirt-5.5.0/src/lxc/lxc_driver.c
 #include "virstring.h"
 #include "viraccessapicheck.h"
 #include "viraccessapichecklxc.h"
-@@ -3916,6 +3917,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
+@@ -3925,6 +3926,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.5.0/src/lxc/lxc_driver.c
             break;
 
         case VIR_DOMAIN_NET_TYPE_DIRECT:
-@@ -4360,6 +4362,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
+@@ -4369,6 +4371,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
             virDomainAuditNet(vm, detach, NULL, "detach", false);
             goto cleanup;
         }
@ -61,10 +61,10 @@ Index: libvirt-5.5.0/src/lxc/lxc_driver.c
         break;
 
         /* It'd be nice to support this, but with macvlan
-Index: libvirt-5.5.0/src/lxc/lxc_process.c
+Index: libvirt-5.6.0/src/lxc/lxc_process.c
 ===================================================================
--- libvirt-5.5.0.orig/src/lxc/lxc_process.c
-+++ libvirt-5.5.0/src/lxc/lxc_process.c
+--- libvirt-5.6.0.orig/src/lxc/lxc_process.c
+++ libvirt-5.6.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.5.0/src/network/bridge_driver.c
+Index: libvirt-5.6.0/src/network/bridge_driver.c
 ===================================================================
--- libvirt-5.5.0.orig/src/network/bridge_driver.c
-+++ libvirt-5.5.0/src/network/bridge_driver.c
-@@ -1384,7 +1384,14 @@ networkDnsmasqConfContents(virNetworkObj
+--- libvirt-5.6.0.orig/src/network/bridge_driver.c
+++ libvirt-5.6.0/src/network/bridge_driver.c
+@@ -1528,7 +1528,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.5.0/src/network/bridge_driver.c
             }
 
             if (ipdef->tftproot) {
-Index: libvirt-5.5.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+Index: libvirt-5.6.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
 ===================================================================
--- libvirt-5.5.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
-+++ libvirt-5.5.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+--- libvirt-5.6.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-5.6.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.5.0/src/util/virarch.c
+Index: libvirt-5.6.0/src/util/virarch.c
 ===================================================================
--- libvirt-5.5.0.orig/src/util/virarch.c
-+++ libvirt-5.5.0/src/util/virarch.c
+--- libvirt-5.6.0.orig/src/util/virarch.c
+++ libvirt-5.6.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.5.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-5.6.0/src/security/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-5.5.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-5.5.0/src/security/apparmor/libvirt-qemu
+--- libvirt-5.6.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-5.6.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.5.0/src/xenconfig/xen_common.c
+Index: libvirt-5.6.0/src/xenconfig/xen_common.c
 ===================================================================
--- libvirt-5.5.0.orig/src/xenconfig/xen_common.c
-+++ libvirt-5.5.0/src/xenconfig/xen_common.c
-@@ -386,12 +386,19 @@ xenParsePCI(char *entry)
+--- libvirt-5.6.0.orig/src/xenconfig/xen_common.c
+++ libvirt-5.6.0/src/xenconfig/xen_common.c
+@@ -388,12 +388,19 @@ xenParsePCI(char *entry)
     int busID;
     int slotID;
     int funcID;
@ -32,7 +32,7 @@ Index: libvirt-5.5.0/src/xenconfig/xen_common.c
     if (!(nextkey = strchr(key, ':')))
         return NULL;
     if (virStrncpy(domain, key, (nextkey - key), sizeof(domain)) < 0) {
-@@ -436,10 +443,30 @@ xenParsePCI(char *entry)
+@@ -438,10 +445,30 @@ xenParsePCI(char *entry)
     if (virStrToLong_i(func, NULL, 16, &funcID) < 0)
         return NULL;
 
@ -64,73 +64,3 @@ Index: libvirt-5.5.0/src/xenconfig/xen_common.c
     hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
     hostdev->source.subsys.u.pci.addr.domain = domainID;
     hostdev->source.subsys.u.pci.addr.bus = busID;
-Index: libvirt-5.5.0/src/xenconfig/xen_sxpr.c
-===================================================================
--- libvirt-5.5.0.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-5.5.0/src/xenconfig/xen_sxpr.c
-@@ -1054,6 +1054,7 @@ xenParseSxprPCI(virDomainDefPtr def,
-         int busID;
-         int slotID;
-         int funcID;
-+        bool managed;
- 
-         node = cur->u.s.car;
-         if (!sexpr_lookup(node, "dev"))
-@@ -1101,11 +1102,13 @@ xenParseSxprPCI(virDomainDefPtr def,
-             goto error;
-         }
- 
-+        managed = sexpr_int(node, "dev/opts/managed");
-+
-         if (!(dev = virDomainHostdevDefNew()))
-            goto error;
- 
-         dev->mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS;
-        dev->managed = false;
-+        dev->managed = managed ? true : false;
-         dev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
-         dev->source.subsys.u.pci.addr.domain = domainID;
-         dev->source.subsys.u.pci.addr.bus = busID;
-@@ -1964,11 +1967,15 @@ static void
- xenFormatSxprPCI(virDomainHostdevDefPtr def,
-                  virBufferPtr buf)
- {
-    virBufferAsprintf(buf, "(dev (domain 0x%04x)(bus 0x%02x)(slot 0x%02x)(func 0x%x))",
-+    virBufferAsprintf(buf, "(dev (domain 0x%04x)(bus 0x%02x)(slot 0x%02x)(func 0x%x)",
-                       def->source.subsys.u.pci.addr.domain,
-                       def->source.subsys.u.pci.addr.bus,
-                       def->source.subsys.u.pci.addr.slot,
-                       def->source.subsys.u.pci.addr.function);
-+
-+    if (def->managed)
-+        virBufferAddLit(buf, "(opts (managed 1))");
-+    virBufferAddLit(buf, ")");
- }
- 
- 
-@@ -1987,12 +1994,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
-                     virBufferPtr buf,
-                     int detach)
- {
-    if (def->managed) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("managed PCI devices not supported with XenD"));
-        return -1;
-    }
-
-     virBufferAddLit(buf, "(pci ");
-     xenFormatSxprPCI(def, buf);
-     if (detach)
-@@ -2047,12 +2048,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
-     for (i = 0; i < def->nhostdevs; i++) {
-         if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
-             def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
-            if (def->hostdevs[i]->managed) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("managed PCI devices not supported with XenD"));
-                return -1;
-            }
-
-             xenFormatSxprPCI(def->hostdevs[i], buf);
-         }
-     }
--- 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.5.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-5.6.0/src/security/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-5.5.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-5.5.0/src/security/apparmor/libvirt-qemu
+--- libvirt-5.6.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-5.6.0/src/security/apparmor/libvirt-qemu
@@ -63,6 +63,7 @@
   #/dev/fb* rw,
 
@ -20,10 +20,10 @@ Index: libvirt-5.5.0/src/security/apparmor/libvirt-qemu
   @{HOME}/.pulse-cookie rwk,
   owner /root/.pulse-cookie rwk,
   owner /root/.pulse/ rw,
-Index: libvirt-5.5.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
+Index: libvirt-5.6.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
 ===================================================================
--- libvirt-5.5.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
-+++ libvirt-5.5.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
+--- libvirt-5.6.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
+++ libvirt-5.6.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
@@ -17,7 +17,7 @@ profile virt-aa-helper /usr/{lib,lib64}/
   owner @{PROC}/[0-9]*/status r,
   @{PROC}/filesystems 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.5.0/tools/libvirt-guests.sh.in
+Index: libvirt-5.6.0/tools/libvirt-guests.sh.in
 ===================================================================
--- libvirt-5.5.0.orig/tools/libvirt-guests.sh.in
-+++ libvirt-5.5.0/tools/libvirt-guests.sh.in
+--- libvirt-5.6.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-5.6.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.5.0/tools/libvirt-guests.sh.in
 esac
 -exit $RETVAL
 +rc_exit
-Index: libvirt-5.5.0/tools/libvirt-guests.sysconf
+Index: libvirt-5.6.0/tools/libvirt-guests.sysconf
 ===================================================================
--- libvirt-5.5.0.orig/tools/libvirt-guests.sysconf
-+++ libvirt-5.5.0/tools/libvirt-guests.sysconf
+--- libvirt-5.6.0.orig/tools/libvirt-guests.sysconf
+++ libvirt-5.6.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.5.0/src/remote/libvirtd.conf
+Index: libvirt-5.6.0/src/remote/libvirtd.conf
 ===================================================================
--- libvirt-5.5.0.orig/src/remote/libvirtd.conf
-+++ libvirt-5.5.0/src/remote/libvirtd.conf
-@@ -13,8 +13,8 @@
+--- libvirt-5.6.0.orig/src/remote/libvirtd.conf
+++ libvirt-5.6.0/src/remote/libvirtd.conf
+@@ -16,8 +16,8 @@
 # It is necessary to setup a CA and issue server certificates before
 # using this capability.
 #
@ -18,10 +18,10 @@ Index: libvirt-5.5.0/src/remote/libvirtd.conf
 
 # Listen for unencrypted TCP connections on the public TCP/IP port.
 # NB, must pass the --listen flag to the libvirtd process for this to
-Index: libvirt-5.5.0/src/remote/remote_daemon_config.c
+Index: libvirt-5.6.0/src/remote/remote_daemon_config.c
 ===================================================================
--- libvirt-5.5.0.orig/src/remote/remote_daemon_config.c
-+++ libvirt-5.5.0/src/remote/remote_daemon_config.c
+--- libvirt-5.6.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-5.6.0/src/remote/remote_daemon_config.c
@@ -106,7 +106,7 @@ daemonConfigNew(bool privileged ATTRIBUT
     if (VIR_ALLOC(data) < 0)
         return NULL;
@ -31,10 +31,10 @@ Index: libvirt-5.5.0/src/remote/remote_daemon_config.c
     data->listen_tcp = 0;
 
     if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
-Index: libvirt-5.5.0/src/remote/test_libvirtd.aug.in
+Index: libvirt-5.6.0/src/remote/test_libvirtd.aug.in
 ===================================================================
--- libvirt-5.5.0.orig/src/remote/test_libvirtd.aug.in
-+++ libvirt-5.5.0/src/remote/test_libvirtd.aug.in
+--- libvirt-5.6.0.orig/src/remote/test_libvirtd.aug.in
+++ libvirt-5.6.0/src/remote/test_libvirtd.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd =
    ::CONFIG::
 
--- a/suse-libvirtd-service-xen.patch
+++ b/suse-libvirtd-service-xen.patch
@ -7,11 +7,11 @@ On SUSE distros, we promote libvirt and all the libvirt-based
 tools. If a user installs libvirt on their SUSE Xen host, then
 libvirt should be king and override xendomains. See bsc#1015348

-Index: libvirt-5.5.0/src/remote/libvirtd.service.in
+Index: libvirt-5.6.0/src/remote/libvirtd.service.in
 ===================================================================
--- libvirt-5.5.0.orig/src/remote/libvirtd.service.in
-+++ libvirt-5.5.0/src/remote/libvirtd.service.in
-@@ -17,6 +17,8 @@ After=local-fs.target
+--- libvirt-5.6.0.orig/src/remote/libvirtd.service.in
+++ libvirt-5.6.0/src/remote/libvirtd.service.in
+@@ -15,6 +15,8 @@ After=local-fs.target
 After=remote-fs.target
 After=systemd-logind.service
 After=systemd-machined.service
--- a/suse-libvirtd-sysconfig-settings.patch
+++ b/suse-libvirtd-sysconfig-settings.patch
@ -1,28 +1,20 @@
 Adjust libvirtd sysconfig file to conform to SUSE standards

-Index: libvirt-5.5.0/src/remote/libvirtd.sysconf
+Index: libvirt-5.6.0/src/remote/libvirtd.sysconf
 ===================================================================
--- libvirt-5.5.0.orig/src/remote/libvirtd.sysconf
-+++ libvirt-5.5.0/src/remote/libvirtd.sysconf
-@@ -1,16 +1,25 @@
+--- libvirt-5.6.0.orig/src/remote/libvirtd.sysconf
+++ libvirt-5.6.0/src/remote/libvirtd.sysconf
+@@ -1,13 +1,18 @@
 +## Path: System/Virtualization/libvirt
-+
-+## Type: string
-+## Default: /etc/libvirt/libvirtd.conf
- # Override the default config file
- # NOTE: This setting is no longer honoured if using
- # systemd. Set '--config /etc/libvirt/libvirtd.conf'
- # in LIBVIRTD_ARGS instead.
-#LIBVIRTD_CONFIG=/etc/libvirt/libvirtd.conf
-+LIBVIRTD_CONFIG=/etc/libvirt/libvirtd.conf
+ # Customizations for the libvirtd.service systemd unit
 
-# Listen for TCP/IP connections
+-# Listen for TCP/IP connections. This is not required if using systemd
+-# socket activation.
 -# NB. must setup TLS/SSL keys prior to using this
-#LIBVIRTD_ARGS="--listen"
 +## Type: string
 +## Default: --listen
-+# Arguments to pass to libvirtd
-+LIBVIRTD_ARGS="--listen"
+# Arguments to pass to libvirtd. Not required if using systemd socket activation.
+ #LIBVIRTD_ARGS="--listen"
 
 +## Type: string
 +## Default: none
@ -34,31 +26,3 @@ Index: libvirt-5.5.0/src/remote/libvirtd.sysconf
 # Override the QEMU/SDL default audio driver probing when
 # starting virtual machines using SDL graphics
 #
-@@ -20,14 +29,16 @@
- #
- #SDL_AUDIODRIVER=pulse
- 
-# Override the maximum number of opened files.
-# This only works with traditional init scripts.
-# In the systemd world, the limit can only be changed by overriding
-# LimitNOFILE for libvirtd.service. To do that, just create a *.conf
-# file in /etc/systemd/system/libvirtd.service.d/ (for example
-# /etc/systemd/system/libvirtd.service.d/openfiles.conf) and write
-# the following two lines in it:
-#   [Service]
-#   LimitNOFILE=2048
-#
-#LIBVIRTD_NOFILES_LIMIT=2048
-+## Type: integer
-+## Default: 2048
-+## Override the maximum number of opened files.
-+## This only works with traditional init scripts.
-+## In the systemd world, the limit can only be changed by overriding
-+## LimitNOFILE for libvirtd.service. To do that, just create a *.conf
-+## file in /etc/systemd/system/libvirtd.service.d/ (for example
-+## /etc/systemd/system/libvirtd.service.d/openfiles.conf) and write
-+## the following two lines in it:
-+##   [Service]
-+##   LimitNOFILE=2048
-+##
-+LIBVIRTD_NOFILES_LIMIT=2048
--- 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.5.0/src/libxl/libxl.conf
+Index: libvirt-5.6.0/src/libxl/libxl.conf
 ===================================================================
--- libvirt-5.5.0.orig/src/libxl/libxl.conf
-+++ libvirt-5.5.0/src/libxl/libxl.conf
+--- libvirt-5.6.0.orig/src/libxl/libxl.conf
+++ libvirt-5.6.0/src/libxl/libxl.conf
@@ -4,12 +4,11 @@
 
 # Enable autoballooning of domain0
@ -27,10 +27,10 @@ Index: libvirt-5.5.0/src/libxl/libxl.conf
 
 
 # In order to prevent accidentally starting two domains that
-Index: libvirt-5.5.0/src/libxl/libxl_conf.c
+Index: libvirt-5.6.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-5.5.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-5.5.0/src/libxl/libxl_conf.c
+--- libvirt-5.6.0.orig/src/libxl/libxl_conf.c
+++ libvirt-5.6.0/src/libxl/libxl_conf.c
@@ -22,7 +22,6 @@
 
 #include <config.h>
--- a/suse-ovmf-paths.patch
+++ b/suse-ovmf-paths.patch
@ -1,10 +1,10 @@
 Adjust paths of OVMF firmwares on SUSE distros

-Index: libvirt-5.5.0/src/qemu/qemu.conf
+Index: libvirt-5.6.0/src/qemu/qemu.conf
 ===================================================================
--- libvirt-5.5.0.orig/src/qemu/qemu.conf
-+++ libvirt-5.5.0/src/qemu/qemu.conf
-@@ -781,10 +781,9 @@ security_default_confined = 0
+--- libvirt-5.6.0.orig/src/qemu/qemu.conf
+++ libvirt-5.6.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.
 #nvram = [
@ -18,10 +18,10 @@ Index: libvirt-5.5.0/src/qemu/qemu.conf
 #]
 
 # The backend to use for handling stdout/stderr output from
-Index: libvirt-5.5.0/src/qemu/qemu_conf.c
+Index: libvirt-5.6.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-5.5.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-5.5.0/src/qemu/qemu_conf.c
+--- libvirt-5.6.0.orig/src/qemu/qemu_conf.c
+++ libvirt-5.6.0/src/qemu/qemu_conf.c
@@ -96,10 +96,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver
 
 #ifndef DEFAULT_LOADER_NVRAM
@ -36,10 +36,10 @@ Index: libvirt-5.5.0/src/qemu/qemu_conf.c
 #endif
 
 
-Index: libvirt-5.5.0/src/security/virt-aa-helper.c
+Index: libvirt-5.6.0/src/security/virt-aa-helper.c
 ===================================================================
--- libvirt-5.5.0.orig/src/security/virt-aa-helper.c
-+++ libvirt-5.5.0/src/security/virt-aa-helper.c
+--- libvirt-5.6.0.orig/src/security/virt-aa-helper.c
+++ libvirt-5.6.0/src/security/virt-aa-helper.c
@@ -506,7 +506,8 @@ valid_path(const char *path, const bool
         "/usr/share/ovmf/",              /* for OVMF images */
         "/usr/share/AAVMF/",             /* for AAVMF images */
--- 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-5.5.0/src/qemu/qemu.conf
+Index: libvirt-5.6.0/src/qemu/qemu.conf
 ===================================================================
--- libvirt-5.5.0.orig/src/qemu/qemu.conf
-+++ libvirt-5.5.0/src/qemu/qemu.conf
-@@ -420,11 +420,20 @@
+--- libvirt-5.6.0.orig/src/qemu/qemu.conf
+++ libvirt-5.6.0/src/qemu/qemu.conf
+@@ -420,10 +420,19 @@
 # isolation, but it cannot appear in a list of drivers.
 #
 #security_driver = "selinux"
@ -20,7 +20,6 @@ Index: libvirt-5.5.0/src/qemu/qemu.conf
 # If set to non-zero, then the default security labeling
 # will make guests confined. If set to zero, then guests
 -# will be unconfined by default. Defaults to 1.
-#security_default_confined = 1
 +# will be unconfined by default. Defaults to 0.
 +#
 +# SUSE Note:
@ -30,11 +29,10 @@ Index: libvirt-5.5.0/src/qemu/qemu.conf
 +# instances.  Change this to a non-zero value to enable default
 +# Apparmor confinement of qemu instances.
 +#
-+security_default_confined = 0
+ #security_default_confined = 1
 
 # If set to non-zero, then attempts to create unconfined
- # guests will be blocked. Defaults to 0.
-@@ -655,11 +664,22 @@
+@@ -670,11 +679,22 @@
 #relaxed_acs_check = 1
 
 
@ -62,3 +60,16 @@ Index: libvirt-5.5.0/src/qemu/qemu.conf
 #
 #lock_manager = "lockd"
 
+Index: libvirt-5.6.0/src/qemu/qemu_conf.c
+===================================================================
+--- libvirt-5.6.0.orig/src/qemu/qemu_conf.c
+++ libvirt-5.6.0/src/qemu/qemu_conf.c
+@@ -287,7 +287,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf
+ 
+     cfg->clearEmulatorCapabilities = true;
+ 
+-    cfg->securityDefaultConfined = true;
+    cfg->securityDefaultConfined = false;
+     cfg->securityRequireConfined = false;
+ 
+     cfg->keepAliveInterval = 5;
--- 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.5.0/src/locking/virtlockd.sysconf
+Index: libvirt-5.6.0/src/locking/virtlockd.sysconf
 ===================================================================
--- libvirt-5.5.0.orig/src/locking/virtlockd.sysconf
-+++ libvirt-5.5.0/src/locking/virtlockd.sysconf
+--- libvirt-5.6.0.orig/src/locking/virtlockd.sysconf
+++ libvirt-5.6.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.5.0/src/logging/virtlogd.sysconf
+Index: libvirt-5.6.0/src/logging/virtlogd.sysconf
 ===================================================================
--- libvirt-5.5.0.orig/src/logging/virtlogd.sysconf
-+++ libvirt-5.5.0/src/logging/virtlogd.sysconf
+--- libvirt-5.6.0.orig/src/logging/virtlogd.sysconf
+++ libvirt-5.6.0/src/logging/virtlogd.sysconf
@@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlogd
 +
--- a/virt-create-rootfs.patch
+++ b/virt-create-rootfs.patch
@ -1,7 +1,7 @@
-Index: libvirt-5.3.0/tools/Makefile.am
+Index: libvirt-5.6.0/tools/Makefile.am
 ===================================================================
--- libvirt-5.3.0.orig/tools/Makefile.am
-+++ libvirt-5.3.0/tools/Makefile.am
+--- libvirt-5.6.0.orig/tools/Makefile.am
+++ libvirt-5.6.0/tools/Makefile.am
@@ -52,6 +52,7 @@ PODFILES = \
 	virt-sanlock-cleanup.pod \
 	virt-xml-validate.pod \
@ -28,10 +28,10 @@ Index: libvirt-5.3.0/tools/Makefile.am
 virt-xml-validate: virt-xml-validate.in Makefile
 	$(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|g' \
 		       -e 's|[@]VERSION@|$(VERSION)|g' \
-Index: libvirt-5.3.0/tools/virt-create-rootfs
+Index: libvirt-5.6.0/tools/virt-create-rootfs
 ===================================================================
 --- /dev/null
-+++ libvirt-5.3.0/tools/virt-create-rootfs
+++ libvirt-5.6.0/tools/virt-create-rootfs
@@ -0,0 +1,214 @@
 +#!/bin/sh
 +set -e
@ -247,10 +247,10 @@ Index: libvirt-5.3.0/tools/virt-create-rootfs
 +    echo "pts/0" >> "$ROOT/etc/securetty"
 +    chroot "$ROOT" /usr/bin/passwd
 +fi
-Index: libvirt-5.3.0/tools/virt-create-rootfs.pod
+Index: libvirt-5.6.0/tools/virt-create-rootfs.pod
 ===================================================================
 --- /dev/null
-+++ libvirt-5.3.0/tools/virt-create-rootfs.pod
+++ libvirt-5.6.0/tools/virt-create-rootfs.pod
@@ -0,0 +1,77 @@
 +=head1 NAME
 +
--- a/xen-pv-cdrom.patch
+++ b/xen-pv-cdrom.patch
@ -1,21 +0,0 @@
-Index: libvirt-5.5.0/src/xenconfig/xen_sxpr.c
-===================================================================
--- libvirt-5.5.0.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-5.5.0/src/xenconfig/xen_sxpr.c
-@@ -383,7 +383,7 @@ xenParseSxprVifRate(const char *rate, un
- static int
- xenParseSxprDisks(virDomainDefPtr def,
-                   const struct sexpr *root,
-                  int hvm)
-+                  int hvm ATTRIBUTE_UNUSED)
- {
-     const struct sexpr *cur, *node;
-     virDomainDiskDefPtr disk = NULL;
-@@ -433,7 +433,6 @@ xenParseSxprDisks(virDomainDefPtr def,
-                 /* There is a case without the uname to the CD-ROM device */
-                 offset = strchr(dst, ':');
-                 if (!offset ||
-                    !hvm ||
-                     STRNEQ(offset, ":cdrom")) {
-                     virReportError(VIR_ERR_INTERNAL_ERROR,
-                                    "%s", _("domain information incomplete, vbd has no src"));
--- a/xen-sxpr-disk-type.patch
+++ b/xen-sxpr-disk-type.patch
@ -1,26 +0,0 @@
-xen_sxpr: set disk type to BLOCK when driver is not tap or file
-
-When parsing disk s-expression to virDomainDiskDef structure, explicitly
-set type to VIR_STORAGE_TYPE_BLOCK for all drivers except 'tap', 'tap2',
-and 'file'. This was implicitly done prior to commit 9673418c.
-
-https://bugzilla.suse.com/show_bug.cgi?id=938228
-
-Index: libvirt-5.5.0/src/xenconfig/xen_sxpr.c
-===================================================================
--- libvirt-5.5.0.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-5.5.0/src/xenconfig/xen_sxpr.c
-@@ -497,10 +497,11 @@ xenParseSxprDisks(virDomainDefPtr def,
-                        omnipotent, we can revisit this, perhaps stat()'ing
-                        the src file in question */
-                     virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
-                } else if (STREQ(virDomainDiskGetDriver(disk), "phy")) {
-                    virDomainDiskSetType(disk, VIR_STORAGE_TYPE_BLOCK);
-                 } else if (STREQ(virDomainDiskGetDriver(disk), "file")) {
-                     virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
-+                } else {
-+                    /* Set type to BLOCK for drivers != {tap,tap2,file} */
-+                    virDomainDiskSetType(disk, VIR_STORAGE_TYPE_BLOCK);
-                 }
-             } else {
-                 /* No CDROM media so can't really tell. We'll just