Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2020-01-23 16:07:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Thu Jan 23 16:07:39 2020 rev:297 rq:764823 version:6.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2020-01-13 22:19:00.142448041 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new.26092/libvirt.changes 2020-01-23 16:07:40.959520946 +0100 @@ -1,0 +2,13 @@ +Wed Jan 15 19:27:10 UTC 2020 - James Fehlig <jfeh...@suse.com> + +- Update to libvirt 6.0.0 + - jsc#SLE-6997, jsc#SLE-6998 + - Many incremental improvements and bug fixes, see + https://libvirt.org/news.html + - Dropped patches: + 0a65cba4-news-fix.patch 07aaced4-Add-TAA-No.patch, + f411b7ef6-Add-TSX-CTRL.patch, 50d7465f-qemu-firmware1.patch, + 57f9067c-qemu-firmware2.patch, 7c5264d2-qemu-firmware3.patch, + 8e1804f9-qemu-firmware4.patch, 8fcee478-qemu-firmware5.patch + +------------------------------------------------------------------- Old: ---- 07aaced4-Add-TAA-No.patch 0a65cba4-news-fix.patch 50d7465f-qemu-firmware1.patch 57f9067c-qemu-firmware2.patch 7c5264d2-qemu-firmware3.patch 8e1804f9-qemu-firmware4.patch 8fcee478-qemu-firmware5.patch f411b7ef6-Add-TSX-CTRL.patch libvirt-5.10.0.tar.xz libvirt-5.10.0.tar.xz.asc New: ---- libvirt-6.0.0.tar.xz libvirt-6.0.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.P4jzfC/_old 2020-01-23 16:07:43.507522456 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.511522458 +0100 @@ -1,7 +1,7 @@ # # spec file for package libvirt # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,7 +33,6 @@ # Then the hypervisor drivers that run outside libvirtd, in libvirt.so %define with_openvz 0%{!?_without_openvz:1} %define with_vmware 0%{!?_without_vmware:1} -%define with_phyp 0%{!?_without_phyp:0} %define with_esx 0%{!?_without_esx:1} %define with_hyperv 0%{!?_without_hyperv:0} @@ -98,11 +97,6 @@ %define with_hyperv 0 %endif -# Enable phyp driver for IBM Power systems -%ifarch ppc64 - %define with_phyp 1 -%endif - # Enable firewalld support in newer code bases %if 0%{?suse_version} >= 1500 %define with_firewalld 1 @@ -191,7 +185,7 @@ Name: libvirt URL: http://libvirt.org/ -Version: 5.10.0 +Version: 6.0.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later @@ -250,6 +244,7 @@ BuildRequires: libxslt BuildRequires: perl BuildRequires: python3 +BuildRequires: python3-docutils BuildRequires: readline-devel # rpcgen is needed since we have a patch touching remote_protocol.x BuildRequires: rpcgen @@ -343,14 +338,6 @@ Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: 0a65cba4-news-fix.patch -Patch1: 07aaced4-Add-TAA-No.patch -Patch2: f411b7ef6-Add-TSX-CTRL.patch -Patch3: 50d7465f-qemu-firmware1.patch -Patch4: 57f9067c-qemu-firmware2.patch -Patch5: 7c5264d2-qemu-firmware3.patch -Patch6: 8e1804f9-qemu-firmware4.patch -Patch7: 8fcee478-qemu-firmware5.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -884,14 +871,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 %patch100 -p1 %patch101 -p1 %patch150 -p1 @@ -940,11 +919,6 @@ %else %define arg_vbox --without-vbox %endif -%if %{with_phyp} - %define arg_phyp --with-phyp -%else - %define arg_phyp --without-phyp -%endif %if %{with_esx} %define arg_esx --with-esx %else @@ -1061,7 +1035,6 @@ --with-sasl \ --with-polkit \ --with-libvirtd \ - %{?arg_phyp} \ %{?arg_esx} \ %{?arg_hyperv} \ %{?arg_vmware} \ @@ -1855,7 +1828,6 @@ %{_sbindir}/rclibvirt-guests %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.* @@ -1869,8 +1841,9 @@ %{_datadir}/%{name}/schemas/basictypes.rng %{_datadir}/%{name}/schemas/capability.rng -%{_datadir}/%{name}/schemas/domain.rng %{_datadir}/%{name}/schemas/cputypes.rng +%{_datadir}/%{name}/schemas/domain.rng +%{_datadir}/libvirt/schemas/domainbackup.rng %{_datadir}/%{name}/schemas/domaincaps.rng %{_datadir}/%{name}/schemas/domaincheckpoint.rng %{_datadir}/%{name}/schemas/domaincommon.rng @@ -1920,7 +1893,8 @@ %{_datadir}/%{name}/api/libvirt-lxc-api.xml %files doc -# Website +%doc AUTHORS NEWS README README.md +%license COPYING COPYING.LESSER %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/*.png %doc %{_docdir}/%{name}/*.html @@ -1932,6 +1906,7 @@ %doc %{_docdir}/%{name}/logos %doc %{_docdir}/%{name}/fonts %doc %{_docdir}/%{name}/js +%doc %{_docdir}/%{name}/manpages %dir %{_datadir}/doc/%{name} %dir %{_datadir}/doc/%{name}/examples %doc %{_datadir}/doc/%{name}/examples/* ++++++ 0001-Extract-stats-functions-from-the-qemu-driver.patch ++++++ --- /var/tmp/diff_new_pack.P4jzfC/_old 2020-01-23 16:07:43.543522478 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.543522478 +0100 @@ -18,10 +18,10 @@ create mode 100644 src/conf/domain_stats.c create mode 100644 src/conf/domain_stats.h -Index: libvirt-5.10.0/src/conf/domain_stats.c +Index: libvirt-6.0.0/src/conf/domain_stats.c =================================================================== --- /dev/null -+++ libvirt-5.10.0/src/conf/domain_stats.c ++++ libvirt-6.0.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.10.0/src/conf/domain_stats.h +Index: libvirt-6.0.0/src/conf/domain_stats.h =================================================================== --- /dev/null -+++ libvirt-5.10.0/src/conf/domain_stats.h ++++ libvirt-6.0.0/src/conf/domain_stats.h @@ -0,0 +1,62 @@ +/* + * domain_stats.h: domain stats extraction helpers @@ -209,11 +209,11 @@ + virTypedParamListPtr params); + +#endif /* __DOMAIN_STATS_H */ -Index: libvirt-5.10.0/src/libvirt_private.syms +Index: libvirt-6.0.0/src/libvirt_private.syms =================================================================== ---- libvirt-5.10.0.orig/src/libvirt_private.syms -+++ libvirt-5.10.0/src/libvirt_private.syms -@@ -699,6 +699,9 @@ virDomainConfNWFilterInstantiate; +--- libvirt-6.0.0.orig/src/libvirt_private.syms ++++ libvirt-6.0.0/src/libvirt_private.syms +@@ -714,6 +714,9 @@ virDomainConfNWFilterInstantiate; virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -223,7 +223,7 @@ # conf/interface_conf.h virInterfaceDefFormat; -@@ -1671,6 +1674,7 @@ virCgroupGetMemoryUsage; +@@ -1691,6 +1694,7 @@ virCgroupGetMemoryUsage; virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; @@ -231,11 +231,11 @@ virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKillPainfully; -Index: libvirt-5.10.0/src/qemu/qemu_driver.c +Index: libvirt-6.0.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-5.10.0.orig/src/qemu/qemu_driver.c -+++ libvirt-5.10.0/src/qemu/qemu_driver.c -@@ -66,6 +66,7 @@ +--- libvirt-6.0.0.orig/src/qemu/qemu_driver.c ++++ libvirt-6.0.0/src/qemu/qemu_driver.c +@@ -67,6 +67,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" -@@ -20388,13 +20389,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr +@@ -20584,13 +20585,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr virTypedParamListPtr params, unsigned int privflags G_GNUC_UNUSED) { @@ -258,7 +258,7 @@ } -@@ -20595,17 +20590,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj +@@ -20893,17 +20888,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj if (!priv->cgroup) return 0; @@ -277,7 +277,7 @@ } -@@ -20762,76 +20747,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr +@@ -21071,76 +21056,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr return ret; } @@ -355,10 +355,10 @@ /* refresh information by opening images on the disk */ static int -Index: libvirt-5.10.0/src/util/vircgroup.c +Index: libvirt-6.0.0/src/util/vircgroup.c =================================================================== ---- libvirt-5.10.0.orig/src/util/vircgroup.c -+++ libvirt-5.10.0/src/util/vircgroup.c +--- libvirt-6.0.0.orig/src/util/vircgroup.c ++++ libvirt-6.0.0/src/util/vircgroup.c @@ -2773,6 +2773,31 @@ virCgroupControllerAvailable(int control return ret; } @@ -406,10 +406,10 @@ int virCgroupNewPartition(const char *path G_GNUC_UNUSED, bool create G_GNUC_UNUSED, -Index: libvirt-5.10.0/src/util/vircgroup.h +Index: libvirt-6.0.0/src/util/vircgroup.h =================================================================== ---- libvirt-5.10.0.orig/src/util/vircgroup.h -+++ libvirt-5.10.0/src/util/vircgroup.h +--- libvirt-6.0.0.orig/src/util/vircgroup.h ++++ libvirt-6.0.0/src/util/vircgroup.h @@ -24,6 +24,7 @@ #include "virutil.h" #include "virbitmap.h" @@ -425,11 +425,11 @@ + +int virCgroupGetStatsCpu(virCgroupPtr cgroup, + virTypedParamListPtr params); -Index: libvirt-5.10.0/src/conf/Makefile.inc.am +Index: libvirt-6.0.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 = \ +--- libvirt-6.0.0.orig/src/conf/Makefile.inc.am ++++ libvirt-6.0.0/src/conf/Makefile.inc.am +@@ -28,6 +28,8 @@ DOMAIN_CONF_SOURCES = \ conf/domain_audit.h \ conf/domain_nwfilter.c \ conf/domain_nwfilter.h \ ++++++ 0001-libxl-add-support-for-BlockResize-API.patch ++++++ --- /var/tmp/diff_new_pack.P4jzfC/_old 2020-01-23 16:07:43.551522482 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.551522482 +0100 @@ -19,11 +19,11 @@ src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) -Index: libvirt-5.10.0/src/libxl/libxl_driver.c +Index: libvirt-6.0.0/src/libxl/libxl_driver.c =================================================================== ---- 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, +--- libvirt-6.0.0.orig/src/libxl/libxl_driver.c ++++ libvirt-6.0.0/src/libxl/libxl_driver.c +@@ -5275,6 +5275,96 @@ libxlDomainMemoryStats(virDomainPtr dom, #undef LIBXL_SET_MEMSTAT @@ -120,7 +120,7 @@ static int libxlDomainGetJobInfo(virDomainPtr dom, virDomainJobInfoPtr info) -@@ -6718,6 +6808,7 @@ static virHypervisorDriver libxlHypervis +@@ -6693,6 +6783,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.P4jzfC/_old 2020-01-23 16:07:43.559522487 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.559522487 +0100 @@ -9,10 +9,10 @@ src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) -Index: libvirt-5.10.0/src/lxc/lxc_driver.c +Index: libvirt-6.0.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 +--- libvirt-6.0.0.orig/src/lxc/lxc_driver.c ++++ libvirt-6.0.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 -@@ -5382,6 +5383,135 @@ lxcDomainHasManagedSaveImage(virDomainPt +@@ -5351,6 +5352,135 @@ lxcDomainHasManagedSaveImage(virDomainPt return ret; } @@ -157,7 +157,7 @@ /* Function Tables */ static virHypervisorDriver lxcHypervisorDriver = { -@@ -5477,6 +5607,7 @@ static virHypervisorDriver lxcHypervisor +@@ -5446,6 +5576,7 @@ static virHypervisorDriver lxcHypervisor .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */ .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */ ++++++ libvirt-5.10.0.tar.xz -> libvirt-6.0.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-5.10.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new.26092/libvirt-6.0.0.tar.xz differ: char 15, line 1 ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.P4jzfC/_old 2020-01-23 16:07:43.591522506 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.595522509 +0100 @@ -2,10 +2,10 @@ From: <r...@suse.de> -Index: libvirt-5.10.0/src/cpu_map/ppc64_POWER8.xml +Index: libvirt-6.0.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 +--- libvirt-6.0.0.orig/src/cpu_map/ppc64_POWER8.xml ++++ libvirt-6.0.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.P4jzfC/_old 2020-01-23 16:07:43.615522520 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.615522520 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-5.10.0/configure.ac +Index: libvirt-6.0.0/configure.ac =================================================================== ---- libvirt-5.10.0.orig/configure.ac -+++ libvirt-5.10.0/configure.ac +--- libvirt-6.0.0.orig/configure.ac ++++ libvirt-6.0.0/configure.ac @@ -285,6 +285,7 @@ LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_MACVTAP @@ -18,7 +18,7 @@ LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER -@@ -1015,6 +1017,7 @@ LIBVIRT_RESULT_LIBXL +@@ -1013,6 +1015,7 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_LIBXML LIBVIRT_RESULT_MACVTAP LIBVIRT_RESULT_NETCF @@ -26,11 +26,11 @@ LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL -Index: libvirt-5.10.0/tools/virsh.c +Index: libvirt-6.0.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_ +--- libvirt-6.0.0.orig/tools/virsh.c ++++ libvirt-6.0.0/tools/virsh.c +@@ -553,6 +553,8 @@ virshShowVersion(vshControl *ctl G_GNUC_ vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); @@ -39,10 +39,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-5.10.0/src/interface/interface_backend_netcf.c +Index: libvirt-6.0.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 +--- libvirt-6.0.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-6.0.0/src/interface/interface_backend_netcf.c @@ -21,7 +21,12 @@ #include <config.h> @@ -95,7 +95,7 @@ static void virNetcfDriverStateDispose(void *obj) -@@ -120,6 +156,10 @@ netcfStateInitialize(bool privileged, +@@ -119,6 +155,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", -@@ -1114,6 +1154,7 @@ static int netcfInterfaceIsActive(virInt +@@ -1113,6 +1153,7 @@ static int netcfInterfaceIsActive(virInt return ret; } @@ -114,7 +114,7 @@ static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags) { int ret; -@@ -1188,6 +1229,7 @@ static int netcfInterfaceChangeRollback( +@@ -1187,6 +1228,7 @@ static int netcfInterfaceChangeRollback( virObjectUnlock(driver); return ret; } @@ -122,7 +122,7 @@ static virInterfaceDriver interfaceDriver = { .name = INTERFACE_DRIVER_NAME, -@@ -1204,9 +1246,11 @@ static virInterfaceDriver interfaceDrive +@@ -1203,9 +1245,11 @@ static virInterfaceDriver interfaceDrive .interfaceCreate = netcfInterfaceCreate, /* 0.7.0 */ .interfaceDestroy = netcfInterfaceDestroy, /* 0.7.0 */ .interfaceIsActive = netcfInterfaceIsActive, /* 0.7.3 */ @@ -134,7 +134,7 @@ }; -@@ -1237,6 +1281,19 @@ static virStateDriver interfaceStateDriv +@@ -1236,6 +1280,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.10.0/src/interface/interface_driver.c +Index: libvirt-6.0.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 +--- libvirt-6.0.0.orig/src/interface/interface_driver.c ++++ libvirt-6.0.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.10.0/m4/virt-netcontrol.m4 +Index: libvirt-6.0.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-5.10.0/m4/virt-netcontrol.m4 ++++ libvirt-6.0.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.10.0/src/interface/Makefile.inc.am +Index: libvirt-6.0.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 +--- libvirt-6.0.0.orig/src/interface/Makefile.inc.am ++++ libvirt-6.0.0/src/interface/Makefile.inc.am @@ -6,6 +6,7 @@ INTERFACE_DRIVER_SOURCES = \ $(NULL) ++++++ libxl-dom-reset.patch ++++++ --- /var/tmp/diff_new_pack.P4jzfC/_old 2020-01-23 16:07:43.651522541 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.651522541 +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.10.0/src/libxl/libxl_driver.c +Index: libvirt-6.0.0/src/libxl/libxl_driver.c =================================================================== ---- 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 +--- libvirt-6.0.0.orig/src/libxl/libxl_driver.c ++++ libvirt-6.0.0/src/libxl/libxl_driver.c +@@ -1361,6 +1361,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } static int @@ -74,7 +74,7 @@ libxlDomainDestroyFlags(virDomainPtr dom, unsigned int flags) { -@@ -6593,6 +6648,7 @@ static virHypervisorDriver libxlHypervis +@@ -6568,6 +6623,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.P4jzfC/_old 2020-01-23 16:07:43.659522546 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.659522546 +0100 @@ -3,11 +3,11 @@ src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-5.10.0/src/libxl/libxl_conf.c +Index: libvirt-6.0.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-5.10.0.orig/src/libxl/libxl_conf.c -+++ libvirt-5.10.0/src/libxl/libxl_conf.c -@@ -868,6 +868,30 @@ libxlDiskSetDiscard(libxl_device_disk *x +--- libvirt-6.0.0.orig/src/libxl/libxl_conf.c ++++ libvirt-6.0.0/src/libxl/libxl_conf.c +@@ -867,6 +867,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } @@ -38,7 +38,7 @@ static char * libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src, const char *username, -@@ -1109,6 +1133,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1108,6 +1132,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.P4jzfC/_old 2020-01-23 16:07:43.667522551 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.667522551 +0100 @@ -16,13 +16,13 @@ tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-5.10.0/include/libvirt/libvirt-domain.h +Index: libvirt-6.0.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 { +--- libvirt-6.0.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-6.0.0/include/libvirt/libvirt-domain.h +@@ -1065,6 +1065,31 @@ typedef enum { */ - # define VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS "parallel.connections" + # define VIR_MIGRATE_PARAM_TLS_DESTINATION "tls.destination" +/** + * VIR_MIGRATE_PARAM_SUSE_MAX_ITERS: @@ -52,11 +52,11 @@ /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-5.10.0/src/libxl/libxl_driver.c +Index: libvirt-6.0.0/src/libxl/libxl_driver.c =================================================================== ---- 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 +--- libvirt-6.0.0.orig/src/libxl/libxl_driver.c ++++ libvirt-6.0.0/src/libxl/libxl_driver.c +@@ -6133,6 +6133,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(); -@@ -6155,6 +6158,18 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6149,6 +6152,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) -@@ -6169,11 +6184,11 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6163,11 +6178,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.10.0/src/libxl/libxl_migration.c +Index: libvirt-6.0.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 +--- libvirt-6.0.0.orig/src/libxl/libxl_migration.c ++++ libvirt-6.0.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")); -@@ -903,7 +924,7 @@ struct libxlTunnelControl { +@@ -902,7 +923,7 @@ struct libxlTunnelControl { static int libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver, virDomainObjPtr vm, @@ -154,7 +154,7 @@ virStreamPtr st, struct libxlTunnelControl **tnl) { -@@ -936,7 +957,7 @@ libxlMigrationSrcStartTunnel(libxlDriver +@@ -935,7 +956,7 @@ libxlMigrationSrcStartTunnel(libxlDriver virObjectUnlock(vm); /* Send data to pipe */ @@ -163,7 +163,7 @@ virObjectLock(vm); out: -@@ -972,7 +993,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -971,7 +992,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; -@@ -1017,11 +1038,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1016,11 +1037,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 -@@ -1035,7 +1056,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1034,7 +1055,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) { -@@ -1050,11 +1071,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1049,11 +1070,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP } VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); @@ -210,7 +210,7 @@ if (ret < 0) { notify_source = false; virErrorPreserveLast(&orig_err); -@@ -1089,7 +1110,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1088,7 +1109,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", -@@ -1097,7 +1118,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1096,7 +1117,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP } cleanup: @@ -228,7 +228,7 @@ libxlMigrationSrcStopTunnel(tc); virObjectUnref(st); } -@@ -1141,7 +1162,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD +@@ -1140,7 +1161,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; -@@ -1176,7 +1197,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD +@@ -1175,7 +1196,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD } ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri, @@ -246,7 +246,7 @@ if (ret < 0) { /* -@@ -1203,7 +1224,7 @@ libxlDomainMigrationSrcPerform(libxlDriv +@@ -1202,7 +1223,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; -@@ -1239,7 +1260,7 @@ libxlDomainMigrationSrcPerform(libxlDriv +@@ -1238,7 +1259,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.10.0/src/libxl/libxl_migration.h +Index: libvirt-6.0.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 +--- libvirt-6.0.0.orig/src/libxl/libxl_migration.h ++++ libvirt-6.0.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,13 +312,13 @@ virDomainPtr libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-5.10.0/tools/virsh-domain.c +Index: libvirt-6.0.0/tools/virsh-domain.c =================================================================== ---- 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") +--- libvirt-6.0.0.orig/tools/virsh-domain.c ++++ libvirt-6.0.0/tools/virsh-domain.c +@@ -10589,6 +10589,22 @@ static const vshCmdOptDef opts_migrate[] + .type = VSH_OT_STRING, + .help = N_("override the destination host name used for TLS verification") }, + {.name = "max_iters", + .type = VSH_OT_INT, @@ -339,7 +339,7 @@ {.name = NULL} }; -@@ -10547,6 +10563,7 @@ doMigrate(void *opaque) +@@ -10612,6 +10628,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -347,7 +347,7 @@ sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); -@@ -10666,6 +10683,27 @@ doMigrate(void *opaque) +@@ -10731,6 +10748,27 @@ doMigrate(void *opaque) goto save_error; } @@ -375,22 +375,31 @@ if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { -Index: libvirt-5.10.0/tools/virsh.pod +Index: libvirt-6.0.0/docs/manpages/virsh.rst =================================================================== ---- libvirt-5.10.0.orig/tools/virsh.pod -+++ libvirt-5.10.0/tools/virsh.pod -@@ -2265,6 +2265,14 @@ I<--parallel-connections>. Parallel conn +--- libvirt-6.0.0.orig/docs/manpages/virsh.rst ++++ libvirt-6.0.0/docs/manpages/virsh.rst +@@ -3088,6 +3088,8 @@ migrate + [--postcopy-bandwidth bandwidth] + [--parallel [--parallel-connections connections]] + [--bandwidth bandwidth] [--tls-destination hostname] ++ [--max_iters num] [--max_factor num] [--min_remaining num] ++ [--abort_if_busy] + + Migrate domain to another host. Add *--live* for live migration; <--p2p> + for peer-2-peer migration; *--direct* for direct migration; or *--tunnelled* +@@ -3193,6 +3195,14 @@ parallel connections. The number of such network link between the source and the target and thus speeding up the migration. -+SUSE-specific options for Xen: I<--max_iters> B<num> allows specifying the maximum -+number of iterations before final suspend. Default is 30. I<--max_factor> B<num> ++SUSE-specific options for Xen: *--max_iters* allows specifying the maximum ++number of iterations before final suspend. Default is 30. *--max_factor* +allows specifying the maximum amount of memory to transfer before final suspend. -+Default is (3*VM memory size). I<--min_remaining> B<num> allows specifying the -+number of dirty pages before final suspend. Default is 50. I<--abort_if_busy> -+can be used to abort the migration instead of doing the final suspend for VMs with -+busy workloads. ++Default is (3*VM memory size). *--min_remaining* allows specifying the ++number of dirty pages before final suspend. Default is 50. *--abort_if_busy* ++can be used to abort the migration instead of doing the final suspend for VMs ++with busy workloads. + Running migration can be canceled by interrupting virsh (usually using - C<Ctrl-C>) or by B<domjobabort> command sent from another virsh instance. + ``Ctrl-C``) or by ``domjobabort`` command sent from another virsh instance. ++++++ libxl-support-block-script.patch ++++++ --- /var/tmp/diff_new_pack.P4jzfC/_old 2020-01-23 16:07:43.675522556 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.675522556 +0100 @@ -7,11 +7,11 @@ For more details, see bsc#954872 and FATE#319810 -Index: libvirt-5.10.0/src/libxl/libxl_conf.c +Index: libvirt-6.0.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-5.10.0.orig/src/libxl/libxl_conf.c -+++ libvirt-5.10.0/src/libxl/libxl_conf.c -@@ -868,6 +868,25 @@ libxlDiskSetDiscard(libxl_device_disk *x +--- libvirt-6.0.0.orig/src/libxl/libxl_conf.c ++++ libvirt-6.0.0/src/libxl/libxl_conf.c +@@ -867,6 +867,22 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } @@ -21,23 +21,20 @@ + if (disk_spec == NULL) + return 0; + -+ if (STRPREFIX(disk_spec, "dmmd:")) { -+ if (VIR_STRDUP(x_disk->script, "block-dmmd") < 0) -+ return -1; -+ } else if (STRPREFIX(disk_spec, "drbd:")) { -+ if (VIR_STRDUP(x_disk->script, "block-drbd") < 0) -+ return -1; -+ } else if (STRPREFIX(disk_spec, "npiv:")) { -+ if (VIR_STRDUP(x_disk->script, "block-npiv") < 0) -+ return -1; -+ } ++ if (STRPREFIX(disk_spec, "dmmd:")) ++ x_disk->script = g_strdup("block-dmmd"); ++ else if (STRPREFIX(disk_spec, "drbd:")) ++ x_disk->script = g_strdup("block-drbd"); ++ else if (STRPREFIX(disk_spec, "npiv:")) ++ x_disk->script = g_strdup("block-npiv"); ++ + return 0; +} + static void libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode) { -@@ -1008,6 +1027,7 @@ libxlMakeNetworkDiskSrc(virStorageSource +@@ -1007,6 +1023,7 @@ libxlMakeNetworkDiskSrc(virStorageSource int libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) { @@ -45,7 +42,7 @@ const char *driver = virDomainDiskGetDriver(l_disk); int format = virDomainDiskGetFormat(l_disk); int actual_type = virStorageSourceGetActualType(l_disk->src); -@@ -1023,7 +1043,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1022,7 +1039,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) return -1; } else { @@ -54,7 +51,7 @@ } x_disk->vdev = g_strdup(l_disk->dst); -@@ -1134,6 +1154,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1133,6 +1150,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.P4jzfC/_old 2020-01-23 16:07:43.683522561 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.683522561 +0100 @@ -13,10 +13,10 @@ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-5.10.0/src/lxc/lxc_controller.c +Index: libvirt-6.0.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 +--- libvirt-6.0.0.orig/src/lxc/lxc_controller.c ++++ libvirt-6.0.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 -@@ -1985,6 +1986,7 @@ static int virLXCControllerDeleteInterfa +@@ -2009,6 +2010,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; } @@ -33,10 +33,10 @@ return ret; } -Index: libvirt-5.10.0/src/lxc/lxc_driver.c +Index: libvirt-6.0.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 +--- libvirt-6.0.0.orig/src/lxc/lxc_driver.c ++++ libvirt-6.0.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" -@@ -3918,6 +3919,7 @@ lxcDomainAttachDeviceNetLive(virConnectP +@@ -3903,6 +3904,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive 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: -@@ -4359,6 +4361,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -4343,6 +4345,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.10.0/src/lxc/lxc_process.c +Index: libvirt-6.0.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 +--- libvirt-6.0.0.orig/src/lxc/lxc_process.c ++++ libvirt-6.0.0/src/lxc/lxc_process.c @@ -51,6 +51,7 @@ #include "viratomic.h" #include "virprocess.h" ++++++ network-don-t-use-dhcp-authoritative-on-static-netwo.patch ++++++ --- /var/tmp/diff_new_pack.P4jzfC/_old 2020-01-23 16:07:43.691522565 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.691522565 +0100 @@ -17,11 +17,11 @@ tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-5.10.0/src/network/bridge_driver.c +Index: libvirt-6.0.0/src/network/bridge_driver.c =================================================================== ---- 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 +--- libvirt-6.0.0.orig/src/network/bridge_driver.c ++++ libvirt-6.0.0/src/network/bridge_driver.c +@@ -1497,7 +1497,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.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-6.0.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 +--- libvirt-6.0.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-6.0.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.P4jzfC/_old 2020-01-23 16:07:43.699522570 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.703522572 +0100 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-5.10.0/src/util/virarch.c +Index: libvirt-6.0.0/src/util/virarch.c =================================================================== ---- libvirt-5.10.0.orig/src/util/virarch.c -+++ libvirt-5.10.0/src/util/virarch.c +--- libvirt-6.0.0.orig/src/util/virarch.c ++++ libvirt-6.0.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.P4jzfC/_old 2020-01-23 16:07:43.707522575 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.711522577 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-5.10.0/src/security/apparmor/libvirt-qemu +Index: libvirt-6.0.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 +--- libvirt-6.0.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-6.0.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.P4jzfC/_old 2020-01-23 16:07:43.715522580 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.719522582 +0100 @@ -8,10 +8,10 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-5.10.0/src/libxl/xen_common.c +Index: libvirt-6.0.0/src/libxl/xen_common.c =================================================================== ---- libvirt-5.10.0.orig/src/libxl/xen_common.c -+++ libvirt-5.10.0/src/libxl/xen_common.c +--- libvirt-6.0.0.orig/src/libxl/xen_common.c ++++ libvirt-6.0.0/src/libxl/xen_common.c @@ -381,12 +381,19 @@ xenParsePCI(char *entry) int busID; int slotID; ++++++ suse-apparmor-libnl-paths.patch ++++++ --- /var/tmp/diff_new_pack.P4jzfC/_old 2020-01-23 16:07:43.723522584 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.723522584 +0100 @@ -8,10 +8,10 @@ to squelch a denial when starting confined domains. Found while investigating bsc#1058847 -Index: libvirt-5.10.0/src/security/apparmor/libvirt-qemu +Index: libvirt-6.0.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 +--- libvirt-6.0.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-6.0.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.10.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-6.0.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 +--- libvirt-6.0.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper ++++ libvirt-6.0.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.P4jzfC/_old 2020-01-23 16:07:43.731522589 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.731522589 +0100 @@ -1,9 +1,9 @@ Adjust libvirt-guests service to conform to SUSE standards -Index: libvirt-5.10.0/tools/libvirt-guests.sh.in +Index: libvirt-6.0.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 +--- libvirt-6.0.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-6.0.0/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. @@ -22,7 +22,7 @@ # Source gettext library. # Make sure this file is recognized as having translations: _("dummy") . "@bindir@"/gettext.sh -@@ -45,9 +44,11 @@ test -f "$sysconfdir"/sysconfig/libvirt- +@@ -43,9 +42,11 @@ test -f "$sysconfdir"/sysconfig/libvirt- . "$sysconfdir"/sysconfig/libvirt-guests LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests @@ -37,7 +37,7 @@ # retval COMMAND ARGUMENTS... # run command with arguments and convert non-zero return value to 1 and set -@@ -55,7 +56,7 @@ RETVAL=0 +@@ -53,7 +54,7 @@ RETVAL=0 retval() { "$@" if [ $? -ne 0 ]; then @@ -46,7 +46,7 @@ return 1 else return 0 -@@ -84,6 +85,26 @@ run_virsh_c() { +@@ -82,6 +83,26 @@ run_virsh_c() { ( export LC_ALL=C; run_virsh "$@" ) } @@ -73,7 +73,7 @@ # test_connect URI # check if URI is reachable test_connect() -@@ -117,7 +138,7 @@ list_guests() { +@@ -108,7 +129,7 @@ list_guests() { list=$(run_virsh_c "$uri" list --uuid $persistent) if [ $? -ne 0 ]; then @@ -82,7 +82,7 @@ return 1 fi -@@ -143,7 +164,7 @@ guest_is_on() { +@@ -134,7 +155,7 @@ guest_is_on() { guest_running=false id=$(run_virsh "$uri" domid "$uuid") if [ $? -ne 0 ]; then @@ -91,7 +91,7 @@ return 1 fi -@@ -193,6 +214,13 @@ start() { +@@ -184,6 +205,13 @@ start() { test_connect "$uri" || continue @@ -105,7 +105,7 @@ eval_gettext "Resuming guests on \$uri URI..."; echo for guest in $list; do name=$(guest_name "$uri" "$guest") -@@ -414,7 +442,7 @@ shutdown_guests_parallel() +@@ -405,7 +433,7 @@ shutdown_guests_parallel() timeout=$(($timeout - 1)) if [ $timeout -le 0 ]; then eval_gettext "Timeout expired while shutting down domains"; echo @@ -114,7 +114,7 @@ return fi else -@@ -443,7 +471,7 @@ stop() { +@@ -434,7 +462,7 @@ stop() { if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" echo @@ -123,7 +123,7 @@ return fi fi -@@ -491,14 +519,14 @@ stop() { +@@ -482,14 +510,14 @@ stop() { if [ $? -ne 0 ]; then eval_gettext "Failed to list persistent guests on \$uri" echo @@ -140,7 +140,7 @@ set +f return fi -@@ -557,14 +585,13 @@ gueststatus() { +@@ -548,14 +576,13 @@ gueststatus() { rh_status() { if [ -f "$LISTFILE" ]; then gettext "stopped, with saved guests"; echo @@ -157,16 +157,16 @@ fi fi } -@@ -609,4 +636,4 @@ case "$1" in +@@ -600,4 +627,4 @@ case "$1" in usage ;; esac -exit $RETVAL +rc_exit -Index: libvirt-5.10.0/tools/libvirt-guests.sysconf +Index: libvirt-6.0.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-5.10.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-5.10.0/tools/libvirt-guests.sysconf +--- libvirt-6.0.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-6.0.0/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + ++++++ suse-libvirtd-disable-tls.patch ++++++ --- /var/tmp/diff_new_pack.P4jzfC/_old 2020-01-23 16:07:43.739522594 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.739522594 +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.10.0/src/remote/remote_daemon_config.c +Index: libvirt-6.0.0/src/remote/remote_daemon_config.c =================================================================== ---- 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 +--- libvirt-6.0.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-6.0.0/src/remote/remote_daemon_config.c +@@ -99,7 +99,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.10.0/src/remote/libvirtd.conf.in +Index: libvirt-6.0.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 +--- libvirt-6.0.0.orig/src/remote/libvirtd.conf.in ++++ libvirt-6.0.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.P4jzfC/_old 2020-01-23 16:07:43.747522599 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.747522599 +0100 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-5.10.0/src/remote/libvirtd.sysconf +Index: libvirt-6.0.0/src/remote/libvirtd.sysconf =================================================================== ---- libvirt-5.10.0.orig/src/remote/libvirtd.sysconf -+++ libvirt-5.10.0/src/remote/libvirtd.sysconf +--- libvirt-6.0.0.orig/src/remote/libvirtd.sysconf ++++ libvirt-6.0.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.P4jzfC/_old 2020-01-23 16:07:43.755522603 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.755522603 +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.10.0/src/libxl/libxl.conf +Index: libvirt-6.0.0/src/libxl/libxl.conf =================================================================== ---- libvirt-5.10.0.orig/src/libxl/libxl.conf -+++ libvirt-5.10.0/src/libxl/libxl.conf +--- libvirt-6.0.0.orig/src/libxl/libxl.conf ++++ libvirt-6.0.0/src/libxl/libxl.conf @@ -4,12 +4,11 @@ # Enable autoballooning of domain0 @@ -27,11 +27,11 @@ # In order to prevent accidentally starting two domains that -Index: libvirt-5.10.0/src/libxl/libxl_conf.c +Index: libvirt-6.0.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-5.10.0.orig/src/libxl/libxl_conf.c -+++ libvirt-5.10.0/src/libxl/libxl_conf.c -@@ -1703,15 +1703,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa +--- libvirt-6.0.0.orig/src/libxl/libxl_conf.c ++++ libvirt-6.0.0/src/libxl/libxl_conf.c +@@ -1699,15 +1699,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa /* * Get domain0 autoballoon configuration. Honor user-specified * setting in libxl.conf first. If not specified, autoballooning @@ -48,7 +48,7 @@ int res; res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon); -@@ -1720,15 +1717,8 @@ libxlGetAutoballoonConf(libxlDriverConfi +@@ -1716,15 +1713,8 @@ libxlGetAutoballoonConf(libxlDriverConfi else if (res == 1) return 0; ++++++ suse-ovmf-paths.patch ++++++ --- /var/tmp/diff_new_pack.P4jzfC/_old 2020-01-23 16:07:43.763522608 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.763522608 +0100 @@ -1,10 +1,10 @@ Adjust paths of OVMF firmwares on SUSE distros -Index: libvirt-5.10.0/src/qemu/qemu.conf +Index: libvirt-6.0.0/src/qemu/qemu.conf =================================================================== ---- libvirt-5.10.0.orig/src/qemu/qemu.conf -+++ libvirt-5.10.0/src/qemu/qemu.conf -@@ -799,10 +799,9 @@ +--- libvirt-6.0.0.orig/src/qemu/qemu.conf ++++ libvirt-6.0.0/src/qemu/qemu.conf +@@ -788,10 +788,9 @@ # 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.10.0/src/qemu/qemu_conf.c +Index: libvirt-6.0.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-5.10.0.orig/src/qemu/qemu_conf.c -+++ libvirt-5.10.0/src/qemu/qemu_conf.c +--- libvirt-6.0.0.orig/src/qemu/qemu_conf.c ++++ libvirt-6.0.0/src/qemu/qemu_conf.c @@ -97,10 +97,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver #ifndef DEFAULT_LOADER_NVRAM @@ -36,11 +36,11 @@ #endif -Index: libvirt-5.10.0/src/security/virt-aa-helper.c +Index: libvirt-6.0.0/src/security/virt-aa-helper.c =================================================================== ---- 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 +--- libvirt-6.0.0.orig/src/security/virt-aa-helper.c ++++ libvirt-6.0.0/src/security/virt-aa-helper.c +@@ -489,7 +489,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.P4jzfC/_old 2020-01-23 16:07:43.771522613 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.775522615 +0100 @@ -7,10 +7,10 @@ etc.), but for now they are all lumped together in this single patch. -Index: libvirt-5.10.0/src/qemu/qemu.conf +Index: libvirt-6.0.0/src/qemu/qemu.conf =================================================================== ---- libvirt-5.10.0.orig/src/qemu/qemu.conf -+++ libvirt-5.10.0/src/qemu/qemu.conf +--- libvirt-6.0.0.orig/src/qemu/qemu.conf ++++ libvirt-6.0.0/src/qemu/qemu.conf @@ -420,10 +420,19 @@ # isolation, but it cannot appear in a list of drivers. # @@ -32,7 +32,7 @@ #security_default_confined = 1 # If set to non-zero, then attempts to create unconfined -@@ -670,11 +679,22 @@ +@@ -659,11 +668,22 @@ #relaxed_acs_check = 1 @@ -60,13 +60,13 @@ # #lock_manager = "lockd" -Index: libvirt-5.10.0/src/qemu/qemu_conf.c +Index: libvirt-6.0.0/src/qemu/qemu_conf.c =================================================================== ---- 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; +--- libvirt-6.0.0.orig/src/qemu/qemu_conf.c ++++ libvirt-6.0.0/src/qemu/qemu_conf.c +@@ -229,7 +229,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf + cfg->prHelperName = g_strdup(QEMU_PR_HELPER); + cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER); - cfg->securityDefaultConfined = true; + cfg->securityDefaultConfined = false; ++++++ suse-virtlockd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.P4jzfC/_old 2020-01-23 16:07:43.787522622 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.787522622 +0100 @@ -1,9 +1,9 @@ Adjust virtlockd sysconfig file to conform to SUSE standards -Index: libvirt-5.10.0/src/locking/virtlockd.sysconf +Index: libvirt-6.0.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-5.10.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-5.10.0/src/locking/virtlockd.sysconf +--- libvirt-6.0.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-6.0.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + ++++++ suse-virtlogd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.P4jzfC/_old 2020-01-23 16:07:43.795522627 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.795522627 +0100 @@ -1,9 +1,9 @@ Adjust virtlogd sysconfig file to conform to SUSE standards -Index: libvirt-5.10.0/src/logging/virtlogd.sysconf +Index: libvirt-6.0.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-5.10.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-5.10.0/src/logging/virtlogd.sysconf +--- libvirt-6.0.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-6.0.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + ++++++ virt-create-rootfs.patch ++++++ --- /var/tmp/diff_new_pack.P4jzfC/_old 2020-01-23 16:07:43.799522629 +0100 +++ /var/tmp/diff_new_pack.P4jzfC/_new 2020-01-23 16:07:43.803522632 +0100 @@ -1,16 +1,8 @@ -Index: libvirt-4.0.0/tools/Makefile.am +Index: libvirt-6.0.0/tools/Makefile.am =================================================================== ---- libvirt-4.0.0.orig/tools/Makefile.am -+++ libvirt-4.0.0/tools/Makefile.am -@@ -52,6 +52,7 @@ PODFILES = \ - virt-sanlock-cleanup.pod \ - virt-xml-validate.pod \ - virsh.pod \ -+ virt-create-rootfs.pod \ - $(NULL) - - MANINFILES = \ -@@ -86,7 +87,7 @@ MAINTAINERCLEANFILES = +--- libvirt-6.0.0.orig/tools/Makefile.am ++++ libvirt-6.0.0/tools/Makefile.am +@@ -71,7 +71,7 @@ MAINTAINERCLEANFILES = confdir = $(sysconfdir)/libvirt conf_DATA = @@ -18,20 +10,11 @@ +bin_SCRIPTS = virt-xml-validate virt-pki-validate virt-create-rootfs bin_PROGRAMS = virsh virt-admin libexec_SCRIPTS = libvirt-guests.sh - man1_MANS = \ -@@ -112,6 +113,8 @@ bin_PROGRAMS += virt-host-validate - man1_MANS += virt-host-validate.1 - endif WITH_HOST_VALIDATE -+man1_MANS += virt-create-rootfs.1 -+ - 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-4.0.0/tools/virt-create-rootfs +Index: libvirt-6.0.0/tools/virt-create-rootfs =================================================================== --- /dev/null -+++ libvirt-4.0.0/tools/virt-create-rootfs ++++ libvirt-6.0.0/tools/virt-create-rootfs @@ -0,0 +1,231 @@ +#!/bin/sh +set -e @@ -264,41 +247,66 @@ + echo "pts/0" >> "$ROOT/etc/securetty" + chroot "$ROOT" /usr/bin/passwd +fi -Index: libvirt-4.0.0/tools/virt-create-rootfs.pod +Index: libvirt-6.0.0/docs/Makefile.am +=================================================================== +--- libvirt-6.0.0.orig/docs/Makefile.am ++++ libvirt-6.0.0/docs/Makefile.am +@@ -209,6 +209,7 @@ manpages1_rst = \ + manpages/virt-xml-validate.rst \ + manpages/virt-admin.rst \ + manpages/virsh.rst \ ++ manpages/virt-create-rootfs.rst \ + $(NULL) + manpages7_rst = \ + $(KEYCODES:%=manpages/virkeycode-%.rst) \ +Index: libvirt-6.0.0/docs/manpages/virt-create-rootfs.rst =================================================================== --- /dev/null -+++ libvirt-4.0.0/tools/virt-create-rootfs.pod -@@ -0,0 +1,73 @@ -+=head1 NAME ++++ libvirt-6.0.0/docs/manpages/virt-create-rootfs.rst +@@ -0,0 +1,88 @@ ++================== ++virt-create-rootfs ++================== ++ ++--------------------------------------------------------- ++A tool to create a root file system for distro containers ++--------------------------------------------------------- + -+virt-create-rootfs - tool to create a root file system for distro containers. ++:Manual section: 1 ++:Manual group: Virtualization Support + -+=head1 SYNOPSIS ++.. contents:: + -+B<virt-create-rootfs> [I<OPTION>] ++SYNOPSIS ++======== + -+=head1 DESCRIPTION + -+The B<virt-create-rootfs> program is a shell script setting up a root file ++``virt-create-rootfs`` [*OPTION*] ++ ++ ++DESCRIPTION ++=========== ++ ++The ``virt-create-rootfs`` program is a shell script setting up a root file +system for a distribution container. + +The basic structure of most virt-create-rootfs usage is: + -+ virt-create-rootfs -r /path/to/root -d distro-name ++ ``virt-create-rootfs`` -r /path/to/root -d distro-name + -+=head1 OPTIONS + -+=over ++OPTIONS ++======= + -+=item B<-h, --help> ++``-h``, ``--help`` + +Display command line help usage then exit. + -+=item B<-r, --root> ++``-r``, ``--root`` + +Set the path where to create the new root file system. + -+=item B<-d, --distro> ++``-d``, ``--distro`` + +Set the name of distribution to use for the root file system. + @@ -306,39 +314,41 @@ +where I<XXX> is the version number. Note that SUSEConnect is required to +handle SLE distributions. + -+=item B<-a, --arch> ++``-a``, ``--arch`` + +Set the target architecture of the root file system to either i586 or x86_64. + -+=item B<-c, --regcode> ++``-c``, ``--regcode`` + +Set the registration code for the product to install in the root file system. +For SLE distributions, use a registration code from SUSE Customer Center. + -+=item B<-u, --url> ++``-u``, ``--url`` + +For SLE distributions, set the registration server to use. +Default: http://scc.suse.com. + -+=item B<--dry-run> ++``--dry-run`` + +Don't do anything, just report what would be done. + -+=back + -+=head1 COPYRIGHT ++COPYRIGHT ++========= + +Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. + -+=head1 LICENSE + -+virt-create-rootfs is distributed under the terms of the GNU LGPL v2+. ++LICENSE ++======= ++ ++``virt-create-rootfs`` is distributed under the terms of the GNU LGPL v2+. +This is free software; see the source for copying conditions. There +is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR +PURPOSE + -+=head1 SEE ALSO + -+L<virsh(1)>, L<http://www.libvirt.org/> ++SEE ALSO ++======== + -+=cut ++virsh(1), `https://libvirt.org/ <https://libvirt.org/>`_
