Accepting request 824562 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/824562 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=308
2020-08-13 08:13:38 +00:00 · 2020-08-13 08:13:38 +00:00 · 3c690b0fe5
commit 3c690b0fe5
parent 58779e0c42 f35b0fae10
33 changed files with 263 additions and 204 deletions
--- a/0001-Extract-stats-functions-from-the-qemu-driver.patch
+++ b/0001-Extract-stats-functions-from-the-qemu-driver.patch
@ -18,10 +18,10 @@ them.
 create mode 100644 src/conf/domain_stats.c
 create mode 100644 src/conf/domain_stats.h

-Index: libvirt-6.5.0/src/conf/domain_stats.c
+Index: libvirt-6.6.0/src/conf/domain_stats.c
 ===================================================================
 --- /dev/null
-+++ libvirt-6.5.0/src/conf/domain_stats.c
+++ libvirt-6.6.0/src/conf/domain_stats.c
@@ -0,0 +1,119 @@
 +/*
 + * domain_stats.c: domain stats extraction helpers
@ -142,10 +142,10 @@ Index: libvirt-6.5.0/src/conf/domain_stats.c
 +}
 +
 +#undef STATS_ADD_NET_PARAM
-Index: libvirt-6.5.0/src/conf/domain_stats.h
+Index: libvirt-6.6.0/src/conf/domain_stats.h
 ===================================================================
 --- /dev/null
-+++ libvirt-6.5.0/src/conf/domain_stats.h
+++ libvirt-6.6.0/src/conf/domain_stats.h
@@ -0,0 +1,62 @@
 +/*
 + * domain_stats.h: domain stats extraction helpers
@ -209,10 +209,10 @@ Index: libvirt-6.5.0/src/conf/domain_stats.h
 +                           virTypedParamListPtr params);
 +
 +#endif /* __DOMAIN_STATS_H */
-Index: libvirt-6.5.0/src/libvirt_private.syms
+Index: libvirt-6.6.0/src/libvirt_private.syms
 ===================================================================
--- libvirt-6.5.0.orig/src/libvirt_private.syms
-+++ libvirt-6.5.0/src/libvirt_private.syms
+--- libvirt-6.6.0.orig/src/libvirt_private.syms
+++ libvirt-6.6.0/src/libvirt_private.syms
@@ -732,6 +732,9 @@ virDomainConfNWFilterInstantiate;
 virDomainConfNWFilterTeardown;
 virDomainConfVMNWFilterTeardown;
@ -223,7 +223,7 @@ Index: libvirt-6.5.0/src/libvirt_private.syms
 
 # conf/interface_conf.h
 virInterfaceDefFormat;
-@@ -1764,6 +1767,7 @@ virCgroupGetMemoryUsage;
+@@ -1778,6 +1781,7 @@ virCgroupGetMemoryUsage;
 virCgroupGetMemSwapHardLimit;
 virCgroupGetMemSwapUsage;
 virCgroupGetPercpuStats;
@ -231,10 +231,10 @@ Index: libvirt-6.5.0/src/libvirt_private.syms
 virCgroupHasController;
 virCgroupHasEmptyTasks;
 virCgroupKillPainfully;
-Index: libvirt-6.5.0/src/qemu/qemu_driver.c
+Index: libvirt-6.6.0/src/qemu/qemu_driver.c
 ===================================================================
--- libvirt-6.5.0.orig/src/qemu/qemu_driver.c
-+++ libvirt-6.5.0/src/qemu/qemu_driver.c
+--- libvirt-6.6.0.orig/src/qemu/qemu_driver.c
+++ libvirt-6.6.0/src/qemu/qemu_driver.c
@@ -64,6 +64,7 @@
 #include "virarptable.h"
 #include "viruuid.h"
@ -243,7 +243,7 @@ Index: libvirt-6.5.0/src/qemu/qemu_driver.c
 #include "domain_audit.h"
 #include "domain_cgroup.h"
 #include "domain_driver.h"
-@@ -20681,13 +20682,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
+@@ -20645,13 +20646,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
                         virTypedParamListPtr params,
                         unsigned int privflags G_GNUC_UNUSED)
 {
@ -258,7 +258,7 @@ Index: libvirt-6.5.0/src/qemu/qemu_driver.c
 }
 
 
-@@ -20990,17 +20985,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
+@@ -20954,17 +20949,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
     if (!priv->cgroup)
         return 0;
 
@ -277,7 +277,7 @@ Index: libvirt-6.5.0/src/qemu/qemu_driver.c
 }
 
 
-@@ -21168,76 +21153,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
+@@ -21132,76 +21117,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
     return ret;
 }
 
@ -355,10 +355,10 @@ Index: libvirt-6.5.0/src/qemu/qemu_driver.c
 
 /* refresh information by opening images on the disk */
 static int
-Index: libvirt-6.5.0/src/util/vircgroup.c
+Index: libvirt-6.6.0/src/util/vircgroup.c
 ===================================================================
--- libvirt-6.5.0.orig/src/util/vircgroup.c
-+++ libvirt-6.5.0/src/util/vircgroup.c
+--- libvirt-6.6.0.orig/src/util/vircgroup.c
+++ libvirt-6.6.0/src/util/vircgroup.c
@@ -2776,6 +2776,31 @@ virCgroupControllerAvailable(int control
     return ret;
 }
