Accepting request 627773 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/627773 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=263
2018-08-07 08:50:36 +00:00 · 2018-08-07 08:50:36 +00:00 · 4156a65d46
commit 4156a65d46
parent e963a5da56 145c421e41
35 changed files with 294 additions and 221 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-4.5.0/src/conf/domain_stats.c
+Index: libvirt-4.6.0/src/conf/domain_stats.c
 ===================================================================
 --- /dev/null
-+++ libvirt-4.5.0/src/conf/domain_stats.c
+++ libvirt-4.6.0/src/conf/domain_stats.c
@@ -0,0 +1,139 @@
 +/*
 + * domain_stats.c: domain stats extraction helpers
@ -162,10 +162,10 @@ Index: libvirt-4.5.0/src/conf/domain_stats.c
 +}
 +
 +#undef STATS_ADD_NET_PARAM
-Index: libvirt-4.5.0/src/conf/domain_stats.h
+Index: libvirt-4.6.0/src/conf/domain_stats.h
 ===================================================================
 --- /dev/null
-+++ libvirt-4.5.0/src/conf/domain_stats.h
+++ libvirt-4.6.0/src/conf/domain_stats.h
@@ -0,0 +1,64 @@
 +/*
 + * domain_stats.h: domain stats extraction helpers
@ -231,11 +231,11 @@ Index: libvirt-4.5.0/src/conf/domain_stats.h
 +                               int *maxparams);
 +
 +#endif /* __DOMAIN_STATS_H */
-Index: libvirt-4.5.0/src/libvirt_private.syms
+Index: libvirt-4.6.0/src/libvirt_private.syms
 ===================================================================
--- libvirt-4.5.0.orig/src/libvirt_private.syms
-+++ libvirt-4.5.0/src/libvirt_private.syms
-@@ -654,6 +654,9 @@ virDomainConfNWFilterInstantiate;
+--- libvirt-4.6.0.orig/src/libvirt_private.syms
+++ libvirt-4.6.0/src/libvirt_private.syms
+@@ -647,6 +647,9 @@ virDomainConfNWFilterInstantiate;
 virDomainConfNWFilterTeardown;
 virDomainConfVMNWFilterTeardown;
 
@ -245,7 +245,7 @@ Index: libvirt-4.5.0/src/libvirt_private.syms
 
 # conf/interface_conf.h
 virInterfaceDefFormat;
-@@ -1543,6 +1546,7 @@ virCgroupGetMemoryUsage;
+@@ -1537,6 +1540,7 @@ virCgroupGetMemoryUsage;
 virCgroupGetMemSwapHardLimit;
 virCgroupGetMemSwapUsage;
 virCgroupGetPercpuStats;
@ -253,10 +253,10 @@ Index: libvirt-4.5.0/src/libvirt_private.syms
 virCgroupHasController;
 virCgroupHasEmptyTasks;
 virCgroupKill;
-Index: libvirt-4.5.0/src/qemu/qemu_driver.c
+Index: libvirt-4.6.0/src/qemu/qemu_driver.c
 ===================================================================
--- libvirt-4.5.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-4.5.0/src/qemu/qemu_driver.c
+--- libvirt-4.6.0.orig/src/qemu/qemu_driver.c
+++ libvirt-4.6.0/src/qemu/qemu_driver.c
@@ -74,6 +74,7 @@
 #include "virarptable.h"
 #include "viruuid.h"
@ -265,7 +265,7 @@ Index: libvirt-4.5.0/src/qemu/qemu_driver.c
 #include "domain_audit.h"
 #include "node_device_conf.h"
 #include "virpci.h"
-@@ -19670,21 +19671,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
+@@ -19597,21 +19598,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
                         int *maxparams,
                         unsigned int privflags ATTRIBUTE_UNUSED)
 {
@ -288,7 +288,7 @@ Index: libvirt-4.5.0/src/qemu/qemu_driver.c
 }
 
 
-@@ -19707,37 +19694,7 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr d
+@@ -19634,37 +19621,7 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr d
                       unsigned int privflags ATTRIBUTE_UNUSED)
 {
     qemuDomainObjPrivatePtr priv = dom->privateData;
@ -327,7 +327,7 @@ Index: libvirt-4.5.0/src/qemu/qemu_driver.c
 }
 
 static int
-@@ -19916,44 +19873,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
+@@ -19844,44 +19801,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
     return ret;
 }
 
@ -372,7 +372,7 @@ Index: libvirt-4.5.0/src/qemu/qemu_driver.c
 static int
 qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
                             virDomainObjPtr dom,
