From 9e9ebe001555661937cd9077d81209801510a4ebad3fb25d9dca64608143ac00 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Mon, 6 Jul 2020 16:35:15 +0000 Subject: [PATCH] Accepting request 819031 from home:jfehlig:branches:Virtualization - Update to libvirt 6.5.0 - The node device driver now supports creating mediated devices using the mdevctl utility - Many incremental improvements and bug fixes, see https://libvirt.org/news.html - Dropped patches: ec07aad8-libxl-normalize-mac-addr.patch OBS-URL: https://build.opensuse.org/request/show/819031 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=832 --- ...stats-functions-from-the-qemu-driver.patch | 46 +++---- ...ibxl-add-support-for-BlockResize-API.patch | 6 +- ...c-implement-connectGetAllDomainStats.patch | 25 ++-- disable-multipath-pr-tests.patch | 8 +- ec07aad8-libxl-normalize-mac-addr.patch | 117 ------------------ libvirt-6.4.0.tar.xz | 3 - libvirt-6.4.0.tar.xz.asc | 11 -- libvirt-6.5.0.tar.xz | 3 + libvirt-6.5.0.tar.xz.asc | 11 ++ libvirt-power8-models.patch | 6 +- libvirt-suse-netcontrol.patch | 42 +++---- libvirt.changes | 11 ++ libvirt.spec | 10 +- libxl-dom-reset.patch | 6 +- libxl-set-cach-mode.patch | 6 +- libxl-set-migration-constraints.patch | 66 +++++----- libxl-support-block-script.patch | 6 +- lxc-wait-after-eth-del.patch | 28 ++--- ...e-dhcp-authoritative-on-static-netwo.patch | 12 +- ppc64le-canonical-name.patch | 6 +- qemu-apparmor-screenshot.patch | 6 +- support-managed-pci-xen-driver.patch | 6 +- suse-apparmor-libnl-paths.patch | 12 +- suse-bump-xen-version.patch | 24 ++-- suse-libvirt-guests-service.patch | 12 +- suse-libvirtd-disable-tls.patch | 12 +- suse-libvirtd-sysconfig-settings.patch | 6 +- suse-libxl-disable-autoballoon.patch | 12 +- suse-ovmf-paths.patch | 18 +-- suse-qemu-conf.patch | 12 +- suse-virtlockd-sysconfig-settings.patch | 6 +- suse-virtlogd-sysconfig-settings.patch | 6 +- suse-xen-ovmf-loaders.patch | 6 +- 33 files changed, 228 insertions(+), 339 deletions(-) delete mode 100644 ec07aad8-libxl-normalize-mac-addr.patch delete mode 100644 libvirt-6.4.0.tar.xz delete mode 100644 libvirt-6.4.0.tar.xz.asc create mode 100644 libvirt-6.5.0.tar.xz create mode 100644 libvirt-6.5.0.tar.xz.asc diff --git a/0001-Extract-stats-functions-from-the-qemu-driver.patch b/0001-Extract-stats-functions-from-the-qemu-driver.patch index 75e2d31..88e3abd 100644 --- 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.4.0/src/conf/domain_stats.c +Index: libvirt-6.5.0/src/conf/domain_stats.c =================================================================== --- /dev/null -+++ libvirt-6.4.0/src/conf/domain_stats.c ++++ libvirt-6.5.0/src/conf/domain_stats.c @@ -0,0 +1,119 @@ +/* + * domain_stats.c: domain stats extraction helpers @@ -142,10 +142,10 @@ Index: libvirt-6.4.0/src/conf/domain_stats.c +} + +#undef STATS_ADD_NET_PARAM -Index: libvirt-6.4.0/src/conf/domain_stats.h +Index: libvirt-6.5.0/src/conf/domain_stats.h =================================================================== --- /dev/null -+++ libvirt-6.4.0/src/conf/domain_stats.h ++++ libvirt-6.5.0/src/conf/domain_stats.h @@ -0,0 +1,62 @@ +/* + * domain_stats.h: domain stats extraction helpers @@ -209,10 +209,10 @@ Index: libvirt-6.4.0/src/conf/domain_stats.h + virTypedParamListPtr params); + +#endif /* __DOMAIN_STATS_H */ -Index: libvirt-6.4.0/src/libvirt_private.syms +Index: libvirt-6.5.0/src/libvirt_private.syms =================================================================== ---- libvirt-6.4.0.orig/src/libvirt_private.syms -+++ libvirt-6.4.0/src/libvirt_private.syms +--- libvirt-6.5.0.orig/src/libvirt_private.syms ++++ libvirt-6.5.0/src/libvirt_private.syms @@ -732,6 +732,9 @@ virDomainConfNWFilterInstantiate; virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -223,7 +223,7 @@ Index: libvirt-6.4.0/src/libvirt_private.syms # conf/interface_conf.h virInterfaceDefFormat; -@@ -1763,6 +1766,7 @@ virCgroupGetMemoryUsage; +@@ -1764,6 +1767,7 @@ virCgroupGetMemoryUsage; virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; @@ -231,10 +231,10 @@ Index: libvirt-6.4.0/src/libvirt_private.syms virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKillPainfully; -Index: libvirt-6.4.0/src/qemu/qemu_driver.c +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/qemu/qemu_driver.c ++++ libvirt-6.5.0/src/qemu/qemu_driver.c @@ -64,6 +64,7 @@ #include "virarptable.h" #include "viruuid.h" @@ -243,7 +243,7 @@ Index: libvirt-6.4.0/src/qemu/qemu_driver.c #include "domain_audit.h" #include "domain_cgroup.h" #include "domain_driver.h" -@@ -20654,13 +20655,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr +@@ -20681,13 +20682,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr virTypedParamListPtr params, unsigned int privflags G_GNUC_UNUSED) { @@ -258,7 +258,7 @@ Index: libvirt-6.4.0/src/qemu/qemu_driver.c } -@@ -20963,17 +20958,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj +@@ -20990,17 +20985,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj if (!priv->cgroup) return 0; @@ -277,7 +277,7 @@ Index: libvirt-6.4.0/src/qemu/qemu_driver.c } -@@ -21141,76 +21126,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr +@@ -21168,76 +21153,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr return ret; } @@ -355,10 +355,10 @@ Index: libvirt-6.4.0/src/qemu/qemu_driver.c /* refresh information by opening images on the disk */ static int -Index: libvirt-6.4.0/src/util/vircgroup.c +Index: libvirt-6.5.0/src/util/vircgroup.c =================================================================== ---- libvirt-6.4.0.orig/src/util/vircgroup.c -+++ libvirt-6.4.0/src/util/vircgroup.c +--- libvirt-6.5.0.orig/src/util/vircgroup.c ++++ libvirt-6.5.0/src/util/vircgroup.c @@ -2776,6 +2776,31 @@ virCgroupControllerAvailable(int control return ret; } @@ -406,10 +406,10 @@ Index: libvirt-6.4.0/src/util/vircgroup.c int virCgroupNewPartition(const char *path G_GNUC_UNUSED, bool create G_GNUC_UNUSED, -Index: libvirt-6.4.0/src/util/vircgroup.h +Index: libvirt-6.5.0/src/util/vircgroup.h =================================================================== ---- libvirt-6.4.0.orig/src/util/vircgroup.h -+++ libvirt-6.4.0/src/util/vircgroup.h +--- libvirt-6.5.0.orig/src/util/vircgroup.h ++++ libvirt-6.5.0/src/util/vircgroup.h @@ -23,6 +23,7 @@ #include "virbitmap.h" @@ -425,10 +425,10 @@ Index: libvirt-6.4.0/src/util/vircgroup.h + +int virCgroupGetStatsCpu(virCgroupPtr cgroup, + virTypedParamListPtr params); -Index: libvirt-6.4.0/src/conf/Makefile.inc.am +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/conf/Makefile.inc.am ++++ libvirt-6.5.0/src/conf/Makefile.inc.am @@ -28,6 +28,8 @@ DOMAIN_CONF_SOURCES = \ conf/domain_audit.h \ conf/domain_nwfilter.c \ diff --git a/0001-libxl-add-support-for-BlockResize-API.patch b/0001-libxl-add-support-for-BlockResize-API.patch index 8e2124f..0756f32 100644 --- 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.4.0/src/libxl/libxl_driver.c +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/libxl/libxl_driver.c ++++ libvirt-6.5.0/src/libxl/libxl_driver.c @@ -5323,6 +5323,96 @@ libxlDomainMemoryStats(virDomainPtr dom, #undef LIBXL_SET_MEMSTAT diff --git a/0002-lxc-implement-connectGetAllDomainStats.patch b/0002-lxc-implement-connectGetAllDomainStats.patch index 6023080..a183b42 100644 --- a/0002-lxc-implement-connectGetAllDomainStats.patch +++ b/0002-lxc-implement-connectGetAllDomainStats.patch @@ -9,11 +9,11 @@ them using the existing API. src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) -Index: libvirt-6.4.0/src/lxc/lxc_driver.c +Index: libvirt-6.5.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 @@ +--- libvirt-6.5.0.orig/src/lxc/lxc_driver.c ++++ libvirt-6.5.0/src/lxc/lxc_driver.c +@@ -73,6 +73,7 @@ #include "netdev_bandwidth_conf.h" #include "virsocket.h" #include "virutil.h" @@ -21,7 +21,7 @@ Index: libvirt-6.4.0/src/lxc/lxc_driver.c #define VIR_FROM_THIS VIR_FROM_LXC -@@ -5078,6 +5079,135 @@ lxcDomainHasManagedSaveImage(virDomainPt +@@ -5065,6 +5066,128 @@ lxcDomainHasManagedSaveImage(virDomainPt return ret; } @@ -56,13 +56,10 @@ Index: libvirt-6.4.0/src/lxc/lxc_driver.c + unsigned int stats, + virDomainStatsRecordPtr *record) +{ -+ g_autofree virDomainStatsRecordPtr tmp = NULL; -+ g_autoptr(virTypedParamList) params = NULL; ++ g_autofree virDomainStatsRecordPtr tmp = g_new0(virDomainStatsRecord, 1); ++ g_autoptr(virTypedParamList) params = g_new0(virTypedParamList, 1); + size_t i; + -+ if (VIR_ALLOC(params) < 0) -+ return -1; -+ + for (i = 0; lxcDomainGetStatsWorkers[i].func; i++) { + if (stats & lxcDomainGetStatsWorkers[i].stats) { + if (lxcDomainGetStatsWorkers[i].func(dom, params) < 0) @@ -70,9 +67,6 @@ Index: libvirt-6.4.0/src/lxc/lxc_driver.c + } + } + -+ if (VIR_ALLOC(tmp) < 0) -+ return -1; -+ + if (!(tmp->dom = virGetDomain(conn, dom->def->name, + dom->def->uuid, dom->def->id))) + return -1; @@ -123,8 +117,7 @@ Index: libvirt-6.4.0/src/lxc/lxc_driver.c + return -1; + } + -+ if (VIR_ALLOC_N(tmpstats, nvms + 1) < 0) -+ return -1; ++ tmpstats = g_new0(virDomainStatsRecord, nvms + 1); + + for (i = 0; i < nvms; i++) { + virDomainStatsRecordPtr tmp = NULL; @@ -157,7 +150,7 @@ Index: libvirt-6.4.0/src/lxc/lxc_driver.c /* Function Tables */ static virHypervisorDriver lxcHypervisorDriver = { -@@ -5175,6 +5305,7 @@ static virHypervisorDriver lxcHypervisor +@@ -5162,6 +5285,7 @@ static virHypervisorDriver lxcHypervisor .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */ .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */ diff --git a/disable-multipath-pr-tests.patch b/disable-multipath-pr-tests.patch index 95da672..b7a8dc2 100644 --- 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.4.0/tests/qemuhotplugtest.c +Index: libvirt-6.5.0/tests/qemuhotplugtest.c =================================================================== ---- libvirt-6.4.0.orig/tests/qemuhotplugtest.c -+++ libvirt-6.4.0/tests/qemuhotplugtest.c +--- libvirt-6.5.0.orig/tests/qemuhotplugtest.c ++++ libvirt-6.5.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 @@ Index: libvirt-6.4.0/tests/qemuhotplugtest.c if (qemuTestCapsCacheInsert(driver.qemuCapsCache, priv->qemuCaps) < 0) return -1; -@@ -760,17 +758,6 @@ mymain(void) +@@ -762,17 +760,6 @@ mymain(void) "device_del", QMP_DEVICE_DELETED("scsi3-0-5-6") QMP_OK, "human-monitor-command", HMP("")); diff --git a/ec07aad8-libxl-normalize-mac-addr.patch b/ec07aad8-libxl-normalize-mac-addr.patch deleted file mode 100644 index 1213287..0000000 --- a/ec07aad8-libxl-normalize-mac-addr.patch +++ /dev/null @@ -1,117 +0,0 @@ -commit ec07aad8f8a6ead8e9363c8deec4845edb5bf112 -Author: Jim Fehlig -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 - Reviewed-by: Laine Stump - -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; diff --git a/libvirt-6.4.0.tar.xz b/libvirt-6.4.0.tar.xz deleted file mode 100644 index 7833e39..0000000 --- a/libvirt-6.4.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:586ebcf220369d08a07c6cc17035e8a91bb3741e4300199459904e9e02478be7 -size 8398396 diff --git a/libvirt-6.4.0.tar.xz.asc b/libvirt-6.4.0.tar.xz.asc deleted file mode 100644 index 51b59e1..0000000 --- a/libvirt-6.4.0.tar.xz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAl7WDl4ACgkQFViLJllr -6l1HGggAwbu7umE2jt5pP4EXQDKXF++LxbJI4K3nlU5tvN5FVHltk2jP5ijwxSuH -iYwVzXy+BjaLgVkK7CoZMQYke4ZGB8VvObJyHP07Q9aB57Na5lq8ok34Od7bt0E3 -CKfAw5L8iYfVyPElabJTlCpJej8zn094u7Tc0nROu6t8Z+9zpxBNCVJZwyXtYa51 -yDfNoIAxk9o5W5wHeWJU+NPWkioqvu5mRUE4gj3Q3ntlu6r/zBlzkeW0c2EzumtT -Nby2xVnI/dGSinsDmY+Rjxl/hA6A3/JJDbM7oa71BSfo3fyA+Xa4WUp6NZ7nV6y/ -nwewJq18XQtCI9Jlmlj0tEC/THAvNA== -=gR3a ------END PGP SIGNATURE----- diff --git a/libvirt-6.5.0.tar.xz b/libvirt-6.5.0.tar.xz new file mode 100644 index 0000000..e4e04e5 --- /dev/null +++ b/libvirt-6.5.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4915d9eab299ed79288d7598b717c587156708c05f701fe55a72293f32eb3182 +size 9407160 diff --git a/libvirt-6.5.0.tar.xz.asc b/libvirt-6.5.0.tar.xz.asc new file mode 100644 index 0000000..8fef772 --- /dev/null +++ b/libvirt-6.5.0.tar.xz.asc @@ -0,0 +1,11 @@ +-----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----- diff --git a/libvirt-power8-models.patch b/libvirt-power8-models.patch index 1368187..96ee426 100644 --- 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: -Index: libvirt-6.4.0/src/cpu_map/ppc64_POWER8.xml +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/cpu_map/ppc64_POWER8.xml ++++ libvirt-6.5.0/src/cpu_map/ppc64_POWER8.xml @@ -4,5 +4,7 @@ diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index 20a8fec..23d8ca1 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,7 +1,7 @@ -Index: libvirt-6.4.0/configure.ac +Index: libvirt-6.5.0/configure.ac =================================================================== ---- libvirt-6.4.0.orig/configure.ac -+++ libvirt-6.4.0/configure.ac +--- libvirt-6.5.0.orig/configure.ac ++++ libvirt-6.5.0/configure.ac @@ -278,6 +278,7 @@ LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_MACVTAP @@ -26,10 +26,10 @@ Index: libvirt-6.4.0/configure.ac LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL -Index: libvirt-6.4.0/tools/virsh.c +Index: libvirt-6.5.0/tools/virsh.c =================================================================== ---- libvirt-6.4.0.orig/tools/virsh.c -+++ libvirt-6.4.0/tools/virsh.c +--- libvirt-6.5.0.orig/tools/virsh.c ++++ libvirt-6.5.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.4.0/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-6.4.0/src/interface/interface_backend_netcf.c +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-6.5.0/src/interface/interface_backend_netcf.c @@ -21,7 +21,12 @@ #include @@ -106,7 +106,7 @@ Index: libvirt-6.4.0/src/interface/interface_backend_netcf.c /* open netcf */ if (ncf_init(&driver->netcf, NULL) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -@@ -1121,6 +1161,7 @@ static int netcfInterfaceIsActive(virInt +@@ -1116,6 +1156,7 @@ static int netcfInterfaceIsActive(virInt return ret; } @@ -114,7 +114,7 @@ Index: libvirt-6.4.0/src/interface/interface_backend_netcf.c static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags) { int ret; -@@ -1195,6 +1236,7 @@ static int netcfInterfaceChangeRollback( +@@ -1190,6 +1231,7 @@ static int netcfInterfaceChangeRollback( virObjectUnlock(driver); return ret; } @@ -122,7 +122,7 @@ Index: libvirt-6.4.0/src/interface/interface_backend_netcf.c static virInterfaceDriver interfaceDriver = { .name = INTERFACE_DRIVER_NAME, -@@ -1211,9 +1253,11 @@ static virInterfaceDriver interfaceDrive +@@ -1206,9 +1248,11 @@ static virInterfaceDriver interfaceDrive .interfaceCreate = netcfInterfaceCreate, /* 0.7.0 */ .interfaceDestroy = netcfInterfaceDestroy, /* 0.7.0 */ .interfaceIsActive = netcfInterfaceIsActive, /* 0.7.3 */ @@ -134,7 +134,7 @@ Index: libvirt-6.4.0/src/interface/interface_backend_netcf.c }; -@@ -1244,6 +1288,19 @@ static virStateDriver interfaceStateDriv +@@ -1239,6 +1283,19 @@ static virStateDriver interfaceStateDriv int netcfIfaceRegister(void) { @@ -154,10 +154,10 @@ Index: libvirt-6.4.0/src/interface/interface_backend_netcf.c if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) return -1; if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) -Index: libvirt-6.4.0/src/interface/interface_driver.c +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/interface/interface_driver.c ++++ libvirt-6.5.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -175,10 +175,10 @@ Index: libvirt-6.4.0/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-6.4.0/m4/virt-netcontrol.m4 +Index: libvirt-6.5.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-6.4.0/m4/virt-netcontrol.m4 ++++ libvirt-6.5.0/m4/virt-netcontrol.m4 @@ -0,0 +1,39 @@ +dnl The libnetcontrol library +dnl @@ -219,10 +219,10 @@ Index: libvirt-6.4.0/m4/virt-netcontrol.m4 +AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[ + LIBVIRT_RESULT_LIB([NETCONTROL]) +]) -Index: libvirt-6.4.0/src/interface/Makefile.inc.am +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/interface/Makefile.inc.am ++++ libvirt-6.5.0/src/interface/Makefile.inc.am @@ -6,6 +6,7 @@ INTERFACE_DRIVER_SOURCES = \ $(NULL) diff --git a/libvirt.changes b/libvirt.changes index 3ec02fe..3e8f701 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jul 6 14:58:35 UTC 2020 - James Fehlig + +- Update to libvirt 6.5.0 + - The node device driver now supports creating mediated devices + using the mdevctl utility + - Many incremental improvements and bug fixes, see + https://libvirt.org/news.html + - Dropped patches: + ec07aad8-libxl-normalize-mac-addr.patch + ------------------------------------------------------------------- Wed Jun 3 16:38:09 UTC 2020 - James Fehlig diff --git a/libvirt.spec b/libvirt.spec index ee77309..00e0b0d 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -185,7 +185,7 @@ Name: libvirt URL: http://libvirt.org/ -Version: 6.4.0 +Version: 6.5.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later @@ -338,7 +338,6 @@ Source6: libvirtd-relocation-server.xml Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -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 @@ -495,6 +494,10 @@ Summary: Nodedev driver plugin for the libvirtd daemon Group: System/Management Requires: %{name}-daemon = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} +# For managing persistent mediated devices +%if 0%{?suse_version} >= 1550 +Requires: mdevctl +%endif %description daemon-driver-nodedev The nodedev driver plugin for the libvirtd daemon, providing @@ -874,7 +877,6 @@ libvirt plugin for NSS for translating domain names into IP addresses. %prep %setup -q -%patch0 -p1 %patch100 -p1 %patch101 -p1 %patch150 -p1 @@ -1920,7 +1922,7 @@ fi %{_datadir}/%{name}/api/libvirt-lxc-api.xml %files doc -%doc AUTHORS NEWS README README.rst +%doc AUTHORS NEWS.rst README README.rst %license COPYING COPYING.LESSER %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/* diff --git a/libxl-dom-reset.patch b/libxl-dom-reset.patch index df3f75a..590d81f 100644 --- 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.4.0/src/libxl/libxl_driver.c +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/libxl/libxl_driver.c ++++ libvirt-6.5.0/src/libxl/libxl_driver.c @@ -1371,6 +1371,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } diff --git a/libxl-set-cach-mode.patch b/libxl-set-cach-mode.patch index e0eeb31..1eb5ba2 100644 --- 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.4.0/src/libxl/libxl_conf.c +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/libxl/libxl_conf.c ++++ libvirt-6.5.0/src/libxl/libxl_conf.c @@ -905,6 +905,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } diff --git a/libxl-set-migration-constraints.patch b/libxl-set-migration-constraints.patch index 5c7f505..2293902 100644 --- a/libxl-set-migration-constraints.patch +++ b/libxl-set-migration-constraints.patch @@ -16,10 +16,10 @@ Signed-off-by: Jim Fehlig tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-6.4.0/include/libvirt/libvirt-domain.h +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-6.5.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.4.0/include/libvirt/libvirt-domain.h /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-6.4.0/src/libxl/libxl_driver.c +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/libxl/libxl_driver.c ++++ libvirt-6.5.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.4.0/src/libxl/libxl_driver.c goto cleanup; } -Index: libvirt-6.4.0/src/libxl/libxl_migration.c +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/libxl/libxl_migration.c ++++ libvirt-6.5.0/src/libxl/libxl_migration.c @@ -345,18 +345,39 @@ libxlMigrateDstReceive(virNetSocketPtr s static int libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, @@ -145,7 +145,7 @@ Index: libvirt-6.4.0/src/libxl/libxl_migration.c if (ret != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to send migration data to destination host")); -@@ -913,7 +934,7 @@ struct libxlTunnelControl { +@@ -911,7 +932,7 @@ struct libxlTunnelControl { static int libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver, virDomainObjPtr vm, @@ -154,7 +154,7 @@ Index: libvirt-6.4.0/src/libxl/libxl_migration.c virStreamPtr st, struct libxlTunnelControl **tnl) { -@@ -947,7 +968,7 @@ libxlMigrationSrcStartTunnel(libxlDriver +@@ -945,7 +966,7 @@ libxlMigrationSrcStartTunnel(libxlDriver virObjectUnlock(vm); /* Send data to pipe */ @@ -163,7 +163,7 @@ Index: libvirt-6.4.0/src/libxl/libxl_migration.c virObjectLock(vm); out: -@@ -983,7 +1004,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -981,7 +1002,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP const char *dconnuri G_GNUC_UNUSED, const char *dname, const char *uri, @@ -172,7 +172,7 @@ Index: libvirt-6.4.0/src/libxl/libxl_migration.c { virDomainPtr ddomain = NULL; virTypedParameterPtr params = NULL; -@@ -1028,11 +1049,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1026,11 +1047,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP /* We don't require the destination to have P2P support * as it looks to be normal migration from the receiver perspective. */ @@ -186,7 +186,7 @@ Index: libvirt-6.4.0/src/libxl/libxl_migration.c if (!(st = virStreamNew(dconn, 0))) goto confirm; ret = dconn->driver->domainMigratePrepareTunnel3Params -@@ -1046,7 +1067,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1044,7 +1065,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP if (ret == -1) goto confirm; @@ -195,7 +195,7 @@ Index: libvirt-6.4.0/src/libxl/libxl_migration.c if (uri_out) { if (virTypedParamsReplaceString(¶ms, &nparams, VIR_MIGRATE_PARAM_URI, uri_out) < 0) { -@@ -1061,11 +1082,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1059,11 +1080,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP } VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); @@ -210,7 +210,7 @@ Index: libvirt-6.4.0/src/libxl/libxl_migration.c if (ret < 0) { notify_source = false; virErrorPreserveLast(&orig_err); -@@ -1100,7 +1121,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1098,7 +1119,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP confirm: if (notify_source) { VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm); @@ -219,7 +219,7 @@ Index: libvirt-6.4.0/src/libxl/libxl_migration.c if (ret < 0) VIR_WARN("Guest %s probably left in 'paused' state on source", -@@ -1108,7 +1129,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1106,7 +1127,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP } cleanup: @@ -228,7 +228,7 @@ Index: libvirt-6.4.0/src/libxl/libxl_migration.c libxlMigrationSrcStopTunnel(tc); virObjectUnref(st); } -@@ -1152,7 +1173,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD +@@ -1150,7 +1171,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD const char *dconnuri, const char *uri_str G_GNUC_UNUSED, const char *dname, @@ -237,7 +237,7 @@ Index: libvirt-6.4.0/src/libxl/libxl_migration.c { int ret = -1; bool useParams; -@@ -1187,7 +1208,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD +@@ -1185,7 +1206,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD } ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri, @@ -246,7 +246,7 @@ Index: libvirt-6.4.0/src/libxl/libxl_migration.c if (ret < 0) { /* -@@ -1214,7 +1235,7 @@ libxlDomainMigrationSrcPerform(libxlDriv +@@ -1212,7 +1233,7 @@ libxlDomainMigrationSrcPerform(libxlDriv const char *dconnuri G_GNUC_UNUSED, const char *uri_str, const char *dname G_GNUC_UNUSED, @@ -255,7 +255,7 @@ Index: libvirt-6.4.0/src/libxl/libxl_migration.c { libxlDomainObjPrivatePtr priv = vm->privateData; char *hostname = NULL; -@@ -1250,7 +1271,7 @@ libxlDomainMigrationSrcPerform(libxlDriv +@@ -1248,7 +1269,7 @@ libxlDomainMigrationSrcPerform(libxlDriv /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); @@ -264,10 +264,10 @@ Index: libvirt-6.4.0/src/libxl/libxl_migration.c virObjectLock(vm); if (ret == 0) { -Index: libvirt-6.4.0/src/libxl/libxl_migration.h +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/libxl/libxl_migration.h ++++ libvirt-6.5.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.4.0/src/libxl/libxl_migration.h virDomainPtr libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-6.4.0/tools/virsh-domain.c +Index: libvirt-6.5.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[] +--- 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[] .type = VSH_OT_STRING, .help = N_("override the destination host name used for TLS verification") }, @@ -339,7 +339,7 @@ Index: libvirt-6.4.0/tools/virsh-domain.c {.name = NULL} }; -@@ -10742,6 +10758,7 @@ doMigrate(void *opaque) +@@ -10737,6 +10753,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -347,7 +347,7 @@ Index: libvirt-6.4.0/tools/virsh-domain.c #ifndef WIN32 sigset_t sigmask, oldsigmask; -@@ -10864,6 +10881,27 @@ doMigrate(void *opaque) +@@ -10859,6 +10876,27 @@ doMigrate(void *opaque) goto save_error; } @@ -375,10 +375,10 @@ Index: libvirt-6.4.0/tools/virsh-domain.c if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { -Index: libvirt-6.4.0/docs/manpages/virsh.rst +Index: libvirt-6.5.0/docs/manpages/virsh.rst =================================================================== ---- libvirt-6.4.0.orig/docs/manpages/virsh.rst -+++ libvirt-6.4.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 [--postcopy-bandwidth bandwidth] [--parallel [--parallel-connections connections]] diff --git a/libxl-support-block-script.patch b/libxl-support-block-script.patch index 15d4860..194e536 100644 --- 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.4.0/src/libxl/libxl_conf.c +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/libxl/libxl_conf.c ++++ libvirt-6.5.0/src/libxl/libxl_conf.c @@ -905,6 +905,22 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } diff --git a/lxc-wait-after-eth-del.patch b/lxc-wait-after-eth-del.patch index 5d869e7..96b0778 100644 --- 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.4.0/src/lxc/lxc_controller.c +Index: libvirt-6.5.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 +--- 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 if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; } @@ -25,11 +25,11 @@ Index: libvirt-6.4.0/src/lxc/lxc_controller.c return ret; } -Index: libvirt-6.4.0/src/lxc/lxc_driver.c +Index: libvirt-6.5.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 @@ +--- libvirt-6.5.0.orig/src/lxc/lxc_driver.c ++++ libvirt-6.5.0/src/lxc/lxc_driver.c +@@ -66,6 +66,7 @@ #include "virtime.h" #include "virtypedparam.h" #include "viruri.h" @@ -37,7 +37,7 @@ Index: libvirt-6.4.0/src/lxc/lxc_driver.c #include "virstring.h" #include "viraccessapicheck.h" #include "viraccessapichecklxc.h" -@@ -3552,6 +3553,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive +@@ -3544,6 +3545,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_ETHERNET: ignore_value(virNetDevVethDelete(veth)); @@ -45,7 +45,7 @@ Index: libvirt-6.4.0/src/lxc/lxc_driver.c break; case VIR_DOMAIN_NET_TYPE_DIRECT: -@@ -3992,6 +3994,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -3982,6 +3984,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb virDomainAuditNet(vm, detach, NULL, "detach", false); goto cleanup; } @@ -53,10 +53,10 @@ Index: libvirt-6.4.0/src/lxc/lxc_driver.c break; /* It'd be nice to support this, but with macvlan -Index: libvirt-6.4.0/src/lxc/lxc_process.c +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/lxc/lxc_process.c ++++ libvirt-6.5.0/src/lxc/lxc_process.c @@ -50,6 +50,7 @@ #include "virstring.h" #include "virprocess.h" @@ -65,7 +65,7 @@ Index: libvirt-6.4.0/src/lxc/lxc_process.c #include "netdev_bandwidth_conf.h" #include "virutil.h" -@@ -230,6 +231,7 @@ static void virLXCProcessCleanup(virLXCD +@@ -231,6 +232,7 @@ static void virLXCProcessCleanup(virLXCD VIR_WARN("Unable to release network device '%s'", NULLSTR(iface->ifname)); } } diff --git a/network-don-t-use-dhcp-authoritative-on-static-netwo.patch b/network-don-t-use-dhcp-authoritative-on-static-netwo.patch index 784c01c..c25d961 100644 --- a/network-don-t-use-dhcp-authoritative-on-static-netwo.patch +++ b/network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -17,10 +17,10 @@ Signed-off-by: Martin Wilck tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-6.4.0/src/network/bridge_driver.c +Index: libvirt-6.5.0/src/network/bridge_driver.c =================================================================== ---- libvirt-6.4.0.orig/src/network/bridge_driver.c -+++ libvirt-6.4.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 if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { @@ -37,10 +37,10 @@ Index: libvirt-6.4.0/src/network/bridge_driver.c } if (ipdef->tftproot) { -Index: libvirt-6.4.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-6.5.0/tests/networkxml2confdata/dhcp6host-routed-network.conf @@ -10,7 +10,6 @@ bind-dynamic interface=virbr1 dhcp-range=192.168.122.1,static diff --git a/ppc64le-canonical-name.patch b/ppc64le-canonical-name.patch index 65da6a6..adc5502 100644 --- 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.4.0/src/util/virarch.c +Index: libvirt-6.5.0/src/util/virarch.c =================================================================== ---- libvirt-6.4.0.orig/src/util/virarch.c -+++ libvirt-6.4.0/src/util/virarch.c +--- libvirt-6.5.0.orig/src/util/virarch.c ++++ libvirt-6.5.0/src/util/virarch.c @@ -220,6 +220,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_I686; } else if (STREQ(ut.machine, "amd64")) { diff --git a/qemu-apparmor-screenshot.patch b/qemu-apparmor-screenshot.patch index 2ce243e..79bcfa9 100644 --- a/qemu-apparmor-screenshot.patch +++ b/qemu-apparmor-screenshot.patch @@ -1,7 +1,7 @@ -Index: libvirt-6.4.0/src/security/apparmor/libvirt-qemu +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-6.5.0/src/security/apparmor/libvirt-qemu @@ -233,3 +233,6 @@ # /sys/bus/nd/devices / r, # harmless on any lsb compliant system diff --git a/support-managed-pci-xen-driver.patch b/support-managed-pci-xen-driver.patch index bd6a078..988d849 100644 --- 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.4.0/src/libxl/xen_common.c +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/libxl/xen_common.c ++++ libvirt-6.5.0/src/libxl/xen_common.c @@ -381,12 +381,19 @@ xenParsePCI(char *entry) int busID; int slotID; diff --git a/suse-apparmor-libnl-paths.patch b/suse-apparmor-libnl-paths.patch index f1214bc..82fed4d 100644 --- 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.4.0/src/security/apparmor/libvirt-qemu +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-6.5.0/src/security/apparmor/libvirt-qemu @@ -61,6 +61,7 @@ #/dev/fb* rw, @@ -20,10 +20,10 @@ Index: libvirt-6.4.0/src/security/apparmor/libvirt-qemu @{HOME}/.pulse-cookie rwk, owner /root/.pulse-cookie rwk, owner /root/.pulse/ rw, -Index: libvirt-6.4.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in +Index: libvirt-6.5.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 +--- 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 @@ -19,7 +19,7 @@ profile virt-aa-helper @libexecdir@/virt # Used when internally running another command (namely apparmor_parser) @{PROC}/@{pid}/fd/ r, diff --git a/suse-bump-xen-version.patch b/suse-bump-xen-version.patch index d1010df..008cbf5 100644 --- 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.4.0/m4/virt-driver-libxl.m4 +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/m4/virt-driver-libxl.m4 ++++ libvirt-6.5.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 @@ Index: libvirt-6.4.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.4.0/src/libxl/libxl_conf.c +Index: libvirt-6.5.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 +--- 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) int libxlDriverConfigInit(libxlDriverConfigPtr cfg) @@ -40,10 +40,10 @@ Index: libvirt-6.4.0/src/libxl/libxl_conf.c if (virFileMakePath(cfg->logDir) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, -Index: libvirt-6.4.0/src/libxl/libxl_domain.c +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/libxl/libxl_domain.c ++++ libvirt-6.5.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.4.0/src/libxl/libxl_domain.c &aop_console_how); libxl_domain_restore_params_dispose(¶ms); } -Index: libvirt-6.4.0/tests/libxlmock.c +Index: libvirt-6.5.0/tests/libxlmock.c =================================================================== ---- libvirt-6.4.0.orig/tests/libxlmock.c -+++ libvirt-6.4.0/tests/libxlmock.c +--- libvirt-6.5.0.orig/tests/libxlmock.c ++++ libvirt-6.5.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, diff --git a/suse-libvirt-guests-service.patch b/suse-libvirt-guests-service.patch index a4a1233..8a380cd 100644 --- 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.4.0/tools/libvirt-guests.sh.in +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-6.5.0/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # . @@ -163,10 +163,10 @@ Index: libvirt-6.4.0/tools/libvirt-guests.sh.in esac -exit $RETVAL +rc_exit -Index: libvirt-6.4.0/tools/libvirt-guests.sysconf +Index: libvirt-6.5.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-6.4.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-6.4.0/tools/libvirt-guests.sysconf +--- libvirt-6.5.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-6.5.0/tools/libvirt-guests.sysconf @@ -1,9 +1,14 @@ +## Path: System/Virtualization/libvirt-guests # Customizations for the libvirt-guests.service systemd unit diff --git a/suse-libvirtd-disable-tls.patch b/suse-libvirtd-disable-tls.patch index 7310ac5..f974110 100644 --- 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.4.0/src/remote/remote_daemon_config.c +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-6.5.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.4.0/src/remote/remote_daemon_config.c # else /* ! LIBVIRTD */ data->listen_tls = false; /* Always honoured, --listen doesn't exist. */ # endif /* ! LIBVIRTD */ -Index: libvirt-6.4.0/src/remote/libvirtd.conf.in +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/remote/libvirtd.conf.in ++++ libvirt-6.5.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. diff --git a/suse-libvirtd-sysconfig-settings.patch b/suse-libvirtd-sysconfig-settings.patch index b28a3a9..113ea89 100644 --- 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.4.0/src/remote/libvirtd.sysconf +Index: libvirt-6.5.0/src/remote/libvirtd.sysconf =================================================================== ---- libvirt-6.4.0.orig/src/remote/libvirtd.sysconf -+++ libvirt-6.4.0/src/remote/libvirtd.sysconf +--- libvirt-6.5.0.orig/src/remote/libvirtd.sysconf ++++ libvirt-6.5.0/src/remote/libvirtd.sysconf @@ -1,5 +1,9 @@ +## Path: System/Virtualization/libvirt # Customizations for the libvirtd.service systemd unit diff --git a/suse-libxl-disable-autoballoon.patch b/suse-libxl-disable-autoballoon.patch index 81641f8..dab1fab 100644 --- 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.4.0/src/libxl/libxl.conf +Index: libvirt-6.5.0/src/libxl/libxl.conf =================================================================== ---- libvirt-6.4.0.orig/src/libxl/libxl.conf -+++ libvirt-6.4.0/src/libxl/libxl.conf +--- libvirt-6.5.0.orig/src/libxl/libxl.conf ++++ libvirt-6.5.0/src/libxl/libxl.conf @@ -4,12 +4,11 @@ # Enable autoballooning of domain0 @@ -27,10 +27,10 @@ Index: libvirt-6.4.0/src/libxl/libxl.conf # In order to prevent accidentally starting two domains that -Index: libvirt-6.4.0/src/libxl/libxl_conf.c +Index: libvirt-6.5.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 +--- 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 /* * Get domain0 autoballoon configuration. Honor user-specified diff --git a/suse-ovmf-paths.patch b/suse-ovmf-paths.patch index 00241e5..5daedb8 100644 --- a/suse-ovmf-paths.patch +++ b/suse-ovmf-paths.patch @@ -1,9 +1,9 @@ Adjust paths of OVMF firmwares on SUSE distros -Index: libvirt-6.4.0/src/qemu/qemu.conf +Index: libvirt-6.5.0/src/qemu/qemu.conf =================================================================== ---- libvirt-6.4.0.orig/src/qemu/qemu.conf -+++ libvirt-6.4.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 @@ # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # follows this scheme. @@ -18,10 +18,10 @@ Index: libvirt-6.4.0/src/qemu/qemu.conf #] # The backend to use for handling stdout/stderr output from -Index: libvirt-6.4.0/src/qemu/qemu_conf.c +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/qemu/qemu_conf.c ++++ libvirt-6.5.0/src/qemu/qemu_conf.c @@ -96,10 +96,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver #ifndef DEFAULT_LOADER_NVRAM @@ -36,10 +36,10 @@ Index: libvirt-6.4.0/src/qemu/qemu_conf.c #endif -Index: libvirt-6.4.0/src/security/virt-aa-helper.c +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/security/virt-aa-helper.c ++++ libvirt-6.5.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 */ diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch index 466ca20..b09c6ac 100644 --- 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-6.4.0/src/qemu/qemu.conf +Index: libvirt-6.5.0/src/qemu/qemu.conf =================================================================== ---- libvirt-6.4.0.orig/src/qemu/qemu.conf -+++ libvirt-6.4.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 @@ # isolation, but it cannot appear in a list of drivers. # @@ -60,10 +60,10 @@ Index: libvirt-6.4.0/src/qemu/qemu.conf # #lock_manager = "lockd" -Index: libvirt-6.4.0/src/qemu/qemu_conf.c +Index: libvirt-6.5.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 +--- libvirt-6.5.0.orig/src/qemu/qemu_conf.c ++++ libvirt-6.5.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); diff --git a/suse-virtlockd-sysconfig-settings.patch b/suse-virtlockd-sysconfig-settings.patch index e7ec9c5..07528ec 100644 --- 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.4.0/src/locking/virtlockd.sysconf +Index: libvirt-6.5.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-6.4.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-6.4.0/src/locking/virtlockd.sysconf +--- libvirt-6.5.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-6.5.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + diff --git a/suse-virtlogd-sysconfig-settings.patch b/suse-virtlogd-sysconfig-settings.patch index f93d7c6..d7c3b7a 100644 --- 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.4.0/src/logging/virtlogd.sysconf +Index: libvirt-6.5.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-6.4.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-6.4.0/src/logging/virtlogd.sysconf +--- libvirt-6.5.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-6.5.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + diff --git a/suse-xen-ovmf-loaders.patch b/suse-xen-ovmf-loaders.patch index 972cb76..82734e6 100644 --- a/suse-xen-ovmf-loaders.patch +++ b/suse-xen-ovmf-loaders.patch @@ -5,10 +5,10 @@ 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.4.0/src/libxl/libxl_conf.c +Index: libvirt-6.5.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 +--- 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) cfg->autoDumpDir = g_strdup(LIBXL_DUMP_DIR); cfg->channelDir = g_strdup(LIBXL_CHANNEL_DIR);