@ -406,10 +406,10 @@ Index: libvirt-6.5.0/src/util/vircgroup.c
 int
 virCgroupNewPartition(const char *path G_GNUC_UNUSED,
                       bool create G_GNUC_UNUSED,
-Index: libvirt-6.5.0/src/util/vircgroup.h
+Index: libvirt-6.6.0/src/util/vircgroup.h
 ===================================================================
--- libvirt-6.5.0.orig/src/util/vircgroup.h
-+++ libvirt-6.5.0/src/util/vircgroup.h
+--- libvirt-6.6.0.orig/src/util/vircgroup.h
+++ libvirt-6.6.0/src/util/vircgroup.h
@@ -23,6 +23,7 @@
 
 #include "virbitmap.h"
@ -425,10 +425,10 @@ Index: libvirt-6.5.0/src/util/vircgroup.h
 +
 +int virCgroupGetStatsCpu(virCgroupPtr cgroup,
 +                         virTypedParamListPtr params);
-Index: libvirt-6.5.0/src/conf/Makefile.inc.am
+Index: libvirt-6.6.0/src/conf/Makefile.inc.am
 ===================================================================
--- libvirt-6.5.0.orig/src/conf/Makefile.inc.am
-+++ libvirt-6.5.0/src/conf/Makefile.inc.am
+--- libvirt-6.6.0.orig/src/conf/Makefile.inc.am
+++ libvirt-6.6.0/src/conf/Makefile.inc.am
@@ -28,6 +28,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-6.5.0/src/libxl/libxl_driver.c
+Index: libvirt-6.6.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-6.5.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-6.5.0/src/libxl/libxl_driver.c
+--- libvirt-6.6.0.orig/src/libxl/libxl_driver.c
+++ libvirt-6.6.0/src/libxl/libxl_driver.c
@@ -5323,6 +5323,96 @@ 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-6.5.0/src/lxc/lxc_driver.c
+Index: libvirt-6.6.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-6.5.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-6.5.0/src/lxc/lxc_driver.c
+--- libvirt-6.6.0.orig/src/lxc/lxc_driver.c
+++ libvirt-6.6.0/src/lxc/lxc_driver.c
@@ -73,6 +73,7 @@
 #include "netdev_bandwidth_conf.h"
 #include "virsocket.h"
--- a/disable-multipath-pr-tests.patch
+++ b/disable-multipath-pr-tests.patch
@ -3,10 +3,10 @@ tests: temporarily disable the new multipath PR tests
 The new multipath PR tests are failing in a build root env.
 Disable them for now until discussing a solution with upstream.

-Index: libvirt-6.5.0/tests/qemuhotplugtest.c
+Index: libvirt-6.6.0/tests/qemuhotplugtest.c
 ===================================================================
--- libvirt-6.5.0.orig/tests/qemuhotplugtest.c
-+++ libvirt-6.5.0/tests/qemuhotplugtest.c
+--- libvirt-6.6.0.orig/tests/qemuhotplugtest.c
+++ libvirt-6.6.0/tests/qemuhotplugtest.c
@@ -87,8 +87,6 @@ qemuHotplugCreateObjects(virDomainXMLOpt
     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VNC);
     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SPICE);
--- a/libvirt-6.5.0.tar.xz
+++ b/libvirt-6.5.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4915d9eab299ed79288d7598b717c587156708c05f701fe55a72293f32eb3182
-size 9407160
--- a/libvirt-6.5.0.tar.xz.asc
+++ b/libvirt-6.5.0.tar.xz.asc
@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAl7+1MYACgkQFViLJllr
-6l1LvAf/d9rnHnxKDOQHy/y26aeoGpKpI2ZiHV4INsavZr69xuXwJbBHH4Gs5wM8
-EAqWff3Ixl7MBI7a9Xent46VFHroloGh+ncAuflJsGX3es/hP3xII0PbLbHPe0Uq
-go4URjvVUy1cDtvvWZSn/si8+V0DqgeLsBHG3/5bONmGZ/vOXLRkGu5n1lrjFt8A
-/jFTZaPQqivhy5O9V8/MT9HF+0bvfzHVMmC31oxYeM3921F+gLoUuEAxJZiS13OJ
-k0nfKi56wpsEFbFLOYZnhmeR3+lnYhGFPH27XlMjV6OEX3WGcCtVvGEqa8Kzw80M
-pND3ge0/CijpZJPelcCnTKp9M0BK/w==
-=AkX4
-----END PGP SIGNATURE-----
--- a/libvirt-6.6.0.tar.xz
+++ b/libvirt-6.6.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94e52ddd2d71b650e1a7eb5ab7e651f9607ecee207891216714020b8ff081ef9
+size 9305836
--- a/libvirt-6.6.0.tar.xz.asc
+++ b/libvirt-6.6.0.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEERTtlMQWVVihVRxGZymi+gBAITJwFAl8nPNQACgkQymi+gBAI
+TJyRhw//U6aClk7b/6M4NqTVZYM1siSCWDcGWUlTPKziOfTPFUzHu4qfNRMjJ4rh
+RdExShtlV1hCOHnbyiPKkIgyh3/l90pi38SQT8xHn+qWDr5YyejTwtoevLb+Ifr5
+Lg48owG25cBJTRzJ4mWXeiT9d4O58oy0fEIRaeKX8SA8+hd6ee51YLdhBnDe69PS
+cJrWME7okFrdpYCHX6CQkAo9lLlM1a0s0Px+IyV5bojnvzl/GTMrTElkdFYEdf9U
+izR2PLDbSY0O+xeVvqNgU85OoP5P/sce8YVJsJAm3N9BbAdery+xsgIKdn5dQK6J
+NEnkchWilSHqvkODAr7jJplr9Ljtgt2VU8j/7CSh5VTTFf8SthfsR4xlhMr8f3K
+EcqqhwiX408rfWM7iHnVqC921XTiObvZx/6LX3ELJF3cpccIG8wk24MsmjcpZSEx
+duB0DFFUBgw7gYDNru+hyTXjZ5KuB5PLPlPDJNvSTs/cCDwEUoACiu0IH2Xd1gq2
+4vzDoEvr2xh6bTVGthjICeWVoIrUHuKo/xpUOIDBrXv8tyOjrqAclsLtjWcUYKwz
+7CTBjEz+OSspgydYZ+4zToh866O1pZuTRR3F8SPbISHm864FkgNFBOU8Sp1EDcTE
+Ru0ol+eGSg8p3fzQgyHAqS/bfHwwPdCNzsQVZzSIKeZRm5KKG/U=
+=SptM
+-----END PGP SIGNATURE-----
--- a/libvirt-power8-models.patch
+++ b/libvirt-power8-models.patch
@ -2,10 +2,10 @@ Add POWER8 v2.0 and v2.1 to cpu map XML

 From: <ro@suse.de>

-Index: libvirt-6.5.0/src/cpu_map/ppc64_POWER8.xml
+Index: libvirt-6.6.0/src/cpu_map/ppc64_POWER8.xml
 ===================================================================