-@@ -19961,68 +19880,9 @@ qemuDomainGetStatsInterface(virQEMUDrive
+@@ -19889,68 +19808,9 @@ qemuDomainGetStatsInterface(virQEMUDrive
                             int *maxparams,
                             unsigned int privflags ATTRIBUTE_UNUSED)
 {
@ -442,7 +442,7 @@ Index: libvirt-4.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]; \
-@@ -20144,10 +20004,10 @@ qemuDomainGetStatsOneBlock(virQEMUDriver
+@@ -20072,10 +19932,10 @@ qemuDomainGetStatsOneBlock(virQEMUDriver
     if (disk->info.alias)
         alias = qemuDomainStorageAlias(disk->info.alias, backing_idx);
 
@ -455,7 +455,7 @@ Index: libvirt-4.5.0/src/qemu/qemu_driver.c
                             block_idx, src->path);
     if (backing_idx)
         QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, block_idx, "backingIndex",
-@@ -20263,7 +20123,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
+@@ -20191,7 +20051,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-4.5.0/src/qemu/qemu_driver.c
 
     for (i = 0; i < dom->def->ndisks; i++) {
         virDomainDiskDefPtr disk = dom->def->disks[i];
-@@ -20297,10 +20157,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
+@@ -20225,10 +20085,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
 
 #undef QEMU_ADD_BLOCK_PARAM_ULL
 
@ -475,11 +475,11 @@ Index: libvirt-4.5.0/src/qemu/qemu_driver.c
 static int
 qemuDomainGetStatsPerfOneEvent(virPerfPtr perf,
                                virPerfEventType type,
-Index: libvirt-4.5.0/src/util/vircgroup.c
+Index: libvirt-4.6.0/src/util/vircgroup.c
 ===================================================================
--- libvirt-4.5.0.orig/src/util/vircgroup.c
-+++ libvirt-4.5.0/src/util/vircgroup.c
-@@ -4122,6 +4122,44 @@ virCgroupControllerAvailable(int control
+--- libvirt-4.6.0.orig/src/util/vircgroup.c
+++ libvirt-4.6.0/src/util/vircgroup.c
+@@ -3956,6 +3956,44 @@ virCgroupControllerAvailable(int control
     return ret;
 }
 
@ -524,7 +524,7 @@ Index: libvirt-4.5.0/src/util/vircgroup.c
 #else /* !VIR_CGROUP_SUPPORTED */
 
 bool
-@@ -4899,6 +4937,14 @@ virCgroupControllerAvailable(int control
+@@ -4733,6 +4771,14 @@ virCgroupControllerAvailable(int control
 {
     return false;
 }
@ -539,11 +539,11 @@ Index: libvirt-4.5.0/src/util/vircgroup.c
 #endif /* !VIR_CGROUP_SUPPORTED */
 
 
-Index: libvirt-4.5.0/src/util/vircgroup.h
+Index: libvirt-4.6.0/src/util/vircgroup.h
 ===================================================================
--- libvirt-4.5.0.orig/src/util/vircgroup.h
-+++ libvirt-4.5.0/src/util/vircgroup.h
-@@ -297,4 +297,8 @@ int virCgroupSetOwner(virCgroupPtr cgrou
+--- libvirt-4.6.0.orig/src/util/vircgroup.h
+++ libvirt-4.6.0/src/util/vircgroup.h
+@@ -297,4 +297,9 @@ int virCgroupSetOwner(virCgroupPtr cgrou
 int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller);
 
 bool virCgroupControllerAvailable(int controller);
@ -551,11 +551,12 @@ Index: libvirt-4.5.0/src/util/vircgroup.h
 +int virCgroupGetStatsCpu(virCgroupPtr cgroup,
 +                         virDomainStatsRecordPtr record,
 +                         int *maxparams);
+
 #endif /* __VIR_CGROUP_H__ */
-Index: libvirt-4.5.0/src/conf/Makefile.inc.am
+Index: libvirt-4.6.0/src/conf/Makefile.inc.am
 ===================================================================
--- libvirt-4.5.0.orig/src/conf/Makefile.inc.am
-+++ libvirt-4.5.0/src/conf/Makefile.inc.am
+--- libvirt-4.6.0.orig/src/conf/Makefile.inc.am
+++ libvirt-4.6.0/src/conf/Makefile.inc.am
@@ -20,6 +20,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,10 +19,10 @@ reworking this patch and submitting it to upstream libvirt.
 src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

-Index: libvirt-4.5.0/src/libxl/libxl_driver.c
+Index: libvirt-4.6.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-4.5.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-4.5.0/src/libxl/libxl_driver.c
+--- libvirt-4.6.0.orig/src/libxl/libxl_driver.c
+++ libvirt-4.6.0/src/libxl/libxl_driver.c
@@ -5119,6 +5119,97 @@ libxlDomainMemoryStats(virDomainPtr dom,
 
 #undef LIBXL_SET_MEMSTAT
--- 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-4.5.0/src/lxc/lxc_driver.c
+Index: libvirt-4.6.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-4.5.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-4.5.0/src/lxc/lxc_driver.c
+--- libvirt-4.6.0.orig/src/lxc/lxc_driver.c
+++ libvirt-4.6.0/src/lxc/lxc_driver.c
@@ -79,6 +79,7 @@
 #include "viraccessapichecklxc.h"
 #include "virhostdev.h"
@ -21,7 +21,7 @@ Index: libvirt-4.5.0/src/lxc/lxc_driver.c
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
-@@ -5444,6 +5445,142 @@ lxcDomainHasManagedSaveImage(virDomainPt
+@@ -5411,6 +5412,142 @@ lxcDomainHasManagedSaveImage(virDomainPt
     return ret;
 }
 
@ -164,7 +164,7 @@ Index: libvirt-4.5.0/src/lxc/lxc_driver.c
 
 /* Function Tables */
 static virHypervisorDriver lxcHypervisorDriver = {
-@@ -5539,6 +5676,7 @@ static virHypervisorDriver lxcHypervisor
+@@ -5506,6 +5643,7 @@ static virHypervisorDriver lxcHypervisor
     .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */
     .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */
     .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */
--- a/apparmor-no-mount.patch
+++ b/apparmor-no-mount.patch
@ -1,7 +1,7 @@
-Index: libvirt-4.5.0/examples/apparmor/libvirt-lxc
+Index: libvirt-4.6.0/examples/apparmor/libvirt-lxc
 ===================================================================
--- libvirt-4.5.0.orig/examples/apparmor/libvirt-lxc
-+++ libvirt-4.5.0/examples/apparmor/libvirt-lxc
+--- libvirt-4.6.0.orig/examples/apparmor/libvirt-lxc
+++ libvirt-4.6.0/examples/apparmor/libvirt-lxc
@@ -2,39 +2,15 @@
 
   #include <abstractions/base>
--- 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-4.5.0/src/qemu/qemu_driver.c
+Index: libvirt-4.6.0/src/qemu/qemu_driver.c
 ===================================================================
--- libvirt-4.5.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-4.5.0/src/qemu/qemu_driver.c
-@@ -17559,6 +17559,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt
+--- libvirt-4.6.0.orig/src/qemu/qemu_driver.c
+++ libvirt-4.6.0/src/qemu/qemu_driver.c
+@@ -17484,6 +17484,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt
         goto endjob;
     }
 
--- a/libvirt-4.5.0.tar.xz
+++ b/libvirt-4.5.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7e95edc0ca553046761ed55a8d01a06a3a3a4238bbeaedb3ba34680a277ab09
-size 14743956
--- a/libvirt-4.5.0.tar.xz.asc
+++ b/libvirt-4.5.0.tar.xz.asc
@ -1,10 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQEcBAABAgAGBQJbOofKAAoJEBVYiyZZa+pdmh8IAI3FmofnsjIeMZ7I53BgUz56
-BVYmffWOTlEVv2gBilhTxZkCbUyc7kCA8eHdgdGHpDR/ED1r/8QixSXUzpG7pCys
-nqw4BHsOPqjO7+gL37h6bMjNhqjuqSsxthcH4xpiXiGBmCFU8/6kCeIiua5LF5zp
-sMq/YKOqxziV8+3hCweb95NtR8Q/zge35IDpXaPHMnbSoAFUDEJEGaI80G/PJxjn
-Ocmv1PP7gZhf0blcTFbEk4ee5u19cTh2wf22Q19TzcbT6ZPLRxz2dNNNUUGKlJQu
-o1P/mU5D9PgoAlcXyl0OrapyDK+f5qKaK4SZLRuEsS+on6nsjPssgdlVo5M9xYA=
-=cVCB
-----END PGP SIGNATURE-----
--- a/libvirt-4.6.0.tar.xz
+++ b/libvirt-4.6.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b4ac6cd1825d89b9bbafff53f6308f1ac292a44d78eee67bebe01973e2574066
+size 14760064
--- a/libvirt-4.6.0.tar.xz.asc
+++ b/libvirt-4.6.0.tar.xz.asc
@ -0,0 +1,10 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEcBAABAgAGBQJbaBZOAAoJEBVYiyZZa+pdHE0H/0RkvhipAOBDymXtIpZyh2tJ
+m5mLcet12U0b179AsI1BdTVq3/fMgIww+KAd/l823hDd5E2dpUj68vd+n6UFNwU5
+05go+M7mFuzyZg+iSvfs2YGNeFvmdWGYnPqQdhg984mgnPHgciIG+fIQK8m/ayKy
+5coETDRp7GjeNX8Cw9Ll8VdgMk79OoS+dRZ+pMKEALyoIrY4IKbXI0vvQsF1hkLg
+zqmZlHAkwDkONfvrreMXQkjvOd5RVMzXy3mg1pDOdzH8SXusReBHe17uV914n/w3
+xL/tqkZKvnzYRAVeaYnyfxpCtImOwlmsDpCIYSUQa2VpylOVm/I1JJTPi58qTDs=
+=fejE
+-----END PGP SIGNATURE-----
--- a/libvirt-power8-models.patch
+++ b/libvirt-power8-models.patch
@ -2,11 +2,11 @@ Add POWER8 v2.0 and v2.1 to cpu map XML

 From: <ro@suse.de>

-Index: libvirt-4.5.0/src/cpu/cpu_map.xml
+Index: libvirt-4.6.0/src/cpu/cpu_map.xml
 ===================================================================
--- libvirt-4.5.0.orig/src/cpu/cpu_map.xml
-+++ libvirt-4.5.0/src/cpu/cpu_map.xml
-@@ -2355,6 +2355,8 @@
+--- libvirt-4.6.0.orig/src/cpu/cpu_map.xml
+++ libvirt-4.6.0/src/cpu/cpu_map.xml
+@@ -2361,6 +2361,8 @@
       <pvr value='0x004b0000' mask='0xffff0000'/>
       <pvr value='0x004c0000' mask='0xffff0000'/>
       <pvr value='0x004d0000' mask='0xffff0000'/>
--- a/libvirt-suse-netcontrol.patch
+++ b/libvirt-suse-netcontrol.patch
@ -1,8 +1,8 @@
-Index: libvirt-4.5.0/configure.ac
+Index: libvirt-4.6.0/configure.ac
 ===================================================================
--- libvirt-4.5.0.orig/configure.ac
-+++ libvirt-4.5.0/configure.ac
-@@ -255,6 +255,7 @@ LIBVIRT_ARG_LIBSSH
+--- libvirt-4.6.0.orig/configure.ac
+++ libvirt-4.6.0/configure.ac
+@@ -256,6 +256,7 @@ LIBVIRT_ARG_LIBSSH
 LIBVIRT_ARG_LIBXML
 LIBVIRT_ARG_MACVTAP
 LIBVIRT_ARG_NETCF
@ -10,7 +10,7 @@ Index: libvirt-4.5.0/configure.ac
 LIBVIRT_ARG_NLS
 LIBVIRT_ARG_NSS
 LIBVIRT_ARG_NUMACTL
-@@ -297,6 +298,7 @@ LIBVIRT_CHECK_LIBSSH
+@@ -299,6 +300,7 @@ LIBVIRT_CHECK_LIBSSH
 LIBVIRT_CHECK_LIBXML
 LIBVIRT_CHECK_MACVTAP
 LIBVIRT_CHECK_NETCF
@ -18,7 +18,7 @@ Index: libvirt-4.5.0/configure.ac
 LIBVIRT_CHECK_NLS
 LIBVIRT_CHECK_NUMACTL
 LIBVIRT_CHECK_NWFILTER
-@@ -970,6 +972,7 @@ LIBVIRT_RESULT_LIBXL
+@@ -980,6 +982,7 @@ LIBVIRT_RESULT_LIBXL
 LIBVIRT_RESULT_LIBXML
 LIBVIRT_RESULT_MACVTAP
 LIBVIRT_RESULT_NETCF
@ -26,10 +26,10 @@ Index: libvirt-4.5.0/configure.ac
 LIBVIRT_RESULT_NLS
 LIBVIRT_RESULT_NSS
 LIBVIRT_RESULT_NUMACTL
-Index: libvirt-4.5.0/tools/virsh.c
+Index: libvirt-4.6.0/tools/virsh.c
 ===================================================================
--- libvirt-4.5.0.orig/tools/virsh.c
-+++ libvirt-4.5.0/tools/virsh.c
+--- libvirt-4.6.0.orig/tools/virsh.c
+++ libvirt-4.6.0/tools/virsh.c
@@ -575,6 +575,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
     vshPrint(ctl, " Interface");
 # if defined(WITH_NETCF)
@ -39,10 +39,10 @@ Index: libvirt-4.5.0/tools/virsh.c
 # elif defined(WITH_UDEV)
     vshPrint(ctl, " udev");
 # endif
-Index: libvirt-4.5.0/src/interface/interface_backend_netcf.c
+Index: libvirt-4.6.0/src/interface/interface_backend_netcf.c
 ===================================================================
--- libvirt-4.5.0.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-4.5.0/src/interface/interface_backend_netcf.c
+--- libvirt-4.6.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-4.6.0/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@
 
 #include <config.h>
@ -126,10 +126,10 @@ Index: libvirt-4.5.0/src/interface/interface_backend_netcf.c
     if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
         return -1;
     if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
-Index: libvirt-4.5.0/src/interface/interface_driver.c
+Index: libvirt-4.6.0/src/interface/interface_driver.c
 ===================================================================
--- libvirt-4.5.0.orig/src/interface/interface_driver.c
-+++ libvirt-4.5.0/src/interface/interface_driver.c
+--- libvirt-4.6.0.orig/src/interface/interface_driver.c
+++ libvirt-4.6.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
     if (netcfIfaceRegister() == 0)
         return 0;
@ -147,10 +147,10 @@ Index: libvirt-4.5.0/src/interface/interface_driver.c
     if (udevIfaceRegister() == 0)
         return 0;
 #endif /* WITH_UDEV */
-Index: libvirt-4.5.0/m4/virt-netcontrol.m4
+Index: libvirt-4.6.0/m4/virt-netcontrol.m4
 ===================================================================
 --- /dev/null
-+++ libvirt-4.5.0/m4/virt-netcontrol.m4
+++ libvirt-4.6.0/m4/virt-netcontrol.m4
@@ -0,0 +1,39 @@
 +dnl The libnetcontrol library
 +dnl
@ -191,10 +191,10 @@ Index: libvirt-4.5.0/m4/virt-netcontrol.m4
 +AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[
 +  LIBVIRT_RESULT_LIB([NETCONTROL])
 +])
-Index: libvirt-4.5.0/src/interface/Makefile.inc.am
+Index: libvirt-4.6.0/src/interface/Makefile.inc.am
 ===================================================================
--- libvirt-4.5.0.orig/src/interface/Makefile.inc.am
-+++ libvirt-4.5.0/src/interface/Makefile.inc.am
+--- libvirt-4.6.0.orig/src/interface/Makefile.inc.am
+++ libvirt-4.6.0/src/interface/Makefile.inc.am
@@ -4,6 +4,7 @@ INTERFACE_DRIVER_SOURCES = \
 	$(NULL)
 
--- a/libvirt.changes
+++ b/libvirt.changes
@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Mon Aug  6 16:38:32 UTC 2018 - jfehlig@suse.com
+
+- Update to libvirt 4.6.0
+  - Many incremental improvements and bug fixes, see
+    http://libvirt.org/news.html
+  - Switch from yajl to jansson
+  - Dropped patches:
+    libvirt-4.5.0-apparmor-add-missing-comma.patch
+  - Patches added to fix upstream bugs:
+    temp-build-fix.patch
+
+-------------------------------------------------------------------
+Fri Aug  3 09:31:55 UTC 2018 - antoine.belvire@opensuse.org
+
+- Fix apparmor failure at startup because of syntax error in
+  libvirt profile:
+  * Add libvirt-4.5.0-apparmor-add-missing-comma.patch (picked
+    from upstream).
+
 -------------------------------------------------------------------
 Thu Jul  5 16:25:57 UTC 2018 - jfehlig@suse.com

--- a/libvirt.spec
+++ b/libvirt.spec
@ -48,7 +48,6 @@
 %define with_libssh2       0%{!?_without_libssh2:1}

 # A few optional bits off by default, we enable later
-%define with_cgconfig      0%{!?_without_cgconfig:0}
 %define with_numactl       0%{!?_without_numactl:0}
 %define with_numad         0%{!?_without_numad:0}
 %define with_firewalld     0%{!?_without_firewalld:0}
@ -167,11 +166,6 @@
 %define qemu_user          qemu
 %define qemu_group         qemu

-# Pull in cgroups config system
-%if %{with_qemu} || %{with_lxc}
-    %define with_cgconfig  0%{!?_without_cgconfig:1}
-%endif
-
 %if %{with_firewalld}
    %define _fwdefdir %{_prefix}/lib/firewalld/services
 %else
@ -184,7 +178,7 @@

 Name:           libvirt
 Url:            http://libvirt.org/
-Version:        4.5.0
+Version:        4.6.0
 Release:        0
 Summary:        Library providing a simple virtualization API
 License:        LGPL-2.1-or-later
@ -253,9 +247,9 @@ BuildRequires:  readline-devel
 BuildRequires:  perl(XML::XPath)
 # For pool-build probing for existing pools
 BuildRequires:  libblkid-devel >= 2.17
+BuildRequires:  libjansson-devel
 BuildRequires:  libpciaccess0-devel >= 0.10.9
 BuildRequires:  libudev-devel >= 145
-BuildRequires:  libyajl-devel
 %if %{with_sanlock}
 BuildRequires:  sanlock-devel >= 2.4
 %endif
@ -270,12 +264,11 @@ BuildRequires:  libtirpc-devel
 BuildRequires:  apparmor-rpm-macros
 BuildRequires:  libapparmor-devel
 %endif
-BuildRequires:  dnsmasq >= 2.41
-BuildRequires:  iptables
-# TODO BuildRequires:  iptables-ipv6
 BuildRequires:  cyrus-sasl-devel
+BuildRequires:  dnsmasq >= 2.41
 BuildRequires:  ebtables
-BuildRequires:  polkit >= 0.93
+BuildRequires:  iptables
+BuildRequires:  polkit >= 0.112
 BuildRequires:  radvd
 # For mount/umount in FS driver
 BuildRequires:  util-linux
@ -348,6 +341,7 @@ 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
+Patch159:       temp-build-fix.patch
 # Our patches
 Patch200:       suse-libvirtd-disable-tls.patch
 Patch201:       suse-libvirtd-sysconfig-settings.patch
@ -403,7 +397,7 @@ Requires:       modutils
 Requires:       iproute
 Requires:       logrotate
 Requires:       udev >= 145
-Recommends:     polkit >= 0.93
+Recommends:     polkit >= 0.112
 %ifarch i386 i586 i686 x86_64 ia64
 # For virConnectGetSysinfo
 Requires:       dmidecode
@ -462,10 +456,10 @@ cleaning guest network traffic.
 %package daemon-driver-network
 Summary:        Network driver plugin for the libvirtd daemon
 Group:          Development/Libraries/C and C++
+Requires:       %{name}-daemon = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 Requires:       dnsmasq >= 2.41
 Requires:       iptables
-# TODO Requires:       iptables-ipv6
-Requires:       %{name}-daemon = %{version}-%{release}
 Requires:       radvd

 %description daemon-driver-network
@ -476,10 +470,10 @@ bridge capabilities.
 %package daemon-driver-nwfilter
 Summary:        A nwfilter driver plugin for the libvirtd daemon
 Group:          Development/Libraries/C and C++
+Requires:       %{name}-daemon = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 Requires:       ebtables
 Requires:       iptables
-# TODO Requires:       iptables-ipv6
-Requires:       %{name}-daemon = %{version}-%{release}

 %description daemon-driver-nwfilter
 The nwfilter driver plugin for the libvirtd daemon, providing
@ -490,6 +484,7 @@ iptables and ip6tables capabilities
 Summary:        Nodedev driver plugin for the libvirtd daemon
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-daemon = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}

 %description daemon-driver-nodedev
 The nodedev driver plugin for the libvirtd daemon, providing
@ -500,6 +495,7 @@ capabilities.
 Summary:        Interface driver plugin for the libvirtd daemon
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-daemon = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}

 %description daemon-driver-interface
 The interface driver plugin for the libvirtd daemon, providing
@ -519,6 +515,7 @@ an implementation of the secret key APIs.
 Summary:        Storage driver plugin including base backends for the libvirtd daemon
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-daemon = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 Requires:       nfs-utils
 # For mkfs
 Requires:       util-linux
@ -536,6 +533,7 @@ iSCSI, and multipath storage.
 Summary:        Storage driver plugin for lvm volumes
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 Requires:       lvm2

 %description daemon-driver-storage-logical
@ -557,6 +555,7 @@ volumes using the host disks.
 Summary:        Storage driver plugin for local scsi devices
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}

 %description daemon-driver-storage-scsi
 The storage driver backend adding implementation of the storage APIs for scsi
@ -566,6 +565,7 @@ host devices.
 Summary:        Storage driver plugin for iscsi
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 Requires:       open-iscsi

 %description daemon-driver-storage-iscsi
@ -576,6 +576,7 @@ volumes using the host iscsi stack.
 Summary:        Storage driver plugin for multipath volumes
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 Requires:       device-mapper

 %description daemon-driver-storage-mpath
@ -588,6 +589,7 @@ multipath storage using device mapper.
 Summary:        Storage driver plugin for gluster
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}

 %description daemon-driver-storage-gluster
 The storage driver backend adding implementation of the storage APIs for gluster
@ -599,6 +601,7 @@ volumes using libgfapi.
 Summary:        Storage driver plugin for rbd
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}

 %description daemon-driver-storage-rbd
 The storage driver backend adding implementation of the storage APIs for rbd
@ -610,6 +613,7 @@ volumes using the ceph protocol.
 Summary:        Storage driver plugin for sheepdog
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 Requires:       sheepdog

 %description daemon-driver-storage-sheepdog
@ -647,6 +651,7 @@ parted and more.
 Summary:        Qemu driver plugin for the libvirtd daemon
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-daemon = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 # There really is a hard cross-driver dependency here
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}
 Requires:       %{name}-daemon-driver-storage-core = %{version}-%{release}
@ -669,6 +674,7 @@ an implementation of the hypervisor driver APIs using QEMU.
 Summary:        LXC driver plugin for the libvirtd daemon
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-daemon = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 # There really is a hard cross-driver dependency here
 Requires:       %{name}-daemon-driver-network = %{version}-%{release}

@ -684,6 +690,7 @@ the Linux kernel
 Summary:        Uml driver plugin for the libvirtd daemon
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-daemon = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}

 %description daemon-driver-uml
 The UML driver plugin for the libvirtd daemon, providing
@ -697,6 +704,7 @@ User Mode Linux
 Summary:        VirtualBox driver plugin for the libvirtd daemon
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-daemon = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}

 %description daemon-driver-vbox
 The vbox driver plugin for the libvirtd daemon, providing
@ -710,6 +718,7 @@ VirtualBox
 Summary:        Libxl driver plugin for the libvirtd daemon
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-daemon = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}

 %description daemon-driver-libxl
 The Libxl driver plugin for the libvirtd daemon, providing
