diff --git a/0001-Extract-stats-functions-from-the-qemu-driver.patch b/0001-Extract-stats-functions-from-the-qemu-driver.patch index f4d370a..05e78dd 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-4.8.0/src/conf/domain_stats.c +Index: libvirt-4.9.0/src/conf/domain_stats.c =================================================================== --- /dev/null -+++ libvirt-4.8.0/src/conf/domain_stats.c ++++ libvirt-4.9.0/src/conf/domain_stats.c @@ -0,0 +1,139 @@ +/* + * domain_stats.c: domain stats extraction helpers @@ -162,10 +162,10 @@ Index: libvirt-4.8.0/src/conf/domain_stats.c +} + +#undef STATS_ADD_NET_PARAM -Index: libvirt-4.8.0/src/conf/domain_stats.h +Index: libvirt-4.9.0/src/conf/domain_stats.h =================================================================== --- /dev/null -+++ libvirt-4.8.0/src/conf/domain_stats.h ++++ libvirt-4.9.0/src/conf/domain_stats.h @@ -0,0 +1,64 @@ +/* + * domain_stats.h: domain stats extraction helpers @@ -231,10 +231,10 @@ Index: libvirt-4.8.0/src/conf/domain_stats.h + int *maxparams); + +#endif /* __DOMAIN_STATS_H */ -Index: libvirt-4.8.0/src/libvirt_private.syms +Index: libvirt-4.9.0/src/libvirt_private.syms =================================================================== ---- libvirt-4.8.0.orig/src/libvirt_private.syms -+++ libvirt-4.8.0/src/libvirt_private.syms +--- libvirt-4.9.0.orig/src/libvirt_private.syms ++++ libvirt-4.9.0/src/libvirt_private.syms @@ -653,6 +653,9 @@ virDomainConfNWFilterInstantiate; virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -253,10 +253,10 @@ Index: libvirt-4.8.0/src/libvirt_private.syms virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKillPainfully; -Index: libvirt-4.8.0/src/qemu/qemu_driver.c +Index: libvirt-4.9.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-4.8.0.orig/src/qemu/qemu_driver.c -+++ libvirt-4.8.0/src/qemu/qemu_driver.c +--- libvirt-4.9.0.orig/src/qemu/qemu_driver.c ++++ libvirt-4.9.0/src/qemu/qemu_driver.c @@ -69,6 +69,7 @@ #include "virarptable.h" #include "viruuid.h" @@ -265,7 +265,7 @@ Index: libvirt-4.8.0/src/qemu/qemu_driver.c #include "domain_audit.h" #include "node_device_conf.h" #include "virpci.h" -@@ -19674,21 +19675,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr +@@ -19677,21 +19678,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr int *maxparams, unsigned int privflags ATTRIBUTE_UNUSED) { @@ -288,7 +288,7 @@ Index: libvirt-4.8.0/src/qemu/qemu_driver.c } -@@ -19711,37 +19698,7 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr d +@@ -19714,37 +19701,7 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr d unsigned int privflags ATTRIBUTE_UNUSED) { qemuDomainObjPrivatePtr priv = dom->privateData; @@ -327,7 +327,7 @@ Index: libvirt-4.8.0/src/qemu/qemu_driver.c } static int -@@ -19921,44 +19878,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr +@@ -19924,44 +19881,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr return ret; } @@ -372,7 +372,7 @@ Index: libvirt-4.8.0/src/qemu/qemu_driver.c static int qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr dom, -@@ -19966,68 +19885,9 @@ qemuDomainGetStatsInterface(virQEMUDrive +@@ -19969,68 +19888,9 @@ qemuDomainGetStatsInterface(virQEMUDrive int *maxparams, unsigned int privflags ATTRIBUTE_UNUSED) { @@ -442,7 +442,7 @@ Index: libvirt-4.8.0/src/qemu/qemu_driver.c #define QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, num, name, value) \ do { \ char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \ -@@ -20260,10 +20120,10 @@ qemuDomainGetStatsBlockExportHeader(virD +@@ -20263,10 +20123,10 @@ qemuDomainGetStatsBlockExportHeader(virD { int ret = -1; @@ -455,7 +455,7 @@ Index: libvirt-4.8.0/src/qemu/qemu_driver.c if (src->id) QEMU_ADD_BLOCK_PARAM_UI(records, nrecords, recordnr, "backingIndex", src->id); -@@ -20403,7 +20263,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr +@@ -20406,7 +20266,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr * after the iteration than it is to iterate twice; but we still * want count listed first. */ count_index = record->nparams; @@ -464,7 +464,7 @@ Index: libvirt-4.8.0/src/qemu/qemu_driver.c for (i = 0; i < dom->def->ndisks; i++) { if (qemuDomainGetStatsBlockExportDisk(dom->def->disks[i], stats, nodestats, -@@ -20428,10 +20288,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr +@@ -20431,10 +20291,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr #undef QEMU_ADD_BLOCK_PARAM_ULL @@ -475,11 +475,11 @@ Index: libvirt-4.8.0/src/qemu/qemu_driver.c static int qemuDomainGetStatsPerfOneEvent(virPerfPtr perf, virPerfEventType type, -Index: libvirt-4.8.0/src/util/vircgroup.c +Index: libvirt-4.9.0/src/util/vircgroup.c =================================================================== ---- libvirt-4.8.0.orig/src/util/vircgroup.c -+++ libvirt-4.8.0/src/util/vircgroup.c -@@ -2628,6 +2628,44 @@ virCgroupControllerAvailable(int control +--- libvirt-4.9.0.orig/src/util/vircgroup.c ++++ libvirt-4.9.0/src/util/vircgroup.c +@@ -2794,6 +2794,44 @@ virCgroupControllerAvailable(int control return ret; } @@ -524,7 +524,7 @@ Index: libvirt-4.8.0/src/util/vircgroup.c #else /* !__linux__ */ bool -@@ -2637,6 +2675,15 @@ virCgroupAvailable(void) +@@ -2803,6 +2841,15 @@ virCgroupAvailable(void) } @@ -540,10 +540,10 @@ Index: libvirt-4.8.0/src/util/vircgroup.c int virCgroupNewPartition(const char *path ATTRIBUTE_UNUSED, bool create ATTRIBUTE_UNUSED, -Index: libvirt-4.8.0/src/util/vircgroup.h +Index: libvirt-4.9.0/src/util/vircgroup.h =================================================================== ---- libvirt-4.8.0.orig/src/util/vircgroup.h -+++ libvirt-4.8.0/src/util/vircgroup.h +--- libvirt-4.9.0.orig/src/util/vircgroup.h ++++ libvirt-4.9.0/src/util/vircgroup.h @@ -287,4 +287,9 @@ int virCgroupSetOwner(virCgroupPtr cgrou int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller); @@ -554,10 +554,10 @@ Index: libvirt-4.8.0/src/util/vircgroup.h + int *maxparams); + #endif /* __VIR_CGROUP_H__ */ -Index: libvirt-4.8.0/src/conf/Makefile.inc.am +Index: libvirt-4.9.0/src/conf/Makefile.inc.am =================================================================== ---- libvirt-4.8.0.orig/src/conf/Makefile.inc.am -+++ libvirt-4.8.0/src/conf/Makefile.inc.am +--- libvirt-4.9.0.orig/src/conf/Makefile.inc.am ++++ libvirt-4.9.0/src/conf/Makefile.inc.am @@ -20,6 +20,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 38ba92f..5fdf1c0 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-4.8.0/src/libxl/libxl_driver.c +Index: libvirt-4.9.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-4.8.0.orig/src/libxl/libxl_driver.c -+++ libvirt-4.8.0/src/libxl/libxl_driver.c +--- libvirt-4.9.0.orig/src/libxl/libxl_driver.c ++++ libvirt-4.9.0/src/libxl/libxl_driver.c @@ -5253,6 +5253,97 @@ libxlDomainMemoryStats(virDomainPtr dom, #undef LIBXL_SET_MEMSTAT diff --git a/0002-lxc-implement-connectGetAllDomainStats.patch b/0002-lxc-implement-connectGetAllDomainStats.patch index 2fd93d8..2e5df44 100644 --- a/0002-lxc-implement-connectGetAllDomainStats.patch +++ b/0002-lxc-implement-connectGetAllDomainStats.patch @@ -9,10 +9,10 @@ them using the existing API. src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) -Index: libvirt-4.8.0/src/lxc/lxc_driver.c +Index: libvirt-4.9.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-4.8.0.orig/src/lxc/lxc_driver.c -+++ libvirt-4.8.0/src/lxc/lxc_driver.c +--- libvirt-4.9.0.orig/src/lxc/lxc_driver.c ++++ libvirt-4.9.0/src/lxc/lxc_driver.c @@ -78,6 +78,7 @@ #include "viraccessapichecklxc.h" #include "virhostdev.h" diff --git a/apparmor-no-mount.patch b/apparmor-no-mount.patch index 6e792ac..a4b6397 100644 --- a/apparmor-no-mount.patch +++ b/apparmor-no-mount.patch @@ -1,7 +1,7 @@ -Index: libvirt-4.8.0/examples/apparmor/libvirt-lxc +Index: libvirt-4.9.0/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-4.8.0.orig/examples/apparmor/libvirt-lxc -+++ libvirt-4.8.0/examples/apparmor/libvirt-lxc +--- libvirt-4.9.0.orig/examples/apparmor/libvirt-lxc ++++ libvirt-4.9.0/examples/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include diff --git a/blockcopy-check-dst-identical-device.patch b/blockcopy-check-dst-identical-device.patch index 5ee3992..1da6d38 100644 --- a/blockcopy-check-dst-identical-device.patch +++ b/blockcopy-check-dst-identical-device.patch @@ -11,11 +11,11 @@ Signed-off-by: Chunyan Liu src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: libvirt-4.8.0/src/qemu/qemu_driver.c +Index: libvirt-4.9.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-4.8.0.orig/src/qemu/qemu_driver.c -+++ libvirt-4.8.0/src/qemu/qemu_driver.c -@@ -17503,6 +17503,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-4.9.0.orig/src/qemu/qemu_driver.c ++++ libvirt-4.9.0/src/qemu/qemu_driver.c +@@ -17506,6 +17506,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt goto endjob; } diff --git a/libvirt-4.8.0.tar.xz b/libvirt-4.8.0.tar.xz deleted file mode 100644 index 62dc76d..0000000 --- a/libvirt-4.8.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2fd7112d6689fbb4d700b31c01aadd8a0eb275e127dc959cdc166f5f60b3032 -size 14739652 diff --git a/libvirt-4.8.0.tar.xz.asc b/libvirt-4.8.0.tar.xz.asc deleted file mode 100644 index 2d865e4..0000000 --- a/libvirt-4.8.0.tar.xz.asc +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEcBAABAgAGBQJbsjv9AAoJEBVYiyZZa+pdHs8H/2Vq5LT4yMFlSA6gephfgPkV -+I8lITiZleJuQLDN73iUrUvCw2rOY0B5s0TRAwUIdh4t0dtszJt2X+MsaLY+n3dB -19WZSTGtwOy/gd5NNPz8ua2Z4KH1DPcme2pMkqurwsmu+6FBnl+gVZYZeZm4S1gl -C/8JZu/5VDCbN/HDgQQ1fGlgSZZZ5JwLoHF6USg3GDEOO20B4LUeOiy5Vgp/B8+T -7C0Jf4KS6rsH5HXw63ATrTWO/XYbDeoVYXgWe9tugsyVO8mzoF/Odu49Pkc2Kzp5 -Sdod9MsAIFgZLKNCw3izCaCpf2Xdwwz7D3wF7BIdKsVgUfX52Xk84/YwyHT2O2Q= -=w6sZ ------END PGP SIGNATURE----- diff --git a/libvirt-4.9.0.tar.xz b/libvirt-4.9.0.tar.xz new file mode 100644 index 0000000..9e9f2d4 --- /dev/null +++ b/libvirt-4.9.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fd4bfe7312b7996a817c7919cf0062de0d5b3c400c93bd30855a46c40dd455a +size 14744184 diff --git a/libvirt-4.9.0.tar.xz.asc b/libvirt-4.9.0.tar.xz.asc new file mode 100644 index 0000000..83e8551 --- /dev/null +++ b/libvirt-4.9.0.tar.xz.asc @@ -0,0 +1,10 @@ +-----BEGIN PGP SIGNATURE----- + +iQEcBAABAgAGBQJb3yVYAAoJEBVYiyZZa+pde8QIALgbitxgn79S7cAYatk5xv7n +5OKXY6MjaF1568fx6uCnFo/hM7GR4l43Lqjk4lc3nNxYjhnCIjK6fpwdnIKg0G+F +JgsGV0Ydjxrqs140SnhgYYWyaHq6juHdqSdfKqnLJ/uPYVUPhUomhZ5c4LvBcYCX +3Sy9TKJOpFjEmuBpzZHMzvXibtS+fUkTyzlNixOQ/tjVNnYu1OboOuXov4ay+aS4 +uild4jnO86mDa0LBxHWVEobjLiJs5RTDPbnnn8DT6nRdn14TzAsIJU2wms8OO36w +x3h1Ao59X7yUKOE5rYZnIIG6oW2I6jM3Vy6NxDVNAx0P/1/bCqE7lwgJD4uh2Zg= +=aLc3 +-----END PGP SIGNATURE----- diff --git a/libvirt-power8-models.patch b/libvirt-power8-models.patch index f6bd679..04a8097 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-4.8.0/src/cpu_map/ppc64_POWER8.xml +Index: libvirt-4.9.0/src/cpu_map/ppc64_POWER8.xml =================================================================== ---- libvirt-4.8.0.orig/src/cpu_map/ppc64_POWER8.xml -+++ libvirt-4.8.0/src/cpu_map/ppc64_POWER8.xml +--- libvirt-4.9.0.orig/src/cpu_map/ppc64_POWER8.xml ++++ libvirt-4.9.0/src/cpu_map/ppc64_POWER8.xml @@ -4,5 +4,7 @@ diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index 98f55c3..64f2aa2 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,7 +1,7 @@ -Index: libvirt-4.8.0/configure.ac +Index: libvirt-4.9.0/configure.ac =================================================================== ---- libvirt-4.8.0.orig/configure.ac -+++ libvirt-4.8.0/configure.ac +--- libvirt-4.9.0.orig/configure.ac ++++ libvirt-4.9.0/configure.ac @@ -256,6 +256,7 @@ LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_MACVTAP @@ -18,7 +18,7 @@ Index: libvirt-4.8.0/configure.ac LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER -@@ -984,6 +986,7 @@ LIBVIRT_RESULT_LIBXL +@@ -1016,6 +1018,7 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_LIBXML LIBVIRT_RESULT_MACVTAP LIBVIRT_RESULT_NETCF @@ -26,10 +26,10 @@ Index: libvirt-4.8.0/configure.ac LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL -Index: libvirt-4.8.0/tools/virsh.c +Index: libvirt-4.9.0/tools/virsh.c =================================================================== ---- libvirt-4.8.0.orig/tools/virsh.c -+++ libvirt-4.8.0/tools/virsh.c +--- libvirt-4.9.0.orig/tools/virsh.c ++++ libvirt-4.9.0/tools/virsh.c @@ -570,6 +570,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -39,10 +39,10 @@ Index: libvirt-4.8.0/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-4.8.0/src/interface/interface_backend_netcf.c +Index: libvirt-4.9.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-4.8.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-4.8.0/src/interface/interface_backend_netcf.c +--- libvirt-4.9.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-4.9.0/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include @@ -126,10 +126,10 @@ Index: libvirt-4.8.0/src/interface/interface_backend_netcf.c if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) return -1; if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) -Index: libvirt-4.8.0/src/interface/interface_driver.c +Index: libvirt-4.9.0/src/interface/interface_driver.c =================================================================== ---- libvirt-4.8.0.orig/src/interface/interface_driver.c -+++ libvirt-4.8.0/src/interface/interface_driver.c +--- libvirt-4.9.0.orig/src/interface/interface_driver.c ++++ libvirt-4.9.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -147,10 +147,10 @@ Index: libvirt-4.8.0/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-4.8.0/m4/virt-netcontrol.m4 +Index: libvirt-4.9.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-4.8.0/m4/virt-netcontrol.m4 ++++ libvirt-4.9.0/m4/virt-netcontrol.m4 @@ -0,0 +1,39 @@ +dnl The libnetcontrol library +dnl @@ -191,10 +191,10 @@ Index: libvirt-4.8.0/m4/virt-netcontrol.m4 +AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[ + LIBVIRT_RESULT_LIB([NETCONTROL]) +]) -Index: libvirt-4.8.0/src/interface/Makefile.inc.am +Index: libvirt-4.9.0/src/interface/Makefile.inc.am =================================================================== ---- libvirt-4.8.0.orig/src/interface/Makefile.inc.am -+++ libvirt-4.8.0/src/interface/Makefile.inc.am +--- libvirt-4.9.0.orig/src/interface/Makefile.inc.am ++++ libvirt-4.9.0/src/interface/Makefile.inc.am @@ -4,6 +4,7 @@ INTERFACE_DRIVER_SOURCES = \ $(NULL) diff --git a/libvirt.changes b/libvirt.changes index b99bb28..b9c4936 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Nov 5 15:10:31 UTC 2018 - James Fehlig + +- Update to libvirt 4.9.0 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - FATE#326371 + ------------------------------------------------------------------- Fri Oct 19 16:47:18 UTC 2018 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 4d67ae9..4cb5202 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -185,7 +185,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 4.8.0 +Version: 4.9.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later diff --git a/libxl-dom-reset.patch b/libxl-dom-reset.patch index 5a9d015..719c6a2 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-4.8.0/src/libxl/libxl_driver.c +Index: libvirt-4.9.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-4.8.0.orig/src/libxl/libxl_driver.c -+++ libvirt-4.8.0/src/libxl/libxl_driver.c +--- libvirt-4.9.0.orig/src/libxl/libxl_driver.c ++++ libvirt-4.9.0/src/libxl/libxl_driver.c @@ -1355,6 +1355,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } diff --git a/libxl-qemu-emulator-caps.patch b/libxl-qemu-emulator-caps.patch index 624ae32..0670bc0 100644 --- a/libxl-qemu-emulator-caps.patch +++ b/libxl-qemu-emulator-caps.patch @@ -8,10 +8,10 @@ as the default , instead of the qemu-xen one. See FATE#320638 for details. -Index: libvirt-4.8.0/src/libxl/libxl_capabilities.c +Index: libvirt-4.9.0/src/libxl/libxl_capabilities.c =================================================================== ---- libvirt-4.8.0.orig/src/libxl/libxl_capabilities.c -+++ libvirt-4.8.0/src/libxl/libxl_capabilities.c +--- libvirt-4.9.0.orig/src/libxl/libxl_capabilities.c ++++ libvirt-4.9.0/src/libxl/libxl_capabilities.c @@ -38,6 +38,7 @@ #include "libxl_capabilities.h" #include "cpu/cpu_x86.h" diff --git a/libxl-set-cach-mode.patch b/libxl-set-cach-mode.patch index 5d242c7..dc7849e 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-4.8.0/src/libxl/libxl_conf.c +Index: libvirt-4.9.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-4.8.0.orig/src/libxl/libxl_conf.c -+++ libvirt-4.8.0/src/libxl/libxl_conf.c +--- libvirt-4.9.0.orig/src/libxl/libxl_conf.c ++++ libvirt-4.9.0/src/libxl/libxl_conf.c @@ -848,6 +848,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } diff --git a/libxl-set-migration-constraints.patch b/libxl-set-migration-constraints.patch index 7cbbb6b..7fba868 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-4.8.0/include/libvirt/libvirt-domain.h +Index: libvirt-4.9.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-4.8.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-4.8.0/include/libvirt/libvirt-domain.h +--- libvirt-4.9.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-4.9.0/include/libvirt/libvirt-domain.h @@ -1015,6 +1015,31 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment" @@ -52,10 +52,10 @@ Index: libvirt-4.8.0/include/libvirt/libvirt-domain.h /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-4.8.0/src/libxl/libxl_driver.c +Index: libvirt-4.9.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-4.8.0.orig/src/libxl/libxl_driver.c -+++ libvirt-4.8.0/src/libxl/libxl_driver.c +--- libvirt-4.9.0.orig/src/libxl/libxl_driver.c ++++ libvirt-4.9.0/src/libxl/libxl_driver.c @@ -6119,6 +6119,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; @@ -99,10 +99,10 @@ Index: libvirt-4.8.0/src/libxl/libxl_driver.c goto cleanup; } -Index: libvirt-4.8.0/src/libxl/libxl_migration.c +Index: libvirt-4.9.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-4.8.0.orig/src/libxl/libxl_migration.c -+++ libvirt-4.8.0/src/libxl/libxl_migration.c +--- libvirt-4.9.0.orig/src/libxl/libxl_migration.c ++++ libvirt-4.9.0/src/libxl/libxl_migration.c @@ -346,18 +346,39 @@ libxlMigrateDstReceive(virNetSocketPtr s static int libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, @@ -264,10 +264,10 @@ Index: libvirt-4.8.0/src/libxl/libxl_migration.c virObjectLock(vm); if (ret < 0) { -Index: libvirt-4.8.0/src/libxl/libxl_migration.h +Index: libvirt-4.9.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-4.8.0.orig/src/libxl/libxl_migration.h -+++ libvirt-4.8.0/src/libxl/libxl_migration.h +--- libvirt-4.9.0.orig/src/libxl/libxl_migration.h ++++ libvirt-4.9.0/src/libxl/libxl_migration.h @@ -39,6 +39,10 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ @@ -312,10 +312,10 @@ Index: libvirt-4.8.0/src/libxl/libxl_migration.h virDomainPtr libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-4.8.0/tools/virsh-domain.c +Index: libvirt-4.9.0/tools/virsh-domain.c =================================================================== ---- libvirt-4.8.0.orig/tools/virsh-domain.c -+++ libvirt-4.8.0/tools/virsh-domain.c +--- libvirt-4.9.0.orig/tools/virsh-domain.c ++++ libvirt-4.9.0/tools/virsh-domain.c @@ -10450,6 +10450,22 @@ static const vshCmdOptDef opts_migrate[] .type = VSH_OT_BOOL, .help = N_("use TLS for migration") @@ -375,10 +375,10 @@ Index: libvirt-4.8.0/tools/virsh-domain.c if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { -Index: libvirt-4.8.0/tools/virsh.pod +Index: libvirt-4.9.0/tools/virsh.pod =================================================================== ---- libvirt-4.8.0.orig/tools/virsh.pod -+++ libvirt-4.8.0/tools/virsh.pod +--- libvirt-4.9.0.orig/tools/virsh.pod ++++ libvirt-4.9.0/tools/virsh.pod @@ -1937,6 +1937,14 @@ Providing I<--tls> causes the migration the migration of the domain. Usage requires proper TLS setup for both source and target. diff --git a/libxl-support-block-script.patch b/libxl-support-block-script.patch index 5841a7e..cc016e5 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-4.8.0/src/libxl/libxl_conf.c +Index: libvirt-4.9.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-4.8.0.orig/src/libxl/libxl_conf.c -+++ libvirt-4.8.0/src/libxl/libxl_conf.c +--- libvirt-4.9.0.orig/src/libxl/libxl_conf.c ++++ libvirt-4.9.0/src/libxl/libxl_conf.c @@ -848,6 +848,25 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } diff --git a/lxc-wait-after-eth-del.patch b/lxc-wait-after-eth-del.patch index 0fc3b4c..994d235 100644 --- a/lxc-wait-after-eth-del.patch +++ b/lxc-wait-after-eth-del.patch @@ -13,10 +13,10 @@ device with the same name that is being created. src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-4.8.0/src/lxc/lxc_controller.c +Index: libvirt-4.9.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-4.8.0.orig/src/lxc/lxc_controller.c -+++ libvirt-4.8.0/src/lxc/lxc_controller.c +--- libvirt-4.9.0.orig/src/lxc/lxc_controller.c ++++ libvirt-4.9.0/src/lxc/lxc_controller.c @@ -72,6 +72,7 @@ #include "rpc/virnetdaemon.h" #include "virstring.h" @@ -33,10 +33,10 @@ Index: libvirt-4.8.0/src/lxc/lxc_controller.c return ret; } -Index: libvirt-4.8.0/src/lxc/lxc_driver.c +Index: libvirt-4.9.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-4.8.0.orig/src/lxc/lxc_driver.c -+++ libvirt-4.8.0/src/lxc/lxc_driver.c +--- libvirt-4.9.0.orig/src/lxc/lxc_driver.c ++++ libvirt-4.9.0/src/lxc/lxc_driver.c @@ -73,6 +73,7 @@ #include "virtime.h" #include "virtypedparam.h" @@ -61,10 +61,10 @@ Index: libvirt-4.8.0/src/lxc/lxc_driver.c break; /* It'd be nice to support this, but with macvlan -Index: libvirt-4.8.0/src/lxc/lxc_process.c +Index: libvirt-4.9.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-4.8.0.orig/src/lxc/lxc_process.c -+++ libvirt-4.8.0/src/lxc/lxc_process.c +--- libvirt-4.9.0.orig/src/lxc/lxc_process.c ++++ libvirt-4.9.0/src/lxc/lxc_process.c @@ -51,6 +51,7 @@ #include "viratomic.h" #include "virprocess.h" 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 e0ed075..44ef4fd 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-4.8.0/src/network/bridge_driver.c +Index: libvirt-4.9.0/src/network/bridge_driver.c =================================================================== ---- libvirt-4.8.0.orig/src/network/bridge_driver.c -+++ libvirt-4.8.0/src/network/bridge_driver.c +--- libvirt-4.9.0.orig/src/network/bridge_driver.c ++++ libvirt-4.9.0/src/network/bridge_driver.c @@ -1458,7 +1458,14 @@ networkDnsmasqConfContents(virNetworkObj if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { @@ -37,10 +37,10 @@ Index: libvirt-4.8.0/src/network/bridge_driver.c } if (ipdef->tftproot) { -Index: libvirt-4.8.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-4.9.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-4.8.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-4.8.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-4.9.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-4.9.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 3cf1919..ec64872 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-4.8.0/src/util/virarch.c +Index: libvirt-4.9.0/src/util/virarch.c =================================================================== ---- libvirt-4.8.0.orig/src/util/virarch.c -+++ libvirt-4.8.0/src/util/virarch.c +--- libvirt-4.9.0.orig/src/util/virarch.c ++++ libvirt-4.9.0/src/util/virarch.c @@ -172,6 +172,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 452af01..22e3ac3 100644 --- a/qemu-apparmor-screenshot.patch +++ b/qemu-apparmor-screenshot.patch @@ -1,7 +1,7 @@ -Index: libvirt-4.8.0/examples/apparmor/libvirt-qemu +Index: libvirt-4.9.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-4.8.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-4.8.0/examples/apparmor/libvirt-qemu +--- libvirt-4.9.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-4.9.0/examples/apparmor/libvirt-qemu @@ -221,3 +221,6 @@ # required for sasl GSSAPI plugin /etc/gss/mech.d/ r, diff --git a/support-managed-pci-xen-driver.patch b/support-managed-pci-xen-driver.patch index f6abb96..54c04fe 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-4.8.0/src/xenconfig/xen_common.c +Index: libvirt-4.9.0/src/xenconfig/xen_common.c =================================================================== ---- libvirt-4.8.0.orig/src/xenconfig/xen_common.c -+++ libvirt-4.8.0/src/xenconfig/xen_common.c +--- libvirt-4.9.0.orig/src/xenconfig/xen_common.c ++++ libvirt-4.9.0/src/xenconfig/xen_common.c @@ -390,12 +390,19 @@ xenParsePCI(char *entry) int busID; int slotID; @@ -64,10 +64,10 @@ Index: libvirt-4.8.0/src/xenconfig/xen_common.c hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; hostdev->source.subsys.u.pci.addr.domain = domainID; hostdev->source.subsys.u.pci.addr.bus = busID; -Index: libvirt-4.8.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.9.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-4.8.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-4.8.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.9.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.9.0/src/xenconfig/xen_sxpr.c @@ -1057,6 +1057,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; diff --git a/suse-apparmor-libnl-paths.patch b/suse-apparmor-libnl-paths.patch index 14e6caf..8501624 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-4.8.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-4.9.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-4.8.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper -+++ libvirt-4.8.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-4.9.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper ++++ libvirt-4.9.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper @@ -17,7 +17,7 @@ profile virt-aa-helper /usr/{lib,lib64}/ owner @{PROC}/[0-9]*/status r, @{PROC}/filesystems r, @@ -21,10 +21,10 @@ Index: libvirt-4.8.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper # for hostdev /sys/devices/ r, -Index: libvirt-4.8.0/examples/apparmor/libvirt-qemu +Index: libvirt-4.9.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-4.8.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-4.8.0/examples/apparmor/libvirt-qemu +--- libvirt-4.9.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-4.9.0/examples/apparmor/libvirt-qemu @@ -62,6 +62,7 @@ #/dev/fb* rw, diff --git a/suse-libvirt-guests-service.patch b/suse-libvirt-guests-service.patch index 22833e8..d0bbe35 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-4.8.0/tools/libvirt-guests.init.in +Index: libvirt-4.9.0/tools/libvirt-guests.init.in =================================================================== ---- libvirt-4.8.0.orig/tools/libvirt-guests.init.in -+++ libvirt-4.8.0/tools/libvirt-guests.init.in +--- libvirt-4.9.0.orig/tools/libvirt-guests.init.in ++++ libvirt-4.9.0/tools/libvirt-guests.init.in @@ -4,27 +4,27 @@ # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # @@ -46,10 +46,10 @@ Index: libvirt-4.8.0/tools/libvirt-guests.init.in + exec @libexecdir@/libvirt-guests.sh "$@" -Index: libvirt-4.8.0/tools/libvirt-guests.sh.in +Index: libvirt-4.9.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-4.8.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-4.8.0/tools/libvirt-guests.sh.in +--- libvirt-4.9.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-4.9.0/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # . @@ -209,10 +209,10 @@ Index: libvirt-4.8.0/tools/libvirt-guests.sh.in esac -exit $RETVAL +rc_exit -Index: libvirt-4.8.0/tools/libvirt-guests.sysconf +Index: libvirt-4.9.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-4.8.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-4.8.0/tools/libvirt-guests.sysconf +--- libvirt-4.9.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-4.9.0/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + diff --git a/suse-libvirtd-disable-tls.patch b/suse-libvirtd-disable-tls.patch index 2d17c85..5318b08 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-4.8.0/src/remote/libvirtd.conf +Index: libvirt-4.9.0/src/remote/libvirtd.conf =================================================================== ---- libvirt-4.8.0.orig/src/remote/libvirtd.conf -+++ libvirt-4.8.0/src/remote/libvirtd.conf +--- libvirt-4.9.0.orig/src/remote/libvirtd.conf ++++ libvirt-4.9.0/src/remote/libvirtd.conf @@ -18,8 +18,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -18,10 +18,10 @@ Index: libvirt-4.8.0/src/remote/libvirtd.conf # Listen for unencrypted TCP connections on the public TCP/IP port. # NB, must pass the --listen flag to the libvirtd process for this to -Index: libvirt-4.8.0/src/remote/remote_daemon_config.c +Index: libvirt-4.9.0/src/remote/remote_daemon_config.c =================================================================== ---- libvirt-4.8.0.orig/src/remote/remote_daemon_config.c -+++ libvirt-4.8.0/src/remote/remote_daemon_config.c +--- libvirt-4.9.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-4.9.0/src/remote/remote_daemon_config.c @@ -110,7 +110,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; @@ -31,10 +31,10 @@ Index: libvirt-4.8.0/src/remote/remote_daemon_config.c data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-4.8.0/src/remote/test_libvirtd.aug.in +Index: libvirt-4.9.0/src/remote/test_libvirtd.aug.in =================================================================== ---- libvirt-4.8.0.orig/src/remote/test_libvirtd.aug.in -+++ libvirt-4.8.0/src/remote/test_libvirtd.aug.in +--- libvirt-4.9.0.orig/src/remote/test_libvirtd.aug.in ++++ libvirt-4.9.0/src/remote/test_libvirtd.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd = ::CONFIG:: diff --git a/suse-libvirtd-service-xen.patch b/suse-libvirtd-service-xen.patch index 57a296a..acd0870 100644 --- a/suse-libvirtd-service-xen.patch +++ b/suse-libvirtd-service-xen.patch @@ -7,10 +7,10 @@ On SUSE distros, we promote libvirt and all the libvirt-based tools. If a user installs libvirt on their SUSE Xen host, then libvirt should be king and override xendomains. See bsc#1015348 -Index: libvirt-4.8.0/src/remote/libvirtd.service.in +Index: libvirt-4.9.0/src/remote/libvirtd.service.in =================================================================== ---- libvirt-4.8.0.orig/src/remote/libvirtd.service.in -+++ libvirt-4.8.0/src/remote/libvirtd.service.in +--- libvirt-4.9.0.orig/src/remote/libvirtd.service.in ++++ libvirt-4.9.0/src/remote/libvirtd.service.in @@ -17,6 +17,8 @@ After=local-fs.target After=remote-fs.target After=systemd-logind.service diff --git a/suse-libvirtd-sysconfig-settings.patch b/suse-libvirtd-sysconfig-settings.patch index 8475769..0f0bd7a 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-4.8.0/src/remote/libvirtd.sysconf +Index: libvirt-4.9.0/src/remote/libvirtd.sysconf =================================================================== ---- libvirt-4.8.0.orig/src/remote/libvirtd.sysconf -+++ libvirt-4.8.0/src/remote/libvirtd.sysconf +--- libvirt-4.9.0.orig/src/remote/libvirtd.sysconf ++++ libvirt-4.9.0/src/remote/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + diff --git a/suse-ovmf-paths.patch b/suse-ovmf-paths.patch index d93d2b2..a98394d 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-4.8.0/src/qemu/qemu.conf +Index: libvirt-4.9.0/src/qemu/qemu.conf =================================================================== ---- libvirt-4.8.0.orig/src/qemu/qemu.conf -+++ libvirt-4.8.0/src/qemu/qemu.conf +--- libvirt-4.9.0.orig/src/qemu/qemu.conf ++++ libvirt-4.9.0/src/qemu/qemu.conf @@ -768,10 +768,9 @@ security_default_confined = 0 # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # follows this scheme. @@ -18,10 +18,10 @@ Index: libvirt-4.8.0/src/qemu/qemu.conf #] # The backend to use for handling stdout/stderr output from -Index: libvirt-4.8.0/src/qemu/qemu_conf.c +Index: libvirt-4.9.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-4.8.0.orig/src/qemu/qemu_conf.c -+++ libvirt-4.8.0/src/qemu/qemu_conf.c +--- libvirt-4.9.0.orig/src/qemu/qemu_conf.c ++++ libvirt-4.9.0/src/qemu/qemu_conf.c @@ -118,10 +118,9 @@ void qemuDomainCmdlineDefFree(qemuDomain #ifndef DEFAULT_LOADER_NVRAM @@ -36,10 +36,10 @@ Index: libvirt-4.8.0/src/qemu/qemu_conf.c #endif -Index: libvirt-4.8.0/src/security/virt-aa-helper.c +Index: libvirt-4.9.0/src/security/virt-aa-helper.c =================================================================== ---- libvirt-4.8.0.orig/src/security/virt-aa-helper.c -+++ libvirt-4.8.0/src/security/virt-aa-helper.c +--- libvirt-4.9.0.orig/src/security/virt-aa-helper.c ++++ libvirt-4.9.0/src/security/virt-aa-helper.c @@ -511,7 +511,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 02f7a24..64404c2 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-4.8.0/src/qemu/qemu.conf +Index: libvirt-4.9.0/src/qemu/qemu.conf =================================================================== ---- libvirt-4.8.0.orig/src/qemu/qemu.conf -+++ libvirt-4.8.0/src/qemu/qemu.conf +--- libvirt-4.9.0.orig/src/qemu/qemu.conf ++++ libvirt-4.9.0/src/qemu/qemu.conf @@ -414,11 +414,20 @@ # isolation, but it cannot appear in a list of drivers. # diff --git a/suse-virtlockd-sysconfig-settings.patch b/suse-virtlockd-sysconfig-settings.patch index 71aaf73..61f9a2e 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-4.8.0/src/locking/virtlockd.sysconf +Index: libvirt-4.9.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-4.8.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-4.8.0/src/locking/virtlockd.sysconf +--- libvirt-4.9.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-4.9.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 8747694..7673365 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-4.8.0/src/logging/virtlogd.sysconf +Index: libvirt-4.9.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-4.8.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-4.8.0/src/logging/virtlogd.sysconf +--- libvirt-4.9.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-4.9.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + diff --git a/xen-pv-cdrom.patch b/xen-pv-cdrom.patch index ce5859e..24fb365 100644 --- a/xen-pv-cdrom.patch +++ b/xen-pv-cdrom.patch @@ -1,7 +1,7 @@ -Index: libvirt-4.8.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.9.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-4.8.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-4.8.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.9.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.9.0/src/xenconfig/xen_sxpr.c @@ -387,7 +387,7 @@ xenParseSxprVifRate(const char *rate, un static int xenParseSxprDisks(virDomainDefPtr def, diff --git a/xen-sxpr-disk-type.patch b/xen-sxpr-disk-type.patch index 8f9944f..32e7daa 100644 --- a/xen-sxpr-disk-type.patch +++ b/xen-sxpr-disk-type.patch @@ -6,10 +6,10 @@ and 'file'. This was implicitly done prior to commit 9673418c. https://bugzilla.suse.com/show_bug.cgi?id=938228 -Index: libvirt-4.8.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.9.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-4.8.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-4.8.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.9.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.9.0/src/xenconfig/xen_sxpr.c @@ -501,10 +501,11 @@ xenParseSxprDisks(virDomainDefPtr def, omnipotent, we can revisit this, perhaps stat()'ing the src file in question */