--- libvirt-6.5.0.orig/src/cpu_map/ppc64_POWER8.xml
-+++ libvirt-6.5.0/src/cpu_map/ppc64_POWER8.xml
+--- libvirt-6.6.0.orig/src/cpu_map/ppc64_POWER8.xml
+++ libvirt-6.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,8 +1,8 @@
-Index: libvirt-6.5.0/configure.ac
+Index: libvirt-6.6.0/configure.ac
 ===================================================================
--- libvirt-6.5.0.orig/configure.ac
-+++ libvirt-6.5.0/configure.ac
-@@ -278,6 +278,7 @@ LIBVIRT_ARG_LIBSSH
+--- libvirt-6.6.0.orig/configure.ac
+++ libvirt-6.6.0/configure.ac
+@@ -289,6 +289,7 @@ LIBVIRT_ARG_LIBSSH
 LIBVIRT_ARG_LIBXML
 LIBVIRT_ARG_MACVTAP
 LIBVIRT_ARG_NETCF
@ -10,7 +10,7 @@ Index: libvirt-6.5.0/configure.ac
 LIBVIRT_ARG_NLS
 LIBVIRT_ARG_NSS
 LIBVIRT_ARG_NUMACTL
-@@ -321,6 +322,7 @@ LIBVIRT_CHECK_LIBSSH
+@@ -332,6 +333,7 @@ LIBVIRT_CHECK_LIBSSH
 LIBVIRT_CHECK_LIBXML
 LIBVIRT_CHECK_MACVTAP
 LIBVIRT_CHECK_NETCF
@ -18,7 +18,7 @@ Index: libvirt-6.5.0/configure.ac
 LIBVIRT_CHECK_NLS
 LIBVIRT_CHECK_NUMACTL
 LIBVIRT_CHECK_NWFILTER
-@@ -1008,6 +1010,7 @@ LIBVIRT_RESULT_LIBXL
+@@ -1011,6 +1013,7 @@ LIBVIRT_RESULT_LIBXL
 LIBVIRT_RESULT_LIBXML
 LIBVIRT_RESULT_MACVTAP
 LIBVIRT_RESULT_NETCF
@ -26,10 +26,10 @@ Index: libvirt-6.5.0/configure.ac
 LIBVIRT_RESULT_NLS
 LIBVIRT_RESULT_NSS
 LIBVIRT_RESULT_NUMACTL
-Index: libvirt-6.5.0/tools/virsh.c
+Index: libvirt-6.6.0/tools/virsh.c
 ===================================================================
--- libvirt-6.5.0.orig/tools/virsh.c
-+++ libvirt-6.5.0/tools/virsh.c
+--- libvirt-6.6.0.orig/tools/virsh.c
+++ libvirt-6.6.0/tools/virsh.c
@@ -547,6 +547,8 @@ virshShowVersion(vshControl *ctl G_GNUC_
     vshPrint(ctl, " Interface");
 # if defined(WITH_NETCF)
@ -39,10 +39,10 @@ Index: libvirt-6.5.0/tools/virsh.c
 # elif defined(WITH_UDEV)
     vshPrint(ctl, " udev");
 # endif
-Index: libvirt-6.5.0/src/interface/interface_backend_netcf.c
+Index: libvirt-6.6.0/src/interface/interface_backend_netcf.c
 ===================================================================
--- libvirt-6.5.0.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-6.5.0/src/interface/interface_backend_netcf.c
+--- libvirt-6.6.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-6.6.0/src/interface/interface_backend_netcf.c
@@ -21,7 +21,12 @@
 
 #include <config.h>
@ -154,10 +154,10 @@ Index: libvirt-6.5.0/src/interface/interface_backend_netcf.c
     if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
         return -1;
     if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
-Index: libvirt-6.5.0/src/interface/interface_driver.c
+Index: libvirt-6.6.0/src/interface/interface_driver.c
 ===================================================================
--- libvirt-6.5.0.orig/src/interface/interface_driver.c
-+++ libvirt-6.5.0/src/interface/interface_driver.c
+--- libvirt-6.6.0.orig/src/interface/interface_driver.c
+++ libvirt-6.6.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
     if (netcfIfaceRegister() == 0)
         return 0;
@ -175,10 +175,10 @@ Index: libvirt-6.5.0/src/interface/interface_driver.c
     if (udevIfaceRegister() == 0)
         return 0;
 #endif /* WITH_UDEV */
-Index: libvirt-6.5.0/m4/virt-netcontrol.m4
+Index: libvirt-6.6.0/m4/virt-netcontrol.m4
 ===================================================================
 --- /dev/null
-+++ libvirt-6.5.0/m4/virt-netcontrol.m4
+++ libvirt-6.6.0/m4/virt-netcontrol.m4
@@ -0,0 +1,39 @@
 +dnl The libnetcontrol library
 +dnl
@ -219,10 +219,10 @@ Index: libvirt-6.5.0/m4/virt-netcontrol.m4
 +AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[
 +  LIBVIRT_RESULT_LIB([NETCONTROL])
 +])
-Index: libvirt-6.5.0/src/interface/Makefile.inc.am
+Index: libvirt-6.6.0/src/interface/Makefile.inc.am
 ===================================================================
--- libvirt-6.5.0.orig/src/interface/Makefile.inc.am
-+++ libvirt-6.5.0/src/interface/Makefile.inc.am
+--- libvirt-6.6.0.orig/src/interface/Makefile.inc.am
+++ libvirt-6.6.0/src/interface/Makefile.inc.am
@@ -6,6 +6,7 @@ INTERFACE_DRIVER_SOURCES = \
 	$(NULL)
 
--- a/libvirt.changes
+++ b/libvirt.changes
@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Aug  4 22:46:13 UTC 2020 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 6.6.0
+  - CVE-2020-14339
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html
+
 -------------------------------------------------------------------
 Mon Jul  6 14:58:35 UTC 2020 - James Fehlig <jfehlig@suse.com>

--- a/libvirt.keyring
+++ b/libvirt.keyring
@ -212,3 +212,51 @@ n+szFhmrIXMGUT5auvbAGIQzuBI/F+fTmg1SN4+YTJLVEdHG5zYhUzqElYNkMwGJ
 3aBhP3rFTdF/TXGI9aXs84nW3KYWQV18Av1rw0O+PKkX4fu4Yktc
 =9Te5
 -----END PGP PUBLIC KEY BLOCK-----
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+cA==
+=o6gq
+-----END PGP PUBLIC KEY BLOCK-----
--- a/libvirt.spec
+++ b/libvirt.spec
@ -185,7 +185,7 @@

 Name:           libvirt
 URL:            http://libvirt.org/