@ -830,6 +839,8 @@ Requires:       gettext-runtime
 # Needed by virt-pki-validate script.
 Requires:       cyrus-sasl
 Requires:       gnutls
+# We dlopen(libjansson.so.4), so need an explicit dep
+Requires:       libjansson4
 %if %{with_bash_completion}
 Requires:       %{name}-bash-completion = %{version}-%{release}
 %endif
@ -931,6 +942,7 @@ libvirt plugin for NSS for translating domain names into IP addresses.
 %patch156 -p1
 %patch157 -p1
 %patch158 -p1
+%patch159 -p1
 %patch200 -p1
 %patch201 -p1
 %patch202 -p1
@ -1112,7 +1124,7 @@ export PYTHON=%{_bindir}/python3
           %{?arg_apparmor} \
           %{?arg_apparmor_profiles} \
           --with-udev \
-           --with-yajl \
+           --with-jansson \
           %{?arg_sanlock} \
           --with-libpcap \
           --with-macvtap \
--- a/libxl-dom-reset.patch
+++ b/libxl-dom-reset.patch
@ -8,10 +8,10 @@ Date:   Mon Jun 23 15:51:20 2014 -0600
    option, but domainReset can be implemented in the libxl driver by
    forcibly destroying the domain and starting it again.

-Index: libvirt-4.5.0/src/libxl/libxl_driver.c
+Index: libvirt-4.6.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-4.5.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-4.5.0/src/libxl/libxl_driver.c
+--- libvirt-4.6.0.orig/src/libxl/libxl_driver.c
+++ libvirt-4.6.0/src/libxl/libxl_driver.c
@@ -1344,6 +1344,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
 }
 
