Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2019-12-07 15:16:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Sat Dec 7 15:16:19 2019 rev:293 rq:753763 version:5.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2019-11-18 20:02:54.201818455 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new.4691/libvirt.changes 2019-12-07 15:19:52.383757999 +0100 @@ -1,0 +2,18 @@ +Mon Dec 2 23:24:23 UTC 2019 - James Fehlig <jfeh...@suse.com> + +- Update to libvirt 5.10.0 + - bsc#1157149 + - Many incremental improvements and bug fixes, see + https://libvirt.org/news.html + - Dropped patches: + 2552752f-libxl-fix-lock-manager-lock-ordering.patch + - Added patches: + 0a65cba4-news-fix.patch + +------------------------------------------------------------------- +Wed Nov 27 20:26:03 UTC 2019 - James Fehlig <jfeh...@suse.com> + +- spec: Enable 'libvirt' firewalld zone for firewalld >= 0.7.0 + boo#1157766 + +------------------------------------------------------------------- Old: ---- 2552752f-libxl-fix-lock-manager-lock-ordering.patch libvirt-5.9.0.tar.xz libvirt-5.9.0.tar.xz.asc New: ---- 0a65cba4-news-fix.patch libvirt-5.10.0.tar.xz libvirt-5.10.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:00.767756838 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:00.771756838 +0100 @@ -1,7 +1,7 @@ # # spec file for package libvirt # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,14 @@ # -#Compat macro for new _fillupdir macro introduced in Nov 2017 +# Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir /var/adm/fillup-templates %endif +# libvirt does not support building in srcdir +%define _vpath_builddir %{_target_platform} + # The hypervisor drivers that run in libvirtd %define with_qemu 0%{!?_without_qemu:1} %define with_lxc 0%{!?_without_lxc:1} @@ -105,6 +108,11 @@ %define with_firewalld 1 %endif +# The 'libvirt' zone must be used with firewalld >= 0.7.0 +%if 0%{?suse_version} >= 1550 + %define with_firewalld_zone 1 +%endif + # Enable libssh support in newer code bases %if 0%{?suse_version} >= 1500 %define with_libssh 1 @@ -182,8 +190,8 @@ %endif Name: libvirt -Url: http://libvirt.org/ -Version: 5.9.0 +URL: http://libvirt.org/ +Version: 5.10.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later @@ -243,9 +251,6 @@ BuildRequires: perl BuildRequires: python3 BuildRequires: readline-devel -# perl XPath is needed since we have a patch touching files that cause -# hvsupport.html to be regenerated -BuildRequires: perl(XML::XPath) # rpcgen is needed since we have a patch touching remote_protocol.x BuildRequires: rpcgen # For pool-build probing for existing pools @@ -338,7 +343,7 @@ Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: 2552752f-libxl-fix-lock-manager-lock-ordering.patch +Patch0: 0a65cba4-news-fix.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -1026,9 +1031,13 @@ %endif autoreconf -f -i +%define _configure ../configure +mkdir %{_vpath_builddir} +cd %{_vpath_builddir} export CFLAGS="%{optflags}" export PYTHON=%{_bindir}/python3 %configure --disable-static \ + --enable-dependency-tracking \ --with-runstatedir=%{_rundir} \ %{?arg_qemu} \ %{?arg_openvz} \ @@ -1093,11 +1102,11 @@ ac_cv_path_PARTED=/usr/sbin/parted \ ac_cv_path_QEMU_BRIDGE_HELPER=/usr/lib/qemu-bridge-helper %make_build HTML_DIR=%{_docdir}/%{name} -gzip -9 ChangeLog %install +cd %{_vpath_builddir} %make_install SYSTEMD_UNIT_DIR=%{_unitdir} HTML_DIR=%{_docdir}/%{name} -cp examples/sh/virt-lxc-convert %{buildroot}/%{_bindir} +cp ../examples/sh/virt-lxc-convert %{buildroot}/%{_bindir} rm -f %{buildroot}/%{_libdir}/*.la %if %{with_wireshark} rm -f %{buildroot}/%{wireshark_plugindir}/libvirt.la @@ -1235,11 +1244,10 @@ rm -f $i printf 'int main(void) { return 0; }' > $i.c done -%make_build - +cd ../%{_vpath_builddir} if ! %make_build check VIR_TEST_DEBUG=1 then - cat test-suite.log || true + cat tests/test-suite.log || true exit 1 fi @@ -1604,6 +1612,7 @@ %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so %if %{with_firewalld_zone} +%dir %{_prefix}/lib/firewalld/zones/ %{_prefix}/lib/firewalld/zones/libvirt.xml %endif @@ -1831,8 +1840,8 @@ %{_unitdir}/libvirt-guests.service %{_sbindir}/rclibvirt-guests -%files libs -f %{name}.lang -%doc AUTHORS ChangeLog.gz NEWS README README.md COPYING COPYING.LESSER +%files libs -f %{_vpath_builddir}/%{name}.lang +%doc AUTHORS NEWS README README.md COPYING COPYING.LESSER %config(noreplace) %{_sysconfdir}/%{name}/libvirt.conf %config(noreplace) %{_sysconfdir}/%{name}/libvirt-admin.conf %{_libdir}/libvirt.so.* ++++++ 0001-Extract-stats-functions-from-the-qemu-driver.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:00.815756832 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:00.815756832 +0100 @@ -18,10 +18,10 @@ create mode 100644 src/conf/domain_stats.c create mode 100644 src/conf/domain_stats.h -Index: libvirt-5.9.0/src/conf/domain_stats.c +Index: libvirt-5.10.0/src/conf/domain_stats.c =================================================================== --- /dev/null -+++ libvirt-5.9.0/src/conf/domain_stats.c ++++ libvirt-5.10.0/src/conf/domain_stats.c @@ -0,0 +1,119 @@ +/* + * domain_stats.c: domain stats extraction helpers @@ -142,10 +142,10 @@ +} + +#undef STATS_ADD_NET_PARAM -Index: libvirt-5.9.0/src/conf/domain_stats.h +Index: libvirt-5.10.0/src/conf/domain_stats.h =================================================================== --- /dev/null -+++ libvirt-5.9.0/src/conf/domain_stats.h ++++ libvirt-5.10.0/src/conf/domain_stats.h @@ -0,0 +1,62 @@ +/* + * domain_stats.h: domain stats extraction helpers @@ -209,10 +209,10 @@ + virTypedParamListPtr params); + +#endif /* __DOMAIN_STATS_H */ -Index: libvirt-5.9.0/src/libvirt_private.syms +Index: libvirt-5.10.0/src/libvirt_private.syms =================================================================== ---- libvirt-5.9.0.orig/src/libvirt_private.syms -+++ libvirt-5.9.0/src/libvirt_private.syms +--- libvirt-5.10.0.orig/src/libvirt_private.syms ++++ libvirt-5.10.0/src/libvirt_private.syms @@ -697,6 +697,9 @@ virDomainConfNWFilterInstantiate; virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -223,7 +223,7 @@ # conf/interface_conf.h virInterfaceDefFormat; -@@ -1653,6 +1656,7 @@ virCgroupGetMemoryUsage; +@@ -1669,6 +1672,7 @@ virCgroupGetMemoryUsage; virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; @@ -231,11 +231,11 @@ virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKillPainfully; -Index: libvirt-5.9.0/src/qemu/qemu_driver.c +Index: libvirt-5.10.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-5.9.0.orig/src/qemu/qemu_driver.c -+++ libvirt-5.9.0/src/qemu/qemu_driver.c -@@ -67,6 +67,7 @@ +--- libvirt-5.10.0.orig/src/qemu/qemu_driver.c ++++ libvirt-5.10.0/src/qemu/qemu_driver.c +@@ -66,6 +66,7 @@ #include "virarptable.h" #include "viruuid.h" #include "domain_conf.h" @@ -243,7 +243,7 @@ #include "domain_audit.h" #include "node_device_conf.h" #include "virpci.h" -@@ -20394,13 +20395,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr +@@ -20389,13 +20390,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr virTypedParamListPtr params, unsigned int privflags G_GNUC_UNUSED) { @@ -258,7 +258,7 @@ } -@@ -20601,17 +20596,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj +@@ -20596,17 +20591,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj if (!priv->cgroup) return 0; @@ -277,7 +277,7 @@ } -@@ -20768,79 +20753,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr +@@ -20763,76 +20748,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr return ret; } @@ -294,13 +294,12 @@ { - size_t i; - struct _virDomainInterfaceStats tmp; -- int ret = -1; - - if (!virDomainObjIsActive(dom)) - return 0; - - if (virTypedParamListAddUInt(params, dom->def->nnets, "net.count") < 0) -- goto cleanup; +- return -1; - - /* Check the path is one of the domain's network interfaces. */ - for (i = 0; i < dom->def->nnets; i++) { @@ -315,7 +314,7 @@ - actualType = virDomainNetGetActualType(net); - - if (virTypedParamListAddString(params, net->ifname, "net.%zu.name", i) < 0) -- goto cleanup; +- return -1; - - if (actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER) { - if (virNetDevOpenvswitchInterfaceStats(net->ifname, &tmp) < 0) { @@ -348,9 +347,7 @@ - "tx.drop", tmp.tx_drop); - } - -- ret = 0; -- cleanup: -- return ret; +- return 0; + return virDomainStatsGetInterface(dom,params); } @@ -358,11 +355,11 @@ /* refresh information by opening images on the disk */ static int -Index: libvirt-5.9.0/src/util/vircgroup.c +Index: libvirt-5.10.0/src/util/vircgroup.c =================================================================== ---- libvirt-5.9.0.orig/src/util/vircgroup.c -+++ libvirt-5.9.0/src/util/vircgroup.c -@@ -2785,6 +2785,31 @@ virCgroupControllerAvailable(int control +--- libvirt-5.10.0.orig/src/util/vircgroup.c ++++ libvirt-5.10.0/src/util/vircgroup.c +@@ -2773,6 +2773,31 @@ virCgroupControllerAvailable(int control return ret; } @@ -394,7 +391,7 @@ #else /* !__linux__ */ bool -@@ -2794,6 +2819,14 @@ virCgroupAvailable(void) +@@ -2782,6 +2807,14 @@ virCgroupAvailable(void) } @@ -409,10 +406,10 @@ int virCgroupNewPartition(const char *path G_GNUC_UNUSED, bool create G_GNUC_UNUSED, -Index: libvirt-5.9.0/src/util/vircgroup.h +Index: libvirt-5.10.0/src/util/vircgroup.h =================================================================== ---- libvirt-5.9.0.orig/src/util/vircgroup.h -+++ libvirt-5.9.0/src/util/vircgroup.h +--- libvirt-5.10.0.orig/src/util/vircgroup.h ++++ libvirt-5.10.0/src/util/vircgroup.h @@ -24,6 +24,7 @@ #include "virutil.h" #include "virbitmap.h" @@ -428,10 +425,10 @@ + +int virCgroupGetStatsCpu(virCgroupPtr cgroup, + virTypedParamListPtr params); -Index: libvirt-5.9.0/src/conf/Makefile.inc.am +Index: libvirt-5.10.0/src/conf/Makefile.inc.am =================================================================== ---- libvirt-5.9.0.orig/src/conf/Makefile.inc.am -+++ libvirt-5.9.0/src/conf/Makefile.inc.am +--- libvirt-5.10.0.orig/src/conf/Makefile.inc.am ++++ libvirt-5.10.0/src/conf/Makefile.inc.am @@ -26,6 +26,8 @@ DOMAIN_CONF_SOURCES = \ conf/domain_audit.h \ conf/domain_nwfilter.c \ ++++++ 0001-libxl-add-support-for-BlockResize-API.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:00.823756831 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:00.823756831 +0100 @@ -19,11 +19,11 @@ src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) -Index: libvirt-5.9.0/src/libxl/libxl_driver.c +Index: libvirt-5.10.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-5.9.0.orig/src/libxl/libxl_driver.c -+++ libvirt-5.9.0/src/libxl/libxl_driver.c -@@ -5283,6 +5283,97 @@ libxlDomainMemoryStats(virDomainPtr dom, +--- libvirt-5.10.0.orig/src/libxl/libxl_driver.c ++++ libvirt-5.10.0/src/libxl/libxl_driver.c +@@ -5281,6 +5281,96 @@ libxlDomainMemoryStats(virDomainPtr dom, #undef LIBXL_SET_MEMSTAT @@ -95,8 +95,7 @@ + disk->src->format == VIR_STORAGE_FILE_QED) + size = VIR_ROUND_UP(size, 512); + -+ if (virAsprintf(&moncmd, "block_resize %s %lluB", disk->dst, size) < 0) -+ goto endjob; ++ moncmd = g_strdup_printf("block_resize %s %lluB", disk->dst, size); + + if (libxl_qemu_monitor_command(cfg->ctx, vm->def->id, moncmd, &monreply) != 0) { + virReportError(VIR_ERR_OPERATION_FAILED, @@ -121,7 +120,7 @@ static int libxlDomainGetJobInfo(virDomainPtr dom, virDomainJobInfoPtr info) -@@ -6724,6 +6815,7 @@ static virHypervisorDriver libxlHypervis +@@ -6718,6 +6808,7 @@ static virHypervisorDriver libxlHypervis #endif .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */ ++++++ 0002-lxc-implement-connectGetAllDomainStats.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:00.831756830 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:00.835756829 +0100 @@ -9,10 +9,10 @@ src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) -Index: libvirt-5.9.0/src/lxc/lxc_driver.c +Index: libvirt-5.10.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-5.9.0.orig/src/lxc/lxc_driver.c -+++ libvirt-5.9.0/src/lxc/lxc_driver.c +--- libvirt-5.10.0.orig/src/lxc/lxc_driver.c ++++ libvirt-5.10.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 -@@ -5394,6 +5395,135 @@ lxcDomainHasManagedSaveImage(virDomainPt +@@ -5382,6 +5383,135 @@ lxcDomainHasManagedSaveImage(virDomainPt return ret; } @@ -157,7 +157,7 @@ /* Function Tables */ static virHypervisorDriver lxcHypervisorDriver = { -@@ -5489,6 +5619,7 @@ static virHypervisorDriver lxcHypervisor +@@ -5477,6 +5607,7 @@ static virHypervisorDriver lxcHypervisor .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */ .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */ ++++++ 0a65cba4-news-fix.patch ++++++ commit 0a65cba423781f2cbf123354b7f670c4f441b385 Author: Jim Fehlig <jfeh...@suse.com> Date: Mon Dec 2 20:48:24 2019 -0700 news: Fix XML validation The news schema requires two digits for both month and day in the date attribute. s/2/02/ in the day value of date to fix the following 'make check' failure 2165) Checking ../docs/news.xml against ../news.rng ... libvirt: XML Util error : XML document failed to validate against schema: Unable to validate doc against /home/jfehlig/virt/upstream/libvirt/build/../docs/schemas/../news.rng Element release failed to validate attributes Signed-off-by: Jim Fehlig <jfeh...@suse.com> Index: libvirt-5.10.0/docs/news.xml =================================================================== --- libvirt-5.10.0.orig/docs/news.xml +++ libvirt-5.10.0/docs/news.xml @@ -42,7 +42,7 @@ --> <libvirt> - <release version="v5.10.0" date="2019-12-2"> + <release version="v5.10.0" date="2019-12-02"> <section title="New features"> <change> <summary> ++++++ libvirt-5.9.0.tar.xz -> libvirt-5.10.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-5.9.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new.4691/libvirt-5.10.0.tar.xz differ: char 15, line 1 ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:00.883756822 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:00.883756822 +0100 @@ -2,10 +2,10 @@ From: <r...@suse.de> -Index: libvirt-5.9.0/src/cpu_map/ppc64_POWER8.xml +Index: libvirt-5.10.0/src/cpu_map/ppc64_POWER8.xml =================================================================== ---- libvirt-5.9.0.orig/src/cpu_map/ppc64_POWER8.xml -+++ libvirt-5.9.0/src/cpu_map/ppc64_POWER8.xml +--- libvirt-5.10.0.orig/src/cpu_map/ppc64_POWER8.xml ++++ libvirt-5.10.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.gqP8Dk/_old 2019-12-07 15:20:00.911756819 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:00.915756818 +0100 @@ -1,8 +1,8 @@ -Index: libvirt-5.9.0/configure.ac +Index: libvirt-5.10.0/configure.ac =================================================================== ---- libvirt-5.9.0.orig/configure.ac -+++ libvirt-5.9.0/configure.ac -@@ -279,6 +279,7 @@ LIBVIRT_ARG_LIBSSH +--- libvirt-5.10.0.orig/configure.ac ++++ libvirt-5.10.0/configure.ac +@@ -285,6 +285,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 -@@ -323,6 +324,7 @@ LIBVIRT_CHECK_LIBSSH +@@ -329,6 +330,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 -@@ -1003,6 +1005,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.9.0/tools/virsh.c +Index: libvirt-5.10.0/tools/virsh.c =================================================================== ---- libvirt-5.9.0.orig/tools/virsh.c -+++ libvirt-5.9.0/tools/virsh.c +--- libvirt-5.10.0.orig/tools/virsh.c ++++ libvirt-5.10.0/tools/virsh.c @@ -555,6 +555,8 @@ virshShowVersion(vshControl *ctl G_GNUC_ vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -39,10 +39,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-5.9.0/src/interface/interface_backend_netcf.c +Index: libvirt-5.10.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-5.9.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-5.9.0/src/interface/interface_backend_netcf.c +--- libvirt-5.10.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-5.10.0/src/interface/interface_backend_netcf.c @@ -21,7 +21,12 @@ #include <config.h> @@ -95,7 +95,7 @@ static void virNetcfDriverStateDispose(void *obj) -@@ -123,6 +159,10 @@ netcfStateInitialize(bool privileged, +@@ -120,6 +156,10 @@ netcfStateInitialize(bool privileged, virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto error; @@ -106,7 +106,7 @@ /* open netcf */ if (ncf_init(&driver->netcf, NULL) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -@@ -1117,6 +1157,7 @@ static int netcfInterfaceIsActive(virInt +@@ -1114,6 +1154,7 @@ static int netcfInterfaceIsActive(virInt return ret; } @@ -114,7 +114,7 @@ static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags) { int ret; -@@ -1191,6 +1232,7 @@ static int netcfInterfaceChangeRollback( +@@ -1188,6 +1229,7 @@ static int netcfInterfaceChangeRollback( virObjectUnlock(driver); return ret; } @@ -122,7 +122,7 @@ static virInterfaceDriver interfaceDriver = { .name = INTERFACE_DRIVER_NAME, -@@ -1207,9 +1249,11 @@ static virInterfaceDriver interfaceDrive +@@ -1204,9 +1246,11 @@ static virInterfaceDriver interfaceDrive .interfaceCreate = netcfInterfaceCreate, /* 0.7.0 */ .interfaceDestroy = netcfInterfaceDestroy, /* 0.7.0 */ .interfaceIsActive = netcfInterfaceIsActive, /* 0.7.3 */ @@ -134,7 +134,7 @@ }; -@@ -1240,6 +1284,19 @@ static virStateDriver interfaceStateDriv +@@ -1237,6 +1281,19 @@ static virStateDriver interfaceStateDriv int netcfIfaceRegister(void) { @@ -154,10 +154,10 @@ if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) return -1; if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) -Index: libvirt-5.9.0/src/interface/interface_driver.c +Index: libvirt-5.10.0/src/interface/interface_driver.c =================================================================== ---- libvirt-5.9.0.orig/src/interface/interface_driver.c -+++ libvirt-5.9.0/src/interface/interface_driver.c +--- libvirt-5.10.0.orig/src/interface/interface_driver.c ++++ libvirt-5.10.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -175,10 +175,10 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-5.9.0/m4/virt-netcontrol.m4 +Index: libvirt-5.10.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-5.9.0/m4/virt-netcontrol.m4 ++++ libvirt-5.10.0/m4/virt-netcontrol.m4 @@ -0,0 +1,39 @@ +dnl The libnetcontrol library +dnl @@ -219,10 +219,10 @@ +AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[ + LIBVIRT_RESULT_LIB([NETCONTROL]) +]) -Index: libvirt-5.9.0/src/interface/Makefile.inc.am +Index: libvirt-5.10.0/src/interface/Makefile.inc.am =================================================================== ---- libvirt-5.9.0.orig/src/interface/Makefile.inc.am -+++ libvirt-5.9.0/src/interface/Makefile.inc.am +--- libvirt-5.10.0.orig/src/interface/Makefile.inc.am ++++ libvirt-5.10.0/src/interface/Makefile.inc.am @@ -6,6 +6,7 @@ INTERFACE_DRIVER_SOURCES = \ $(NULL) @@ -230,8 +230,8 @@ +INTERFACE_DRIVER_NETCONTROL_SOURCES = interface/interface_backend_netcf.c INTERFACE_DRIVER_UDEV_SOURCES = interface/interface_backend_udev.c - DRIVER_SOURCE_FILES += $(INTERFACE_DRIVER_SOURCES) -@@ -36,6 +37,11 @@ libvirt_driver_interface_la_CFLAGS += $( + DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) +@@ -38,6 +39,11 @@ libvirt_driver_interface_la_CFLAGS += $( libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) libvirt_driver_interface_la_SOURCES += $(INTERFACE_DRIVER_NETCF_SOURCES) endif WITH_NETCF ++++++ libxl-dom-reset.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:00.959756812 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:00.959756812 +0100 @@ -8,11 +8,11 @@ option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. -Index: libvirt-5.9.0/src/libxl/libxl_driver.c +Index: libvirt-5.10.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-5.9.0.orig/src/libxl/libxl_driver.c -+++ libvirt-5.9.0/src/libxl/libxl_driver.c -@@ -1365,6 +1365,61 @@ libxlDomainReboot(virDomainPtr dom, unsi +--- libvirt-5.10.0.orig/src/libxl/libxl_driver.c ++++ libvirt-5.10.0/src/libxl/libxl_driver.c +@@ -1363,6 +1363,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } static int @@ -74,7 +74,7 @@ libxlDomainDestroyFlags(virDomainPtr dom, unsigned int flags) { -@@ -6599,6 +6654,7 @@ static virHypervisorDriver libxlHypervis +@@ -6593,6 +6648,7 @@ static virHypervisorDriver libxlHypervis .domainShutdown = libxlDomainShutdown, /* 0.9.0 */ .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */ .domainReboot = libxlDomainReboot, /* 0.9.0 */ ++++++ libxl-set-cach-mode.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:00.967756811 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:00.971756810 +0100 @@ -3,11 +3,11 @@ src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-5.9.0/src/libxl/libxl_conf.c +Index: libvirt-5.10.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-5.9.0.orig/src/libxl/libxl_conf.c -+++ libvirt-5.9.0/src/libxl/libxl_conf.c -@@ -880,6 +880,30 @@ libxlDiskSetDiscard(libxl_device_disk *x +--- libvirt-5.10.0.orig/src/libxl/libxl_conf.c ++++ libvirt-5.10.0/src/libxl/libxl_conf.c +@@ -869,6 +869,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } @@ -38,7 +38,7 @@ static char * libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src, const char *username, -@@ -1121,6 +1145,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1110,6 +1134,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) return -1; ++++++ libxl-set-migration-constraints.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:00.979756809 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:00.979756809 +0100 @@ -16,10 +16,10 @@ tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-5.9.0/include/libvirt/libvirt-domain.h +Index: libvirt-5.10.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-5.9.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-5.9.0/include/libvirt/libvirt-domain.h +--- libvirt-5.10.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-5.10.0/include/libvirt/libvirt-domain.h @@ -1051,6 +1051,31 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS "parallel.connections" @@ -52,11 +52,11 @@ /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-5.9.0/src/libxl/libxl_driver.c +Index: libvirt-5.10.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-5.9.0.orig/src/libxl/libxl_driver.c -+++ libvirt-5.9.0/src/libxl/libxl_driver.c -@@ -6145,6 +6145,9 @@ libxlDomainMigratePerform3Params(virDoma +--- libvirt-5.10.0.orig/src/libxl/libxl_driver.c ++++ libvirt-5.10.0/src/libxl/libxl_driver.c +@@ -6139,6 +6139,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; int ret = -1; @@ -66,7 +66,7 @@ #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME virReportUnsupportedError(); -@@ -6161,6 +6164,18 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6155,6 +6158,18 @@ libxlDomainMigratePerform3Params(virDoma virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 || @@ -85,7 +85,7 @@ virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_URI, &uri) < 0) -@@ -6175,11 +6190,11 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6169,11 +6184,11 @@ libxlDomainMigratePerform3Params(virDoma if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml, @@ -99,10 +99,10 @@ goto cleanup; } -Index: libvirt-5.9.0/src/libxl/libxl_migration.c +Index: libvirt-5.10.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-5.9.0.orig/src/libxl/libxl_migration.c -+++ libvirt-5.9.0/src/libxl/libxl_migration.c +--- libvirt-5.10.0.orig/src/libxl/libxl_migration.c ++++ libvirt-5.10.0/src/libxl/libxl_migration.c @@ -338,18 +338,39 @@ libxlMigrateDstReceive(virNetSocketPtr s static int libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, @@ -145,7 +145,7 @@ if (ret != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to send migration data to destination host")); -@@ -906,7 +927,7 @@ struct libxlTunnelControl { +@@ -903,7 +924,7 @@ struct libxlTunnelControl { static int libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver, virDomainObjPtr vm, @@ -154,7 +154,7 @@ virStreamPtr st, struct libxlTunnelControl **tnl) { -@@ -939,7 +960,7 @@ libxlMigrationSrcStartTunnel(libxlDriver +@@ -936,7 +957,7 @@ libxlMigrationSrcStartTunnel(libxlDriver virObjectUnlock(vm); /* Send data to pipe */ @@ -163,7 +163,7 @@ virObjectLock(vm); out: -@@ -975,7 +996,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -972,7 +993,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP const char *dconnuri G_GNUC_UNUSED, const char *dname, const char *uri, @@ -172,7 +172,7 @@ { virDomainPtr ddomain = NULL; virTypedParameterPtr params = NULL; -@@ -1020,11 +1041,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1017,11 +1038,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP /* We don't require the destination to have P2P support * as it looks to be normal migration from the receiver perspective. */ @@ -186,7 +186,7 @@ if (!(st = virStreamNew(dconn, 0))) goto confirm; ret = dconn->driver->domainMigratePrepareTunnel3Params -@@ -1038,7 +1059,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1035,7 +1056,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP if (ret == -1) goto confirm; @@ -195,7 +195,7 @@ if (uri_out) { if (virTypedParamsReplaceString(¶ms, &nparams, VIR_MIGRATE_PARAM_URI, uri_out) < 0) { -@@ -1053,11 +1074,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1050,11 +1071,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP } VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); @@ -210,7 +210,7 @@ if (ret < 0) { notify_source = false; virErrorPreserveLast(&orig_err); -@@ -1092,7 +1113,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1089,7 +1110,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP confirm: if (notify_source) { VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm); @@ -219,7 +219,7 @@ if (ret < 0) VIR_WARN("Guest %s probably left in 'paused' state on source", -@@ -1100,7 +1121,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1097,7 +1118,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP } cleanup: @@ -228,7 +228,7 @@ libxlMigrationSrcStopTunnel(tc); virObjectUnref(st); } -@@ -1144,7 +1165,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD +@@ -1141,7 +1162,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD const char *dconnuri, const char *uri_str G_GNUC_UNUSED, const char *dname, @@ -237,7 +237,7 @@ { int ret = -1; bool useParams; -@@ -1179,7 +1200,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD +@@ -1176,7 +1197,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD } ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri, @@ -246,7 +246,7 @@ if (ret < 0) { /* -@@ -1206,7 +1227,7 @@ libxlDomainMigrationSrcPerform(libxlDriv +@@ -1203,7 +1224,7 @@ libxlDomainMigrationSrcPerform(libxlDriv const char *dconnuri G_GNUC_UNUSED, const char *uri_str, const char *dname G_GNUC_UNUSED, @@ -255,7 +255,7 @@ { libxlDomainObjPrivatePtr priv = vm->privateData; char *hostname = NULL; -@@ -1242,7 +1263,7 @@ libxlDomainMigrationSrcPerform(libxlDriv +@@ -1239,7 +1260,7 @@ libxlDomainMigrationSrcPerform(libxlDriv /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); @@ -264,10 +264,10 @@ virObjectLock(vm); if (ret == 0) { -Index: libvirt-5.9.0/src/libxl/libxl_migration.h +Index: libvirt-5.10.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-5.9.0.orig/src/libxl/libxl_migration.h -+++ libvirt-5.9.0/src/libxl/libxl_migration.h +--- libvirt-5.10.0.orig/src/libxl/libxl_migration.h ++++ libvirt-5.10.0/src/libxl/libxl_migration.h @@ -35,6 +35,10 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ @@ -312,11 +312,11 @@ virDomainPtr libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-5.9.0/tools/virsh-domain.c +Index: libvirt-5.10.0/tools/virsh-domain.c =================================================================== ---- libvirt-5.9.0.orig/tools/virsh-domain.c -+++ libvirt-5.9.0/tools/virsh-domain.c -@@ -10542,6 +10542,22 @@ static const vshCmdOptDef opts_migrate[] +--- libvirt-5.10.0.orig/tools/virsh-domain.c ++++ libvirt-5.10.0/tools/virsh-domain.c +@@ -10524,6 +10524,22 @@ static const vshCmdOptDef opts_migrate[] .type = VSH_OT_INT, .help = N_("migration bandwidth limit in MiB/s") }, @@ -339,7 +339,7 @@ {.name = NULL} }; -@@ -10565,6 +10581,7 @@ doMigrate(void *opaque) +@@ -10547,6 +10563,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -347,7 +347,7 @@ sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); -@@ -10684,6 +10701,27 @@ doMigrate(void *opaque) +@@ -10666,6 +10683,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.9.0/tools/virsh.pod +Index: libvirt-5.10.0/tools/virsh.pod =================================================================== ---- libvirt-5.9.0.orig/tools/virsh.pod -+++ libvirt-5.9.0/tools/virsh.pod -@@ -2254,6 +2254,14 @@ I<--parallel-connections>. Parallel conn +--- libvirt-5.10.0.orig/tools/virsh.pod ++++ libvirt-5.10.0/tools/virsh.pod +@@ -2265,6 +2265,14 @@ I<--parallel-connections>. Parallel conn network link between the source and the target and thus speeding up the migration. ++++++ libxl-support-block-script.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:00.987756808 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:00.987756808 +0100 @@ -7,11 +7,11 @@ For more details, see bsc#954872 and FATE#319810 -Index: libvirt-5.9.0/src/libxl/libxl_conf.c +Index: libvirt-5.10.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-5.9.0.orig/src/libxl/libxl_conf.c -+++ libvirt-5.9.0/src/libxl/libxl_conf.c -@@ -880,6 +880,25 @@ libxlDiskSetDiscard(libxl_device_disk *x +--- libvirt-5.10.0.orig/src/libxl/libxl_conf.c ++++ libvirt-5.10.0/src/libxl/libxl_conf.c +@@ -869,6 +869,25 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } @@ -37,7 +37,7 @@ static void libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode) { -@@ -1020,6 +1039,7 @@ libxlMakeNetworkDiskSrc(virStorageSource +@@ -1009,6 +1028,7 @@ libxlMakeNetworkDiskSrc(virStorageSource int libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) { @@ -45,7 +45,7 @@ const char *driver = virDomainDiskGetDriver(l_disk); int format = virDomainDiskGetFormat(l_disk); int actual_type = virStorageSourceGetActualType(l_disk->src); -@@ -1035,7 +1055,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1024,7 +1044,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) return -1; } else { @@ -54,7 +54,7 @@ } x_disk->vdev = g_strdup(l_disk->dst); -@@ -1146,6 +1166,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1135,6 +1155,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) return -1; libxlDiskSetCacheMode(x_disk, l_disk->cachemode); ++++++ lxc-wait-after-eth-del.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:00.995756807 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:00.999756806 +0100 @@ -13,10 +13,10 @@ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-5.9.0/src/lxc/lxc_controller.c +Index: libvirt-5.10.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-5.9.0.orig/src/lxc/lxc_controller.c -+++ libvirt-5.9.0/src/lxc/lxc_controller.c +--- libvirt-5.10.0.orig/src/lxc/lxc_controller.c ++++ libvirt-5.10.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 -@@ -2010,6 +2011,7 @@ static int virLXCControllerDeleteInterfa +@@ -1985,6 +1986,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; } @@ -33,10 +33,10 @@ return ret; } -Index: libvirt-5.9.0/src/lxc/lxc_driver.c +Index: libvirt-5.10.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-5.9.0.orig/src/lxc/lxc_driver.c -+++ libvirt-5.9.0/src/lxc/lxc_driver.c +--- libvirt-5.10.0.orig/src/lxc/lxc_driver.c ++++ libvirt-5.10.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" -@@ -3919,6 +3920,7 @@ lxcDomainAttachDeviceNetLive(virConnectP +@@ -3918,6 +3919,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: -@@ -4363,6 +4365,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -4359,6 +4361,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.9.0/src/lxc/lxc_process.c +Index: libvirt-5.10.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-5.9.0.orig/src/lxc/lxc_process.c -+++ libvirt-5.9.0/src/lxc/lxc_process.c +--- libvirt-5.10.0.orig/src/lxc/lxc_process.c ++++ libvirt-5.10.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 -@@ -232,6 +233,7 @@ static void virLXCProcessCleanup(virLXCD +@@ -231,6 +232,7 @@ static void virLXCProcessCleanup(virLXCD VIR_WARN("Unable to release network device '%s'", NULLSTR(iface->ifname)); } } ++++++ network-don-t-use-dhcp-authoritative-on-static-netwo.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:01.007756805 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:01.007756805 +0100 @@ -17,11 +17,11 @@ tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-5.9.0/src/network/bridge_driver.c +Index: libvirt-5.10.0/src/network/bridge_driver.c =================================================================== ---- libvirt-5.9.0.orig/src/network/bridge_driver.c -+++ libvirt-5.9.0/src/network/bridge_driver.c -@@ -1512,7 +1512,14 @@ networkDnsmasqConfContents(virNetworkObj +--- libvirt-5.10.0.orig/src/network/bridge_driver.c ++++ libvirt-5.10.0/src/network/bridge_driver.c +@@ -1499,7 +1499,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.9.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-5.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-5.9.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-5.9.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-5.10.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-5.10.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.gqP8Dk/_old 2019-12-07 15:20:01.015756805 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:01.019756803 +0100 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-5.9.0/src/util/virarch.c +Index: libvirt-5.10.0/src/util/virarch.c =================================================================== ---- libvirt-5.9.0.orig/src/util/virarch.c -+++ libvirt-5.9.0/src/util/virarch.c +--- libvirt-5.10.0.orig/src/util/virarch.c ++++ libvirt-5.10.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.gqP8Dk/_old 2019-12-07 15:20:01.027756802 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:01.027756802 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-5.9.0/src/security/apparmor/libvirt-qemu +Index: libvirt-5.10.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-5.9.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-5.9.0/src/security/apparmor/libvirt-qemu +--- libvirt-5.10.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-5.10.0/src/security/apparmor/libvirt-qemu @@ -228,3 +228,6 @@ # required for sasl GSSAPI plugin /etc/gss/mech.d/ r, ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:01.039756801 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:01.039756801 +0100 @@ -8,11 +8,11 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-5.9.0/src/libxl/xen_common.c +Index: libvirt-5.10.0/src/libxl/xen_common.c =================================================================== ---- libvirt-5.9.0.orig/src/libxl/xen_common.c -+++ libvirt-5.9.0/src/libxl/xen_common.c -@@ -383,12 +383,19 @@ xenParsePCI(char *entry) +--- libvirt-5.10.0.orig/src/libxl/xen_common.c ++++ libvirt-5.10.0/src/libxl/xen_common.c +@@ -381,12 +381,19 @@ xenParsePCI(char *entry) int busID; int slotID; int funcID; @@ -32,7 +32,7 @@ if (!(nextkey = strchr(key, ':'))) return NULL; if (virStrncpy(domain, key, (nextkey - key), sizeof(domain)) < 0) { -@@ -433,10 +440,30 @@ xenParsePCI(char *entry) +@@ -431,10 +438,30 @@ xenParsePCI(char *entry) if (virStrToLong_i(func, NULL, 16, &funcID) < 0) return NULL; ++++++ suse-apparmor-libnl-paths.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:01.047756800 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:01.051756799 +0100 @@ -8,10 +8,10 @@ to squelch a denial when starting confined domains. Found while investigating bsc#1058847 -Index: libvirt-5.9.0/src/security/apparmor/libvirt-qemu +Index: libvirt-5.10.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-5.9.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-5.9.0/src/security/apparmor/libvirt-qemu +--- libvirt-5.10.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-5.10.0/src/security/apparmor/libvirt-qemu @@ -63,6 +63,7 @@ #/dev/fb* rw, @@ -20,10 +20,10 @@ @{HOME}/.pulse-cookie rwk, owner /root/.pulse-cookie rwk, owner /root/.pulse/ rw, -Index: libvirt-5.9.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-5.10.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-5.9.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper -+++ libvirt-5.9.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-5.10.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper ++++ libvirt-5.10.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper @@ -20,7 +20,7 @@ profile virt-aa-helper /usr/{lib,lib64}/ # Used when internally running another command (namely apparmor_parser) @{PROC}/@{pid}/fd/ r, ++++++ suse-libvirt-guests-service.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:01.055756799 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:01.059756798 +0100 @@ -1,9 +1,9 @@ Adjust libvirt-guests service to conform to SUSE standards -Index: libvirt-5.9.0/tools/libvirt-guests.sh.in +Index: libvirt-5.10.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-5.9.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-5.9.0/tools/libvirt-guests.sh.in +--- libvirt-5.10.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-5.10.0/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. @@ -163,10 +163,10 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-5.9.0/tools/libvirt-guests.sysconf +Index: libvirt-5.10.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-5.9.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-5.9.0/tools/libvirt-guests.sysconf +--- libvirt-5.10.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-5.10.0/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + ++++++ suse-libvirtd-disable-tls.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:01.067756797 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:01.067756797 +0100 @@ -3,11 +3,11 @@ 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.9.0/src/remote/remote_daemon_config.c +Index: libvirt-5.10.0/src/remote/remote_daemon_config.c =================================================================== ---- libvirt-5.9.0.orig/src/remote/remote_daemon_config.c -+++ libvirt-5.9.0/src/remote/remote_daemon_config.c -@@ -107,7 +107,7 @@ daemonConfigNew(bool privileged G_GNUC_U +--- libvirt-5.10.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-5.10.0/src/remote/remote_daemon_config.c +@@ -104,7 +104,7 @@ daemonConfigNew(bool privileged G_GNUC_U #ifdef WITH_IP # ifdef LIBVIRTD @@ -16,10 +16,10 @@ # else /* ! LIBVIRTD */ data->listen_tls = 0; /* Always honoured, --listen doesn't exist. */ # endif /* ! LIBVIRTD */ -Index: libvirt-5.9.0/src/remote/libvirtd.conf.in +Index: libvirt-5.10.0/src/remote/libvirtd.conf.in =================================================================== ---- libvirt-5.9.0.orig/src/remote/libvirtd.conf.in -+++ libvirt-5.9.0/src/remote/libvirtd.conf.in +--- libvirt-5.10.0.orig/src/remote/libvirtd.conf.in ++++ libvirt-5.10.0/src/remote/libvirtd.conf.in @@ -17,8 +17,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. ++++++ suse-libvirtd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:01.075756796 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:01.079756795 +0100 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-5.9.0/src/remote/libvirtd.sysconf +Index: libvirt-5.10.0/src/remote/libvirtd.sysconf =================================================================== ---- libvirt-5.9.0.orig/src/remote/libvirtd.sysconf -+++ libvirt-5.9.0/src/remote/libvirtd.sysconf +--- libvirt-5.10.0.orig/src/remote/libvirtd.sysconf ++++ libvirt-5.10.0/src/remote/libvirtd.sysconf @@ -1,5 +1,9 @@ +## Path: System/Virtualization/libvirt # Customizations for the libvirtd.service systemd unit ++++++ suse-libxl-disable-autoballoon.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:01.083756795 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:01.083756795 +0100 @@ -6,10 +6,10 @@ by default. It can only be enabled with the 'autoballoon' setting in libxl.conf. See jsc#SLE-3059 for more details. -Index: libvirt-5.9.0/src/libxl/libxl.conf +Index: libvirt-5.10.0/src/libxl/libxl.conf =================================================================== ---- libvirt-5.9.0.orig/src/libxl/libxl.conf -+++ libvirt-5.9.0/src/libxl/libxl.conf +--- libvirt-5.10.0.orig/src/libxl/libxl.conf ++++ libvirt-5.10.0/src/libxl/libxl.conf @@ -4,12 +4,11 @@ # Enable autoballooning of domain0 @@ -27,19 +27,11 @@ # In order to prevent accidentally starting two domains that -Index: libvirt-5.9.0/src/libxl/libxl_conf.c +Index: libvirt-5.10.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-5.9.0.orig/src/libxl/libxl_conf.c -+++ libvirt-5.9.0/src/libxl/libxl_conf.c -@@ -22,7 +22,6 @@ - - #include <config.h> - --#include <regex.h> - #include <libxl.h> - #include <sys/types.h> - #include <sys/socket.h> -@@ -1715,14 +1714,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa +--- libvirt-5.10.0.orig/src/libxl/libxl_conf.c ++++ libvirt-5.10.0/src/libxl/libxl_conf.c +@@ -1704,15 +1704,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa /* * Get domain0 autoballoon configuration. Honor user-specified * setting in libxl.conf first. If not specified, autoballooning @@ -51,29 +43,24 @@ libxlGetAutoballoonConf(libxlDriverConfigPtr cfg, virConfPtr conf) { -- regex_t regex; +- g_autoptr(GRegex) regex = NULL; +- g_autoptr(GError) err = NULL; int res; res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon); -@@ -1731,21 +1728,8 @@ libxlGetAutoballoonConf(libxlDriverConfi +@@ -1721,15 +1718,8 @@ libxlGetAutoballoonConf(libxlDriverConfi else if (res == 1) return 0; -- if ((res = regcomp(®ex, -- "(^| )dom0_mem=((|min:|max:)[0-9]+[bBkKmMgG]?,?)+($| )", -- REG_NOSUB | REG_EXTENDED)) != 0) { -- char error[100]; -- regerror(res, ®ex, error, sizeof(error)); +- regex = g_regex_new("(^| )dom0_mem=((|min:|max:)[0-9]+[bBkKmMgG]?,?)+($| )", +- 0, 0, &err); +- if (!regex) { - virReportError(VIR_ERR_INTERNAL_ERROR, -- _("Failed to compile regex %s"), -- error); -- +- _("Failed to compile regex %s"), err->message); - return -1; - } - -- res = regexec(®ex, cfg->verInfo->commandline, 0, NULL, 0); -- regfree(®ex); -- cfg->autoballoon = res == REG_NOMATCH; +- cfg->autoballoon = !g_regex_match(regex, cfg->verInfo->commandline, 0, NULL); + /* make it explicit */ + cfg->autoballoon = 0; return 0; ++++++ suse-ovmf-paths.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:01.091756793 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:01.091756793 +0100 @@ -1,10 +1,10 @@ Adjust paths of OVMF firmwares on SUSE distros -Index: libvirt-5.9.0/src/qemu/qemu.conf +Index: libvirt-5.10.0/src/qemu/qemu.conf =================================================================== ---- libvirt-5.9.0.orig/src/qemu/qemu.conf -+++ libvirt-5.9.0/src/qemu/qemu.conf -@@ -796,10 +796,9 @@ +--- libvirt-5.10.0.orig/src/qemu/qemu.conf ++++ libvirt-5.10.0/src/qemu/qemu.conf +@@ -799,10 +799,9 @@ # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # follows this scheme. #nvram = [ @@ -18,11 +18,11 @@ #] # The backend to use for handling stdout/stderr output from -Index: libvirt-5.9.0/src/qemu/qemu_conf.c +Index: libvirt-5.10.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-5.9.0.orig/src/qemu/qemu_conf.c -+++ libvirt-5.9.0/src/qemu/qemu_conf.c -@@ -96,10 +96,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver +--- libvirt-5.10.0.orig/src/qemu/qemu_conf.c ++++ libvirt-5.10.0/src/qemu/qemu_conf.c +@@ -97,10 +97,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver #ifndef DEFAULT_LOADER_NVRAM # define DEFAULT_LOADER_NVRAM \ @@ -36,11 +36,11 @@ #endif -Index: libvirt-5.9.0/src/security/virt-aa-helper.c +Index: libvirt-5.10.0/src/security/virt-aa-helper.c =================================================================== ---- libvirt-5.9.0.orig/src/security/virt-aa-helper.c -+++ libvirt-5.9.0/src/security/virt-aa-helper.c -@@ -510,7 +510,8 @@ valid_path(const char *path, const bool +--- libvirt-5.10.0.orig/src/security/virt-aa-helper.c ++++ libvirt-5.10.0/src/security/virt-aa-helper.c +@@ -490,7 +490,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.gqP8Dk/_old 2019-12-07 15:20:01.099756792 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:01.103756792 +0100 @@ -7,10 +7,10 @@ etc.), but for now they are all lumped together in this single patch. -Index: libvirt-5.9.0/src/qemu/qemu.conf +Index: libvirt-5.10.0/src/qemu/qemu.conf =================================================================== ---- libvirt-5.9.0.orig/src/qemu/qemu.conf -+++ libvirt-5.9.0/src/qemu/qemu.conf +--- libvirt-5.10.0.orig/src/qemu/qemu.conf ++++ libvirt-5.10.0/src/qemu/qemu.conf @@ -420,10 +420,19 @@ # isolation, but it cannot appear in a list of drivers. # @@ -60,11 +60,11 @@ # #lock_manager = "lockd" -Index: libvirt-5.9.0/src/qemu/qemu_conf.c +Index: libvirt-5.10.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-5.9.0.orig/src/qemu/qemu_conf.c -+++ libvirt-5.9.0/src/qemu/qemu_conf.c -@@ -271,7 +271,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf +--- libvirt-5.10.0.orig/src/qemu/qemu_conf.c ++++ libvirt-5.10.0/src/qemu/qemu_conf.c +@@ -236,7 +236,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf cfg->clearEmulatorCapabilities = true; ++++++ suse-virtlockd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:01.119756790 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:01.119756790 +0100 @@ -1,9 +1,9 @@ Adjust virtlockd sysconfig file to conform to SUSE standards -Index: libvirt-5.9.0/src/locking/virtlockd.sysconf +Index: libvirt-5.10.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-5.9.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-5.9.0/src/locking/virtlockd.sysconf +--- libvirt-5.10.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-5.10.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + ++++++ suse-virtlogd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:01.127756789 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:01.127756789 +0100 @@ -1,9 +1,9 @@ Adjust virtlogd sysconfig file to conform to SUSE standards -Index: libvirt-5.9.0/src/logging/virtlogd.sysconf +Index: libvirt-5.10.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-5.9.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-5.9.0/src/logging/virtlogd.sysconf +--- libvirt-5.10.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-5.10.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + ++++++ virt-create-rootfs.patch ++++++ --- /var/tmp/diff_new_pack.gqP8Dk/_old 2019-12-07 15:20:01.135756788 +0100 +++ /var/tmp/diff_new_pack.gqP8Dk/_new 2019-12-07 15:20:01.135756788 +0100 @@ -1,8 +1,8 @@ -Index: libvirt-5.8.0/tools/Makefile.am +Index: libvirt-5.10.0/tools/Makefile.am =================================================================== ---- libvirt-5.8.0.orig/tools/Makefile.am -+++ libvirt-5.8.0/tools/Makefile.am -@@ -59,6 +59,7 @@ PODFILES = \ +--- libvirt-5.10.0.orig/tools/Makefile.am ++++ libvirt-5.10.0/tools/Makefile.am +@@ -60,6 +60,7 @@ PODFILES = \ virt-sanlock-cleanup.pod \ virt-xml-validate.pod \ virsh.pod \ @@ -28,10 +28,10 @@ virt-xml-validate: virt-xml-validate.in Makefile $(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|g' \ -e 's|[@]VERSION@|$(VERSION)|g' \ -Index: libvirt-5.8.0/tools/virt-create-rootfs +Index: libvirt-5.10.0/tools/virt-create-rootfs =================================================================== --- /dev/null -+++ libvirt-5.8.0/tools/virt-create-rootfs ++++ libvirt-5.10.0/tools/virt-create-rootfs @@ -0,0 +1,214 @@ +#!/bin/sh +set -e @@ -247,10 +247,10 @@ + echo "pts/0" >> "$ROOT/etc/securetty" + chroot "$ROOT" /usr/bin/passwd +fi -Index: libvirt-5.8.0/tools/virt-create-rootfs.pod +Index: libvirt-5.10.0/tools/virt-create-rootfs.pod =================================================================== --- /dev/null -+++ libvirt-5.8.0/tools/virt-create-rootfs.pod ++++ libvirt-5.10.0/tools/virt-create-rootfs.pod @@ -0,0 +1,77 @@ +=head1 NAME +