-Version:        6.5.0
+Version:        6.6.0
 Release:        0
 Summary:        Library providing a virtualization API
 License:        LGPL-2.1-or-later
@ -259,9 +259,7 @@ BuildRequires:  sanlock-devel >= 2.4
 BuildRequires:  libnl3-devel
 BuildRequires:  libpcap-devel >= 1.5.0
 BuildRequires:  libselinux-devel
-%if 0%{?suse_version} >= 1330
 BuildRequires:  libtirpc-devel
-%endif
 %if %{with_apparmor}
 BuildRequires:  apparmor-rpm-macros
 BuildRequires:  libapparmor-devel
--- 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-6.5.0/src/libxl/libxl_driver.c
+Index: libvirt-6.6.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-6.5.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-6.5.0/src/libxl/libxl_driver.c
+--- libvirt-6.6.0.orig/src/libxl/libxl_driver.c
+++ libvirt-6.6.0/src/libxl/libxl_driver.c
@@ -1371,6 +1371,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
 }
 
--- 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-6.5.0/src/libxl/libxl_conf.c
+Index: libvirt-6.6.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-6.5.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.5.0/src/libxl/libxl_conf.c
+--- libvirt-6.6.0.orig/src/libxl/libxl_conf.c
+++ libvirt-6.6.0/src/libxl/libxl_conf.c
@@ -905,6 +905,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
 #endif
 }
@ -38,7 +38,7 @@ Index: libvirt-6.5.0/src/libxl/libxl_conf.c
 static char *
 libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src,
                            const char *username,
-@@ -1146,6 +1170,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -1142,6 +1166,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
     x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
     if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
         return -1;
--- a/libxl-set-migration-constraints.patch
+++ b/libxl-set-migration-constraints.patch
@ -16,10 +16,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 tools/virsh.pod                  |    8 ++++++++
 6 files changed, 125 insertions(+), 6 deletions(-)

-Index: libvirt-6.5.0/include/libvirt/libvirt-domain.h
+Index: libvirt-6.6.0/include/libvirt/libvirt-domain.h
 ===================================================================
--- libvirt-6.5.0.orig/include/libvirt/libvirt-domain.h
-+++ libvirt-6.5.0/include/libvirt/libvirt-domain.h
+--- libvirt-6.6.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-6.6.0/include/libvirt/libvirt-domain.h
@@ -1065,6 +1065,31 @@ typedef enum {
  */
 # define VIR_MIGRATE_PARAM_TLS_DESTINATION          "tls.destination"
@ -52,10 +52,10 @@ Index: libvirt-6.5.0/include/libvirt/libvirt-domain.h
 /* Domain migration. */
 virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
                                unsigned long flags, const char *dname,
-Index: libvirt-6.5.0/src/libxl/libxl_driver.c
+Index: libvirt-6.6.0/src/libxl/libxl_driver.c
 ===================================================================
--- libvirt-6.5.0.orig/src/libxl/libxl_driver.c
-+++ libvirt-6.5.0/src/libxl/libxl_driver.c
+--- libvirt-6.6.0.orig/src/libxl/libxl_driver.c
+++ libvirt-6.6.0/src/libxl/libxl_driver.c
@@ -6232,6 +6232,9 @@ libxlDomainMigratePerform3Params(virDoma
     const char *dname = NULL;
     const char *uri = NULL;
@ -99,10 +99,10 @@ Index: libvirt-6.5.0/src/libxl/libxl_driver.c
             goto cleanup;
     }
 
-Index: libvirt-6.5.0/src/libxl/libxl_migration.c
+Index: libvirt-6.6.0/src/libxl/libxl_migration.c
 ===================================================================
--- libvirt-6.5.0.orig/src/libxl/libxl_migration.c
-+++ libvirt-6.5.0/src/libxl/libxl_migration.c
+--- libvirt-6.6.0.orig/src/libxl/libxl_migration.c
+++ libvirt-6.6.0/src/libxl/libxl_migration.c
@@ -345,18 +345,39 @@ libxlMigrateDstReceive(virNetSocketPtr s
 static int
 libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver,
@ -264,10 +264,10 @@ Index: libvirt-6.5.0/src/libxl/libxl_migration.c
     virObjectLock(vm);
 
     if (ret == 0) {
-Index: libvirt-6.5.0/src/libxl/libxl_migration.h
+Index: libvirt-6.6.0/src/libxl/libxl_migration.h
 ===================================================================
--- libvirt-6.5.0.orig/src/libxl/libxl_migration.h
-+++ libvirt-6.5.0/src/libxl/libxl_migration.h
+--- libvirt-6.6.0.orig/src/libxl/libxl_migration.h
+++ libvirt-6.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-6.5.0/src/libxl/libxl_migration.h
 
 virDomainPtr
 libxlDomainMigrationDstFinish(virConnectPtr dconn,
-Index: libvirt-6.5.0/tools/virsh-domain.c
+Index: libvirt-6.6.0/tools/virsh-domain.c
 ===================================================================
--- libvirt-6.5.0.orig/tools/virsh-domain.c
-+++ libvirt-6.5.0/tools/virsh-domain.c
-@@ -10716,6 +10716,22 @@ static const vshCmdOptDef opts_migrate[]
+--- libvirt-6.6.0.orig/tools/virsh-domain.c
+++ libvirt-6.6.0/tools/virsh-domain.c
+@@ -10700,6 +10700,22 @@ static const vshCmdOptDef opts_migrate[]
      .type = VSH_OT_STRING,
      .help = N_("override the destination host name used for TLS verification")
     },
@ -339,7 +339,7 @@ Index: libvirt-6.5.0/tools/virsh-domain.c
     {.name = NULL}
 };
 
-@@ -10737,6 +10753,7 @@ doMigrate(void *opaque)
+@@ -10721,6 +10737,7 @@ doMigrate(void *opaque)
     unsigned long long ullOpt = 0;
     int rv;
     virConnectPtr dconn = data->dconn;
@ -347,7 +347,7 @@ Index: libvirt-6.5.0/tools/virsh-domain.c
 #ifndef WIN32
     sigset_t sigmask, oldsigmask;
 
-@@ -10859,6 +10876,27 @@ doMigrate(void *opaque)
+@@ -10843,6 +10860,27 @@ doMigrate(void *opaque)
             goto save_error;
     }
 
@ -375,11 +375,11 @@ Index: libvirt-6.5.0/tools/virsh-domain.c
     if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0)
         goto out;
     if (opt) {
-Index: libvirt-6.5.0/docs/manpages/virsh.rst
+Index: libvirt-6.6.0/docs/manpages/virsh.rst
 ===================================================================
--- libvirt-6.5.0.orig/docs/manpages/virsh.rst
-+++ libvirt-6.5.0/docs/manpages/virsh.rst
-@@ -3093,6 +3093,8 @@ migrate
+--- libvirt-6.6.0.orig/docs/manpages/virsh.rst
+++ libvirt-6.6.0/docs/manpages/virsh.rst
+@@ -3102,6 +3102,8 @@ migrate
       [--postcopy-bandwidth bandwidth]
       [--parallel [--parallel-connections connections]]
       [--bandwidth bandwidth] [--tls-destination hostname]
@ -388,7 +388,7 @@ Index: libvirt-6.5.0/docs/manpages/virsh.rst
 
 Migrate domain to another host.  Add *--live* for live migration; <--p2p>
 for peer-2-peer migration; *--direct* for direct migration; or *--tunnelled*
-@@ -3198,6 +3200,14 @@ parallel connections. The number of such
+@@ -3207,6 +3209,14 @@ parallel connections. The number of such
 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-6.5.0/src/libxl/libxl_conf.c
+Index: libvirt-6.6.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-6.5.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.5.0/src/libxl/libxl_conf.c
+--- libvirt-6.6.0.orig/src/libxl/libxl_conf.c
+++ libvirt-6.6.0/src/libxl/libxl_conf.c
@@ -905,6 +905,22 @@ libxlDiskSetDiscard(libxl_device_disk *x
 #endif
 }
@ -34,7 +34,7 @@ Index: libvirt-6.5.0/src/libxl/libxl_conf.c
 static void
 libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode)
 {
-@@ -1045,6 +1061,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
+@@ -1041,6 +1057,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
 int
 libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)
 {
@ -42,7 +42,7 @@ Index: libvirt-6.5.0/src/libxl/libxl_conf.c
     const char *driver = virDomainDiskGetDriver(l_disk);
     int format = virDomainDiskGetFormat(l_disk);
     int actual_type = virStorageSourceGetActualType(l_disk->src);
-@@ -1060,7 +1077,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -1056,7 +1073,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
         if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0)
             return -1;
     } else {
@ -51,7 +51,7 @@ Index: libvirt-6.5.0/src/libxl/libxl_conf.c
     }
 
     x_disk->vdev = g_strdup(l_disk->dst);