--- a/libxl-qemu-emulator-caps.patch
+++ b/libxl-qemu-emulator-caps.patch
@ -8,10 +8,10 @@ as the default <emulator>, instead of the qemu-xen one.

 See FATE#320638 for details.

-Index: libvirt-4.5.0/src/libxl/libxl_capabilities.c
+Index: libvirt-4.6.0/src/libxl/libxl_capabilities.c
 ===================================================================
--- libvirt-4.5.0.orig/src/libxl/libxl_capabilities.c
-+++ libvirt-4.5.0/src/libxl/libxl_capabilities.c
+--- libvirt-4.6.0.orig/src/libxl/libxl_capabilities.c
+++ libvirt-4.6.0/src/libxl/libxl_capabilities.c
@@ -38,6 +38,7 @@
 #include "libxl_capabilities.h"
 #include "cpu/cpu_x86.h"
--- 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-4.5.0/src/libxl/libxl_conf.c
+Index: libvirt-4.6.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-4.5.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-4.5.0/src/libxl/libxl_conf.c
+--- libvirt-4.6.0.orig/src/libxl/libxl_conf.c
+++ libvirt-4.6.0/src/libxl/libxl_conf.c
@@ -837,6 +837,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
 #endif
 }
--- a/libxl-set-migration-constraints.patch
+++ b/libxl-set-migration-constraints.patch
@ -16,11 +16,11 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 tools/virsh.pod                  |    8 ++++++++
 6 files changed, 125 insertions(+), 6 deletions(-)

