Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2020-06-05 20:03:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Fri Jun 5 20:03:58 2020 rev:306 rq:811207 version:6.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2020-05-09 19:50:58.608660447 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new.3606/libvirt.changes 2020-06-05 20:04:47.996832622 +0200 @@ -1,0 +2,19 @@ +Wed Jun 3 16:38:09 UTC 2020 - James Fehlig <[email protected]> + +- libxl: Normalize MAC address in device conf on netdev hotplug + ec07aad8-libxl-normalize-mac-addr.patch + bsc#1172052 + +------------------------------------------------------------------- +Tue Jun 2 15:16:15 UTC 2020 - James Fehlig <[email protected]> + +- Update to libvirt 6.4.0 + - Many incremental improvements and bug fixes, see + https://libvirt.org/news.html + - Dropped patches: + d677de9d-libxl-fix-driver-name-check.patch, + d218a9c2-libxl-xen-driver-tables.patch, + 836ea91d-libxl-xenlight-internal.patch, + 57687260-xen-doc-improvements.patch + +------------------------------------------------------------------- Old: ---- 57687260-xen-doc-improvements.patch 836ea91d-libxl-xenlight-internal.patch d218a9c2-libxl-xen-driver-tables.patch d677de9d-libxl-fix-driver-name-check.patch libvirt-6.3.0.tar.xz libvirt-6.3.0.tar.xz.asc New: ---- ec07aad8-libxl-normalize-mac-addr.patch libvirt-6.4.0.tar.xz libvirt-6.4.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.376894590 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.380894597 +0200 @@ -185,7 +185,7 @@ Name: libvirt URL: http://libvirt.org/ -Version: 6.3.0 +Version: 6.4.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later @@ -338,10 +338,7 @@ Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: d677de9d-libxl-fix-driver-name-check.patch -Patch1: d218a9c2-libxl-xen-driver-tables.patch -Patch2: 836ea91d-libxl-xenlight-internal.patch -Patch3: 57687260-xen-doc-improvements.patch +Patch0: ec07aad8-libxl-normalize-mac-addr.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -878,9 +875,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %patch100 -p1 %patch101 -p1 %patch150 -p1 ++++++ 0001-Extract-stats-functions-from-the-qemu-driver.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.412894653 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.412894653 +0200 @@ -18,10 +18,10 @@ create mode 100644 src/conf/domain_stats.c create mode 100644 src/conf/domain_stats.h -Index: libvirt-6.3.0/src/conf/domain_stats.c +Index: libvirt-6.4.0/src/conf/domain_stats.c =================================================================== --- /dev/null -+++ libvirt-6.3.0/src/conf/domain_stats.c ++++ libvirt-6.4.0/src/conf/domain_stats.c @@ -0,0 +1,119 @@ +/* + * domain_stats.c: domain stats extraction helpers @@ -142,10 +142,10 @@ +} + +#undef STATS_ADD_NET_PARAM -Index: libvirt-6.3.0/src/conf/domain_stats.h +Index: libvirt-6.4.0/src/conf/domain_stats.h =================================================================== --- /dev/null -+++ libvirt-6.3.0/src/conf/domain_stats.h ++++ libvirt-6.4.0/src/conf/domain_stats.h @@ -0,0 +1,62 @@ +/* + * domain_stats.h: domain stats extraction helpers @@ -209,10 +209,10 @@ + virTypedParamListPtr params); + +#endif /* __DOMAIN_STATS_H */ -Index: libvirt-6.3.0/src/libvirt_private.syms +Index: libvirt-6.4.0/src/libvirt_private.syms =================================================================== ---- libvirt-6.3.0.orig/src/libvirt_private.syms -+++ libvirt-6.3.0/src/libvirt_private.syms +--- libvirt-6.4.0.orig/src/libvirt_private.syms ++++ libvirt-6.4.0/src/libvirt_private.syms @@ -732,6 +732,9 @@ virDomainConfNWFilterInstantiate; virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -231,10 +231,10 @@ virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKillPainfully; -Index: libvirt-6.3.0/src/qemu/qemu_driver.c +Index: libvirt-6.4.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-6.3.0.orig/src/qemu/qemu_driver.c -+++ libvirt-6.3.0/src/qemu/qemu_driver.c +--- libvirt-6.4.0.orig/src/qemu/qemu_driver.c ++++ libvirt-6.4.0/src/qemu/qemu_driver.c @@ -64,6 +64,7 @@ #include "virarptable.h" #include "viruuid.h" @@ -243,7 +243,7 @@ #include "domain_audit.h" #include "domain_cgroup.h" #include "domain_driver.h" -@@ -20636,13 +20637,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr +@@ -20654,13 +20655,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr virTypedParamListPtr params, unsigned int privflags G_GNUC_UNUSED) { @@ -258,7 +258,7 @@ } -@@ -20945,17 +20940,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj +@@ -20963,17 +20958,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj if (!priv->cgroup) return 0; @@ -277,7 +277,7 @@ } -@@ -21123,76 +21108,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr +@@ -21141,76 +21126,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr return ret; } @@ -355,11 +355,11 @@ /* refresh information by opening images on the disk */ static int -Index: libvirt-6.3.0/src/util/vircgroup.c +Index: libvirt-6.4.0/src/util/vircgroup.c =================================================================== ---- libvirt-6.3.0.orig/src/util/vircgroup.c -+++ libvirt-6.3.0/src/util/vircgroup.c -@@ -2779,6 +2779,31 @@ virCgroupControllerAvailable(int control +--- libvirt-6.4.0.orig/src/util/vircgroup.c ++++ libvirt-6.4.0/src/util/vircgroup.c +@@ -2776,6 +2776,31 @@ virCgroupControllerAvailable(int control return ret; } @@ -391,7 +391,7 @@ #else /* !__linux__ */ bool -@@ -2788,6 +2813,14 @@ virCgroupAvailable(void) +@@ -2785,6 +2810,14 @@ virCgroupAvailable(void) } @@ -406,10 +406,10 @@ int virCgroupNewPartition(const char *path G_GNUC_UNUSED, bool create G_GNUC_UNUSED, -Index: libvirt-6.3.0/src/util/vircgroup.h +Index: libvirt-6.4.0/src/util/vircgroup.h =================================================================== ---- libvirt-6.3.0.orig/src/util/vircgroup.h -+++ libvirt-6.3.0/src/util/vircgroup.h +--- libvirt-6.4.0.orig/src/util/vircgroup.h ++++ libvirt-6.4.0/src/util/vircgroup.h @@ -23,6 +23,7 @@ #include "virbitmap.h" @@ -425,10 +425,10 @@ + +int virCgroupGetStatsCpu(virCgroupPtr cgroup, + virTypedParamListPtr params); -Index: libvirt-6.3.0/src/conf/Makefile.inc.am +Index: libvirt-6.4.0/src/conf/Makefile.inc.am =================================================================== ---- libvirt-6.3.0.orig/src/conf/Makefile.inc.am -+++ libvirt-6.3.0/src/conf/Makefile.inc.am +--- libvirt-6.4.0.orig/src/conf/Makefile.inc.am ++++ libvirt-6.4.0/src/conf/Makefile.inc.am @@ -28,6 +28,8 @@ DOMAIN_CONF_SOURCES = \ conf/domain_audit.h \ conf/domain_nwfilter.c \ ++++++ 0001-libxl-add-support-for-BlockResize-API.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.420894667 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.420894667 +0200 @@ -19,11 +19,11 @@ src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) -Index: libvirt-6.3.0/src/libxl/libxl_driver.c +Index: libvirt-6.4.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-6.3.0.orig/src/libxl/libxl_driver.c -+++ libvirt-6.3.0/src/libxl/libxl_driver.c -@@ -5287,6 +5287,96 @@ libxlDomainMemoryStats(virDomainPtr dom, +--- libvirt-6.4.0.orig/src/libxl/libxl_driver.c ++++ libvirt-6.4.0/src/libxl/libxl_driver.c +@@ -5323,6 +5323,96 @@ libxlDomainMemoryStats(virDomainPtr dom, #undef LIBXL_SET_MEMSTAT @@ -120,7 +120,7 @@ static int libxlDomainGetJobInfo(virDomainPtr dom, virDomainJobInfoPtr info) -@@ -6756,6 +6846,7 @@ static virHypervisorDriver libxlHypervis +@@ -6792,6 +6882,7 @@ static virHypervisorDriver libxlHypervis #endif .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */ ++++++ 0002-lxc-implement-connectGetAllDomainStats.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.428894681 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.428894681 +0200 @@ -9,10 +9,10 @@ src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) -Index: libvirt-6.3.0/src/lxc/lxc_driver.c +Index: libvirt-6.4.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-6.3.0.orig/src/lxc/lxc_driver.c -+++ libvirt-6.3.0/src/lxc/lxc_driver.c +--- libvirt-6.4.0.orig/src/lxc/lxc_driver.c ++++ libvirt-6.4.0/src/lxc/lxc_driver.c @@ -74,6 +74,7 @@ #include "netdev_bandwidth_conf.h" #include "virsocket.h" ++++++ disable-multipath-pr-tests.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.452894723 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.452894723 +0200 @@ -3,10 +3,10 @@ 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.3.0/tests/qemuhotplugtest.c +Index: libvirt-6.4.0/tests/qemuhotplugtest.c =================================================================== ---- libvirt-6.3.0.orig/tests/qemuhotplugtest.c -+++ libvirt-6.3.0/tests/qemuhotplugtest.c +--- libvirt-6.4.0.orig/tests/qemuhotplugtest.c ++++ libvirt-6.4.0/tests/qemuhotplugtest.c @@ -87,8 +87,6 @@ qemuHotplugCreateObjects(virDomainXMLOpt virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VNC); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SPICE); @@ -16,7 +16,7 @@ if (qemuTestCapsCacheInsert(driver.qemuCapsCache, priv->qemuCaps) < 0) return -1; -@@ -755,17 +753,6 @@ mymain(void) +@@ -760,17 +758,6 @@ mymain(void) "device_del", QMP_DEVICE_DELETED("scsi3-0-5-6") QMP_OK, "human-monitor-command", HMP("")); ++++++ ec07aad8-libxl-normalize-mac-addr.patch ++++++ commit ec07aad8f8a6ead8e9363c8deec4845edb5bf112 Author: Jim Fehlig <[email protected]> Date: Wed May 27 17:29:33 2020 -0600 libxl: Normalize MAC address in device conf when hotplugging a netdev Similar to commits 55ce6564634 and 6c17606b7cc in the qemu driver, make separate copies of persistent and live device config and normalize the MAC address between the two. This avoids having different MAC address for the persistent and live config, ensuring the device has the same address when the persistent config takes affect after a VM restart. Signed-off-by: Jim Fehlig <[email protected]> Reviewed-by: Laine Stump <[email protected]> Index: libvirt-6.4.0/src/libxl/libxl_driver.c =================================================================== --- libvirt-6.4.0.orig/src/libxl/libxl_driver.c +++ libvirt-6.4.0/src/libxl/libxl_driver.c @@ -4096,6 +4096,31 @@ libxlDomainUpdateDeviceConfig(virDomainD } +static void +libxlDomainAttachDeviceNormalize(const virDomainDeviceDef *devConf, + virDomainDeviceDefPtr devLive) +{ + /* + * Fixup anything that needs to be identical in the live and + * config versions of DeviceDef, but might not be. Do this by + * changing the contents of devLive. This is done after all + * post-parse tweaks and validation, so be very careful about what + * changes are made. + */ + + /* MAC address should be identical in both DeviceDefs, but if it + * wasn't specified in the XML, and was instead autogenerated, it + * will be different for the two since they are each the result of + * a separate parser call. If it *was* specified, it will already + * be the same, so copying does no harm. + */ + + if (devConf->type == VIR_DOMAIN_DEVICE_NET) + virMacAddrSet(&devLive->data.net->mac, &devConf->data.net->mac); + +} + + static int libxlDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, unsigned int flags) @@ -4104,7 +4129,9 @@ libxlDomainAttachDeviceFlags(virDomainPt libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); virDomainObjPtr vm = NULL; virDomainDefPtr vmdef = NULL; - virDomainDeviceDefPtr dev = NULL; + virDomainDeviceDefPtr devConf = NULL; + virDomainDeviceDef devConfSave = { 0 }; + virDomainDeviceDefPtr devLive = NULL; int ret = -1; virCheckFlags(VIR_DOMAIN_DEVICE_MODIFY_LIVE | @@ -4123,28 +4150,36 @@ libxlDomainAttachDeviceFlags(virDomainPt goto endjob; if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - if (!(dev = virDomainDeviceDefParse(xml, vm->def, - driver->xmlopt, NULL, - VIR_DOMAIN_DEF_PARSE_INACTIVE))) + if (!(devConf = virDomainDeviceDefParse(xml, vm->def, + driver->xmlopt, NULL, + VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto endjob; /* Make a copy for updated domain. */ if (!(vmdef = virDomainObjCopyPersistentDef(vm, driver->xmlopt, NULL))) goto endjob; - if (libxlDomainAttachDeviceConfig(vmdef, dev) < 0) + /* + * devConf will be NULLed out by + * libxlDomainAttachDeviceConfig(), so save it for later use by + * libxlDomainAttachDeviceNormalize() + */ + devConfSave = *devConf; + + if (libxlDomainAttachDeviceConfig(vmdef, devConf) < 0) goto endjob; } if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) { - /* If dev exists it was created to modify the domain config. Free it. */ - virDomainDeviceDefFree(dev); - if (!(dev = virDomainDeviceDefParse(xml, vm->def, + if (!(devLive = virDomainDeviceDefParse(xml, vm->def, driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto endjob; - if (libxlDomainAttachDeviceLive(driver, vm, dev) < 0) + if (flags & VIR_DOMAIN_AFFECT_CONFIG) + libxlDomainAttachDeviceNormalize(&devConfSave, devLive); + + if (libxlDomainAttachDeviceLive(driver, vm, devLive) < 0) goto endjob; /* @@ -4171,7 +4206,8 @@ libxlDomainAttachDeviceFlags(virDomainPt cleanup: virDomainDefFree(vmdef); - virDomainDeviceDefFree(dev); + virDomainDeviceDefFree(devConf); + virDomainDeviceDefFree(devLive); virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; ++++++ libvirt-6.3.0.tar.xz -> libvirt-6.4.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-6.3.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new.3606/libvirt-6.4.0.tar.xz differ: char 15, line 1 ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.492894793 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.496894800 +0200 @@ -2,10 +2,10 @@ From: <[email protected]> -Index: libvirt-6.3.0/src/cpu_map/ppc64_POWER8.xml +Index: libvirt-6.4.0/src/cpu_map/ppc64_POWER8.xml =================================================================== ---- libvirt-6.3.0.orig/src/cpu_map/ppc64_POWER8.xml -+++ libvirt-6.3.0/src/cpu_map/ppc64_POWER8.xml +--- libvirt-6.4.0.orig/src/cpu_map/ppc64_POWER8.xml ++++ libvirt-6.4.0/src/cpu_map/ppc64_POWER8.xml @@ -4,5 +4,7 @@ <pvr value='0x004b0000' mask='0xffff0000'/> <pvr value='0x004c0000' mask='0xffff0000'/> ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.528894856 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.528894856 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-6.3.0/configure.ac +Index: libvirt-6.4.0/configure.ac =================================================================== ---- libvirt-6.3.0.orig/configure.ac -+++ libvirt-6.3.0/configure.ac +--- libvirt-6.4.0.orig/configure.ac ++++ libvirt-6.4.0/configure.ac @@ -278,6 +278,7 @@ LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_MACVTAP @@ -26,10 +26,10 @@ LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL -Index: libvirt-6.3.0/tools/virsh.c +Index: libvirt-6.4.0/tools/virsh.c =================================================================== ---- libvirt-6.3.0.orig/tools/virsh.c -+++ libvirt-6.3.0/tools/virsh.c +--- libvirt-6.4.0.orig/tools/virsh.c ++++ libvirt-6.4.0/tools/virsh.c @@ -547,6 +547,8 @@ virshShowVersion(vshControl *ctl G_GNUC_ vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -39,10 +39,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-6.3.0/src/interface/interface_backend_netcf.c +Index: libvirt-6.4.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-6.3.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-6.3.0/src/interface/interface_backend_netcf.c +--- libvirt-6.4.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-6.4.0/src/interface/interface_backend_netcf.c @@ -21,7 +21,12 @@ #include <config.h> @@ -154,10 +154,10 @@ if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) return -1; if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) -Index: libvirt-6.3.0/src/interface/interface_driver.c +Index: libvirt-6.4.0/src/interface/interface_driver.c =================================================================== ---- libvirt-6.3.0.orig/src/interface/interface_driver.c -+++ libvirt-6.3.0/src/interface/interface_driver.c +--- libvirt-6.4.0.orig/src/interface/interface_driver.c ++++ libvirt-6.4.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -175,10 +175,10 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-6.3.0/m4/virt-netcontrol.m4 +Index: libvirt-6.4.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-6.3.0/m4/virt-netcontrol.m4 ++++ libvirt-6.4.0/m4/virt-netcontrol.m4 @@ -0,0 +1,39 @@ +dnl The libnetcontrol library +dnl @@ -219,10 +219,10 @@ +AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[ + LIBVIRT_RESULT_LIB([NETCONTROL]) +]) -Index: libvirt-6.3.0/src/interface/Makefile.inc.am +Index: libvirt-6.4.0/src/interface/Makefile.inc.am =================================================================== ---- libvirt-6.3.0.orig/src/interface/Makefile.inc.am -+++ libvirt-6.3.0/src/interface/Makefile.inc.am +--- libvirt-6.4.0.orig/src/interface/Makefile.inc.am ++++ libvirt-6.4.0/src/interface/Makefile.inc.am @@ -6,6 +6,7 @@ INTERFACE_DRIVER_SOURCES = \ $(NULL) ++++++ libxl-dom-reset.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.576894941 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.576894941 +0200 @@ -8,10 +8,10 @@ option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. -Index: libvirt-6.3.0/src/libxl/libxl_driver.c +Index: libvirt-6.4.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-6.3.0.orig/src/libxl/libxl_driver.c -+++ libvirt-6.3.0/src/libxl/libxl_driver.c +--- libvirt-6.4.0.orig/src/libxl/libxl_driver.c ++++ libvirt-6.4.0/src/libxl/libxl_driver.c @@ -1371,6 +1371,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } @@ -74,7 +74,7 @@ libxlDomainDestroyFlags(virDomainPtr dom, unsigned int flags) { -@@ -6631,6 +6686,7 @@ static virHypervisorDriver libxlHypervis +@@ -6667,6 +6722,7 @@ static virHypervisorDriver libxlHypervis .domainShutdown = libxlDomainShutdown, /* 0.9.0 */ .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */ .domainReboot = libxlDomainReboot, /* 0.9.0 */ ++++++ libxl-set-cach-mode.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.584894954 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.588894962 +0200 @@ -3,10 +3,10 @@ src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-6.3.0/src/libxl/libxl_conf.c +Index: libvirt-6.4.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-6.3.0.orig/src/libxl/libxl_conf.c -+++ libvirt-6.3.0/src/libxl/libxl_conf.c +--- libvirt-6.4.0.orig/src/libxl/libxl_conf.c ++++ libvirt-6.4.0/src/libxl/libxl_conf.c @@ -905,6 +905,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } ++++++ libxl-set-migration-constraints.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.596894975 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.596894975 +0200 @@ -16,10 +16,10 @@ tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-6.3.0/include/libvirt/libvirt-domain.h +Index: libvirt-6.4.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-6.3.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-6.3.0/include/libvirt/libvirt-domain.h +--- libvirt-6.4.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-6.4.0/include/libvirt/libvirt-domain.h @@ -1065,6 +1065,31 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_TLS_DESTINATION "tls.destination" @@ -52,11 +52,11 @@ /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-6.3.0/src/libxl/libxl_driver.c +Index: libvirt-6.4.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-6.3.0.orig/src/libxl/libxl_driver.c -+++ libvirt-6.3.0/src/libxl/libxl_driver.c -@@ -6196,6 +6196,9 @@ libxlDomainMigratePerform3Params(virDoma +--- libvirt-6.4.0.orig/src/libxl/libxl_driver.c ++++ libvirt-6.4.0/src/libxl/libxl_driver.c +@@ -6232,6 +6232,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; int ret = -1; @@ -66,7 +66,7 @@ #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME virReportUnsupportedError(); -@@ -6212,6 +6215,18 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6248,6 +6251,18 @@ libxlDomainMigratePerform3Params(virDoma virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 || @@ -85,7 +85,7 @@ virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_URI, &uri) < 0) -@@ -6226,11 +6241,11 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6262,11 +6277,11 @@ libxlDomainMigratePerform3Params(virDoma if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml, @@ -99,10 +99,10 @@ goto cleanup; } -Index: libvirt-6.3.0/src/libxl/libxl_migration.c +Index: libvirt-6.4.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-6.3.0.orig/src/libxl/libxl_migration.c -+++ libvirt-6.3.0/src/libxl/libxl_migration.c +--- libvirt-6.4.0.orig/src/libxl/libxl_migration.c ++++ libvirt-6.4.0/src/libxl/libxl_migration.c @@ -345,18 +345,39 @@ libxlMigrateDstReceive(virNetSocketPtr s static int libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, @@ -264,10 +264,10 @@ virObjectLock(vm); if (ret == 0) { -Index: libvirt-6.3.0/src/libxl/libxl_migration.h +Index: libvirt-6.4.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-6.3.0.orig/src/libxl/libxl_migration.h -+++ libvirt-6.3.0/src/libxl/libxl_migration.h +--- libvirt-6.4.0.orig/src/libxl/libxl_migration.h ++++ libvirt-6.4.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,10 +312,10 @@ virDomainPtr libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-6.3.0/tools/virsh-domain.c +Index: libvirt-6.4.0/tools/virsh-domain.c =================================================================== ---- libvirt-6.3.0.orig/tools/virsh-domain.c -+++ libvirt-6.3.0/tools/virsh-domain.c +--- libvirt-6.4.0.orig/tools/virsh-domain.c ++++ libvirt-6.4.0/tools/virsh-domain.c @@ -10721,6 +10721,22 @@ static const vshCmdOptDef opts_migrate[] .type = VSH_OT_STRING, .help = N_("override the destination host name used for TLS verification") @@ -375,10 +375,10 @@ if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { -Index: libvirt-6.3.0/docs/manpages/virsh.rst +Index: libvirt-6.4.0/docs/manpages/virsh.rst =================================================================== ---- libvirt-6.3.0.orig/docs/manpages/virsh.rst -+++ libvirt-6.3.0/docs/manpages/virsh.rst +--- libvirt-6.4.0.orig/docs/manpages/virsh.rst ++++ libvirt-6.4.0/docs/manpages/virsh.rst @@ -3093,6 +3093,8 @@ migrate [--postcopy-bandwidth bandwidth] [--parallel [--parallel-connections connections]] ++++++ libxl-support-block-script.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.608894996 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.608894996 +0200 @@ -7,10 +7,10 @@ For more details, see bsc#954872 and FATE#319810 -Index: libvirt-6.3.0/src/libxl/libxl_conf.c +Index: libvirt-6.4.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-6.3.0.orig/src/libxl/libxl_conf.c -+++ libvirt-6.3.0/src/libxl/libxl_conf.c +--- libvirt-6.4.0.orig/src/libxl/libxl_conf.c ++++ libvirt-6.4.0/src/libxl/libxl_conf.c @@ -905,6 +905,22 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } ++++++ lxc-wait-after-eth-del.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.616895011 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.616895011 +0200 @@ -13,10 +13,10 @@ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-6.3.0/src/lxc/lxc_controller.c +Index: libvirt-6.4.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-6.3.0.orig/src/lxc/lxc_controller.c -+++ libvirt-6.3.0/src/lxc/lxc_controller.c +--- libvirt-6.4.0.orig/src/lxc/lxc_controller.c ++++ libvirt-6.4.0/src/lxc/lxc_controller.c @@ -2056,6 +2056,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; @@ -25,10 +25,10 @@ return ret; } -Index: libvirt-6.3.0/src/lxc/lxc_driver.c +Index: libvirt-6.4.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-6.3.0.orig/src/lxc/lxc_driver.c -+++ libvirt-6.3.0/src/lxc/lxc_driver.c +--- libvirt-6.4.0.orig/src/lxc/lxc_driver.c ++++ libvirt-6.4.0/src/lxc/lxc_driver.c @@ -67,6 +67,7 @@ #include "virtime.h" #include "virtypedparam.h" @@ -53,10 +53,10 @@ break; /* It'd be nice to support this, but with macvlan -Index: libvirt-6.3.0/src/lxc/lxc_process.c +Index: libvirt-6.4.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-6.3.0.orig/src/lxc/lxc_process.c -+++ libvirt-6.3.0/src/lxc/lxc_process.c +--- libvirt-6.4.0.orig/src/lxc/lxc_process.c ++++ libvirt-6.4.0/src/lxc/lxc_process.c @@ -50,6 +50,7 @@ #include "virstring.h" #include "virprocess.h" ++++++ network-don-t-use-dhcp-authoritative-on-static-netwo.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.628895032 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.628895032 +0200 @@ -17,11 +17,11 @@ tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-6.3.0/src/network/bridge_driver.c +Index: libvirt-6.4.0/src/network/bridge_driver.c =================================================================== ---- libvirt-6.3.0.orig/src/network/bridge_driver.c -+++ libvirt-6.3.0/src/network/bridge_driver.c -@@ -1476,7 +1476,14 @@ networkDnsmasqConfContents(virNetworkObj +--- libvirt-6.4.0.orig/src/network/bridge_driver.c ++++ libvirt-6.4.0/src/network/bridge_driver.c +@@ -1478,7 +1478,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 @@ } if (ipdef->tftproot) { -Index: libvirt-6.3.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-6.4.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-6.3.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-6.3.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-6.4.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-6.4.0/tests/networkxml2confdata/dhcp6host-routed-network.conf @@ -10,7 +10,6 @@ bind-dynamic interface=virbr1 dhcp-range=192.168.122.1,static ++++++ ppc64le-canonical-name.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.636895045 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.636895045 +0200 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-6.3.0/src/util/virarch.c +Index: libvirt-6.4.0/src/util/virarch.c =================================================================== ---- libvirt-6.3.0.orig/src/util/virarch.c -+++ libvirt-6.3.0/src/util/virarch.c +--- libvirt-6.4.0.orig/src/util/virarch.c ++++ libvirt-6.4.0/src/util/virarch.c @@ -220,6 +220,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_I686; } else if (STREQ(ut.machine, "amd64")) { ++++++ qemu-apparmor-screenshot.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.648895066 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.648895066 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-6.3.0/src/security/apparmor/libvirt-qemu +Index: libvirt-6.4.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-6.3.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-6.3.0/src/security/apparmor/libvirt-qemu +--- libvirt-6.4.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-6.4.0/src/security/apparmor/libvirt-qemu @@ -233,3 +233,6 @@ # /sys/bus/nd/devices / r, # harmless on any lsb compliant system ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.660895087 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.660895087 +0200 @@ -8,10 +8,10 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-6.3.0/src/libxl/xen_common.c +Index: libvirt-6.4.0/src/libxl/xen_common.c =================================================================== ---- libvirt-6.3.0.orig/src/libxl/xen_common.c -+++ libvirt-6.3.0/src/libxl/xen_common.c +--- libvirt-6.4.0.orig/src/libxl/xen_common.c ++++ libvirt-6.4.0/src/libxl/xen_common.c @@ -381,12 +381,19 @@ xenParsePCI(char *entry) int busID; int slotID; ++++++ suse-apparmor-libnl-paths.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.672895108 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.672895108 +0200 @@ -8,10 +8,10 @@ to squelch a denial when starting confined domains. Found while investigating bsc#1058847 -Index: libvirt-6.3.0/src/security/apparmor/libvirt-qemu +Index: libvirt-6.4.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-6.3.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-6.3.0/src/security/apparmor/libvirt-qemu +--- libvirt-6.4.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-6.4.0/src/security/apparmor/libvirt-qemu @@ -61,6 +61,7 @@ #/dev/fb* rw, @@ -20,10 +20,10 @@ @{HOME}/.pulse-cookie rwk, owner /root/.pulse-cookie rwk, owner /root/.pulse/ rw, -Index: libvirt-6.3.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in +Index: libvirt-6.4.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in =================================================================== ---- libvirt-6.3.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in -+++ libvirt-6.3.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in +--- libvirt-6.4.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ libvirt-6.4.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, ++++++ suse-bump-xen-version.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.680895123 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.684895129 +0200 @@ -9,10 +9,10 @@ c3999835df makes it hard to upstream this patch. See bsc#1157490 and bsc#1167007 for more details -Index: libvirt-6.3.0/m4/virt-driver-libxl.m4 +Index: libvirt-6.4.0/m4/virt-driver-libxl.m4 =================================================================== ---- libvirt-6.3.0.orig/m4/virt-driver-libxl.m4 -+++ libvirt-6.3.0/m4/virt-driver-libxl.m4 +--- libvirt-6.4.0.orig/m4/virt-driver-libxl.m4 ++++ libvirt-6.4.0/m4/virt-driver-libxl.m4 @@ -26,11 +26,11 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [ LIBXL_CFLAGS="" LIBXL_FIRMWARE_DIR="" @@ -27,10 +27,10 @@ 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.3.0/src/libxl/libxl_conf.c +Index: libvirt-6.4.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-6.3.0.orig/src/libxl/libxl_conf.c -+++ libvirt-6.3.0/src/libxl/libxl_conf.c +--- libvirt-6.4.0.orig/src/libxl/libxl_conf.c ++++ libvirt-6.4.0/src/libxl/libxl_conf.c @@ -1823,7 +1823,7 @@ libxlDriverConfigNew(void) int libxlDriverConfigInit(libxlDriverConfigPtr cfg) @@ -40,10 +40,10 @@ if (virFileMakePath(cfg->logDir) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, -Index: libvirt-6.3.0/src/libxl/libxl_domain.c +Index: libvirt-6.4.0/src/libxl/libxl_domain.c =================================================================== ---- libvirt-6.3.0.orig/src/libxl/libxl_domain.c -+++ libvirt-6.3.0/src/libxl/libxl_domain.c +--- libvirt-6.4.0.orig/src/libxl/libxl_domain.c ++++ libvirt-6.4.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 @@ &aop_console_how); libxl_domain_restore_params_dispose(¶ms); } -Index: libvirt-6.3.0/tests/libxlmock.c +Index: libvirt-6.4.0/tests/libxlmock.c =================================================================== ---- libvirt-6.3.0.orig/tests/libxlmock.c -+++ libvirt-6.3.0/tests/libxlmock.c +--- libvirt-6.4.0.orig/tests/libxlmock.c ++++ libvirt-6.4.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, ++++++ suse-libvirt-guests-service.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.692895144 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.692895144 +0200 @@ -1,9 +1,9 @@ Adjust libvirt-guests service to conform to SUSE standards -Index: libvirt-6.3.0/tools/libvirt-guests.sh.in +Index: libvirt-6.4.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-6.3.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-6.3.0/tools/libvirt-guests.sh.in +--- libvirt-6.4.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-6.4.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 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-6.3.0/tools/libvirt-guests.sysconf +Index: libvirt-6.4.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-6.3.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-6.3.0/tools/libvirt-guests.sysconf +--- libvirt-6.4.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-6.4.0/tools/libvirt-guests.sysconf @@ -1,9 +1,14 @@ +## Path: System/Virtualization/libvirt-guests # Customizations for the libvirt-guests.service systemd unit ++++++ suse-libvirtd-disable-tls.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.704895164 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.704895164 +0200 @@ -3,23 +3,23 @@ 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.3.0/src/remote/remote_daemon_config.c +Index: libvirt-6.4.0/src/remote/remote_daemon_config.c =================================================================== ---- libvirt-6.3.0.orig/src/remote/remote_daemon_config.c -+++ libvirt-6.3.0/src/remote/remote_daemon_config.c +--- libvirt-6.4.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-6.4.0/src/remote/remote_daemon_config.c @@ -99,7 +99,7 @@ daemonConfigNew(bool privileged G_GNUC_U #ifdef WITH_IP # ifdef LIBVIRTD -- data->listen_tls = 1; /* Only honoured if --listen is set */ -+ data->listen_tls = 0; /* Only honoured if --listen is set */ +- data->listen_tls = true; /* Only honoured if --listen is set */ ++ data->listen_tls = false; /* Only honoured if --listen is set */ # else /* ! LIBVIRTD */ - data->listen_tls = 0; /* Always honoured, --listen doesn't exist. */ + data->listen_tls = false; /* Always honoured, --listen doesn't exist. */ # endif /* ! LIBVIRTD */ -Index: libvirt-6.3.0/src/remote/libvirtd.conf.in +Index: libvirt-6.4.0/src/remote/libvirtd.conf.in =================================================================== ---- libvirt-6.3.0.orig/src/remote/libvirtd.conf.in -+++ libvirt-6.3.0/src/remote/libvirtd.conf.in +--- libvirt-6.4.0.orig/src/remote/libvirtd.conf.in ++++ libvirt-6.4.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. ++++++ suse-libvirtd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.712895178 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.712895178 +0200 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-6.3.0/src/remote/libvirtd.sysconf +Index: libvirt-6.4.0/src/remote/libvirtd.sysconf =================================================================== ---- libvirt-6.3.0.orig/src/remote/libvirtd.sysconf -+++ libvirt-6.3.0/src/remote/libvirtd.sysconf +--- libvirt-6.4.0.orig/src/remote/libvirtd.sysconf ++++ libvirt-6.4.0/src/remote/libvirtd.sysconf @@ -1,5 +1,9 @@ +## Path: System/Virtualization/libvirt # Customizations for the libvirtd.service systemd unit ++++++ suse-libxl-disable-autoballoon.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.720895193 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.720895193 +0200 @@ -6,10 +6,10 @@ by default. It can only be enabled with the 'autoballoon' setting in libxl.conf. See jsc#SLE-3059 for more details. -Index: libvirt-6.3.0/src/libxl/libxl.conf +Index: libvirt-6.4.0/src/libxl/libxl.conf =================================================================== ---- libvirt-6.3.0.orig/src/libxl/libxl.conf -+++ libvirt-6.3.0/src/libxl/libxl.conf +--- libvirt-6.4.0.orig/src/libxl/libxl.conf ++++ libvirt-6.4.0/src/libxl/libxl.conf @@ -4,12 +4,11 @@ # Enable autoballooning of domain0 @@ -27,10 +27,10 @@ # In order to prevent accidentally starting two domains that -Index: libvirt-6.3.0/src/libxl/libxl_conf.c +Index: libvirt-6.4.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-6.3.0.orig/src/libxl/libxl_conf.c -+++ libvirt-6.3.0/src/libxl/libxl_conf.c +--- libvirt-6.4.0.orig/src/libxl/libxl_conf.c ++++ libvirt-6.4.0/src/libxl/libxl_conf.c @@ -1737,15 +1737,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa /* * Get domain0 autoballoon configuration. Honor user-specified ++++++ suse-ovmf-paths.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.732895214 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.732895214 +0200 @@ -1,10 +1,10 @@ Adjust paths of OVMF firmwares on SUSE distros -Index: libvirt-6.3.0/src/qemu/qemu.conf +Index: libvirt-6.4.0/src/qemu/qemu.conf =================================================================== ---- libvirt-6.3.0.orig/src/qemu/qemu.conf -+++ libvirt-6.3.0/src/qemu/qemu.conf -@@ -788,10 +788,9 @@ +--- libvirt-6.4.0.orig/src/qemu/qemu.conf ++++ libvirt-6.4.0/src/qemu/qemu.conf +@@ -787,10 +787,9 @@ # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # follows this scheme. #nvram = [ @@ -18,10 +18,10 @@ #] # The backend to use for handling stdout/stderr output from -Index: libvirt-6.3.0/src/qemu/qemu_conf.c +Index: libvirt-6.4.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-6.3.0.orig/src/qemu/qemu_conf.c -+++ libvirt-6.3.0/src/qemu/qemu_conf.c +--- libvirt-6.4.0.orig/src/qemu/qemu_conf.c ++++ libvirt-6.4.0/src/qemu/qemu_conf.c @@ -96,10 +96,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver #ifndef DEFAULT_LOADER_NVRAM @@ -36,10 +36,10 @@ #endif -Index: libvirt-6.3.0/src/security/virt-aa-helper.c +Index: libvirt-6.4.0/src/security/virt-aa-helper.c =================================================================== ---- libvirt-6.3.0.orig/src/security/virt-aa-helper.c -+++ libvirt-6.3.0/src/security/virt-aa-helper.c +--- libvirt-6.4.0.orig/src/security/virt-aa-helper.c ++++ libvirt-6.4.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 */ ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.740895227 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.744895235 +0200 @@ -7,10 +7,10 @@ etc.), but for now they are all lumped together in this single patch. -Index: libvirt-6.3.0/src/qemu/qemu.conf +Index: libvirt-6.4.0/src/qemu/qemu.conf =================================================================== ---- libvirt-6.3.0.orig/src/qemu/qemu.conf -+++ libvirt-6.3.0/src/qemu/qemu.conf +--- libvirt-6.4.0.orig/src/qemu/qemu.conf ++++ libvirt-6.4.0/src/qemu/qemu.conf @@ -420,10 +420,19 @@ # isolation, but it cannot appear in a list of drivers. # @@ -32,7 +32,7 @@ #security_default_confined = 1 # If set to non-zero, then attempts to create unconfined -@@ -659,11 +668,22 @@ +@@ -658,11 +667,22 @@ #relaxed_acs_check = 1 @@ -60,10 +60,10 @@ # #lock_manager = "lockd" -Index: libvirt-6.3.0/src/qemu/qemu_conf.c +Index: libvirt-6.4.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-6.3.0.orig/src/qemu/qemu_conf.c -+++ libvirt-6.3.0/src/qemu/qemu_conf.c +--- libvirt-6.4.0.orig/src/qemu/qemu_conf.c ++++ libvirt-6.4.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); ++++++ suse-virtlockd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.760895263 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.760895263 +0200 @@ -1,9 +1,9 @@ Adjust virtlockd sysconfig file to conform to SUSE standards -Index: libvirt-6.3.0/src/locking/virtlockd.sysconf +Index: libvirt-6.4.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-6.3.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-6.3.0/src/locking/virtlockd.sysconf +--- libvirt-6.4.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-6.4.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + ++++++ suse-virtlogd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.768895276 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.768895276 +0200 @@ -1,9 +1,9 @@ Adjust virtlogd sysconfig file to conform to SUSE standards -Index: libvirt-6.3.0/src/logging/virtlogd.sysconf +Index: libvirt-6.4.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-6.3.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-6.3.0/src/logging/virtlogd.sysconf +--- libvirt-6.4.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-6.4.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + ++++++ suse-xen-ovmf-loaders.patch ++++++ --- /var/tmp/diff_new_pack.uKMhYp/_old 2020-06-05 20:05:23.776895290 +0200 +++ /var/tmp/diff_new_pack.uKMhYp/_new 2020-06-05 20:05:23.780895297 +0200 @@ -5,10 +5,10 @@ upstream efforts to improve firmware handling in the qemu driver broke the firmware handling in the xen driver. -Index: libvirt-6.3.0/src/libxl/libxl_conf.c +Index: libvirt-6.4.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-6.3.0.orig/src/libxl/libxl_conf.c -+++ libvirt-6.3.0/src/libxl/libxl_conf.c +--- libvirt-6.4.0.orig/src/libxl/libxl_conf.c ++++ libvirt-6.4.0/src/libxl/libxl_conf.c @@ -1777,6 +1777,15 @@ libxlDriverConfigNew(void) cfg->autoDumpDir = g_strdup(LIBXL_DUMP_DIR); cfg->channelDir = g_strdup(LIBXL_CHANNEL_DIR);