-@@ -1171,6 +1188,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
+@@ -1167,6 +1184,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
     if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
         return -1;
     libxlDiskSetCacheMode(x_disk, l_disk->cachemode);
--- a/lxc-wait-after-eth-del.patch
+++ b/lxc-wait-after-eth-del.patch
@ -13,11 +13,11 @@ device with the same name that is being created.
 src/lxc/lxc_process.c    | 1 +
 3 files changed, 4 insertions(+)

-Index: libvirt-6.5.0/src/lxc/lxc_controller.c
+Index: libvirt-6.6.0/src/lxc/lxc_controller.c
 ===================================================================
--- libvirt-6.5.0.orig/src/lxc/lxc_controller.c
-+++ libvirt-6.5.0/src/lxc/lxc_controller.c
-@@ -2028,6 +2028,7 @@ static int virLXCControllerDeleteInterfa
+--- libvirt-6.6.0.orig/src/lxc/lxc_controller.c
+++ libvirt-6.6.0/src/lxc/lxc_controller.c
+@@ -2024,6 +2024,7 @@ static int virLXCControllerDeleteInterfa
         if (virNetDevVethDelete(ctrl->veths[i]) < 0)
             ret = -1;
     }
@ -25,10 +25,10 @@ Index: libvirt-6.5.0/src/lxc/lxc_controller.c
 
     return ret;
 }
-Index: libvirt-6.5.0/src/lxc/lxc_driver.c
+Index: libvirt-6.6.0/src/lxc/lxc_driver.c
 ===================================================================
--- libvirt-6.5.0.orig/src/lxc/lxc_driver.c
-+++ libvirt-6.5.0/src/lxc/lxc_driver.c
+--- libvirt-6.6.0.orig/src/lxc/lxc_driver.c
+++ libvirt-6.6.0/src/lxc/lxc_driver.c
@@ -66,6 +66,7 @@
 #include "virtime.h"
 #include "virtypedparam.h"