-Index: libvirt-4.5.0/include/libvirt/libvirt-domain.h
+Index: libvirt-4.6.0/include/libvirt/libvirt-domain.h
 ===================================================================
--- libvirt-4.5.0.orig/include/libvirt/libvirt-domain.h
-+++ libvirt-4.5.0/include/libvirt/libvirt-domain.h
-@@ -1008,6 +1008,31 @@ typedef enum {
+--- libvirt-4.6.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-4.6.0/include/libvirt/libvirt-domain.h
+@@ -1015,6 +1015,31 @@ typedef enum {
  */
 # define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT  "auto_converge.increment"
 
@ -52,10 +52,10 @@ Index: libvirt-4.5.0/include/libvirt/libvirt-domain.h
 /* Domain migration. */
 virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
                                unsigned long flags, const char *dname,
-Index: libvirt-4.5.0/src/libxl/libxl_driver.c
+Index: libvirt-4.6.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-4.5.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-4.5.0/src/libxl/libxl_driver.c
+--- libvirt-4.6.0.orig/src/libxl/libxl_driver.c
+++ libvirt-4.6.0/src/libxl/libxl_driver.c
@@ -5985,6 +5985,9 @@ libxlDomainMigratePerform3Params(virDoma
     const char *dname = NULL;
     const char *uri = NULL;
@ -99,10 +99,10 @@ Index: libvirt-4.5.0/src/libxl/libxl_driver.c
             goto cleanup;
     }
 
-Index: libvirt-4.5.0/src/libxl/libxl_migration.c
+Index: libvirt-4.6.0/src/libxl/libxl_migration.c
 ===================================================================
--- libvirt-4.5.0.orig/src/libxl/libxl_migration.c
-+++ libvirt-4.5.0/src/libxl/libxl_migration.c
+--- libvirt-4.6.0.orig/src/libxl/libxl_migration.c
+++ libvirt-4.6.0/src/libxl/libxl_migration.c
@@ -353,18 +353,39 @@ libxlMigrateDstReceive(virNetSocketPtr s
 static int
 libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver,
@ -263,10 +263,10 @@ Index: libvirt-4.5.0/src/libxl/libxl_migration.c
     virObjectLock(vm);
 
     if (ret < 0)
-Index: libvirt-4.5.0/src/libxl/libxl_migration.h
+Index: libvirt-4.6.0/src/libxl/libxl_migration.h
 ===================================================================
--- libvirt-4.5.0.orig/src/libxl/libxl_migration.h
-+++ libvirt-4.5.0/src/libxl/libxl_migration.h
+--- libvirt-4.6.0.orig/src/libxl/libxl_migration.h
+++ libvirt-4.6.0/src/libxl/libxl_migration.h
@@ -39,6 +39,10 @@
     VIR_MIGRATE_PARAM_URI,              VIR_TYPED_PARAM_STRING, \
     VIR_MIGRATE_PARAM_DEST_NAME,        VIR_TYPED_PARAM_STRING, \
@ -311,11 +311,11 @@ Index: libvirt-4.5.0/src/libxl/libxl_migration.h
 
 virDomainPtr
 libxlDomainMigrationDstFinish(virConnectPtr dconn,
-Index: libvirt-4.5.0/tools/virsh-domain.c
+Index: libvirt-4.6.0/tools/virsh-domain.c
 ===================================================================
--- libvirt-4.5.0.orig/tools/virsh-domain.c
-+++ libvirt-4.5.0/tools/virsh-domain.c
-@@ -10328,6 +10328,22 @@ static const vshCmdOptDef opts_migrate[]
+--- libvirt-4.6.0.orig/tools/virsh-domain.c
+++ libvirt-4.6.0/tools/virsh-domain.c
+@@ -10425,6 +10425,22 @@ static const vshCmdOptDef opts_migrate[]
      .type = VSH_OT_BOOL,
      .help = N_("use TLS for migration")
     },
@ -338,7 +338,7 @@ Index: libvirt-4.5.0/tools/virsh-domain.c
     {.name = NULL}
 };
 
-@@ -10351,6 +10367,7 @@ doMigrate(void *opaque)
+@@ -10448,6 +10464,7 @@ doMigrate(void *opaque)
     unsigned long long ullOpt = 0;
     int rv;
     virConnectPtr dconn = data->dconn;
@ -346,7 +346,7 @@ Index: libvirt-4.5.0/tools/virsh-domain.c
 
     sigemptyset(&sigmask);
     sigaddset(&sigmask, SIGINT);
-@@ -10470,6 +10487,27 @@ doMigrate(void *opaque)
+@@ -10567,6 +10584,27 @@ doMigrate(void *opaque)
             goto save_error;
     }
 
@ -374,11 +374,11 @@ Index: libvirt-4.5.0/tools/virsh-domain.c
     if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0)
         goto out;
     if (opt) {
-Index: libvirt-4.5.0/tools/virsh.pod
+Index: libvirt-4.6.0/tools/virsh.pod
 ===================================================================
--- libvirt-4.5.0.orig/tools/virsh.pod
-+++ libvirt-4.5.0/tools/virsh.pod
-@@ -1932,6 +1932,14 @@ Providing I<--tls> causes the migration
+--- libvirt-4.6.0.orig/tools/virsh.pod
+++ libvirt-4.6.0/tools/virsh.pod
+@@ -1937,6 +1937,14 @@ Providing I<--tls> causes the migration
 the migration of the domain. Usage requires proper TLS setup for both source
 and target.
 
--- 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-4.5.0/src/libxl/libxl_conf.c
+Index: libvirt-4.6.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-4.5.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-4.5.0/src/libxl/libxl_conf.c
+--- libvirt-4.6.0.orig/src/libxl/libxl_conf.c
+++ libvirt-4.6.0/src/libxl/libxl_conf.c
@@ -837,6 +837,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-4.5.0/src/lxc/lxc_controller.c
+Index: libvirt-4.6.0/src/lxc/lxc_controller.c
 ===================================================================
--- libvirt-4.5.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-4.5.0/src/lxc/lxc_controller.c
+--- libvirt-4.6.0.orig/src/lxc/lxc_controller.c
+++ libvirt-4.6.0/src/lxc/lxc_controller.c
@@ -73,6 +73,7 @@
 #include "rpc/virnetdaemon.h"
 #include "virstring.h"
@ -33,10 +33,10 @@ Index: libvirt-4.5.0/src/lxc/lxc_controller.c
 
     return ret;
 }
