From 4d2c547eb16a8e870dc69f2376923e4efd3705f5920841b39cb95fe0c2bf32b9 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Tue, 5 Jun 2018 23:59:32 +0000 Subject: [PATCH] Accepting request 614408 from home:jfehlig:branches:Virtualization - spec: use wireshark plugin directory from pkg-config - virt-aa-helper: add SUSE path to OVMF and AAVMF images Adjusted suse-ovmf-paths.patch boo#1095556 - Update to libvirt 4.4.0 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - CVE-2018-3639 - Dropped patches: 1dbca2ec-CVE-2018-3639.patch, 92673422-CVE-2018-3639.patch - libxl: fix leaking logfile fds 67c56f6e-libxl-logfd-leak-fix.patch bsc#1094480 OBS-URL: https://build.opensuse.org/request/show/614408 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=691 --- ...stats-functions-from-the-qemu-driver.patch | 56 +++++++------- ...c-implement-connectGetAllDomainStats.patch | 10 +-- 1dbca2ec-CVE-2018-3639.patch | 27 ------- 67c56f6e-libxl-logfd-leak-fix.patch | 42 +++++++++++ 92673422-CVE-2018-3639.patch | 37 ---------- apparmor-no-mount.patch | 6 +- blockcopy-check-dst-identical-device.patch | 8 +- libvirt-4.3.0.tar.xz | 3 - libvirt-4.3.0.tar.xz.asc | 10 --- libvirt-4.4.0.tar.xz | 3 + libvirt-4.4.0.tar.xz.asc | 10 +++ libvirt-power8-models.patch | 6 +- libvirt-suse-netcontrol.patch | 36 ++++----- libvirt.changes | 25 +++++++ libvirt.spec | 25 +++++-- libxl-dom-reset.patch | 10 +-- libxl-qemu-emulator-caps.patch | 6 +- libxl-set-cach-mode.patch | 6 +- libxl-set-migration-constraints.patch | 74 +++++++++---------- libxl-support-block-script.patch | 6 +- lxc-wait-after-eth-del.patch | 22 +++--- ...e-dhcp-authoritative-on-static-netwo.patch | 12 +-- ppc64le-canonical-name.patch | 6 +- qemu-apparmor-screenshot.patch | 6 +- support-managed-pci-xen-driver.patch | 12 +-- suse-apparmor-libnl-paths.patch | 12 +-- suse-libvirt-guests-service.patch | 18 ++--- suse-libvirtd-disable-tls.patch | 18 ++--- suse-libvirtd-service-xen.patch | 6 +- suse-libvirtd-sysconfig-settings.patch | 6 +- suse-ovmf-paths.patch | 26 +++++-- suse-qemu-conf.patch | 6 +- suse-virtlockd-sysconfig-settings.patch | 6 +- suse-virtlogd-sysconfig-settings.patch | 6 +- xen-pv-cdrom.patch | 6 +- xen-sxpr-disk-type.patch | 6 +- 36 files changed, 304 insertions(+), 276 deletions(-) delete mode 100644 1dbca2ec-CVE-2018-3639.patch create mode 100644 67c56f6e-libxl-logfd-leak-fix.patch delete mode 100644 92673422-CVE-2018-3639.patch delete mode 100644 libvirt-4.3.0.tar.xz delete mode 100644 libvirt-4.3.0.tar.xz.asc create mode 100644 libvirt-4.4.0.tar.xz create mode 100644 libvirt-4.4.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 e62c835..a28846c 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.3.0/src/conf/domain_stats.c +Index: libvirt-4.4.0/src/conf/domain_stats.c =================================================================== --- /dev/null -+++ libvirt-4.3.0/src/conf/domain_stats.c ++++ libvirt-4.4.0/src/conf/domain_stats.c @@ -0,0 +1,139 @@ +/* + * domain_stats.c: domain stats extraction helpers @@ -162,10 +162,10 @@ Index: libvirt-4.3.0/src/conf/domain_stats.c +} + +#undef STATS_ADD_NET_PARAM -Index: libvirt-4.3.0/src/conf/domain_stats.h +Index: libvirt-4.4.0/src/conf/domain_stats.h =================================================================== --- /dev/null -+++ libvirt-4.3.0/src/conf/domain_stats.h ++++ libvirt-4.4.0/src/conf/domain_stats.h @@ -0,0 +1,64 @@ +/* + * domain_stats.h: domain stats extraction helpers @@ -231,11 +231,11 @@ Index: libvirt-4.3.0/src/conf/domain_stats.h + int *maxparams); + +#endif /* __DOMAIN_STATS_H */ -Index: libvirt-4.3.0/src/libvirt_private.syms +Index: libvirt-4.4.0/src/libvirt_private.syms =================================================================== ---- libvirt-4.3.0.orig/src/libvirt_private.syms -+++ libvirt-4.3.0/src/libvirt_private.syms -@@ -649,6 +649,9 @@ virDomainConfNWFilterRegister; +--- libvirt-4.4.0.orig/src/libvirt_private.syms ++++ libvirt-4.4.0/src/libvirt_private.syms +@@ -652,6 +652,9 @@ virDomainConfNWFilterRegister; virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -245,7 +245,7 @@ Index: libvirt-4.3.0/src/libvirt_private.syms # conf/interface_conf.h virInterfaceDefFormat; -@@ -1508,6 +1511,7 @@ virCgroupGetMemoryUsage; +@@ -1511,6 +1514,7 @@ virCgroupGetMemoryUsage; virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; @@ -253,10 +253,10 @@ Index: libvirt-4.3.0/src/libvirt_private.syms virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKill; -Index: libvirt-4.3.0/src/qemu/qemu_driver.c +Index: libvirt-4.4.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-4.3.0.orig/src/qemu/qemu_driver.c -+++ libvirt-4.3.0/src/qemu/qemu_driver.c +--- libvirt-4.4.0.orig/src/qemu/qemu_driver.c ++++ libvirt-4.4.0/src/qemu/qemu_driver.c @@ -74,6 +74,7 @@ #include "virarptable.h" #include "viruuid.h" @@ -265,7 +265,7 @@ Index: libvirt-4.3.0/src/qemu/qemu_driver.c #include "domain_audit.h" #include "node_device_conf.h" #include "virpci.h" -@@ -19508,21 +19509,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr +@@ -19607,21 +19608,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr int *maxparams, unsigned int privflags ATTRIBUTE_UNUSED) { @@ -288,7 +288,7 @@ Index: libvirt-4.3.0/src/qemu/qemu_driver.c } -@@ -19545,37 +19532,7 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr d +@@ -19644,37 +19631,7 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr d unsigned int privflags ATTRIBUTE_UNUSED) { qemuDomainObjPrivatePtr priv = dom->privateData; @@ -327,7 +327,7 @@ Index: libvirt-4.3.0/src/qemu/qemu_driver.c } static int -@@ -19754,44 +19711,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr +@@ -19853,44 +19810,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr return ret; } @@ -372,7 +372,7 @@ Index: libvirt-4.3.0/src/qemu/qemu_driver.c static int qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr dom, -@@ -19799,68 +19718,9 @@ qemuDomainGetStatsInterface(virQEMUDrive +@@ -19898,68 +19817,9 @@ qemuDomainGetStatsInterface(virQEMUDrive int *maxparams, unsigned int privflags ATTRIBUTE_UNUSED) { @@ -442,7 +442,7 @@ Index: libvirt-4.3.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]; \ -@@ -19982,10 +19842,10 @@ qemuDomainGetStatsOneBlock(virQEMUDriver +@@ -20081,10 +19941,10 @@ qemuDomainGetStatsOneBlock(virQEMUDriver if (disk->info.alias) alias = qemuDomainStorageAlias(disk->info.alias, backing_idx); @@ -455,7 +455,7 @@ Index: libvirt-4.3.0/src/qemu/qemu_driver.c block_idx, src->path); if (backing_idx) QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, block_idx, "backingIndex", -@@ -20101,7 +19961,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr +@@ -20200,7 +20060,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.3.0/src/qemu/qemu_driver.c for (i = 0; i < dom->def->ndisks; i++) { virDomainDiskDefPtr disk = dom->def->disks[i]; -@@ -20135,10 +19995,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr +@@ -20234,10 +20094,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr #undef QEMU_ADD_BLOCK_PARAM_ULL @@ -475,10 +475,10 @@ Index: libvirt-4.3.0/src/qemu/qemu_driver.c static int qemuDomainGetStatsPerfOneEvent(virPerfPtr perf, virPerfEventType type, -Index: libvirt-4.3.0/src/util/vircgroup.c +Index: libvirt-4.4.0/src/util/vircgroup.c =================================================================== ---- libvirt-4.3.0.orig/src/util/vircgroup.c -+++ libvirt-4.3.0/src/util/vircgroup.c +--- libvirt-4.4.0.orig/src/util/vircgroup.c ++++ libvirt-4.4.0/src/util/vircgroup.c @@ -4122,6 +4122,44 @@ virCgroupControllerAvailable(int control return ret; } @@ -539,10 +539,10 @@ Index: libvirt-4.3.0/src/util/vircgroup.c #endif /* !VIR_CGROUP_SUPPORTED */ -Index: libvirt-4.3.0/src/util/vircgroup.h +Index: libvirt-4.4.0/src/util/vircgroup.h =================================================================== ---- libvirt-4.3.0.orig/src/util/vircgroup.h -+++ libvirt-4.3.0/src/util/vircgroup.h +--- libvirt-4.4.0.orig/src/util/vircgroup.h ++++ libvirt-4.4.0/src/util/vircgroup.h @@ -297,4 +297,8 @@ int virCgroupSetOwner(virCgroupPtr cgrou int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller); @@ -552,10 +552,10 @@ Index: libvirt-4.3.0/src/util/vircgroup.h + virDomainStatsRecordPtr record, + int *maxparams); #endif /* __VIR_CGROUP_H__ */ -Index: libvirt-4.3.0/src/conf/Makefile.inc.am +Index: libvirt-4.4.0/src/conf/Makefile.inc.am =================================================================== ---- libvirt-4.3.0.orig/src/conf/Makefile.inc.am -+++ libvirt-4.3.0/src/conf/Makefile.inc.am +--- libvirt-4.4.0.orig/src/conf/Makefile.inc.am ++++ libvirt-4.4.0/src/conf/Makefile.inc.am @@ -20,6 +20,8 @@ DOMAIN_CONF_SOURCES = \ conf/domain_audit.h \ conf/domain_nwfilter.c \ diff --git a/0002-lxc-implement-connectGetAllDomainStats.patch b/0002-lxc-implement-connectGetAllDomainStats.patch index 35a40bc..a24c73e 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.3.0/src/lxc/lxc_driver.c +Index: libvirt-4.4.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-4.3.0.orig/src/lxc/lxc_driver.c -+++ libvirt-4.3.0/src/lxc/lxc_driver.c +--- libvirt-4.4.0.orig/src/lxc/lxc_driver.c ++++ libvirt-4.4.0/src/lxc/lxc_driver.c @@ -80,6 +80,7 @@ #include "viraccessapichecklxc.h" #include "virhostdev.h" @@ -21,7 +21,7 @@ Index: libvirt-4.3.0/src/lxc/lxc_driver.c #define VIR_FROM_THIS VIR_FROM_LXC -@@ -5524,6 +5525,142 @@ lxcDomainHasManagedSaveImage(virDomainPt +@@ -5474,6 +5475,142 @@ lxcDomainHasManagedSaveImage(virDomainPt return ret; } @@ -164,7 +164,7 @@ Index: libvirt-4.3.0/src/lxc/lxc_driver.c /* Function Tables */ static virHypervisorDriver lxcHypervisorDriver = { -@@ -5619,6 +5756,7 @@ static virHypervisorDriver lxcHypervisor +@@ -5569,6 +5706,7 @@ static virHypervisorDriver lxcHypervisor .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */ .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */ diff --git a/1dbca2ec-CVE-2018-3639.patch b/1dbca2ec-CVE-2018-3639.patch deleted file mode 100644 index 96e66c8..0000000 --- a/1dbca2ec-CVE-2018-3639.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 1dbca2eccad58d91a5fd33962854f1a653638182 -Author: Daniel P. Berrangé -Date: Mon May 21 23:05:07 2018 +0100 - - cpu: define the 'ssbd' CPUID feature bit (CVE-2018-3639) - - New microcode introduces the "Speculative Store Bypass Disable" - CPUID feature bit. This needs to be exposed to guest OS to allow - them to protect against CVE-2018-3639. - - Signed-off-by: Daniel P. Berrangé - Reviewed-by: Jiri Denemark - -Index: libvirt-4.3.0/src/cpu/cpu_map.xml -=================================================================== ---- libvirt-4.3.0.orig/src/cpu/cpu_map.xml -+++ libvirt-4.3.0/src/cpu/cpu_map.xml -@@ -298,6 +298,9 @@ - - - -+ -+ -+ - - - diff --git a/67c56f6e-libxl-logfd-leak-fix.patch b/67c56f6e-libxl-logfd-leak-fix.patch new file mode 100644 index 0000000..3e11805 --- /dev/null +++ b/67c56f6e-libxl-logfd-leak-fix.patch @@ -0,0 +1,42 @@ +commit 67c56f6e65b9cd2681ef1bc61d8b51cbc543fa42 +Author: Jim Fehlig +Date: Thu May 31 15:41:37 2018 -0600 + + libxl: fix leaking logfile fds + + Per-domain log files were introduced in commit a30b08b7179. The FILE + objects associated with these log files are stored in a hash table + using domid as a key. When a domain is shutdown, destroyed, or + otherwise powered-off, the FILE object is removed from the hash table, + where the free function will close the FILE. + + Unfortunately the call to remove the FILE from the hash table occurs + after setting domid=-1 in the libxlDomainCleanup() function. The + object is never removed from the hash table, the free function is + never called, and the underlying fd is leaked. Fix by removing the + FILE object from the hash table before setting domid=-1. + + Signed-off-by: Jim Fehlig + Reviewed-by: Ján Tomko + +diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c +index d4859d6707..d12b1b1b4b 100644 +--- a/src/libxl/libxl_domain.c ++++ b/src/libxl/libxl_domain.c +@@ -769,6 +769,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, + VIR_WARN("Unable to release lease on %s", vm->def->name); + VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); + ++ libxlLoggerCloseFile(cfg->logger, vm->def->id); + vm->def->id = -1; + + if (priv->deathW) { +@@ -822,8 +823,6 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, + VIR_FREE(xml); + } + +- libxlLoggerCloseFile(cfg->logger, vm->def->id); +- + virDomainObjRemoveTransientDef(vm); + virObjectUnref(cfg); + } diff --git a/92673422-CVE-2018-3639.patch b/92673422-CVE-2018-3639.patch deleted file mode 100644 index 16e3abf..0000000 --- a/92673422-CVE-2018-3639.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit 9267342206ce17f6933d57a3128cdc504d5945c9 -Author: Daniel P. Berrangé -Date: Mon May 21 23:05:08 2018 +0100 - - cpu: define the 'virt-ssbd' CPUID feature bit (CVE-2018-3639) - - Some AMD processors only support a non-architectural means of - enabling Speculative Store Bypass Disable. To allow simplified - handling in virtual environments, hypervisors will expose an - architectural definition through CPUID bit 0x80000008_EBX[25]. - This needs to be exposed to guest OS running on AMD x86 hosts to - allow them to protect against CVE-2018-3639. - - Note that since this CPUID bit won't be present in the host CPUID - results on physical hosts, it will not be enabled automatically - in guests configured with "host-model" CPU unless using QEMU - version >= 2.9.0. Thus for older versions of QEMU, this feature - must be manually enabled using policy=force. Guests using the - "host-passthrough" CPU mode do not need special handling. - - Signed-off-by: Daniel P. Berrangé - Reviewed-by: Jiri Denemark - -Index: libvirt-4.3.0/src/cpu/cpu_map.xml -=================================================================== ---- libvirt-4.3.0.orig/src/cpu/cpu_map.xml -+++ libvirt-4.3.0/src/cpu/cpu_map.xml -@@ -433,6 +433,9 @@ - - - -+ -+ -+ - - - diff --git a/apparmor-no-mount.patch b/apparmor-no-mount.patch index c66d792..51bf394 100644 --- a/apparmor-no-mount.patch +++ b/apparmor-no-mount.patch @@ -1,7 +1,7 @@ -Index: libvirt-4.3.0/examples/apparmor/libvirt-lxc +Index: libvirt-4.4.0/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-4.3.0.orig/examples/apparmor/libvirt-lxc -+++ libvirt-4.3.0/examples/apparmor/libvirt-lxc +--- libvirt-4.4.0.orig/examples/apparmor/libvirt-lxc ++++ libvirt-4.4.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 5ff4692..6c77948 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.3.0/src/qemu/qemu_driver.c +Index: libvirt-4.4.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-4.3.0.orig/src/qemu/qemu_driver.c -+++ libvirt-4.3.0/src/qemu/qemu_driver.c -@@ -17293,6 +17293,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-4.4.0.orig/src/qemu/qemu_driver.c ++++ libvirt-4.4.0/src/qemu/qemu_driver.c +@@ -17498,6 +17498,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt goto endjob; } diff --git a/libvirt-4.3.0.tar.xz b/libvirt-4.3.0.tar.xz deleted file mode 100644 index e262ac2..0000000 --- a/libvirt-4.3.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a531e22c8b985ecb2d1223b913fd6ec0f1800e3ebe02351924274885db20c2b7 -size 14667860 diff --git a/libvirt-4.3.0.tar.xz.asc b/libvirt-4.3.0.tar.xz.asc deleted file mode 100644 index c6e1e55..0000000 --- a/libvirt-4.3.0.tar.xz.asc +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEcBAABAgAGBQJa6a7HAAoJEBVYiyZZa+pdvAoIALsZwGBIlMfuJYbhnMVYIgpj -sFKFYy4v/0w8tvXurhVXFo724fCREaqr30RebmktMYRN9V891Q6Brvf6PGH0Zoiu -9ZmxYE3wnQh+4qoccOy0A2opjmnsXBp0DCWgsIg8TTb7stUSYQ6vMzgH8v1ozR6J -yR5dkqdghTz3KRmRY68uZY/QqULl7//ye3ZAF1erNm9MIq3i6BdxSS55pBCJvMqU -RO3UeyKIVhQ3R7p1T/ZtNrtx1EL6NQ30HWp7DrcLUX9S9hnKA2Xf1Pj34IZvjUTm -GSedEVeewJW2qpO2eMb4G4Zv5qGPi/oYLe1V3BXaw/hKYenVmDCp1arGa1CtBN8= -=fuwj ------END PGP SIGNATURE----- diff --git a/libvirt-4.4.0.tar.xz b/libvirt-4.4.0.tar.xz new file mode 100644 index 0000000..9a8c2ca --- /dev/null +++ b/libvirt-4.4.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46631d63cb61af8042593a93fa046dddfff204d29858f20df77a125bd6f84ab6 +size 14668912 diff --git a/libvirt-4.4.0.tar.xz.asc b/libvirt-4.4.0.tar.xz.asc new file mode 100644 index 0000000..fe5cf85 --- /dev/null +++ b/libvirt-4.4.0.tar.xz.asc @@ -0,0 +1,10 @@ +-----BEGIN PGP SIGNATURE----- + +iQEcBAABAgAGBQJbFZ/HAAoJEBVYiyZZa+pdSRIIALhg1w9rRjJxZXLVyexGVl69 +ASEPuAtOLPGheicV4cNjAj/j1nyz0k2ldD47aXmVcX3r1B9u/uxVOl31J3Y+u2HH +zNgrU+/WGX9ZUp3mzSBJtTIa3ZaHdElY7yI7ONiw7yJ7F0+u0gzIeHnTZ17DXuiL +CRvNW0fTUExzEcas1tNmNNHiifcZdfG/v+LKduDyEu3uyAzIfTV8UbKWOe0vMOqJ +oXttqZPSJf9x5XBNhnYGUc+2WM08wDhlxrtL1VNyhKrPZCaciiPDl9BvTbSSq8zZ +7+vs1YnxKIkiAItxQuWH8ujaS5siBNJ2AwFeSWefSESI325Cq3bjO1H8Np+/xIc= +=MBxi +-----END PGP SIGNATURE----- diff --git a/libvirt-power8-models.patch b/libvirt-power8-models.patch index 705ff54..0fc6443 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.3.0/src/cpu/cpu_map.xml +Index: libvirt-4.4.0/src/cpu/cpu_map.xml =================================================================== ---- libvirt-4.3.0.orig/src/cpu/cpu_map.xml -+++ libvirt-4.3.0/src/cpu/cpu_map.xml +--- libvirt-4.4.0.orig/src/cpu/cpu_map.xml ++++ libvirt-4.4.0/src/cpu/cpu_map.xml @@ -2355,6 +2355,8 @@ diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index 1f5e457..00b7f1a 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,7 +1,7 @@ -Index: libvirt-4.3.0/configure.ac +Index: libvirt-4.4.0/configure.ac =================================================================== ---- libvirt-4.3.0.orig/configure.ac -+++ libvirt-4.3.0/configure.ac +--- libvirt-4.4.0.orig/configure.ac ++++ libvirt-4.4.0/configure.ac @@ -257,6 +257,7 @@ LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_MACVTAP @@ -18,7 +18,7 @@ Index: libvirt-4.3.0/configure.ac LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER -@@ -966,6 +968,7 @@ LIBVIRT_RESULT_LIBXL +@@ -972,6 +974,7 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_LIBXML LIBVIRT_RESULT_MACVTAP LIBVIRT_RESULT_NETCF @@ -26,10 +26,10 @@ Index: libvirt-4.3.0/configure.ac LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL -Index: libvirt-4.3.0/tools/virsh.c +Index: libvirt-4.4.0/tools/virsh.c =================================================================== ---- libvirt-4.3.0.orig/tools/virsh.c -+++ libvirt-4.3.0/tools/virsh.c +--- libvirt-4.4.0.orig/tools/virsh.c ++++ libvirt-4.4.0/tools/virsh.c @@ -575,6 +575,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -39,10 +39,10 @@ Index: libvirt-4.3.0/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-4.3.0/src/interface/interface_backend_netcf.c +Index: libvirt-4.4.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-4.3.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-4.3.0/src/interface/interface_backend_netcf.c +--- libvirt-4.4.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-4.4.0/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include @@ -126,10 +126,10 @@ Index: libvirt-4.3.0/src/interface/interface_backend_netcf.c if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) return -1; if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) -Index: libvirt-4.3.0/src/interface/interface_driver.c +Index: libvirt-4.4.0/src/interface/interface_driver.c =================================================================== ---- libvirt-4.3.0.orig/src/interface/interface_driver.c -+++ libvirt-4.3.0/src/interface/interface_driver.c +--- libvirt-4.4.0.orig/src/interface/interface_driver.c ++++ libvirt-4.4.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -147,10 +147,10 @@ Index: libvirt-4.3.0/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-4.3.0/m4/virt-netcontrol.m4 +Index: libvirt-4.4.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-4.3.0/m4/virt-netcontrol.m4 ++++ libvirt-4.4.0/m4/virt-netcontrol.m4 @@ -0,0 +1,39 @@ +dnl The libnetcontrol library +dnl @@ -191,10 +191,10 @@ Index: libvirt-4.3.0/m4/virt-netcontrol.m4 +AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[ + LIBVIRT_RESULT_LIB([NETCONTROL]) +]) -Index: libvirt-4.3.0/src/interface/Makefile.inc.am +Index: libvirt-4.4.0/src/interface/Makefile.inc.am =================================================================== ---- libvirt-4.3.0.orig/src/interface/Makefile.inc.am -+++ libvirt-4.3.0/src/interface/Makefile.inc.am +--- libvirt-4.4.0.orig/src/interface/Makefile.inc.am ++++ libvirt-4.4.0/src/interface/Makefile.inc.am @@ -4,6 +4,7 @@ INTERFACE_DRIVER_SOURCES = \ $(NULL) diff --git a/libvirt.changes b/libvirt.changes index 0283c09..5790f88 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue Jun 5 22:56:28 UTC 2018 - jfehlig@suse.com + +- spec: use wireshark plugin directory from pkg-config + +------------------------------------------------------------------- +Tue Jun 5 22:15:26 UTC 2018 - jfehlig@suse.com + +- virt-aa-helper: add SUSE path to OVMF and AAVMF images + Adjusted suse-ovmf-paths.patch + boo#1095556 + +------------------------------------------------------------------- +Mon Jun 4 22:32:54 UTC 2018 - jfehlig@suse.com + +- Update to libvirt 4.4.0 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - CVE-2018-3639 + - Dropped patches: + 1dbca2ec-CVE-2018-3639.patch, 92673422-CVE-2018-3639.patch +- libxl: fix leaking logfile fds + 67c56f6e-libxl-logfd-leak-fix.patch + bsc#1094480 + ------------------------------------------------------------------- Tue May 22 14:44:51 UTC 2018 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index a6c2388..9bf768c 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -173,9 +173,13 @@ %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services %endif +%if %{with_wireshark} + %define wireshark_plugindir %(pkg-config --variable plugindir wireshark) +%endif + Name: libvirt Url: http://libvirt.org/ -Version: 4.3.0 +Version: 4.4.0 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1-or-later @@ -323,8 +327,7 @@ Source6: libvirtd-relocation-server.xml Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: 1dbca2ec-CVE-2018-3639.patch -Patch1: 92673422-CVE-2018-3639.patch +Patch0: 67c56f6e-libxl-logfd-leak-fix.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -910,7 +913,6 @@ libvirt plugin for NSS for translating domain names into IP addresses. %prep %setup -q %patch0 -p1 -%patch1 -p1 %patch100 -p1 %patch101 -p1 %patch150 -p1 @@ -1132,7 +1134,7 @@ make %{?_smp_mflags} -C examples distclean cp examples/lxcconvert/virt-lxc-convert %{buildroot}/%{_bindir} rm -f %{buildroot}/%{_libdir}/*.la %if %{with_wireshark} -rm -f %{buildroot}/%{_libdir}/wireshark/plugins/*/libvirt.la +rm -f %{buildroot}/%{wireshark_plugindir}/libvirt.la %endif rm -f %{buildroot}/%{_libdir}/*.a rm -f %{buildroot}/%{_libdir}/%{name}/lock-driver/*.la @@ -1141,6 +1143,8 @@ rm -f %{buildroot}/%{_libdir}/%{name}/connection-driver/*.la rm -f %{buildroot}/%{_libdir}/%{name}/connection-driver/*.a rm -f %{buildroot}/%{_libdir}/%{name}/storage-backend/*.la rm -f %{buildroot}/%{_libdir}/%{name}/storage-backend/*.a +rm -f %{buildroot}/%{_libdir}/%{name}/storage-file/*.la +rm -f %{buildroot}/%{_libdir}/%{name}/storage-file/*.a # remove currently unsupported locale(s) for dir in %{buildroot}/usr/share/locale/* do @@ -1251,9 +1255,11 @@ install -m 755 %{S:5} %{buildroot}/%{_sysconfdir}/libvirt/hooks/qemu %ifarch %{power64} s390x x86_64 mv %{buildroot}/%{_datadir}/systemtap/tapset/libvirt_probes.stp \ %{buildroot}/%{_datadir}/systemtap/tapset/libvirt_probes-64.stp +%if %{with_qemu} mv %{buildroot}/%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ %{buildroot}/%{_datadir}/systemtap/tapset/libvirt_qemu_probes-64.stp %endif +%endif %fdupes -s %{buildroot} %clean @@ -1395,8 +1401,10 @@ fi %{_datadir}/augeas/lenses/libvirt_lockd.aug %{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug %{_datadir}/systemtap/tapset/libvirt_probes*.stp -%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp %{_datadir}/systemtap/tapset/libvirt_functions.stp +%if %{with_qemu} +%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp +%endif %if %{with_bash_completion} %{_datadir}/bash-completion/completions/virsh %endif @@ -1489,6 +1497,8 @@ fi %{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so %dir %{_libdir}/%{name}/storage-backend %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_fs.so +%dir %{_libdir}/%{name}/storage-file +%{_libdir}/%{name}/storage-file/libvirt_storage_file_fs.so %files daemon-driver-storage-disk %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_disk.so @@ -1508,6 +1518,7 @@ fi %if %{with_storage_gluster} %files daemon-driver-storage-gluster %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_gluster.so +%{_libdir}/%{name}/storage-file/libvirt_storage_file_gluster.so %endif %if %{with_storage_rbd} @@ -1732,7 +1743,7 @@ fi %if %{with_wireshark} %files -n wireshark-plugin-libvirt -%{_libdir}/wireshark/plugins/*/libvirt.so +%{wireshark_plugindir}/libvirt.so %endif %files nss diff --git a/libxl-dom-reset.patch b/libxl-dom-reset.patch index 96cde98..590f546 100644 --- a/libxl-dom-reset.patch +++ b/libxl-dom-reset.patch @@ -8,11 +8,11 @@ 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.3.0/src/libxl/libxl_driver.c +Index: libvirt-4.4.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-4.3.0.orig/src/libxl/libxl_driver.c -+++ libvirt-4.3.0/src/libxl/libxl_driver.c -@@ -1358,6 +1358,61 @@ libxlDomainReboot(virDomainPtr dom, unsi +--- libvirt-4.4.0.orig/src/libxl/libxl_driver.c ++++ libvirt-4.4.0/src/libxl/libxl_driver.c +@@ -1346,6 +1346,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } static int @@ -74,7 +74,7 @@ Index: libvirt-4.3.0/src/libxl/libxl_driver.c libxlDomainDestroyFlags(virDomainPtr dom, unsigned int flags) { -@@ -6426,6 +6481,7 @@ static virHypervisorDriver libxlHypervis +@@ -6390,6 +6445,7 @@ static virHypervisorDriver libxlHypervis .domainShutdown = libxlDomainShutdown, /* 0.9.0 */ .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */ .domainReboot = libxlDomainReboot, /* 0.9.0 */ diff --git a/libxl-qemu-emulator-caps.patch b/libxl-qemu-emulator-caps.patch index 287e8a6..b2e6107 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.3.0/src/libxl/libxl_capabilities.c +Index: libvirt-4.4.0/src/libxl/libxl_capabilities.c =================================================================== ---- libvirt-4.3.0.orig/src/libxl/libxl_capabilities.c -+++ libvirt-4.3.0/src/libxl/libxl_capabilities.c +--- libvirt-4.4.0.orig/src/libxl/libxl_capabilities.c ++++ libvirt-4.4.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 9c17074..12ff7a9 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.3.0/src/libxl/libxl_conf.c +Index: libvirt-4.4.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-4.3.0.orig/src/libxl/libxl_conf.c -+++ libvirt-4.3.0/src/libxl/libxl_conf.c +--- libvirt-4.4.0.orig/src/libxl/libxl_conf.c ++++ libvirt-4.4.0/src/libxl/libxl_conf.c @@ -837,6 +837,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } diff --git a/libxl-set-migration-constraints.patch b/libxl-set-migration-constraints.patch index a925b10..f1aee27 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.3.0/include/libvirt/libvirt-domain.h +Index: libvirt-4.4.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-4.3.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-4.3.0/include/libvirt/libvirt-domain.h +--- libvirt-4.4.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-4.4.0/include/libvirt/libvirt-domain.h @@ -1008,6 +1008,31 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment" @@ -52,11 +52,11 @@ Index: libvirt-4.3.0/include/libvirt/libvirt-domain.h /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-4.3.0/src/libxl/libxl_driver.c +Index: libvirt-4.4.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-4.3.0.orig/src/libxl/libxl_driver.c -+++ libvirt-4.3.0/src/libxl/libxl_driver.c -@@ -6028,6 +6028,9 @@ libxlDomainMigratePerform3Params(virDoma +--- libvirt-4.4.0.orig/src/libxl/libxl_driver.c ++++ libvirt-4.4.0/src/libxl/libxl_driver.c +@@ -5992,6 +5992,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; int ret = -1; @@ -66,7 +66,7 @@ Index: libvirt-4.3.0/src/libxl/libxl_driver.c #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME virReportUnsupportedError(); -@@ -6044,6 +6047,18 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6008,6 +6011,18 @@ libxlDomainMigratePerform3Params(virDoma virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 || @@ -85,7 +85,7 @@ Index: libvirt-4.3.0/src/libxl/libxl_driver.c virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_URI, &uri) < 0) -@@ -6058,11 +6073,11 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6022,11 +6037,11 @@ libxlDomainMigratePerform3Params(virDoma if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml, @@ -99,11 +99,11 @@ Index: libvirt-4.3.0/src/libxl/libxl_driver.c goto cleanup; } -Index: libvirt-4.3.0/src/libxl/libxl_migration.c +Index: libvirt-4.4.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-4.3.0.orig/src/libxl/libxl_migration.c -+++ libvirt-4.3.0/src/libxl/libxl_migration.c -@@ -356,18 +356,39 @@ libxlMigrateDstReceive(virNetSocketPtr s +--- libvirt-4.4.0.orig/src/libxl/libxl_migration.c ++++ libvirt-4.4.0/src/libxl/libxl_migration.c +@@ -353,18 +353,39 @@ libxlMigrateDstReceive(virNetSocketPtr s static int libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, virDomainObjPtr vm, @@ -145,7 +145,7 @@ Index: libvirt-4.3.0/src/libxl/libxl_migration.c if (ret != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to send migration data to destination host")); -@@ -903,7 +924,7 @@ struct libxlTunnelControl { +@@ -894,7 +915,7 @@ struct libxlTunnelControl { static int libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver, virDomainObjPtr vm, @@ -154,7 +154,7 @@ Index: libvirt-4.3.0/src/libxl/libxl_migration.c virStreamPtr st, struct libxlTunnelControl **tnl) { -@@ -936,7 +957,7 @@ libxlMigrationSrcStartTunnel(libxlDriver +@@ -927,7 +948,7 @@ libxlMigrationSrcStartTunnel(libxlDriver virObjectUnlock(vm); /* Send data to pipe */ @@ -163,7 +163,7 @@ Index: libvirt-4.3.0/src/libxl/libxl_migration.c virObjectLock(vm); out: -@@ -972,7 +993,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -963,7 +984,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP const char *dconnuri ATTRIBUTE_UNUSED, const char *dname, const char *uri, @@ -172,7 +172,7 @@ Index: libvirt-4.3.0/src/libxl/libxl_migration.c { virDomainPtr ddomain = NULL; virTypedParameterPtr params = NULL; -@@ -1012,11 +1033,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1003,11 +1024,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP /* We don't require the destination to have P2P support * as it looks to be normal migration from the receiver perpective. */ @@ -186,7 +186,7 @@ Index: libvirt-4.3.0/src/libxl/libxl_migration.c if (!(st = virStreamNew(dconn, 0))) goto cleanup; ret = dconn->driver->domainMigratePrepareTunnel3Params -@@ -1030,7 +1051,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1021,7 +1042,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP if (ret == -1) goto cleanup; @@ -195,7 +195,7 @@ Index: libvirt-4.3.0/src/libxl/libxl_migration.c if (uri_out) { if (virTypedParamsReplaceString(¶ms, &nparams, VIR_MIGRATE_PARAM_URI, uri_out) < 0) { -@@ -1045,11 +1066,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1036,11 +1057,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP } VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); @@ -210,7 +210,7 @@ Index: libvirt-4.3.0/src/libxl/libxl_migration.c if (ret < 0) orig_err = virSaveLastError(); -@@ -1080,14 +1101,14 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1071,14 +1092,14 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP orig_err = virSaveLastError(); VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm); @@ -227,7 +227,7 @@ Index: libvirt-4.3.0/src/libxl/libxl_migration.c libxlMigrationSrcStopTunnel(tc); virObjectUnref(st); } -@@ -1134,7 +1155,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD +@@ -1125,7 +1146,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD const char *dconnuri, const char *uri_str ATTRIBUTE_UNUSED, const char *dname, @@ -236,7 +236,7 @@ Index: libvirt-4.3.0/src/libxl/libxl_migration.c { int ret = -1; bool useParams; -@@ -1169,7 +1190,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD +@@ -1160,7 +1181,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD } ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri, @@ -245,7 +245,7 @@ Index: libvirt-4.3.0/src/libxl/libxl_migration.c cleanup: orig_err = virSaveLastError(); -@@ -1191,7 +1212,7 @@ libxlDomainMigrationSrcPerform(libxlDriv +@@ -1182,7 +1203,7 @@ libxlDomainMigrationSrcPerform(libxlDriv const char *dconnuri ATTRIBUTE_UNUSED, const char *uri_str, const char *dname ATTRIBUTE_UNUSED, @@ -254,7 +254,7 @@ Index: libvirt-4.3.0/src/libxl/libxl_migration.c { libxlDomainObjPrivatePtr priv = vm->privateData; char *hostname = NULL; -@@ -1231,7 +1252,7 @@ libxlDomainMigrationSrcPerform(libxlDriv +@@ -1222,7 +1243,7 @@ libxlDomainMigrationSrcPerform(libxlDriv /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); @@ -263,10 +263,10 @@ Index: libvirt-4.3.0/src/libxl/libxl_migration.c virObjectLock(vm); if (ret < 0) -Index: libvirt-4.3.0/src/libxl/libxl_migration.h +Index: libvirt-4.4.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-4.3.0.orig/src/libxl/libxl_migration.h -+++ libvirt-4.3.0/src/libxl/libxl_migration.h +--- libvirt-4.4.0.orig/src/libxl/libxl_migration.h ++++ libvirt-4.4.0/src/libxl/libxl_migration.h @@ -39,6 +39,10 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ @@ -311,11 +311,11 @@ Index: libvirt-4.3.0/src/libxl/libxl_migration.h virDomainPtr libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-4.3.0/tools/virsh-domain.c +Index: libvirt-4.4.0/tools/virsh-domain.c =================================================================== ---- libvirt-4.3.0.orig/tools/virsh-domain.c -+++ libvirt-4.3.0/tools/virsh-domain.c -@@ -10545,6 +10545,22 @@ static const vshCmdOptDef opts_migrate[] +--- libvirt-4.4.0.orig/tools/virsh-domain.c ++++ libvirt-4.4.0/tools/virsh-domain.c +@@ -10330,6 +10330,22 @@ static const vshCmdOptDef opts_migrate[] .type = VSH_OT_BOOL, .help = N_("use TLS for migration") }, @@ -338,7 +338,7 @@ Index: libvirt-4.3.0/tools/virsh-domain.c {.name = NULL} }; -@@ -10568,6 +10584,7 @@ doMigrate(void *opaque) +@@ -10353,6 +10369,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -346,7 +346,7 @@ Index: libvirt-4.3.0/tools/virsh-domain.c sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); -@@ -10687,6 +10704,27 @@ doMigrate(void *opaque) +@@ -10472,6 +10489,27 @@ doMigrate(void *opaque) goto save_error; } @@ -374,11 +374,11 @@ Index: libvirt-4.3.0/tools/virsh-domain.c if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { -Index: libvirt-4.3.0/tools/virsh.pod +Index: libvirt-4.4.0/tools/virsh.pod =================================================================== ---- libvirt-4.3.0.orig/tools/virsh.pod -+++ libvirt-4.3.0/tools/virsh.pod -@@ -1850,6 +1850,14 @@ Providing I<--tls> causes the migration +--- libvirt-4.4.0.orig/tools/virsh.pod ++++ libvirt-4.4.0/tools/virsh.pod +@@ -1923,6 +1923,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 4a3b0e8..384ae32 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.3.0/src/libxl/libxl_conf.c +Index: libvirt-4.4.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-4.3.0.orig/src/libxl/libxl_conf.c -+++ libvirt-4.3.0/src/libxl/libxl_conf.c +--- libvirt-4.4.0.orig/src/libxl/libxl_conf.c ++++ libvirt-4.4.0/src/libxl/libxl_conf.c @@ -837,6 +837,25 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } diff --git a/lxc-wait-after-eth-del.patch b/lxc-wait-after-eth-del.patch index 827e4e6..559c57d 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.3.0/src/lxc/lxc_controller.c +Index: libvirt-4.4.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-4.3.0.orig/src/lxc/lxc_controller.c -+++ libvirt-4.3.0/src/lxc/lxc_controller.c +--- libvirt-4.4.0.orig/src/lxc/lxc_controller.c ++++ libvirt-4.4.0/src/lxc/lxc_controller.c @@ -73,6 +73,7 @@ #include "rpc/virnetdaemon.h" #include "virstring.h" @@ -33,10 +33,10 @@ Index: libvirt-4.3.0/src/lxc/lxc_controller.c return ret; } -Index: libvirt-4.3.0/src/lxc/lxc_driver.c +Index: libvirt-4.4.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-4.3.0.orig/src/lxc/lxc_driver.c -+++ libvirt-4.3.0/src/lxc/lxc_driver.c +--- libvirt-4.4.0.orig/src/lxc/lxc_driver.c ++++ libvirt-4.4.0/src/lxc/lxc_driver.c @@ -75,6 +75,7 @@ #include "virtime.h" #include "virtypedparam.h" @@ -45,7 +45,7 @@ Index: libvirt-4.3.0/src/lxc/lxc_driver.c #include "virstring.h" #include "viraccessapicheck.h" #include "viraccessapichecklxc.h" -@@ -4031,6 +4032,7 @@ lxcDomainAttachDeviceNetLive(virConnectP +@@ -3990,6 +3991,7 @@ lxcDomainAttachDeviceNetLive(virConnectP case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_ETHERNET: ignore_value(virNetDevVethDelete(veth)); @@ -53,7 +53,7 @@ Index: libvirt-4.3.0/src/lxc/lxc_driver.c break; case VIR_DOMAIN_NET_TYPE_DIRECT: -@@ -4474,6 +4476,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -4433,6 +4435,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb virDomainAuditNet(vm, detach, NULL, "detach", false); goto cleanup; } @@ -61,10 +61,10 @@ Index: libvirt-4.3.0/src/lxc/lxc_driver.c break; /* It'd be nice to support this, but with macvlan -Index: libvirt-4.3.0/src/lxc/lxc_process.c +Index: libvirt-4.4.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-4.3.0.orig/src/lxc/lxc_process.c -+++ libvirt-4.3.0/src/lxc/lxc_process.c +--- libvirt-4.4.0.orig/src/lxc/lxc_process.c ++++ libvirt-4.4.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 8c2b37c..f1d6289 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.3.0/src/network/bridge_driver.c +Index: libvirt-4.4.0/src/network/bridge_driver.c =================================================================== ---- libvirt-4.3.0.orig/src/network/bridge_driver.c -+++ libvirt-4.3.0/src/network/bridge_driver.c +--- libvirt-4.4.0.orig/src/network/bridge_driver.c ++++ libvirt-4.4.0/src/network/bridge_driver.c @@ -1457,7 +1457,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.3.0/src/network/bridge_driver.c } if (ipdef->tftproot) { -Index: libvirt-4.3.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-4.4.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-4.3.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-4.3.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-4.4.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-4.4.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 9ff70a5..4f8e5be 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.3.0/src/util/virarch.c +Index: libvirt-4.4.0/src/util/virarch.c =================================================================== ---- libvirt-4.3.0.orig/src/util/virarch.c -+++ libvirt-4.3.0/src/util/virarch.c +--- libvirt-4.4.0.orig/src/util/virarch.c ++++ libvirt-4.4.0/src/util/virarch.c @@ -169,6 +169,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 63803d4..b43635c 100644 --- a/qemu-apparmor-screenshot.patch +++ b/qemu-apparmor-screenshot.patch @@ -1,7 +1,7 @@ -Index: libvirt-4.3.0/examples/apparmor/libvirt-qemu +Index: libvirt-4.4.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-4.3.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-4.3.0/examples/apparmor/libvirt-qemu +--- libvirt-4.4.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-4.4.0/examples/apparmor/libvirt-qemu @@ -197,3 +197,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 224fccf..4ae8acb 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.3.0/src/xenconfig/xen_common.c +Index: libvirt-4.4.0/src/xenconfig/xen_common.c =================================================================== ---- libvirt-4.3.0.orig/src/xenconfig/xen_common.c -+++ libvirt-4.3.0/src/xenconfig/xen_common.c +--- libvirt-4.4.0.orig/src/xenconfig/xen_common.c ++++ libvirt-4.4.0/src/xenconfig/xen_common.c @@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe { virConfValuePtr list = virConfGetValue(conf, "pci"); @@ -66,10 +66,10 @@ Index: libvirt-4.3.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.3.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.4.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-4.3.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-4.3.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.4.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.4.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 b35f133..eb89e7b 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.3.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-4.4.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-4.3.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper -+++ libvirt-4.3.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-4.4.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper ++++ libvirt-4.4.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.3.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper # for hostdev /sys/devices/ r, -Index: libvirt-4.3.0/examples/apparmor/libvirt-qemu +Index: libvirt-4.4.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-4.3.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-4.3.0/examples/apparmor/libvirt-qemu +--- libvirt-4.4.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-4.4.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 17772d1..56b2d3c 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.3.0/tools/libvirt-guests.init.in +Index: libvirt-4.4.0/tools/libvirt-guests.init.in =================================================================== ---- libvirt-4.3.0.orig/tools/libvirt-guests.init.in -+++ libvirt-4.3.0/tools/libvirt-guests.init.in +--- libvirt-4.4.0.orig/tools/libvirt-guests.init.in ++++ libvirt-4.4.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.3.0/tools/libvirt-guests.init.in + exec @libexecdir@/libvirt-guests.sh "$@" -Index: libvirt-4.3.0/tools/libvirt-guests.sh.in +Index: libvirt-4.4.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-4.3.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-4.3.0/tools/libvirt-guests.sh.in +--- libvirt-4.4.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-4.4.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.3.0/tools/libvirt-guests.sh.in esac -exit $RETVAL +rc_exit -Index: libvirt-4.3.0/tools/libvirt-guests.sysconf +Index: libvirt-4.4.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-4.3.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-4.3.0/tools/libvirt-guests.sysconf +--- libvirt-4.4.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-4.4.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 fefff22..c2c0e8d 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.3.0/src/remote/libvirtd.conf +Index: libvirt-4.4.0/src/remote/libvirtd.conf =================================================================== ---- libvirt-4.3.0.orig/src/remote/libvirtd.conf -+++ libvirt-4.3.0/src/remote/libvirtd.conf +--- libvirt-4.4.0.orig/src/remote/libvirtd.conf ++++ libvirt-4.4.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.3.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.3.0/src/remote/remote_daemon_config.c +Index: libvirt-4.4.0/src/remote/remote_daemon_config.c =================================================================== ---- libvirt-4.3.0.orig/src/remote/remote_daemon_config.c -+++ libvirt-4.3.0/src/remote/remote_daemon_config.c +--- libvirt-4.4.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-4.4.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.3.0/src/remote/remote_daemon_config.c data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-4.3.0/src/remote/test_libvirtd.aug.in +Index: libvirt-4.4.0/src/remote/test_libvirtd.aug.in =================================================================== ---- libvirt-4.3.0.orig/src/remote/test_libvirtd.aug.in -+++ libvirt-4.3.0/src/remote/test_libvirtd.aug.in +--- libvirt-4.4.0.orig/src/remote/test_libvirtd.aug.in ++++ libvirt-4.4.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 aa7d344..b52e659 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.3.0/src/remote/libvirtd.service.in +Index: libvirt-4.4.0/src/remote/libvirtd.service.in =================================================================== ---- libvirt-4.3.0.orig/src/remote/libvirtd.service.in -+++ libvirt-4.3.0/src/remote/libvirtd.service.in +--- libvirt-4.4.0.orig/src/remote/libvirtd.service.in ++++ libvirt-4.4.0/src/remote/libvirtd.service.in @@ -16,6 +16,8 @@ After=apparmor.service After=local-fs.target After=remote-fs.target diff --git a/suse-libvirtd-sysconfig-settings.patch b/suse-libvirtd-sysconfig-settings.patch index 2cfcc63..293f307 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.3.0/src/remote/libvirtd.sysconf +Index: libvirt-4.4.0/src/remote/libvirtd.sysconf =================================================================== ---- libvirt-4.3.0.orig/src/remote/libvirtd.sysconf -+++ libvirt-4.3.0/src/remote/libvirtd.sysconf +--- libvirt-4.4.0.orig/src/remote/libvirtd.sysconf ++++ libvirt-4.4.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 a9cb014..d965f0f 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.3.0/src/qemu/qemu.conf +Index: libvirt-4.4.0/src/qemu/qemu.conf =================================================================== ---- libvirt-4.3.0.orig/src/qemu/qemu.conf -+++ libvirt-4.3.0/src/qemu/qemu.conf +--- libvirt-4.4.0.orig/src/qemu/qemu.conf ++++ libvirt-4.4.0/src/qemu/qemu.conf @@ -747,10 +747,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.3.0/src/qemu/qemu.conf #] # The backend to use for handling stdout/stderr output from -Index: libvirt-4.3.0/src/qemu/qemu_conf.c +Index: libvirt-4.4.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-4.3.0.orig/src/qemu/qemu_conf.c -+++ libvirt-4.3.0/src/qemu/qemu_conf.c +--- libvirt-4.4.0.orig/src/qemu/qemu_conf.c ++++ libvirt-4.4.0/src/qemu/qemu_conf.c @@ -122,10 +122,9 @@ void qemuDomainCmdlineDefFree(qemuDomain #ifndef DEFAULT_LOADER_NVRAM @@ -36,3 +36,17 @@ Index: libvirt-4.3.0/src/qemu/qemu_conf.c #endif +Index: libvirt-4.4.0/src/security/virt-aa-helper.c +=================================================================== +--- libvirt-4.4.0.orig/src/security/virt-aa-helper.c ++++ libvirt-4.4.0/src/security/virt-aa-helper.c +@@ -517,7 +517,8 @@ valid_path(const char *path, const bool + "/usr/share/ovmf/", /* for OVMF images */ + "/usr/share/AAVMF/", /* for AAVMF images */ + "/usr/share/qemu-efi/", /* for AAVMF images */ +- "/usr/share/qemu-efi-aarch64/" /* for AAVMF images */ ++ "/usr/share/qemu-efi-aarch64/", /* for AAVMF images */ ++ "/usr/share/qemu/" /* SUSE path for OVMF and AAVMF images */ + }; + /* override the above with these */ + const char * const override[] = { diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch index b808e86..4e5f6ee 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.3.0/src/qemu/qemu.conf +Index: libvirt-4.4.0/src/qemu/qemu.conf =================================================================== ---- libvirt-4.3.0.orig/src/qemu/qemu.conf -+++ libvirt-4.3.0/src/qemu/qemu.conf +--- libvirt-4.4.0.orig/src/qemu/qemu.conf ++++ libvirt-4.4.0/src/qemu/qemu.conf @@ -380,11 +380,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 1b5ec12..90ae330 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.3.0/src/locking/virtlockd.sysconf +Index: libvirt-4.4.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-4.3.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-4.3.0/src/locking/virtlockd.sysconf +--- libvirt-4.4.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-4.4.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 b1d7305..54cfd50 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.3.0/src/logging/virtlogd.sysconf +Index: libvirt-4.4.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-4.3.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-4.3.0/src/logging/virtlogd.sysconf +--- libvirt-4.4.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-4.4.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 822fe11..6e15fcc 100644 --- a/xen-pv-cdrom.patch +++ b/xen-pv-cdrom.patch @@ -1,7 +1,7 @@ -Index: libvirt-4.3.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.4.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-4.3.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-4.3.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.4.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.4.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 82ae09d..1b05290 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.3.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.4.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-4.3.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-4.3.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.4.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.4.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 */