@ -53,10 +53,10 @@ Index: libvirt-6.5.0/src/lxc/lxc_driver.c
         break;
 
         /* It'd be nice to support this, but with macvlan
-Index: libvirt-6.5.0/src/lxc/lxc_process.c
+Index: libvirt-6.6.0/src/lxc/lxc_process.c
 ===================================================================
--- libvirt-6.5.0.orig/src/lxc/lxc_process.c
-+++ libvirt-6.5.0/src/lxc/lxc_process.c
+--- libvirt-6.6.0.orig/src/lxc/lxc_process.c
+++ libvirt-6.6.0/src/lxc/lxc_process.c
@@ -50,6 +50,7 @@
 #include "virstring.h"
 #include "virprocess.h"
--- a/network-don-t-use-dhcp-authoritative-on-static-netwo.patch
+++ b/network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@ -17,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-6.5.0/src/network/bridge_driver.c
+Index: libvirt-6.6.0/src/network/bridge_driver.c
 ===================================================================
--- libvirt-6.5.0.orig/src/network/bridge_driver.c
-+++ libvirt-6.5.0/src/network/bridge_driver.c
-@@ -1478,7 +1478,14 @@ networkDnsmasqConfContents(virNetworkObj
+--- libvirt-6.6.0.orig/src/network/bridge_driver.c
+++ libvirt-6.6.0/src/network/bridge_driver.c
+@@ -1448,7 +1448,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-6.5.0/src/network/bridge_driver.c
             }
 
             if (ipdef->tftproot) {
-Index: libvirt-6.5.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+Index: libvirt-6.6.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
 ===================================================================
--- libvirt-6.5.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
-+++ libvirt-6.5.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
+--- libvirt-6.6.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-6.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-6.5.0/src/util/virarch.c
+Index: libvirt-6.6.0/src/util/virarch.c
 ===================================================================
--- libvirt-6.5.0.orig/src/util/virarch.c
-+++ libvirt-6.5.0/src/util/virarch.c
+--- libvirt-6.6.0.orig/src/util/virarch.c
+++ libvirt-6.6.0/src/util/virarch.c
@@ -220,6 +220,8 @@ virArch virArchFromHost(void)
         arch = VIR_ARCH_I686;
     } else if (STREQ(ut.machine, "amd64")) {
--- a/qemu-apparmor-screenshot.patch
+++ b/qemu-apparmor-screenshot.patch
@ -1,7 +1,7 @@
-Index: libvirt-6.5.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-6.6.0/src/security/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-6.5.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-6.5.0/src/security/apparmor/libvirt-qemu
+--- libvirt-6.6.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-6.6.0/src/security/apparmor/libvirt-qemu
@@ -233,3 +233,6 @@
   # /sys/bus/nd/devices
   / r, # harmless on any lsb compliant system
--- 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-6.5.0/src/libxl/xen_common.c
+Index: libvirt-6.6.0/src/libxl/xen_common.c
 ===================================================================
--- libvirt-6.5.0.orig/src/libxl/xen_common.c
-+++ libvirt-6.5.0/src/libxl/xen_common.c
+--- libvirt-6.6.0.orig/src/libxl/xen_common.c
+++ libvirt-6.6.0/src/libxl/xen_common.c
@@ -381,12 +381,19 @@ xenParsePCI(char *entry)
     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-6.5.0/src/security/apparmor/libvirt-qemu
+Index: libvirt-6.6.0/src/security/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-6.5.0.orig/src/security/apparmor/libvirt-qemu
-+++ libvirt-6.5.0/src/security/apparmor/libvirt-qemu
+--- libvirt-6.6.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-6.6.0/src/security/apparmor/libvirt-qemu
@@ -61,6 +61,7 @@
   #/dev/fb* rw,
 
@ -20,10 +20,10 @@ Index: libvirt-6.5.0/src/security/apparmor/libvirt-qemu
   @{HOME}/.pulse-cookie rwk,
   owner /root/.pulse-cookie rwk,
   owner /root/.pulse/ rw,
-Index: libvirt-6.5.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+Index: libvirt-6.6.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
 ===================================================================
--- libvirt-6.5.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
-+++ libvirt-6.5.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+--- libvirt-6.6.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+++ libvirt-6.6.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -19,7 +19,7 @@ profile virt-aa-helper @libexecdir@/virt
   # Used when internally running another command (namely apparmor_parser)
   @{PROC}/@{pid}/fd/ r,
--- a/suse-bump-xen-version.patch
+++ b/suse-bump-xen-version.patch
@ -9,10 +9,10 @@ need backporting to anything older. The dependency on xen.git commit
 c3999835df makes it hard to upstream this patch.

 See bsc#1157490 and bsc#1167007 for more details
-Index: libvirt-6.5.0/m4/virt-driver-libxl.m4
+Index: libvirt-6.6.0/m4/virt-driver-libxl.m4
 ===================================================================
--- libvirt-6.5.0.orig/m4/virt-driver-libxl.m4
-+++ libvirt-6.5.0/m4/virt-driver-libxl.m4
+--- libvirt-6.6.0.orig/m4/virt-driver-libxl.m4
+++ libvirt-6.6.0/m4/virt-driver-libxl.m4
@@ -26,11 +26,11 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [
   LIBXL_CFLAGS=""
   LIBXL_FIRMWARE_DIR=""
@ -27,11 +27,11 @@ Index: libvirt-6.5.0/m4/virt-driver-libxl.m4
   if test "x$with_libxl" = "xyes" ; then
     LIBXL_FIRMWARE_DIR=$($PKG_CONFIG --variable xenfirmwaredir xenlight)
     LIBXL_EXECBIN_DIR=$($PKG_CONFIG --variable libexec_bin xenlight)
-Index: libvirt-6.5.0/src/libxl/libxl_conf.c
+Index: libvirt-6.6.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-6.5.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.5.0/src/libxl/libxl_conf.c
-@@ -1823,7 +1823,7 @@ libxlDriverConfigNew(void)
+--- libvirt-6.6.0.orig/src/libxl/libxl_conf.c
+++ libvirt-6.6.0/src/libxl/libxl_conf.c
+@@ -1818,7 +1818,7 @@ libxlDriverConfigNew(void)
 int
 libxlDriverConfigInit(libxlDriverConfigPtr cfg)
 {
@ -40,10 +40,10 @@ Index: libvirt-6.5.0/src/libxl/libxl_conf.c
 
     if (virFileMakePath(cfg->logDir) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
-Index: libvirt-6.5.0/src/libxl/libxl_domain.c
+Index: libvirt-6.6.0/src/libxl/libxl_domain.c
 ===================================================================
--- libvirt-6.5.0.orig/src/libxl/libxl_domain.c
-+++ libvirt-6.5.0/src/libxl/libxl_domain.c
+--- libvirt-6.6.0.orig/src/libxl/libxl_domain.c
+++ libvirt-6.6.0/src/libxl/libxl_domain.c
@@ -1020,8 +1020,8 @@ libxlDomainSetVcpuAffinities(libxlDriver
 static int
 libxlDomainFreeMem(libxl_ctx *ctx, libxl_domain_config *d_config)
@ -64,10 +64,10 @@ Index: libvirt-6.5.0/src/libxl/libxl_domain.c
                                           &aop_console_how);
         libxl_domain_restore_params_dispose(&params);
     }
-Index: libvirt-6.5.0/tests/libxlmock.c
+Index: libvirt-6.6.0/tests/libxlmock.c
 ===================================================================
--- libvirt-6.5.0.orig/tests/libxlmock.c
-+++ libvirt-6.5.0/tests/libxlmock.c
+--- libvirt-6.6.0.orig/tests/libxlmock.c
+++ libvirt-6.6.0/tests/libxlmock.c
@@ -67,7 +67,7 @@ VIR_MOCK_IMPL_RET_ARGS(libxl_get_version
 VIR_MOCK_STUB_RET_ARGS(libxl_get_free_memory,
                        int, 0,
--- a/suse-libvirt-guests-service.patch
+++ b/suse-libvirt-guests-service.patch
@ -1,9 +1,9 @@
 Adjust libvirt-guests service to conform to SUSE standards

-Index: libvirt-6.5.0/tools/libvirt-guests.sh.in
+Index: libvirt-6.6.0/tools/libvirt-guests.sh.in
 ===================================================================
--- libvirt-6.5.0.orig/tools/libvirt-guests.sh.in
-+++ libvirt-6.5.0/tools/libvirt-guests.sh.in
+--- libvirt-6.6.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-6.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-6.5.0/tools/libvirt-guests.sh.in
 esac
 -exit $RETVAL
 +rc_exit
-Index: libvirt-6.5.0/tools/libvirt-guests.sysconf
+Index: libvirt-6.6.0/tools/libvirt-guests.sysconf
 ===================================================================
--- libvirt-6.5.0.orig/tools/libvirt-guests.sysconf
-+++ libvirt-6.5.0/tools/libvirt-guests.sysconf
+--- libvirt-6.6.0.orig/tools/libvirt-guests.sysconf
+++ libvirt-6.6.0/tools/libvirt-guests.sysconf
@@ -1,9 +1,14 @@
 +## Path: System/Virtualization/libvirt-guests
 # Customizations for the libvirt-guests.service systemd unit
--- a/suse-libvirtd-disable-tls.patch
+++ b/suse-libvirtd-disable-tls.patch
@ -3,10 +3,10 @@ Disable TLS by default
 On SUSE distros, the default is for libvirtd to listen only on the
 Unix Domain Socket. The libvirt client still provides remote access
 via a SSH tunnel.
-Index: libvirt-6.5.0/src/remote/remote_daemon_config.c
+Index: libvirt-6.6.0/src/remote/remote_daemon_config.c
 ===================================================================
--- libvirt-6.5.0.orig/src/remote/remote_daemon_config.c
-+++ libvirt-6.5.0/src/remote/remote_daemon_config.c
+--- libvirt-6.6.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-6.6.0/src/remote/remote_daemon_config.c
@@ -99,7 +99,7 @@ daemonConfigNew(bool privileged G_GNUC_U
 
 #ifdef WITH_IP
@ -16,10 +16,10 @@ Index: libvirt-6.5.0/src/remote/remote_daemon_config.c
 # else /* ! LIBVIRTD */
     data->listen_tls = false; /* Always honoured, --listen doesn't exist. */
 # endif /* ! LIBVIRTD */