-Index: libvirt-4.5.0/src/lxc/lxc_driver.c
+Index: libvirt-4.6.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-4.5.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-4.5.0/src/lxc/lxc_driver.c
+--- libvirt-4.6.0.orig/src/lxc/lxc_driver.c
+++ libvirt-4.6.0/src/lxc/lxc_driver.c
@@ -74,6 +74,7 @@
 #include "virtime.h"
 #include "virtypedparam.h"
@ -45,7 +45,7 @@ Index: libvirt-4.5.0/src/lxc/lxc_driver.c
 #include "virstring.h"
 #include "viraccessapicheck.h"
 #include "viraccessapichecklxc.h"
-@@ -3956,6 +3957,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
+@@ -3945,6 +3946,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-4.5.0/src/lxc/lxc_driver.c
             break;
 
         case VIR_DOMAIN_NET_TYPE_DIRECT:
-@@ -4399,6 +4401,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
+@@ -4388,6 +4390,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
             virDomainAuditNet(vm, detach, NULL, "detach", false);
             goto cleanup;
         }
@ -61,10 +61,10 @@ Index: libvirt-4.5.0/src/lxc/lxc_driver.c
         break;
 
         /* It'd be nice to support this, but with macvlan
-Index: libvirt-4.5.0/src/lxc/lxc_process.c
+Index: libvirt-4.6.0/src/lxc/lxc_process.c
 ===================================================================
--- libvirt-4.5.0.orig/src/lxc/lxc_process.c
-+++ libvirt-4.5.0/src/lxc/lxc_process.c
+--- libvirt-4.6.0.orig/src/lxc/lxc_process.c
+++ libvirt-4.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-4.5.0/src/network/bridge_driver.c
+Index: libvirt-4.6.0/src/network/bridge_driver.c
 ===================================================================
--- libvirt-4.5.0.orig/src/network/bridge_driver.c
-+++ libvirt-4.5.0/src/network/bridge_driver.c
-@@ -1457,7 +1457,14 @@ networkDnsmasqConfContents(virNetworkObj
+--- libvirt-4.6.0.orig/src/network/bridge_driver.c
+++ libvirt-4.6.0/src/network/bridge_driver.c
+@@ -1463,7 +1463,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-4.5.0/src/network/bridge_driver.c
             }
 
             if (ipdef->tftproot) {
-Index: libvirt-4.5.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+Index: libvirt-4.6.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
 ===================================================================
--- libvirt-4.5.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
-+++ libvirt-4.5.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+--- libvirt-4.6.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-4.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-4.5.0/src/util/virarch.c
+Index: libvirt-4.6.0/src/util/virarch.c
 ===================================================================
--- libvirt-4.5.0.orig/src/util/virarch.c
-+++ libvirt-4.5.0/src/util/virarch.c
+--- libvirt-4.6.0.orig/src/util/virarch.c
+++ libvirt-4.6.0/src/util/virarch.c
@@ -169,6 +169,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-4.5.0/examples/apparmor/libvirt-qemu
+Index: libvirt-4.6.0/examples/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-4.5.0.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-4.5.0/examples/apparmor/libvirt-qemu
+--- libvirt-4.6.0.orig/examples/apparmor/libvirt-qemu
+++ libvirt-4.6.0/examples/apparmor/libvirt-qemu
@@ -205,3 +205,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,10 +8,10 @@ Subject: [PATCH] support managed pci devices in xen driver
 src/xenxs/xen_xm.c   |   28 +++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 15 deletions(-)

-Index: libvirt-4.5.0/src/xenconfig/xen_common.c
+Index: libvirt-4.6.0/src/xenconfig/xen_common.c
 ===================================================================
--- libvirt-4.5.0.orig/src/xenconfig/xen_common.c
-+++ libvirt-4.5.0/src/xenconfig/xen_common.c
+--- libvirt-4.6.0.orig/src/xenconfig/xen_common.c
+++ libvirt-4.6.0/src/xenconfig/xen_common.c
@@ -402,12 +402,19 @@ xenParsePCI(char *entry)
     int busID;
     int slotID;
@ -31,7 +31,7 @@ Index: libvirt-4.5.0/src/xenconfig/xen_common.c
 +
     if (!(nextkey = strchr(key, ':')))
         return NULL;
-     if (virStrncpy(domain, key, (nextkey - key), sizeof(domain)) == NULL) {
+     if (virStrncpy(domain, key, (nextkey - key), sizeof(domain)) < 0) {
@@ -452,10 +459,30 @@ xenParsePCI(char *entry)
     if (virStrToLong_i(func, NULL, 16, &funcID) < 0)
         return NULL;
@ -64,10 +64,10 @@ Index: libvirt-4.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-4.5.0/src/xenconfig/xen_sxpr.c
+Index: libvirt-4.6.0/src/xenconfig/xen_sxpr.c
 ===================================================================
--- libvirt-4.5.0.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-4.5.0/src/xenconfig/xen_sxpr.c
+--- libvirt-4.6.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-4.6.0/src/xenconfig/xen_sxpr.c
@@ -1057,6 +1057,7 @@ xenParseSxprPCI(virDomainDefPtr def,
         int busID;
         int slotID;
--- 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-4.5.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+Index: libvirt-4.6.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 ===================================================================
--- libvirt-4.5.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-+++ libvirt-4.5.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+--- libvirt-4.6.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ libvirt-4.6.0/examples/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,
@ -21,10 +21,10 @@ Index: libvirt-4.5.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 
   # for hostdev
   /sys/devices/ r,
-Index: libvirt-4.5.0/examples/apparmor/libvirt-qemu
+Index: libvirt-4.6.0/examples/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-4.5.0.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-4.5.0/examples/apparmor/libvirt-qemu
+--- libvirt-4.6.0.orig/examples/apparmor/libvirt-qemu
+++ libvirt-4.6.0/examples/apparmor/libvirt-qemu
@@ -62,6 +62,7 @@
   #/dev/fb* rw,
 
--- 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-4.5.0/tools/libvirt-guests.init.in
+Index: libvirt-4.6.0/tools/libvirt-guests.init.in
 ===================================================================
--- libvirt-4.5.0.orig/tools/libvirt-guests.init.in
-+++ libvirt-4.5.0/tools/libvirt-guests.init.in
+--- libvirt-4.6.0.orig/tools/libvirt-guests.init.in
+++ libvirt-4.6.0/tools/libvirt-guests.init.in
@@ -4,27 +4,27 @@
 # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
 #
@ -46,10 +46,10 @@ Index: libvirt-4.5.0/tools/libvirt-guests.init.in
 +
 
 exec @libexecdir@/libvirt-guests.sh "$@"
-Index: libvirt-4.5.0/tools/libvirt-guests.sh.in
+Index: libvirt-4.6.0/tools/libvirt-guests.sh.in
 ===================================================================
--- libvirt-4.5.0.orig/tools/libvirt-guests.sh.in
-+++ libvirt-4.5.0/tools/libvirt-guests.sh.in
+--- libvirt-4.6.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-4.6.0/tools/libvirt-guests.sh.in
@@ -16,14 +16,13 @@
 # License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
@ -209,10 +209,10 @@ Index: libvirt-4.5.0/tools/libvirt-guests.sh.in
 esac
 -exit $RETVAL
 +rc_exit
-Index: libvirt-4.5.0/tools/libvirt-guests.sysconf
+Index: libvirt-4.6.0/tools/libvirt-guests.sysconf
 ===================================================================
--- libvirt-4.5.0.orig/tools/libvirt-guests.sysconf
-+++ libvirt-4.5.0/tools/libvirt-guests.sysconf
+--- libvirt-4.6.0.orig/tools/libvirt-guests.sysconf
+++ libvirt-4.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,10 +3,10 @@ Disable TLS by default
 On SUSE distros, the default is for libvirtd to listen only on the
 Unix Domain Socket. The libvirt client still provides remote access
 via a SSH tunnel.
-Index: libvirt-4.5.0/src/remote/libvirtd.conf
+Index: libvirt-4.6.0/src/remote/libvirtd.conf
 ===================================================================
--- libvirt-4.5.0.orig/src/remote/libvirtd.conf
-+++ libvirt-4.5.0/src/remote/libvirtd.conf
+--- libvirt-4.6.0.orig/src/remote/libvirtd.conf
+++ libvirt-4.6.0/src/remote/libvirtd.conf
@@ -18,8 +18,8 @@
 # It is necessary to setup a CA and issue server certificates before
 # using this capability.
@ -18,10 +18,10 @@ Index: libvirt-4.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-4.5.0/src/remote/remote_daemon_config.c
+Index: libvirt-4.6.0/src/remote/remote_daemon_config.c
 ===================================================================
--- libvirt-4.5.0.orig/src/remote/remote_daemon_config.c
-+++ libvirt-4.5.0/src/remote/remote_daemon_config.c
+--- libvirt-4.6.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-4.6.0/src/remote/remote_daemon_config.c
@@ -110,7 +110,7 @@ daemonConfigNew(bool privileged ATTRIBUT
     if (VIR_ALLOC(data) < 0)
         return NULL;
@ -31,10 +31,10 @@ Index: libvirt-4.5.0/src/remote/remote_daemon_config.c
     data->listen_tcp = 0;
 
     if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
-Index: libvirt-4.5.0/src/remote/test_libvirtd.aug.in
+Index: libvirt-4.6.0/src/remote/test_libvirtd.aug.in
 ===================================================================
--- libvirt-4.5.0.orig/src/remote/test_libvirtd.aug.in
-+++ libvirt-4.5.0/src/remote/test_libvirtd.aug.in
+--- libvirt-4.6.0.orig/src/remote/test_libvirtd.aug.in
+++ libvirt-4.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,10 +7,10 @@ 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-4.5.0/src/remote/libvirtd.service.in
+Index: libvirt-4.6.0/src/remote/libvirtd.service.in
 ===================================================================
--- libvirt-4.5.0.orig/src/remote/libvirtd.service.in
-+++ libvirt-4.5.0/src/remote/libvirtd.service.in
+--- libvirt-4.6.0.orig/src/remote/libvirtd.service.in
+++ libvirt-4.6.0/src/remote/libvirtd.service.in
@@ -17,6 +17,8 @@ After=local-fs.target
 After=remote-fs.target
 After=systemd-logind.service
--- 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-4.5.0/src/remote/libvirtd.sysconf
+Index: libvirt-4.6.0/src/remote/libvirtd.sysconf
 ===================================================================
--- libvirt-4.5.0.orig/src/remote/libvirtd.sysconf
-+++ libvirt-4.5.0/src/remote/libvirtd.sysconf
+--- libvirt-4.6.0.orig/src/remote/libvirtd.sysconf
+++ libvirt-4.6.0/src/remote/libvirtd.sysconf
@@ -1,16 +1,25 @@
 +## Path: System/Virtualization/libvirt
 +
--- a/suse-ovmf-paths.patch
+++ b/suse-ovmf-paths.patch
@ -1,9 +1,9 @@
 Adjust paths of OVMF firmwares on SUSE distros

-Index: libvirt-4.5.0/src/qemu/qemu.conf
+Index: libvirt-4.6.0/src/qemu/qemu.conf
 ===================================================================
--- libvirt-4.5.0.orig/src/qemu/qemu.conf
-+++ libvirt-4.5.0/src/qemu/qemu.conf
+--- libvirt-4.6.0.orig/src/qemu/qemu.conf
+++ libvirt-4.6.0/src/qemu/qemu.conf
@@ -769,10 +769,9 @@ security_default_confined = 0
 # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
 # follows this scheme.
@ -18,10 +18,10 @@ Index: libvirt-4.5.0/src/qemu/qemu.conf
 #]
 
 # The backend to use for handling stdout/stderr output from
-Index: libvirt-4.5.0/src/qemu/qemu_conf.c
+Index: libvirt-4.6.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-4.5.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-4.5.0/src/qemu/qemu_conf.c
+--- libvirt-4.6.0.orig/src/qemu/qemu_conf.c
+++ libvirt-4.6.0/src/qemu/qemu_conf.c
@@ -122,10 +122,9 @@ void qemuDomainCmdlineDefFree(qemuDomain
 
 #ifndef DEFAULT_LOADER_NVRAM
@ -36,10 +36,10 @@ Index: libvirt-4.5.0/src/qemu/qemu_conf.c
 #endif
 
 
-Index: libvirt-4.5.0/src/security/virt-aa-helper.c
+Index: libvirt-4.6.0/src/security/virt-aa-helper.c
 ===================================================================
--- libvirt-4.5.0.orig/src/security/virt-aa-helper.c
-+++ libvirt-4.5.0/src/security/virt-aa-helper.c
+--- libvirt-4.6.0.orig/src/security/virt-aa-helper.c
+++ libvirt-4.6.0/src/security/virt-aa-helper.c
@@ -515,7 +515,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,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-4.5.0/src/qemu/qemu.conf
+Index: libvirt-4.6.0/src/qemu/qemu.conf
 ===================================================================
--- libvirt-4.5.0.orig/src/qemu/qemu.conf
-+++ libvirt-4.5.0/src/qemu/qemu.conf
+--- libvirt-4.6.0.orig/src/qemu/qemu.conf
+++ libvirt-4.6.0/src/qemu/qemu.conf
@@ -414,11 +414,20 @@
 # isolation, but it cannot appear in a list of drivers.
 #
--- 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-4.5.0/src/locking/virtlockd.sysconf
+Index: libvirt-4.6.0/src/locking/virtlockd.sysconf
 ===================================================================
--- libvirt-4.5.0.orig/src/locking/virtlockd.sysconf
-+++ libvirt-4.5.0/src/locking/virtlockd.sysconf
+--- libvirt-4.6.0.orig/src/locking/virtlockd.sysconf
+++ libvirt-4.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-4.5.0/src/logging/virtlogd.sysconf
+Index: libvirt-4.6.0/src/logging/virtlogd.sysconf
 ===================================================================
--- libvirt-4.5.0.orig/src/logging/virtlogd.sysconf
-+++ libvirt-4.5.0/src/logging/virtlogd.sysconf
+--- libvirt-4.6.0.orig/src/logging/virtlogd.sysconf
+++ libvirt-4.6.0/src/logging/virtlogd.sysconf
@@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlogd
 +
--- a/temp-build-fix.patch
+++ b/temp-build-fix.patch
@ -0,0 +1,40 @@
+Fix link errors in tools/nss and tests
+
+Although a simple 'make' of libvirt.git works, building libvirt 4.6.0
+with 'osc build ...' fails in tools/nss and tests, with output along
+the lines of:
+
+[  469s] libtool: link: gcc -shared  -fPIC -DPIC  -Wl,--whole-archive nss/.libs/libnss_libvirt_impl.a -Wl,--no-whole-archive  -lpthread -lutil -ltirpc  -fstack-protector-strong -grecord-gcc-switches -O2 -fstack-protector-strong -g -Wl,--version-script=./nss/libvirt_nss.syms -Wl,-z -Wl,relro -Wl,-z -Wl,now -Wl,--no-copy-dt-needed-entries -Wl,-z -Wl,defs -grecord-gcc-switches -O2 -fstack-protector-strong -g   -pthread -Wl,-soname -Wl,libnss_libvirt.so.2 -o nss/.libs/libnss_libvirt.so.2
+[  469s] nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virjsoncompat.o): In function `virJSONJanssonOnce':
+[  469s] /home/abuild/rpmbuild/BUILD/libvirt-4.6.0/src/util/virjsoncompat.c:63: undefined reference to `dlopen'
+[  469s] /home/abuild/rpmbuild/BUILD/libvirt-4.6.0/src/util/virjsoncompat.c:79: undefined reference to `dlsym'
+...
+
+A quick hack is to add '-ldl' to the linker flags for libnss_libvirt_impl
+and /libnss_libvirt_guest_impl. Will ask about a proper fix on libvirt
+dev list.
+
+Index: libvirt-4.6.0/tools/Makefile.am
+===================================================================
+--- libvirt-4.6.0.orig/tools/Makefile.am
+++ libvirt-4.6.0/tools/Makefile.am
+@@ -525,6 +525,9 @@ nss_libnss_libvirt_impl_la_CFLAGS = \
+ 	$(AM_CFLAGS) \
+ 	$(NULL)
+ 
+nss_libnss_libvirt_impl_la_LDFLAGS = \
+	-ldl
+
+ nss_libnss_libvirt_impl_la_LIBADD = \
+ 	../gnulib/lib/libgnu.la \
+ 	../src/libvirt-nss.la
+@@ -552,6 +555,9 @@ nss_libnss_libvirt_guest_impl_la_CFLAGS
+ 	$(AM_CFLAGS) \
+ 	$(NULL)
+ 
+nss_libnss_libvirt_guest_impl_la_LDFLAGS = \
+	-ldl
+
+ nss_libnss_libvirt_guest_impl_la_LIBADD = \
+ 	../gnulib/lib/libgnu.la \
+ 	../src/libvirt-nss.la
--- a/xen-pv-cdrom.patch
+++ b/xen-pv-cdrom.patch
@ -1,7 +1,7 @@
-Index: libvirt-4.5.0/src/xenconfig/xen_sxpr.c
+Index: libvirt-4.6.0/src/xenconfig/xen_sxpr.c
 ===================================================================
--- libvirt-4.5.0.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-4.5.0/src/xenconfig/xen_sxpr.c
+--- libvirt-4.6.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-4.6.0/src/xenconfig/xen_sxpr.c
@@ -387,7 +387,7 @@ xenParseSxprVifRate(const char *rate, un
 static int
 xenParseSxprDisks(virDomainDefPtr def,
--- a/xen-sxpr-disk-type.patch
+++ b/xen-sxpr-disk-type.patch
@ -6,10 +6,10 @@ and 'file'. This was implicitly done prior to commit 9673418c.

 https://bugzilla.suse.com/show_bug.cgi?id=938228

-Index: libvirt-4.5.0/src/xenconfig/xen_sxpr.c
+Index: libvirt-4.6.0/src/xenconfig/xen_sxpr.c
 ===================================================================
--- libvirt-4.5.0.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-4.5.0/src/xenconfig/xen_sxpr.c
+--- libvirt-4.6.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-4.6.0/src/xenconfig/xen_sxpr.c
@@ -501,10 +501,11 @@ xenParseSxprDisks(virDomainDefPtr def,
                        omnipotent, we can revisit this, perhaps stat()'ing
                        the src file in question */