Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2019-03-12 09:48:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Tue Mar 12 09:48:44 2019 rev:275 rq:684124 version:5.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2019-03-01 16:46:16.709825174 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new.28833/libvirt.changes 2019-03-12 09:48:53.503592158 +0100 @@ -1,0 +2,41 @@ +Mon Mar 11 22:50:43 UTC 2019 - James Fehlig <[email protected]> + +- util: skip RDMA detection for non-PCI network devices + f38ef0fa-no-RDMA-check.patch + bsc#1112182 + +------------------------------------------------------------------- +Wed Mar 6 20:34:53 UTC 2019 - James Fehlig <[email protected]> + +- qemu: s390: show correct CPU status after guest crash + 0001-qemu-Fix-query-cpus-fast-target-architecture-detecti.patch + bsc#1127841 + +------------------------------------------------------------------- +Wed Mar 6 17:11:49 UTC 2019 - James Fehlig <[email protected]> + +- apparmor: fix more fallout from changing libvirtd profile to a + named profile + 4ec3cf9a-apparmor-rules.patch, + 0001-apparmor-Check-libvirtd-profile-status-by-name.patch + boo#1125841 + +------------------------------------------------------------------- +Mon Mar 4 18:52:57 UTC 2019 - James Fehlig <[email protected]> + +- Update to libvirt 5.1.0 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Dropped patches: + 11c8aca9-libxl-set-mem-after-balloon.patch, + 70c2933d-apparmor-named-profiles.patch, + a3ab6d42-apparmor-conv-libvirtd-named-profile.patch, + b6440119-qemu-conf-sev.patch, + a404ac34-qemu-cgroup-sev.patch, + 6fd4c8f8-qemu-domain-sev.patch, + 17f6a257-security-dac-sev.patch, + a2d3dea9-qemu-caps-dac-override-sev.patch, + 620d9dd5-qemu-no-dac-override-nonroot.patch + - jsc#SLE-3887, jsc#SLE-4480, jsc#SLE-4577 + +------------------------------------------------------------------- Old: ---- 11c8aca9-libxl-set-mem-after-balloon.patch 17f6a257-security-dac-sev.patch 620d9dd5-qemu-no-dac-override-nonroot.patch 6fd4c8f8-qemu-domain-sev.patch 70c2933d-apparmor-named-profiles.patch a2d3dea9-qemu-caps-dac-override-sev.patch a3ab6d42-apparmor-conv-libvirtd-named-profile.patch a404ac34-qemu-cgroup-sev.patch b6440119-qemu-conf-sev.patch libvirt-5.0.0.tar.xz libvirt-5.0.0.tar.xz.asc New: ---- 0001-apparmor-Check-libvirtd-profile-status-by-name.patch 0001-qemu-Fix-query-cpus-fast-target-architecture-detecti.patch 4ec3cf9a-apparmor-rules.patch f38ef0fa-no-RDMA-check.patch libvirt-5.1.0.tar.xz libvirt-5.1.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.171591825 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.175591824 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -51,6 +51,7 @@ %define with_numactl 0%{!?_without_numactl:0} %define with_numad 0%{!?_without_numad:0} %define with_firewalld 0%{!?_without_firewalld:0} +%define with_firewalld_zone 0%{!?_without_firewalld_zone:0} %define with_libssh 0%{!?_without_libssh:0} %define with_bash_completion 0%{!?_without_bash_completion:0} @@ -177,12 +178,12 @@ %endif %if %{with_wireshark} - %define wireshark_plugindir %(pkg-config --variable plugindir wireshark) + %define wireshark_plugindir %(pkg-config --variable plugindir wireshark)/epan %endif Name: libvirt Url: http://libvirt.org/ -Version: 5.0.0 +Version: 5.1.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later @@ -313,7 +314,7 @@ BuildRequires: numad %endif %if %{with_wireshark} -BuildRequires: wireshark-devel >= 2.1.0 +BuildRequires: wireshark-devel >= 2.4.0 %endif %if %{with_libssh} BuildRequires: libssh-devel >= 0.7.0 @@ -332,18 +333,13 @@ Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: 11c8aca9-libxl-set-mem-after-balloon.patch -Patch1: 70c2933d-apparmor-named-profiles.patch -Patch2: a3ab6d42-apparmor-conv-libvirtd-named-profile.patch -Patch3: b6440119-qemu-conf-sev.patch -Patch4: a404ac34-qemu-cgroup-sev.patch -Patch5: 6fd4c8f8-qemu-domain-sev.patch -Patch6: 17f6a257-security-dac-sev.patch -Patch7: a2d3dea9-qemu-caps-dac-override-sev.patch -Patch8: 620d9dd5-qemu-no-dac-override-nonroot.patch +Patch0: 4ec3cf9a-apparmor-rules.patch +Patch1: f38ef0fa-no-RDMA-check.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch +Patch102: 0001-apparmor-Check-libvirtd-profile-status-by-name.patch +Patch103: 0001-qemu-Fix-query-cpus-fast-target-architecture-detecti.patch # Need to go upstream Patch150: xen-pv-cdrom.patch Patch151: blockcopy-check-dst-identical-device.patch @@ -859,7 +855,7 @@ Summary: Wireshark plugin for libvirt RPC protocol Group: Productivity/Networking/Diagnostic Requires: %{name}-libs = %{version}-%{release} -Requires: wireshark +Requires: wireshark >= 2.4.0 %description -n wireshark-plugin-libvirt Wireshark dissector plugin for better analysis of libvirt RPC traffic. @@ -876,15 +872,10 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 %patch100 -p1 %patch101 -p1 +%patch102 -p1 +%patch103 -p1 %patch150 -p1 %patch151 -p1 %patch152 -p1 @@ -1006,6 +997,11 @@ %else %define arg_firewalld --without-firewalld %endif +%if %{with_firewalld_zone} + %define arg_firewalld_zone --with-firewalld-zone +%else + %define arg_firewalld_zone --without-firewalld-zone +%endif %if %{with_wireshark} %define arg_wireshark --with-wireshark-dissector %else @@ -1082,6 +1078,7 @@ --with-dtrace \ --with-driver-modules \ %{?arg_firewalld} \ + %{?arg_firewalld_zone} \ %{?arg_wireshark} \ --with-nss-plugin \ --libexecdir=%{_libdir}/%{name} \ @@ -1287,6 +1284,14 @@ done fi +%if %{with_firewalld_zone} +%post daemon-driver-network +%firewalld_reload + +%postun daemon-driver-network +%firewalld_reload +%endif + %post daemon-config-network # Install the default network if one doesn't exist if test $1 -eq 1 && test ! -f %{_sysconfdir}/%{name}/qemu/networks/default.xml ; then @@ -1433,6 +1438,9 @@ %attr(0755, root, root) %{_libdir}/%{name}/libvirt_leaseshelper %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so +%if %{with_firewalld_zone} +%{_prefix}/lib/firewalld/zones/libvirt.xml +%endif %files daemon-driver-nodedev %dir %{_libdir}/%{name}/connection-driver @@ -1697,6 +1705,7 @@ %if %{with_wireshark} %files -n wireshark-plugin-libvirt +%dir %{wireshark_plugindir}/ %{wireshark_plugindir}/libvirt.so %endif ++++++ 0001-Extract-stats-functions-from-the-qemu-driver.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.215591816 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.215591816 +0100 @@ -18,10 +18,10 @@ create mode 100644 src/conf/domain_stats.c create mode 100644 src/conf/domain_stats.h -Index: libvirt-5.0.0/src/conf/domain_stats.c +Index: libvirt-5.1.0/src/conf/domain_stats.c =================================================================== --- /dev/null -+++ libvirt-5.0.0/src/conf/domain_stats.c ++++ libvirt-5.1.0/src/conf/domain_stats.c @@ -0,0 +1,139 @@ +/* + * domain_stats.c: domain stats extraction helpers @@ -162,10 +162,10 @@ +} + +#undef STATS_ADD_NET_PARAM -Index: libvirt-5.0.0/src/conf/domain_stats.h +Index: libvirt-5.1.0/src/conf/domain_stats.h =================================================================== --- /dev/null -+++ libvirt-5.0.0/src/conf/domain_stats.h ++++ libvirt-5.1.0/src/conf/domain_stats.h @@ -0,0 +1,64 @@ +/* + * domain_stats.h: domain stats extraction helpers @@ -231,11 +231,11 @@ + int *maxparams); + +#endif /* __DOMAIN_STATS_H */ -Index: libvirt-5.0.0/src/libvirt_private.syms +Index: libvirt-5.1.0/src/libvirt_private.syms =================================================================== ---- libvirt-5.0.0.orig/src/libvirt_private.syms -+++ libvirt-5.0.0/src/libvirt_private.syms -@@ -661,6 +661,9 @@ virDomainConfNWFilterInstantiate; +--- libvirt-5.1.0.orig/src/libvirt_private.syms ++++ libvirt-5.1.0/src/libvirt_private.syms +@@ -662,6 +662,9 @@ virDomainConfNWFilterInstantiate; virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -245,7 +245,7 @@ # conf/interface_conf.h virInterfaceDefFormat; -@@ -1550,6 +1553,7 @@ virCgroupGetMemoryUsage; +@@ -1547,6 +1550,7 @@ virCgroupGetMemoryUsage; virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; @@ -253,10 +253,10 @@ virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKillPainfully; -Index: libvirt-5.0.0/src/qemu/qemu_driver.c +Index: libvirt-5.1.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-5.0.0.orig/src/qemu/qemu_driver.c -+++ libvirt-5.0.0/src/qemu/qemu_driver.c +--- libvirt-5.1.0.orig/src/qemu/qemu_driver.c ++++ libvirt-5.1.0/src/qemu/qemu_driver.c @@ -67,6 +67,7 @@ #include "virarptable.h" #include "viruuid.h" @@ -265,7 +265,7 @@ #include "domain_audit.h" #include "node_device_conf.h" #include "virpci.h" -@@ -19969,21 +19970,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr +@@ -20042,21 +20043,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr int *maxparams, unsigned int privflags ATTRIBUTE_UNUSED) { @@ -288,7 +288,7 @@ } -@@ -20173,37 +20160,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj +@@ -20246,37 +20233,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj int *maxparams) { qemuDomainObjPrivatePtr priv = dom->privateData; @@ -327,7 +327,7 @@ } -@@ -20401,44 +20358,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr +@@ -20470,44 +20427,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr return ret; } @@ -372,7 +372,7 @@ static int qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr dom, -@@ -20446,68 +20365,9 @@ qemuDomainGetStatsInterface(virQEMUDrive +@@ -20515,68 +20434,9 @@ qemuDomainGetStatsInterface(virQEMUDrive int *maxparams, unsigned int privflags ATTRIBUTE_UNUSED) { @@ -442,7 +442,7 @@ #define QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, num, name, value) \ do { \ char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \ -@@ -20740,10 +20600,10 @@ qemuDomainGetStatsBlockExportHeader(virD +@@ -20809,10 +20669,10 @@ qemuDomainGetStatsBlockExportHeader(virD { int ret = -1; @@ -455,7 +455,7 @@ if (src->id) QEMU_ADD_BLOCK_PARAM_UI(records, nrecords, recordnr, "backingIndex", src->id); -@@ -20897,7 +20757,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr +@@ -20966,7 +20826,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 @@ for (i = 0; i < dom->def->ndisks; i++) { if (qemuDomainGetStatsBlockExportDisk(dom->def->disks[i], stats, nodestats, -@@ -20922,8 +20782,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr +@@ -20991,8 +20851,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr #undef QEMU_ADD_BLOCK_PARAM_ULL @@ -473,7 +473,7 @@ #define QEMU_ADD_IOTHREAD_PARAM_UI(record, maxparams, id, name, value) \ do { \ char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \ -@@ -20975,7 +20833,7 @@ qemuDomainGetStatsIOThread(virQEMUDriver +@@ -21044,7 +20902,7 @@ qemuDomainGetStatsIOThread(virQEMUDriver if (niothreads == 0) return 0; @@ -482,7 +482,7 @@ for (i = 0; i < niothreads; i++) { if (iothreads[i]->poll_valid) { -@@ -21008,8 +20866,6 @@ qemuDomainGetStatsIOThread(virQEMUDriver +@@ -21077,8 +20935,6 @@ qemuDomainGetStatsIOThread(virQEMUDriver #undef QEMU_ADD_IOTHREAD_PARAM_ULL @@ -491,11 +491,11 @@ static int qemuDomainGetStatsPerfOneEvent(virPerfPtr perf, virPerfEventType type, -Index: libvirt-5.0.0/src/util/vircgroup.c +Index: libvirt-5.1.0/src/util/vircgroup.c =================================================================== ---- libvirt-5.0.0.orig/src/util/vircgroup.c -+++ libvirt-5.0.0/src/util/vircgroup.c -@@ -2796,6 +2796,44 @@ virCgroupControllerAvailable(int control +--- libvirt-5.1.0.orig/src/util/vircgroup.c ++++ libvirt-5.1.0/src/util/vircgroup.c +@@ -2800,6 +2800,44 @@ virCgroupControllerAvailable(int control return ret; } @@ -540,7 +540,7 @@ #else /* !__linux__ */ bool -@@ -2805,6 +2843,15 @@ virCgroupAvailable(void) +@@ -2809,6 +2847,15 @@ virCgroupAvailable(void) } @@ -556,10 +556,10 @@ int virCgroupNewPartition(const char *path ATTRIBUTE_UNUSED, bool create ATTRIBUTE_UNUSED, -Index: libvirt-5.0.0/src/util/vircgroup.h +Index: libvirt-5.1.0/src/util/vircgroup.h =================================================================== ---- libvirt-5.0.0.orig/src/util/vircgroup.h -+++ libvirt-5.0.0/src/util/vircgroup.h +--- libvirt-5.1.0.orig/src/util/vircgroup.h ++++ libvirt-5.1.0/src/util/vircgroup.h @@ -284,4 +284,9 @@ int virCgroupSetOwner(virCgroupPtr cgrou int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller); @@ -570,10 +570,10 @@ + int *maxparams); + #endif /* LIBVIRT_VIRCGROUP_H */ -Index: libvirt-5.0.0/src/conf/Makefile.inc.am +Index: libvirt-5.1.0/src/conf/Makefile.inc.am =================================================================== ---- libvirt-5.0.0.orig/src/conf/Makefile.inc.am -+++ libvirt-5.0.0/src/conf/Makefile.inc.am +--- libvirt-5.1.0.orig/src/conf/Makefile.inc.am ++++ libvirt-5.1.0/src/conf/Makefile.inc.am @@ -20,6 +20,8 @@ DOMAIN_CONF_SOURCES = \ conf/domain_audit.h \ conf/domain_nwfilter.c \ ++++++ 0001-apparmor-Check-libvirtd-profile-status-by-name.patch ++++++ >From b1a50c10c95747dacd31a23b5c73ec4f938af329 Mon Sep 17 00:00:00 2001 From: Jim Fehlig <[email protected]> Date: Fri, 1 Mar 2019 14:34:17 -0700 Subject: [PATCH 1/2] apparmor: Check libvirtd profile status by name Commit a3ab6d42 changed the libvirtd profile to a named profile, breaking the apparmor driver's ability to detect if the profile is active. When the apparmor driver loads it checks the status of the libvirtd profile using the full binary path, which fails since the profile is now referenced by name. If the apparmor driver is explicitly requested in /etc/libvirt/qemu.conf, then libvirtd fails to load too. Instead of only checking the profile status by full binary path, also check by profile name. The full path check is retained in case users have a customized libvirtd profile with full path. Signed-off-by: Jim Fehlig <[email protected]> --- src/security/security_apparmor.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) Index: libvirt-5.1.0/src/security/security_apparmor.c =================================================================== --- libvirt-5.1.0.orig/src/security/security_apparmor.c +++ libvirt-5.1.0/src/security/security_apparmor.c @@ -257,10 +257,16 @@ use_apparmor(void) if (access(APPARMOR_PROFILES_PATH, R_OK) != 0) goto cleanup; + /* First check profile status using full binary path. If that fails + * check using profile name. + */ rc = profile_status(libvirt_daemon, 1); - /* Error or unconfined should all result in -1*/ - if (rc < 0) - rc = -1; + if (rc < 0) { + rc = profile_status("libvirtd", 1); + /* Error or unconfined should all result in -1*/ + if (rc < 0) + rc = -1; + } cleanup: VIR_FREE(libvirt_daemon); ++++++ 0001-libxl-add-support-for-BlockResize-API.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.243591811 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.243591811 +0100 @@ -19,10 +19,10 @@ src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) -Index: libvirt-5.0.0/src/libxl/libxl_driver.c +Index: libvirt-5.1.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-5.0.0.orig/src/libxl/libxl_driver.c -+++ libvirt-5.0.0/src/libxl/libxl_driver.c +--- libvirt-5.1.0.orig/src/libxl/libxl_driver.c ++++ libvirt-5.1.0/src/libxl/libxl_driver.c @@ -5252,6 +5252,97 @@ libxlDomainMemoryStats(virDomainPtr dom, #undef LIBXL_SET_MEMSTAT ++++++ 0001-qemu-Fix-query-cpus-fast-target-architecture-detecti.patch ++++++ >From 85001fd799deb33338aed627b3c3a6870cb70d2d Mon Sep 17 00:00:00 2001 From: Viktor Mihajlovski <[email protected]> Date: Fri, 1 Mar 2019 11:29:51 +0100 Subject: [PATCH] qemu: Fix query-cpus-fast target architecture detection Since qemu 2.13 reports the target architecture in a property called 'target' additionally to the property 'arch', that has been used in qemu 2.12 in the response data of 'query-cpus-fast'. Libvirts monitor code prefers the 'target' property over 'arch'. At least for s390(x), target is reported as 's390x' while arch is 's390'. In a later step a comparison is performed against 's390' which fails for qemu 2.13 and later. In consequence the architecture specific data for s390 won't be extracted from the returned data, leading to incorrect values being reported by virsh domstats --vcpu. Changing to check explicitly for 's390' and 's390x'. Signed-off-by: Viktor Mihajlovski <[email protected]> Reviewed-by: Bjoern Walk <[email protected]> Reviewed-by: Boris Fiuczynski <[email protected]> --- src/qemu/qemu_monitor_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: libvirt-5.1.0/src/qemu/qemu_monitor_json.c =================================================================== --- libvirt-5.1.0.orig/src/qemu/qemu_monitor_json.c +++ libvirt-5.1.0/src/qemu/qemu_monitor_json.c @@ -1772,7 +1772,7 @@ qemuMonitorJSONExtractCPUInfo(virJSONVal goto cleanup; /* process optional architecture-specific data */ - if (STREQ_NULLABLE(arch, "s390")) + if (STREQ_NULLABLE(arch, "s390") || STREQ_NULLABLE(arch, "s390x")) qemuMonitorJSONExtractCPUS390Info(entry, cpus + i); } ++++++ 0002-lxc-implement-connectGetAllDomainStats.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.267591806 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.267591806 +0100 @@ -9,10 +9,10 @@ src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) -Index: libvirt-5.0.0/src/lxc/lxc_driver.c +Index: libvirt-5.1.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-5.0.0.orig/src/lxc/lxc_driver.c -+++ libvirt-5.0.0/src/lxc/lxc_driver.c +--- libvirt-5.1.0.orig/src/lxc/lxc_driver.c ++++ libvirt-5.1.0/src/lxc/lxc_driver.c @@ -75,6 +75,7 @@ #include "viraccessapichecklxc.h" #include "virhostdev.h" @@ -21,7 +21,7 @@ #define VIR_FROM_THIS VIR_FROM_LXC -@@ -5408,6 +5409,142 @@ lxcDomainHasManagedSaveImage(virDomainPt +@@ -5396,6 +5397,142 @@ lxcDomainHasManagedSaveImage(virDomainPt return ret; } @@ -164,7 +164,7 @@ /* Function Tables */ static virHypervisorDriver lxcHypervisorDriver = { -@@ -5503,6 +5640,7 @@ static virHypervisorDriver lxcHypervisor +@@ -5491,6 +5628,7 @@ static virHypervisorDriver lxcHypervisor .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */ .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */ ++++++ 4ec3cf9a-apparmor-rules.patch ++++++ commit 4ec3cf9a0fc3d76058ea363a6c35df19e67e6261 Author: Jim Fehlig <[email protected]> Date: Fri Mar 1 15:05:36 2019 -0700 apparmor: Add ptrace and signal rules for named profile Commit a3ab6d42 changed the libvirtd profile to a named profile but neglected to accommodate the change in the qemu profile ptrace and signal rules. As a result, libvirtd is unable to signal confined qemu processes and hence unable to shutdown or destroy VMs. Add ptrace and signal rules that reference the libvirtd profile by name in addition to full binary path. Signed-off-by: Jim Fehlig <[email protected]> Acked-by: Jamie Strandboge <[email protected]> Index: libvirt-5.1.0/src/security/apparmor/libvirt-qemu =================================================================== --- libvirt-5.1.0.orig/src/security/apparmor/libvirt-qemu +++ libvirt-5.1.0/src/security/apparmor/libvirt-qemu @@ -16,8 +16,10 @@ network inet stream, network inet6 stream, + ptrace (readby, tracedby) peer=libvirtd, ptrace (readby, tracedby) peer=/usr/sbin/libvirtd, + signal (receive) peer=libvirtd, signal (receive) peer=/usr/sbin/libvirtd, /dev/net/tun rw, ++++++ apparmor-no-mount.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.295591801 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.299591799 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-5.0.0/src/security/apparmor/libvirt-lxc +Index: libvirt-5.1.0/src/security/apparmor/libvirt-lxc =================================================================== ---- libvirt-5.0.0.orig/src/security/apparmor/libvirt-lxc -+++ libvirt-5.0.0/src/security/apparmor/libvirt-lxc +--- libvirt-5.1.0.orig/src/security/apparmor/libvirt-lxc ++++ libvirt-5.1.0/src/security/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include <abstractions/base> ++++++ blockcopy-check-dst-identical-device.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.319591796 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.323591795 +0100 @@ -11,11 +11,11 @@ src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: libvirt-5.0.0/src/qemu/qemu_driver.c +Index: libvirt-5.1.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-5.0.0.orig/src/qemu/qemu_driver.c -+++ libvirt-5.0.0/src/qemu/qemu_driver.c -@@ -17798,6 +17798,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-5.1.0.orig/src/qemu/qemu_driver.c ++++ libvirt-5.1.0/src/qemu/qemu_driver.c +@@ -17836,6 +17836,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt goto endjob; } ++++++ f38ef0fa-no-RDMA-check.patch ++++++ commit f38ef0fac0582ac0cbb749af9d3f8ba515a6084a Author: Pavel Hrdina <[email protected]> Date: Thu Mar 7 17:52:55 2019 +0100 util: skip RDMA detection for non-PCI network devices Only PCI devices have '/sys/class/net/<ifname>/device/resource' so we need to skip this check for all other network devices. Without this patch and RDMA enabled libvirt will not detect any network device that doesn't have the path above which includes 'lo', 'virbr', 'tun', etc. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1639258 Reviewed-by: Andrea Bolognani <[email protected]> Signed-off-by: Pavel Hrdina <[email protected]> Index: libvirt-5.1.0/src/util/virnetdev.c =================================================================== --- libvirt-5.1.0.orig/src/util/virnetdev.c +++ libvirt-5.1.0/src/util/virnetdev.c @@ -2914,8 +2914,14 @@ virNetDevRDMAFeature(const char *ifname, if (virAsprintf(ð_devpath, SYSFS_NET_DIR "%s/device/resource", ifname) < 0) goto cleanup; - if (!virFileExists(eth_devpath)) + + /* If /sys/class/net/<ifname>/device/resource doesn't exist it is not a PCI + * device and therefore it will not have RDMA. */ + if (!virFileExists(eth_devpath)) { + ret = 0; goto cleanup; + } + if (virFileReadAll(eth_devpath, RESOURCE_FILE_LEN, ð_res_buf) < 0) goto cleanup; ++++++ libvirt-5.0.0.tar.xz -> libvirt-5.1.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-5.0.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new.28833/libvirt-5.1.0.tar.xz differ: char 15, line 1 ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.351591790 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.351591790 +0100 @@ -2,10 +2,10 @@ From: <[email protected]> -Index: libvirt-5.0.0/src/cpu_map/ppc64_POWER8.xml +Index: libvirt-5.1.0/src/cpu_map/ppc64_POWER8.xml =================================================================== ---- libvirt-5.0.0.orig/src/cpu_map/ppc64_POWER8.xml -+++ libvirt-5.0.0/src/cpu_map/ppc64_POWER8.xml +--- libvirt-5.1.0.orig/src/cpu_map/ppc64_POWER8.xml ++++ libvirt-5.1.0/src/cpu_map/ppc64_POWER8.xml @@ -4,5 +4,7 @@ <pvr value='0x004b0000' mask='0xffff0000'/> <pvr value='0x004c0000' mask='0xffff0000'/> ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.375591785 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.375591785 +0100 @@ -1,8 +1,8 @@ -Index: libvirt-5.0.0/configure.ac +Index: libvirt-5.1.0/configure.ac =================================================================== ---- libvirt-5.0.0.orig/configure.ac -+++ libvirt-5.0.0/configure.ac -@@ -255,6 +255,7 @@ LIBVIRT_ARG_LIBSSH +--- libvirt-5.1.0.orig/configure.ac ++++ libvirt-5.1.0/configure.ac +@@ -256,6 +256,7 @@ LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_MACVTAP LIBVIRT_ARG_NETCF @@ -10,7 +10,7 @@ LIBVIRT_ARG_NLS LIBVIRT_ARG_NSS LIBVIRT_ARG_NUMACTL -@@ -298,6 +299,7 @@ LIBVIRT_CHECK_LIBSSH +@@ -300,6 +301,7 @@ LIBVIRT_CHECK_LIBSSH LIBVIRT_CHECK_LIBXML LIBVIRT_CHECK_MACVTAP LIBVIRT_CHECK_NETCF @@ -18,7 +18,7 @@ LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER -@@ -1012,6 +1014,7 @@ LIBVIRT_RESULT_LIBXL +@@ -1015,6 +1017,7 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_LIBXML LIBVIRT_RESULT_MACVTAP LIBVIRT_RESULT_NETCF @@ -26,10 +26,10 @@ LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL -Index: libvirt-5.0.0/tools/virsh.c +Index: libvirt-5.1.0/tools/virsh.c =================================================================== ---- libvirt-5.0.0.orig/tools/virsh.c -+++ libvirt-5.0.0/tools/virsh.c +--- libvirt-5.1.0.orig/tools/virsh.c ++++ libvirt-5.1.0/tools/virsh.c @@ -563,6 +563,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -39,10 +39,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-5.0.0/src/interface/interface_backend_netcf.c +Index: libvirt-5.1.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-5.0.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-5.0.0/src/interface/interface_backend_netcf.c +--- libvirt-5.1.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-5.1.0/src/interface/interface_backend_netcf.c @@ -21,7 +21,12 @@ #include <config.h> @@ -126,10 +126,10 @@ if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) return -1; if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) -Index: libvirt-5.0.0/src/interface/interface_driver.c +Index: libvirt-5.1.0/src/interface/interface_driver.c =================================================================== ---- libvirt-5.0.0.orig/src/interface/interface_driver.c -+++ libvirt-5.0.0/src/interface/interface_driver.c +--- libvirt-5.1.0.orig/src/interface/interface_driver.c ++++ libvirt-5.1.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -147,10 +147,10 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-5.0.0/m4/virt-netcontrol.m4 +Index: libvirt-5.1.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-5.0.0/m4/virt-netcontrol.m4 ++++ libvirt-5.1.0/m4/virt-netcontrol.m4 @@ -0,0 +1,39 @@ +dnl The libnetcontrol library +dnl @@ -191,10 +191,10 @@ +AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[ + LIBVIRT_RESULT_LIB([NETCONTROL]) +]) -Index: libvirt-5.0.0/src/interface/Makefile.inc.am +Index: libvirt-5.1.0/src/interface/Makefile.inc.am =================================================================== ---- libvirt-5.0.0.orig/src/interface/Makefile.inc.am -+++ libvirt-5.0.0/src/interface/Makefile.inc.am +--- libvirt-5.1.0.orig/src/interface/Makefile.inc.am ++++ libvirt-5.1.0/src/interface/Makefile.inc.am @@ -4,6 +4,7 @@ INTERFACE_DRIVER_SOURCES = \ $(NULL) ++++++ libxl-dom-reset.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.419591776 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.419591776 +0100 @@ -8,10 +8,10 @@ option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. -Index: libvirt-5.0.0/src/libxl/libxl_driver.c +Index: libvirt-5.1.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-5.0.0.orig/src/libxl/libxl_driver.c -+++ libvirt-5.0.0/src/libxl/libxl_driver.c +--- libvirt-5.1.0.orig/src/libxl/libxl_driver.c ++++ libvirt-5.1.0/src/libxl/libxl_driver.c @@ -1350,6 +1350,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } ++++++ libxl-set-cach-mode.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.435591772 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.435591772 +0100 @@ -3,10 +3,10 @@ src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-5.0.0/src/libxl/libxl_conf.c +Index: libvirt-5.1.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-5.0.0.orig/src/libxl/libxl_conf.c -+++ libvirt-5.0.0/src/libxl/libxl_conf.c +--- libvirt-5.1.0.orig/src/libxl/libxl_conf.c ++++ libvirt-5.1.0/src/libxl/libxl_conf.c @@ -884,6 +884,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } ++++++ libxl-set-migration-constraints.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.443591771 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.443591771 +0100 @@ -16,11 +16,11 @@ tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-5.0.0/include/libvirt/libvirt-domain.h +Index: libvirt-5.1.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-5.0.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-5.0.0/include/libvirt/libvirt-domain.h -@@ -1016,6 +1016,31 @@ typedef enum { +--- libvirt-5.1.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-5.1.0/include/libvirt/libvirt-domain.h +@@ -1025,6 +1025,31 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment" @@ -52,10 +52,10 @@ /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-5.0.0/src/libxl/libxl_driver.c +Index: libvirt-5.1.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-5.0.0.orig/src/libxl/libxl_driver.c -+++ libvirt-5.0.0/src/libxl/libxl_driver.c +--- libvirt-5.1.0.orig/src/libxl/libxl_driver.c ++++ libvirt-5.1.0/src/libxl/libxl_driver.c @@ -6118,6 +6118,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; @@ -99,10 +99,10 @@ goto cleanup; } -Index: libvirt-5.0.0/src/libxl/libxl_migration.c +Index: libvirt-5.1.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-5.0.0.orig/src/libxl/libxl_migration.c -+++ libvirt-5.0.0/src/libxl/libxl_migration.c +--- libvirt-5.1.0.orig/src/libxl/libxl_migration.c ++++ libvirt-5.1.0/src/libxl/libxl_migration.c @@ -342,18 +342,39 @@ libxlMigrateDstReceive(virNetSocketPtr s static int libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, @@ -264,10 +264,10 @@ virObjectLock(vm); if (ret < 0) { -Index: libvirt-5.0.0/src/libxl/libxl_migration.h +Index: libvirt-5.1.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-5.0.0.orig/src/libxl/libxl_migration.h -+++ libvirt-5.0.0/src/libxl/libxl_migration.h +--- libvirt-5.1.0.orig/src/libxl/libxl_migration.h ++++ libvirt-5.1.0/src/libxl/libxl_migration.h @@ -36,6 +36,10 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ @@ -312,13 +312,13 @@ virDomainPtr libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-5.0.0/tools/virsh-domain.c +Index: libvirt-5.1.0/tools/virsh-domain.c =================================================================== ---- libvirt-5.0.0.orig/tools/virsh-domain.c -+++ libvirt-5.0.0/tools/virsh-domain.c -@@ -10558,6 +10558,22 @@ static const vshCmdOptDef opts_migrate[] - .type = VSH_OT_BOOL, - .help = N_("use TLS for migration") +--- libvirt-5.1.0.orig/tools/virsh-domain.c ++++ libvirt-5.1.0/tools/virsh-domain.c +@@ -10562,6 +10562,22 @@ static const vshCmdOptDef opts_migrate[] + .type = VSH_OT_INT, + .help = N_("post-copy migration bandwidth limit in MiB/s") }, + {.name = "max_iters", + .type = VSH_OT_INT, @@ -339,7 +339,7 @@ {.name = NULL} }; -@@ -10581,6 +10597,7 @@ doMigrate(void *opaque) +@@ -10585,6 +10601,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -347,7 +347,7 @@ sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); -@@ -10700,6 +10717,27 @@ doMigrate(void *opaque) +@@ -10704,6 +10721,27 @@ doMigrate(void *opaque) goto save_error; } @@ -375,11 +375,11 @@ if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { -Index: libvirt-5.0.0/tools/virsh.pod +Index: libvirt-5.1.0/tools/virsh.pod =================================================================== ---- libvirt-5.0.0.orig/tools/virsh.pod -+++ libvirt-5.0.0/tools/virsh.pod -@@ -1994,6 +1994,14 @@ Providing I<--tls> causes the migration +--- libvirt-5.1.0.orig/tools/virsh.pod ++++ libvirt-5.1.0/tools/virsh.pod +@@ -1998,6 +1998,14 @@ Providing I<--tls> causes the migration the migration of the domain. Usage requires proper TLS setup for both source and target. ++++++ libxl-support-block-script.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.451591770 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.451591770 +0100 @@ -7,10 +7,10 @@ For more details, see bsc#954872 and FATE#319810 -Index: libvirt-5.0.0/src/libxl/libxl_conf.c +Index: libvirt-5.1.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-5.0.0.orig/src/libxl/libxl_conf.c -+++ libvirt-5.0.0/src/libxl/libxl_conf.c +--- libvirt-5.1.0.orig/src/libxl/libxl_conf.c ++++ libvirt-5.1.0/src/libxl/libxl_conf.c @@ -884,6 +884,25 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } ++++++ lxc-wait-after-eth-del.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.459591768 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.459591768 +0100 @@ -13,10 +13,10 @@ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-5.0.0/src/lxc/lxc_controller.c +Index: libvirt-5.1.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-5.0.0.orig/src/lxc/lxc_controller.c -+++ libvirt-5.0.0/src/lxc/lxc_controller.c +--- libvirt-5.1.0.orig/src/lxc/lxc_controller.c ++++ libvirt-5.1.0/src/lxc/lxc_controller.c @@ -69,6 +69,7 @@ #include "rpc/virnetdaemon.h" #include "virstring.h" @@ -25,7 +25,7 @@ #define VIR_FROM_THIS VIR_FROM_LXC -@@ -2016,6 +2017,7 @@ static int virLXCControllerDeleteInterfa +@@ -2017,6 +2018,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; } @@ -33,10 +33,10 @@ return ret; } -Index: libvirt-5.0.0/src/lxc/lxc_driver.c +Index: libvirt-5.1.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-5.0.0.orig/src/lxc/lxc_driver.c -+++ libvirt-5.0.0/src/lxc/lxc_driver.c +--- libvirt-5.1.0.orig/src/lxc/lxc_driver.c ++++ libvirt-5.1.0/src/lxc/lxc_driver.c @@ -70,6 +70,7 @@ #include "virtime.h" #include "virtypedparam.h" @@ -45,7 +45,7 @@ #include "virstring.h" #include "viraccessapicheck.h" #include "viraccessapichecklxc.h" -@@ -3942,6 +3943,7 @@ lxcDomainAttachDeviceNetLive(virConnectP +@@ -3930,6 +3931,7 @@ lxcDomainAttachDeviceNetLive(virConnectP case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_ETHERNET: ignore_value(virNetDevVethDelete(veth)); @@ -53,7 +53,7 @@ break; case VIR_DOMAIN_NET_TYPE_DIRECT: -@@ -4385,6 +4387,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -4373,6 +4375,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb virDomainAuditNet(vm, detach, NULL, "detach", false); goto cleanup; } @@ -61,10 +61,10 @@ break; /* It'd be nice to support this, but with macvlan -Index: libvirt-5.0.0/src/lxc/lxc_process.c +Index: libvirt-5.1.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-5.0.0.orig/src/lxc/lxc_process.c -+++ libvirt-5.0.0/src/lxc/lxc_process.c +--- libvirt-5.1.0.orig/src/lxc/lxc_process.c ++++ libvirt-5.1.0/src/lxc/lxc_process.c @@ -51,6 +51,7 @@ #include "viratomic.h" #include "virprocess.h" @@ -73,7 +73,7 @@ #include "netdev_bandwidth_conf.h" #define VIR_FROM_THIS VIR_FROM_LXC -@@ -215,6 +216,7 @@ static void virLXCProcessCleanup(virLXCD +@@ -226,6 +227,7 @@ static void virLXCProcessCleanup(virLXCD } virDomainNetReleaseActualDevice(vm->def, iface); } ++++++ network-don-t-use-dhcp-authoritative-on-static-netwo.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.467591766 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.467591766 +0100 @@ -17,11 +17,11 @@ tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-5.0.0/src/network/bridge_driver.c +Index: libvirt-5.1.0/src/network/bridge_driver.c =================================================================== ---- libvirt-5.0.0.orig/src/network/bridge_driver.c -+++ libvirt-5.0.0/src/network/bridge_driver.c -@@ -1456,7 +1456,14 @@ networkDnsmasqConfContents(virNetworkObj +--- libvirt-5.1.0.orig/src/network/bridge_driver.c ++++ libvirt-5.1.0/src/network/bridge_driver.c +@@ -1378,7 +1378,14 @@ networkDnsmasqConfContents(virNetworkObj if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { virBufferAddLit(&configbuf, "dhcp-no-override\n"); @@ -37,10 +37,10 @@ } if (ipdef->tftproot) { -Index: libvirt-5.0.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-5.1.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-5.0.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-5.0.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-5.1.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-5.1.0/tests/networkxml2confdata/dhcp6host-routed-network.conf @@ -10,7 +10,6 @@ bind-dynamic interface=virbr1 dhcp-range=192.168.122.1,static ++++++ ppc64le-canonical-name.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.475591765 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.475591765 +0100 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-5.0.0/src/util/virarch.c +Index: libvirt-5.1.0/src/util/virarch.c =================================================================== ---- libvirt-5.0.0.orig/src/util/virarch.c -+++ libvirt-5.0.0/src/util/virarch.c +--- libvirt-5.1.0.orig/src/util/virarch.c ++++ libvirt-5.1.0/src/util/virarch.c @@ -172,6 +172,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_I686; } else if (STREQ(ut.machine, "amd64")) { ++++++ qemu-apparmor-screenshot.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.483591763 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.487591763 +0100 @@ -1,8 +1,8 @@ -Index: libvirt-5.0.0/src/security/apparmor/libvirt-qemu +Index: libvirt-5.1.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-5.0.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-5.0.0/src/security/apparmor/libvirt-qemu -@@ -221,3 +221,6 @@ +--- libvirt-5.1.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-5.1.0/src/security/apparmor/libvirt-qemu +@@ -222,3 +222,6 @@ # required for sasl GSSAPI plugin /etc/gss/mech.d/ r, /etc/gss/mech.d/* r, ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.491591762 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.491591762 +0100 @@ -8,10 +8,10 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-5.0.0/src/xenconfig/xen_common.c +Index: libvirt-5.1.0/src/xenconfig/xen_common.c =================================================================== ---- libvirt-5.0.0.orig/src/xenconfig/xen_common.c -+++ libvirt-5.0.0/src/xenconfig/xen_common.c +--- libvirt-5.1.0.orig/src/xenconfig/xen_common.c ++++ libvirt-5.1.0/src/xenconfig/xen_common.c @@ -386,12 +386,19 @@ xenParsePCI(char *entry) int busID; int slotID; @@ -64,10 +64,10 @@ 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-5.0.0/src/xenconfig/xen_sxpr.c +Index: libvirt-5.1.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-5.0.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-5.0.0/src/xenconfig/xen_sxpr.c +--- libvirt-5.1.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-5.1.0/src/xenconfig/xen_sxpr.c @@ -1053,6 +1053,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; @@ -91,7 +91,7 @@ dev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; dev->source.subsys.u.pci.addr.domain = domainID; dev->source.subsys.u.pci.addr.bus = busID; -@@ -1968,11 +1971,15 @@ static void +@@ -1962,11 +1965,15 @@ static void xenFormatSxprPCI(virDomainHostdevDefPtr def, virBufferPtr buf) { @@ -108,7 +108,7 @@ } -@@ -1991,12 +1998,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP +@@ -1985,12 +1992,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP virBufferPtr buf, int detach) { @@ -121,7 +121,7 @@ virBufferAddLit(buf, "(pci "); xenFormatSxprPCI(def, buf); if (detach) -@@ -2051,12 +2052,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def, +@@ -2045,12 +2046,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def, for (i = 0; i < def->nhostdevs; i++) { if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { ++++++ suse-apparmor-libnl-paths.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.511591758 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.511591758 +0100 @@ -8,11 +8,11 @@ to squelch a denial when starting confined domains. Found while investigating bsc#1058847 -Index: libvirt-5.0.0/src/security/apparmor/libvirt-qemu +Index: libvirt-5.1.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-5.0.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-5.0.0/src/security/apparmor/libvirt-qemu -@@ -62,6 +62,7 @@ +--- libvirt-5.1.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-5.1.0/src/security/apparmor/libvirt-qemu +@@ -63,6 +63,7 @@ #/dev/fb* rw, /etc/pulse/client.conf r, @@ -20,10 +20,10 @@ @{HOME}/.pulse-cookie rwk, owner /root/.pulse-cookie rwk, owner /root/.pulse/ rw, -Index: libvirt-5.0.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-5.1.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-5.0.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper -+++ libvirt-5.0.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-5.1.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper ++++ libvirt-5.1.0/src/security/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, @@ -31,5 +31,5 @@ - /etc/libnl-3/classid r, + /etc/libnl*/classid r, - # for hostdev - /sys/devices/ r, + # for gl enabled graphics + /dev/dri/{,*} r, ++++++ suse-libvirt-guests-service.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.519591756 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.523591755 +0100 @@ -1,9 +1,9 @@ Adjust libvirt-guests service to conform to SUSE standards -Index: libvirt-5.0.0/tools/libvirt-guests.init.in +Index: libvirt-5.1.0/tools/libvirt-guests.init.in =================================================================== ---- libvirt-5.0.0.orig/tools/libvirt-guests.init.in -+++ libvirt-5.0.0/tools/libvirt-guests.init.in +--- libvirt-5.1.0.orig/tools/libvirt-guests.init.in ++++ libvirt-5.1.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 @@ + exec @libexecdir@/libvirt-guests.sh "$@" -Index: libvirt-5.0.0/tools/libvirt-guests.sh.in +Index: libvirt-5.1.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-5.0.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-5.0.0/tools/libvirt-guests.sh.in +--- libvirt-5.1.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-5.1.0/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. @@ -209,10 +209,10 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-5.0.0/tools/libvirt-guests.sysconf +Index: libvirt-5.1.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-5.0.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-5.0.0/tools/libvirt-guests.sysconf +--- libvirt-5.1.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-5.1.0/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + ++++++ suse-libvirtd-disable-tls.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.531591753 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.531591753 +0100 @@ -3,10 +3,10 @@ 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-5.0.0/src/remote/libvirtd.conf +Index: libvirt-5.1.0/src/remote/libvirtd.conf =================================================================== ---- libvirt-5.0.0.orig/src/remote/libvirtd.conf -+++ libvirt-5.0.0/src/remote/libvirtd.conf +--- libvirt-5.1.0.orig/src/remote/libvirtd.conf ++++ libvirt-5.1.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 @@ # 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-5.0.0/src/remote/remote_daemon_config.c +Index: libvirt-5.1.0/src/remote/remote_daemon_config.c =================================================================== ---- libvirt-5.0.0.orig/src/remote/remote_daemon_config.c -+++ libvirt-5.0.0/src/remote/remote_daemon_config.c +--- libvirt-5.1.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-5.1.0/src/remote/remote_daemon_config.c @@ -108,7 +108,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; @@ -31,10 +31,10 @@ data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-5.0.0/src/remote/test_libvirtd.aug.in +Index: libvirt-5.1.0/src/remote/test_libvirtd.aug.in =================================================================== ---- libvirt-5.0.0.orig/src/remote/test_libvirtd.aug.in -+++ libvirt-5.0.0/src/remote/test_libvirtd.aug.in +--- libvirt-5.1.0.orig/src/remote/test_libvirtd.aug.in ++++ libvirt-5.1.0/src/remote/test_libvirtd.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd = ::CONFIG:: ++++++ suse-libvirtd-service-xen.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.539591752 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.539591752 +0100 @@ -7,10 +7,10 @@ tools. If a user installs libvirt on their SUSE Xen host, then libvirt should be king and override xendomains. See bsc#1015348 -Index: libvirt-5.0.0/src/remote/libvirtd.service.in +Index: libvirt-5.1.0/src/remote/libvirtd.service.in =================================================================== ---- libvirt-5.0.0.orig/src/remote/libvirtd.service.in -+++ libvirt-5.0.0/src/remote/libvirtd.service.in +--- libvirt-5.1.0.orig/src/remote/libvirtd.service.in ++++ libvirt-5.1.0/src/remote/libvirtd.service.in @@ -17,6 +17,8 @@ After=local-fs.target After=remote-fs.target After=systemd-logind.service ++++++ suse-libvirtd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.547591751 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.547591751 +0100 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-5.0.0/src/remote/libvirtd.sysconf +Index: libvirt-5.1.0/src/remote/libvirtd.sysconf =================================================================== ---- libvirt-5.0.0.orig/src/remote/libvirtd.sysconf -+++ libvirt-5.0.0/src/remote/libvirtd.sysconf +--- libvirt-5.1.0.orig/src/remote/libvirtd.sysconf ++++ libvirt-5.1.0/src/remote/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ suse-ovmf-paths.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.555591748 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.555591748 +0100 @@ -1,10 +1,10 @@ Adjust paths of OVMF firmwares on SUSE distros -Index: libvirt-5.0.0/src/qemu/qemu.conf +Index: libvirt-5.1.0/src/qemu/qemu.conf =================================================================== ---- libvirt-5.0.0.orig/src/qemu/qemu.conf -+++ libvirt-5.0.0/src/qemu/qemu.conf -@@ -767,10 +767,9 @@ security_default_confined = 0 +--- libvirt-5.1.0.orig/src/qemu/qemu.conf ++++ libvirt-5.1.0/src/qemu/qemu.conf +@@ -773,10 +773,9 @@ security_default_confined = 0 # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # follows this scheme. #nvram = [ @@ -18,10 +18,10 @@ #] # The backend to use for handling stdout/stderr output from -Index: libvirt-5.0.0/src/qemu/qemu_conf.c +Index: libvirt-5.1.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-5.0.0.orig/src/qemu/qemu_conf.c -+++ libvirt-5.0.0/src/qemu/qemu_conf.c +--- libvirt-5.1.0.orig/src/qemu/qemu_conf.c ++++ libvirt-5.1.0/src/qemu/qemu_conf.c @@ -116,10 +116,9 @@ void qemuDomainCmdlineDefFree(qemuDomain #ifndef DEFAULT_LOADER_NVRAM @@ -36,11 +36,11 @@ #endif -Index: libvirt-5.0.0/src/security/virt-aa-helper.c +Index: libvirt-5.1.0/src/security/virt-aa-helper.c =================================================================== ---- libvirt-5.0.0.orig/src/security/virt-aa-helper.c -+++ libvirt-5.0.0/src/security/virt-aa-helper.c -@@ -507,7 +507,8 @@ valid_path(const char *path, const bool +--- libvirt-5.1.0.orig/src/security/virt-aa-helper.c ++++ libvirt-5.1.0/src/security/virt-aa-helper.c +@@ -506,7 +506,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 */ ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.563591747 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.563591747 +0100 @@ -7,11 +7,11 @@ etc.), but for now they are all lumped together in this single patch. -Index: libvirt-5.0.0/src/qemu/qemu.conf +Index: libvirt-5.1.0/src/qemu/qemu.conf =================================================================== ---- libvirt-5.0.0.orig/src/qemu/qemu.conf -+++ libvirt-5.0.0/src/qemu/qemu.conf -@@ -414,11 +414,20 @@ +--- libvirt-5.1.0.orig/src/qemu/qemu.conf ++++ libvirt-5.1.0/src/qemu/qemu.conf +@@ -420,11 +420,20 @@ # isolation, but it cannot appear in a list of drivers. # #security_driver = "selinux" @@ -34,7 +34,7 @@ # If set to non-zero, then attempts to create unconfined # guests will be blocked. Defaults to 0. -@@ -649,11 +658,22 @@ +@@ -655,11 +664,22 @@ #relaxed_acs_check = 1 ++++++ suse-virtlockd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.579591744 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.579591744 +0100 @@ -1,9 +1,9 @@ Adjust virtlockd sysconfig file to conform to SUSE standards -Index: libvirt-5.0.0/src/locking/virtlockd.sysconf +Index: libvirt-5.1.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-5.0.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-5.0.0/src/locking/virtlockd.sysconf +--- libvirt-5.1.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-5.1.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + ++++++ suse-virtlogd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.587591742 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.587591742 +0100 @@ -1,9 +1,9 @@ Adjust virtlogd sysconfig file to conform to SUSE standards -Index: libvirt-5.0.0/src/logging/virtlogd.sysconf +Index: libvirt-5.1.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-5.0.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-5.0.0/src/logging/virtlogd.sysconf +--- libvirt-5.1.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-5.1.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.595591741 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.595591741 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-5.0.0/src/xenconfig/xen_sxpr.c +Index: libvirt-5.1.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-5.0.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-5.0.0/src/xenconfig/xen_sxpr.c +--- libvirt-5.1.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-5.1.0/src/xenconfig/xen_sxpr.c @@ -383,7 +383,7 @@ xenParseSxprVifRate(const char *rate, un static int xenParseSxprDisks(virDomainDefPtr def, ++++++ xen-sxpr-disk-type.patch ++++++ --- /var/tmp/diff_new_pack.zVCTUZ/_old 2019-03-12 09:48:55.603591739 +0100 +++ /var/tmp/diff_new_pack.zVCTUZ/_new 2019-03-12 09:48:55.603591739 +0100 @@ -6,10 +6,10 @@ https://bugzilla.suse.com/show_bug.cgi?id=938228 -Index: libvirt-5.0.0/src/xenconfig/xen_sxpr.c +Index: libvirt-5.1.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-5.0.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-5.0.0/src/xenconfig/xen_sxpr.c +--- libvirt-5.1.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-5.1.0/src/xenconfig/xen_sxpr.c @@ -497,10 +497,11 @@ xenParseSxprDisks(virDomainDefPtr def, omnipotent, we can revisit this, perhaps stat()'ing the src file in question */