-Index: libvirt-6.5.0/src/remote/libvirtd.conf.in
+Index: libvirt-6.6.0/src/remote/libvirtd.conf.in
 ===================================================================
--- libvirt-6.5.0.orig/src/remote/libvirtd.conf.in
-+++ libvirt-6.5.0/src/remote/libvirtd.conf.in
+--- libvirt-6.6.0.orig/src/remote/libvirtd.conf.in
+++ libvirt-6.6.0/src/remote/libvirtd.conf.in
@@ -17,8 +17,8 @@
 # It is necessary to setup a CA and issue server certificates before
 # using this capability.
--- a/suse-libvirtd-sysconfig-settings.patch
+++ b/suse-libvirtd-sysconfig-settings.patch
@ -1,9 +1,9 @@
 Adjust libvirtd sysconfig file to conform to SUSE standards

-Index: libvirt-6.5.0/src/remote/libvirtd.sysconf
+Index: libvirt-6.6.0/src/remote/libvirtd.sysconf
 ===================================================================
--- libvirt-6.5.0.orig/src/remote/libvirtd.sysconf
-+++ libvirt-6.5.0/src/remote/libvirtd.sysconf
+--- libvirt-6.6.0.orig/src/remote/libvirtd.sysconf
+++ libvirt-6.6.0/src/remote/libvirtd.sysconf
@@ -1,5 +1,9 @@
 +## Path: System/Virtualization/libvirt
 # Customizations for the libvirtd.service systemd unit
--- a/suse-libxl-disable-autoballoon.patch
+++ b/suse-libxl-disable-autoballoon.patch
@ -6,10 +6,10 @@ autoballooning. This patch changes libvirt to also disable autoballooning
 by default. It can only be enabled with the 'autoballoon' setting in
 libxl.conf. See jsc#SLE-3059 for more details.

-Index: libvirt-6.5.0/src/libxl/libxl.conf
+Index: libvirt-6.6.0/src/libxl/libxl.conf
 ===================================================================
--- libvirt-6.5.0.orig/src/libxl/libxl.conf
-+++ libvirt-6.5.0/src/libxl/libxl.conf
+--- libvirt-6.6.0.orig/src/libxl/libxl.conf
+++ libvirt-6.6.0/src/libxl/libxl.conf
@@ -4,12 +4,11 @@
 
 # Enable autoballooning of domain0
@ -27,11 +27,11 @@ Index: libvirt-6.5.0/src/libxl/libxl.conf
 
 
 # In order to prevent accidentally starting two domains that
-Index: libvirt-6.5.0/src/libxl/libxl_conf.c
+Index: libvirt-6.6.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-6.5.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.5.0/src/libxl/libxl_conf.c
-@@ -1737,15 +1737,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
+--- libvirt-6.6.0.orig/src/libxl/libxl_conf.c
+++ libvirt-6.6.0/src/libxl/libxl_conf.c
+@@ -1732,15 +1732,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
 /*
  * Get domain0 autoballoon configuration.  Honor user-specified
  * setting in libxl.conf first.  If not specified, autoballooning
@ -48,7 +48,7 @@ Index: libvirt-6.5.0/src/libxl/libxl_conf.c
     int res;
 
     res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon);
-@@ -1754,15 +1751,8 @@ libxlGetAutoballoonConf(libxlDriverConfi
+@@ -1749,15 +1746,8 @@ libxlGetAutoballoonConf(libxlDriverConfi
     else if (res == 1)
         return 0;
 
--- a/suse-ovmf-paths.patch
+++ b/suse-ovmf-paths.patch
@ -1,10 +1,10 @@
 Adjust paths of OVMF firmwares on SUSE distros

-Index: libvirt-6.5.0/src/qemu/qemu.conf
+Index: libvirt-6.6.0/src/qemu/qemu.conf
 ===================================================================
--- libvirt-6.5.0.orig/src/qemu/qemu.conf
-+++ libvirt-6.5.0/src/qemu/qemu.conf
-@@ -787,10 +787,9 @@
+--- libvirt-6.6.0.orig/src/qemu/qemu.conf
+++ libvirt-6.6.0/src/qemu/qemu.conf
+@@ -844,10 +844,9 @@
 # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
 # follows this scheme.
 #nvram = [
@ -18,10 +18,10 @@ Index: libvirt-6.5.0/src/qemu/qemu.conf
 #]
 
 # The backend to use for handling stdout/stderr output from
-Index: libvirt-6.5.0/src/qemu/qemu_conf.c
+Index: libvirt-6.6.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-6.5.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-6.5.0/src/qemu/qemu_conf.c
+--- libvirt-6.6.0.orig/src/qemu/qemu_conf.c
+++ libvirt-6.6.0/src/qemu/qemu_conf.c
@@ -96,10 +96,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver
 
 #ifndef DEFAULT_LOADER_NVRAM
@ -36,10 +36,10 @@ Index: libvirt-6.5.0/src/qemu/qemu_conf.c
 #endif
 
 
-Index: libvirt-6.5.0/src/security/virt-aa-helper.c
+Index: libvirt-6.6.0/src/security/virt-aa-helper.c
 ===================================================================
--- libvirt-6.5.0.orig/src/security/virt-aa-helper.c
-+++ libvirt-6.5.0/src/security/virt-aa-helper.c
+--- libvirt-6.6.0.orig/src/security/virt-aa-helper.c
+++ libvirt-6.6.0/src/security/virt-aa-helper.c
@@ -479,7 +479,8 @@ valid_path(const char *path, const bool
         "/usr/share/ovmf/",              /* for OVMF images */
         "/usr/share/AAVMF/",             /* for AAVMF images */
--- a/suse-qemu-conf.patch
+++ b/suse-qemu-conf.patch
@ -7,11 +7,11 @@ suse-qemu-conf-secdriver.patch, suse-qemu-conf-lockmgr.patch,
 etc.), but for now they are all lumped together in this
 single patch.

-Index: libvirt-6.5.0/src/qemu/qemu.conf
+Index: libvirt-6.6.0/src/qemu/qemu.conf
 ===================================================================
--- libvirt-6.5.0.orig/src/qemu/qemu.conf
-+++ libvirt-6.5.0/src/qemu/qemu.conf
-@@ -420,10 +420,19 @@
+--- libvirt-6.6.0.orig/src/qemu/qemu.conf
+++ libvirt-6.6.0/src/qemu/qemu.conf
+@@ -477,10 +477,19 @@
 # isolation, but it cannot appear in a list of drivers.
 #
 #security_driver = "selinux"
@ -32,7 +32,7 @@ Index: libvirt-6.5.0/src/qemu/qemu.conf
 #security_default_confined = 1
 
 # If set to non-zero, then attempts to create unconfined
-@@ -658,11 +667,22 @@
+@@ -715,11 +724,22 @@
 #relaxed_acs_check = 1
 
 
@ -60,10 +60,10 @@ Index: libvirt-6.5.0/src/qemu/qemu.conf
 #
 #lock_manager = "lockd"
 
-Index: libvirt-6.5.0/src/qemu/qemu_conf.c
+Index: libvirt-6.6.0/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-6.5.0.orig/src/qemu/qemu_conf.c
-+++ libvirt-6.5.0/src/qemu/qemu_conf.c
+--- libvirt-6.6.0.orig/src/qemu/qemu_conf.c
+++ libvirt-6.6.0/src/qemu/qemu_conf.c
@@ -266,7 +266,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf
     cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER);
     cfg->dbusDaemonName = g_strdup(QEMU_DBUS_DAEMON);
--- a/suse-virtlockd-sysconfig-settings.patch
+++ b/suse-virtlockd-sysconfig-settings.patch
@ -1,9 +1,9 @@
 Adjust virtlockd sysconfig file to conform to SUSE standards

-Index: libvirt-6.5.0/src/locking/virtlockd.sysconf
+Index: libvirt-6.6.0/src/locking/virtlockd.sysconf
 ===================================================================
--- libvirt-6.5.0.orig/src/locking/virtlockd.sysconf
-+++ libvirt-6.5.0/src/locking/virtlockd.sysconf
+--- libvirt-6.6.0.orig/src/locking/virtlockd.sysconf
+++ libvirt-6.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-6.5.0/src/logging/virtlogd.sysconf
+Index: libvirt-6.6.0/src/logging/virtlogd.sysconf
 ===================================================================
--- libvirt-6.5.0.orig/src/logging/virtlogd.sysconf
-+++ libvirt-6.5.0/src/logging/virtlogd.sysconf
+--- libvirt-6.6.0.orig/src/logging/virtlogd.sysconf
+++ libvirt-6.6.0/src/logging/virtlogd.sysconf
@@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlogd
 +
--- a/suse-xen-ovmf-loaders.patch
+++ b/suse-xen-ovmf-loaders.patch
@ -5,11 +5,11 @@ upstream support for firmware autoselection in the xen driver. Sadly, the
 upstream efforts to improve firmware handling in the qemu driver broke
 the firmware handling in the xen driver.

-Index: libvirt-6.5.0/src/libxl/libxl_conf.c
+Index: libvirt-6.6.0/src/libxl/libxl_conf.c
 ===================================================================
--- libvirt-6.5.0.orig/src/libxl/libxl_conf.c
-+++ libvirt-6.5.0/src/libxl/libxl_conf.c
-@@ -1777,6 +1777,15 @@ libxlDriverConfigNew(void)
+--- libvirt-6.6.0.orig/src/libxl/libxl_conf.c
+++ libvirt-6.6.0/src/libxl/libxl_conf.c
+@@ -1772,6 +1772,15 @@ libxlDriverConfigNew(void)
     cfg->autoDumpDir = g_strdup(LIBXL_DUMP_DIR);
     cfg->channelDir = g_strdup(LIBXL_CHANNEL_DIR);