Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2018-01-25 12:35:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Thu Jan 25 12:35:11 2018 rev:248 rq:568386 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2018-01-16 09:40:57.229668006 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2018-01-25 12:35:22.841116755 +0100 @@ -1,0 +2,20 @@ +Fri Jan 19 16:31:53 UTC 2018 - [email protected] + +- Update to libvirt 4.0.0 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Dropped patches: + 2d07f1f0-fix-storage-crash.patch, + 69ed99c7-dom0-persistent.patch, + 8599aedd-libvirt-guests-dom0-filter.patch, + 0f33025a-virt-aa-helper-handle-more-disk-images.patch, + b475a91b-add-virStringFilterChars-string-utility.patch, + faec1958-lxc-set-hostname-based-on-container-name.patch, + 2089ab21-netserver-close-clients-before-stopping-all-drivers.patch, + fix-virt-aa-helper-profile.patch, + - Patches added to fix upstream bugs: + 72adaf2f-revert-qemu-monitor-error-report.patch, + 71d56a39-nodedev-fix-parse-PCI-address.patch + - CVE-2018-5748, CVE-2017-5715, bsc#1071651, bsc#1076500 + +------------------------------------------------------------------- Old: ---- 0f33025a-virt-aa-helper-handle-more-disk-images.patch 2089ab21-netserver-close-clients-before-stopping-all-drivers.patch 2d07f1f0-fix-storage-crash.patch 69ed99c7-dom0-persistent.patch 8599aedd-libvirt-guests-dom0-filter.patch b475a91b-add-virStringFilterChars-string-utility.patch faec1958-lxc-set-hostname-based-on-container-name.patch fix-virt-aa-helper-profile.patch libvirt-3.10.0.tar.xz libvirt-3.10.0.tar.xz.asc New: ---- 71d56a39-nodedev-fix-parse-PCI-address.patch 72adaf2f-revert-qemu-monitor-error-report.patch libvirt-4.0.0.tar.xz libvirt-4.0.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.044967191 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.048967004 +0100 @@ -53,6 +53,7 @@ %define with_numad 0%{!?_without_numad:0} %define with_firewalld 0%{!?_without_firewalld:0} %define with_libssh 0%{!?_without_libssh:0} +%define with_bash_completion 0%{!?_without_bash_completion:0} # Xen no longer contains xm/xend so disable building the legacy Xen driver %define with_xen 0 @@ -110,6 +111,11 @@ %define with_firewalld 1 %endif +# TODO: On what distros can we support bash-completion? +# SLE12 builds seem fine, but configure fails to detect +# completion support on openSUSE distros. +%define with_bash_completion 0%{!?_without_bash_completion:0} + # rbd enablement is a bit tricky. For x86_64 %ifarch x86_64 # enable on anything newer than 1320, or SLE12 family newer than 120100 @@ -165,7 +171,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 3.10.0 +Version: 4.0.0 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ @@ -218,6 +224,9 @@ # For managing ACLs BuildRequires: libacl-devel %endif +%if %{with_bash_completion} +BuildRequires: bash-completion >= 2.0 +%endif BuildRequires: fdupes BuildRequires: libattr-devel BuildRequires: libgcrypt-devel @@ -309,17 +318,11 @@ Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: 2d07f1f0-fix-storage-crash.patch -Patch1: 69ed99c7-dom0-persistent.patch -Patch2: 8599aedd-libvirt-guests-dom0-filter.patch -Patch3: 0f33025a-virt-aa-helper-handle-more-disk-images.patch -Patch4: b475a91b-add-virStringFilterChars-string-utility.patch -Patch5: faec1958-lxc-set-hostname-based-on-container-name.patch -Patch6: 2089ab21-netserver-close-clients-before-stopping-all-drivers.patch +Patch0: 72adaf2f-revert-qemu-monitor-error-report.patch +Patch1: 71d56a39-nodedev-fix-parse-PCI-address.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch -Patch102: fix-virt-aa-helper-profile.patch # Need to go upstream Patch150: xen-pv-cdrom.patch Patch151: blockcopy-check-dst-identical-device.patch @@ -903,14 +906,8 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %patch100 -p1 %patch101 -p1 -%patch102 -p1 %patch150 -p1 %patch151 -p1 %patch152 -p1 @@ -1390,6 +1387,9 @@ %{_datadir}/systemtap/tapset/libvirt_probes*.stp %{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp %{_datadir}/systemtap/tapset/libvirt_functions.stp +%if %{with_bash_completion} +%{_datadir}/bash-completion/completions/vsh +%endif %dir %{_localstatedir}/lib/libvirt/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/filesystems/ ++++++ 71d56a39-nodedev-fix-parse-PCI-address.patch ++++++ commit 71d56a397925a1bd55d3aee30afdbdcd1a14f9a8 Author: Jim Fehlig <[email protected]> Date: Fri Jan 5 17:10:47 2018 -0700 nodedev: Fix failing to parse PCI address for non-PCI network devices Commit 8708ca01c added virNetDevSwitchdevFeature() to check if a network device has Switchdev capabilities. virNetDevSwitchdevFeature() attempts to retrieve the PCI device associated with the network device, ignoring non-PCI devices. It does so via the following call chain virNetDevSwitchdevFeature()->virNetDevGetPCIDevice()-> virPCIGetDeviceAddressFromSysfsLink() For non-PCI network devices (qeth, Xen vif, etc), virPCIGetDeviceAddressFromSysfsLink() will report an error when virPCIDeviceAddressParse() fails. virPCIDeviceAddressParse() also logs an error. After commit 8708ca01c there are now two errors reported for each non-PCI network device even though the errors are harmless. To avoid the errors, introduce virNetDevIsPCIDevice() and use it in virNetDevGetPCIDevice() before attempting to retrieve the associated PCI device. virNetDevIsPCIDevice() uses the 'subsystem' property of the device to determine if it is PCI. See the sysfs rules in kernel documentation for more details https://www.kernel.org/doc/html/latest/admin-guide/sysfs-rules.html Index: libvirt-4.0.0/src/util/virnetdev.c =================================================================== --- libvirt-4.0.0.orig/src/util/virnetdev.c +++ libvirt-4.0.0/src/util/virnetdev.c @@ -22,6 +22,7 @@ #include <config.h> +#include "dirname.h" #include "virnetdev.h" #include "virnetlink.h" #include "virmacaddr.h" @@ -1147,6 +1148,45 @@ virNetDevSysfsDeviceFile(char **pf_sysfs return 0; } +/** + * Determine if the device path specified in devpath is a PCI Device + * by resolving the 'subsystem'-link in devpath and looking for + * 'pci' in the last component. For more information see the rules + * for accessing sysfs in the kernel docs + * + * https://www.kernel.org/doc/html/latest/admin-guide/sysfs-rules.html + * + * Returns true if devpath's susbsystem is pci, false otherwise. + */ +static bool +virNetDevIsPCIDevice(const char *devpath) +{ + char *subsys_link = NULL; + char *abs_path = NULL; + char *subsys = NULL; + bool ret = false; + + if (virAsprintf(&subsys_link, "%s/subsystem", devpath) < 0) + return false; + + if (!virFileExists(subsys_link)) + goto cleanup; + + if (virFileResolveLink(subsys_link, &abs_path) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to resolve device subsystem symlink %s"), + subsys_link); + goto cleanup; + } + + subsys = last_component(abs_path); + ret = STRPREFIX(subsys, "pci"); + + cleanup: + VIR_FREE(subsys_link); + VIR_FREE(abs_path); + return ret; +} static virPCIDevicePtr virNetDevGetPCIDevice(const char *devName) @@ -1158,6 +1198,9 @@ virNetDevGetPCIDevice(const char *devNam if (virNetDevSysfsFile(&vfSysfsDevicePath, devName, "device") < 0) goto cleanup; + if (!virNetDevIsPCIDevice(vfSysfsDevicePath)) + goto cleanup; + vfPCIAddr = virPCIGetDeviceAddressFromSysfsLink(vfSysfsDevicePath); if (!vfPCIAddr) goto cleanup; ++++++ 72adaf2f-revert-qemu-monitor-error-report.patch ++++++ commit 72adaf2f10509c3682f2c65ffad4176e00e5a2fb Author: Michal Privoznik <[email protected]> Date: Fri Jan 19 13:53:57 2018 +0100 Revert "qemu: monitor: do not report error on shutdown" https://bugzilla.redhat.com/show_bug.cgi?id=1536461 This reverts commit aeda1b8c56dc58b0a413acc61bbea938b40499e1. Problem is that we need mon->lastError to be set because it's used all over the place. Also, there's nothing wrong with reporting error if one occurred. I mean, if there's a thread executing an API and which currently is talking on monitor it definitely wants the error reported. Signed-off-by: Michal Privoznik <[email protected]> Index: libvirt-4.0.0/src/qemu/qemu_monitor.c =================================================================== --- libvirt-4.0.0.orig/src/qemu/qemu_monitor.c +++ libvirt-4.0.0/src/qemu/qemu_monitor.c @@ -78,7 +78,6 @@ struct _qemuMonitor { * < 0: an error occurred during the registration of @fd */ int watch; int hasSendFD; - int willhangup; virDomainObjPtr vm; @@ -716,10 +715,8 @@ qemuMonitorIO(int watch, int fd, int eve if (events & VIR_EVENT_HANDLE_HANGUP) { hangup = true; if (!error) { - if (!mon->willhangup) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("End of file from qemu monitor")); - } + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("End of file from qemu monitor")); eof = true; events &= ~VIR_EVENT_HANDLE_HANGUP; } @@ -758,7 +755,7 @@ qemuMonitorIO(int watch, int fd, int eve if (mon->lastError.code != VIR_ERR_OK) { /* Already have an error, so clear any new error */ virResetLastError(); - } else if (!mon->willhangup) { + } else { virErrorPtr err = virGetLastError(); if (!err) virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1352,7 +1349,6 @@ qemuMonitorEmitShutdown(qemuMonitorPtr m { int ret = -1; VIR_DEBUG("mon=%p guest=%u", mon, guest); - mon->willhangup = 1; QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm, guest); return ret; ++++++ apparmor-no-mount.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.140962709 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.140962709 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-3.10.0/examples/apparmor/libvirt-lxc +Index: libvirt-4.0.0/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-3.10.0.orig/examples/apparmor/libvirt-lxc -+++ libvirt-3.10.0/examples/apparmor/libvirt-lxc +--- libvirt-4.0.0.orig/examples/apparmor/libvirt-lxc ++++ libvirt-4.0.0/examples/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include <abstractions/base> ++++++ blockcopy-check-dst-identical-device.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.160961776 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.164961589 +0100 @@ -11,11 +11,11 @@ src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: libvirt-3.10.0/src/qemu/qemu_driver.c +Index: libvirt-4.0.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-3.10.0.orig/src/qemu/qemu_driver.c -+++ libvirt-3.10.0/src/qemu/qemu_driver.c -@@ -17145,6 +17145,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-4.0.0.orig/src/qemu/qemu_driver.c ++++ libvirt-4.0.0/src/qemu/qemu_driver.c +@@ -17159,6 +17159,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt goto endjob; } ++++++ libvirt-3.10.0.tar.xz -> libvirt-4.0.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-3.10.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-4.0.0.tar.xz differ: char 15, line 1 ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.204959721 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.204959721 +0100 @@ -2,11 +2,11 @@ From: <[email protected]> -Index: libvirt-3.10.0/src/cpu/cpu_map.xml +Index: libvirt-4.0.0/src/cpu/cpu_map.xml =================================================================== ---- libvirt-3.10.0.orig/src/cpu/cpu_map.xml -+++ libvirt-3.10.0/src/cpu/cpu_map.xml -@@ -1724,6 +1724,8 @@ +--- libvirt-4.0.0.orig/src/cpu/cpu_map.xml ++++ libvirt-4.0.0/src/cpu/cpu_map.xml +@@ -2346,6 +2346,8 @@ <pvr value='0x004b0000' mask='0xffff0000'/> <pvr value='0x004c0000' mask='0xffff0000'/> <pvr value='0x004d0000' mask='0xffff0000'/> ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.252957481 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.252957481 +0100 @@ -1,8 +1,8 @@ -Index: libvirt-3.10.0/configure.ac +Index: libvirt-4.0.0/configure.ac =================================================================== ---- libvirt-3.10.0.orig/configure.ac -+++ libvirt-3.10.0/configure.ac -@@ -256,6 +256,7 @@ LIBVIRT_ARG_LIBSSH +--- libvirt-4.0.0.orig/configure.ac ++++ libvirt-4.0.0/configure.ac +@@ -257,6 +257,7 @@ LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_MACVTAP LIBVIRT_ARG_NETCF @@ -10,7 +10,7 @@ LIBVIRT_ARG_NSS LIBVIRT_ARG_NUMACTL LIBVIRT_ARG_OPENWSMAN -@@ -296,6 +297,7 @@ LIBVIRT_CHECK_LIBSSH +@@ -298,6 +299,7 @@ LIBVIRT_CHECK_LIBSSH LIBVIRT_CHECK_LIBXML LIBVIRT_CHECK_MACVTAP LIBVIRT_CHECK_NETCF @@ -18,7 +18,7 @@ LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_OPENWSMAN -@@ -993,6 +995,7 @@ LIBVIRT_RESULT_LIBXL +@@ -996,6 +998,7 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_LIBXML LIBVIRT_RESULT_MACVTAP LIBVIRT_RESULT_NETCF @@ -26,10 +26,10 @@ LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN -Index: libvirt-3.10.0/src/Makefile.am +Index: libvirt-4.0.0/src/Makefile.am =================================================================== ---- libvirt-3.10.0.orig/src/Makefile.am -+++ libvirt-3.10.0/src/Makefile.am +--- libvirt-4.0.0.orig/src/Makefile.am ++++ libvirt-4.0.0/src/Makefile.am @@ -1038,6 +1038,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c @@ -52,10 +52,10 @@ if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) -Index: libvirt-3.10.0/tools/virsh.c +Index: libvirt-4.0.0/tools/virsh.c =================================================================== ---- libvirt-3.10.0.orig/tools/virsh.c -+++ libvirt-3.10.0/tools/virsh.c +--- libvirt-4.0.0.orig/tools/virsh.c ++++ libvirt-4.0.0/tools/virsh.c @@ -578,6 +578,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -65,10 +65,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-3.10.0/src/interface/interface_backend_netcf.c +Index: libvirt-4.0.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-3.10.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-3.10.0/src/interface/interface_backend_netcf.c +--- libvirt-4.0.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-4.0.0/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include <config.h> @@ -152,10 +152,10 @@ if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) return -1; if (virRegisterStateDriver(&interfaceStateDriver) < 0) -Index: libvirt-3.10.0/src/interface/interface_driver.c +Index: libvirt-4.0.0/src/interface/interface_driver.c =================================================================== ---- libvirt-3.10.0.orig/src/interface/interface_driver.c -+++ libvirt-3.10.0/src/interface/interface_driver.c +--- libvirt-4.0.0.orig/src/interface/interface_driver.c ++++ libvirt-4.0.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -173,10 +173,10 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-3.10.0/m4/virt-netcontrol.m4 +Index: libvirt-4.0.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-3.10.0/m4/virt-netcontrol.m4 ++++ libvirt-4.0.0/m4/virt-netcontrol.m4 @@ -0,0 +1,39 @@ +dnl The libnetcontrol library +dnl ++++++ libxl-dom-reset.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.296955427 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.296955427 +0100 @@ -8,10 +8,10 @@ option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. -Index: libvirt-3.10.0/src/libxl/libxl_driver.c +Index: libvirt-4.0.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-3.10.0.orig/src/libxl/libxl_driver.c -+++ libvirt-3.10.0/src/libxl/libxl_driver.c +--- libvirt-4.0.0.orig/src/libxl/libxl_driver.c ++++ libvirt-4.0.0/src/libxl/libxl_driver.c @@ -1382,6 +1382,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } ++++++ libxl-qemu-emulator-caps.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.308954867 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.308954867 +0100 @@ -8,10 +8,10 @@ See FATE#320638 for details. -Index: libvirt-3.10.0/src/libxl/libxl_capabilities.c +Index: libvirt-4.0.0/src/libxl/libxl_capabilities.c =================================================================== ---- libvirt-3.10.0.orig/src/libxl/libxl_capabilities.c -+++ libvirt-3.10.0/src/libxl/libxl_capabilities.c +--- libvirt-4.0.0.orig/src/libxl/libxl_capabilities.c ++++ libvirt-4.0.0/src/libxl/libxl_capabilities.c @@ -38,6 +38,7 @@ #include "libxl_capabilities.h" #include "cpu/cpu_x86.h" ++++++ libxl-set-cach-mode.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.320954306 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.320954306 +0100 @@ -3,11 +3,11 @@ src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-3.10.0/src/libxl/libxl_conf.c +Index: libvirt-4.0.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-3.10.0.orig/src/libxl/libxl_conf.c -+++ libvirt-3.10.0/src/libxl/libxl_conf.c -@@ -735,6 +735,30 @@ libxlDiskSetDiscard(libxl_device_disk *x +--- libvirt-4.0.0.orig/src/libxl/libxl_conf.c ++++ libvirt-4.0.0/src/libxl/libxl_conf.c +@@ -736,6 +736,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } @@ -38,7 +38,7 @@ static char * libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src, const char *username, -@@ -983,6 +1007,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -984,6 +1008,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.4ewtTg/_old 2018-01-25 12:35:26.332953747 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.332953747 +0100 @@ -16,10 +16,10 @@ tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-3.10.0/include/libvirt/libvirt-domain.h +Index: libvirt-4.0.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-3.10.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-3.10.0/include/libvirt/libvirt-domain.h +--- libvirt-4.0.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-4.0.0/include/libvirt/libvirt-domain.h @@ -1008,6 +1008,31 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment" @@ -52,10 +52,10 @@ /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-3.10.0/src/libxl/libxl_driver.c +Index: libvirt-4.0.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-3.10.0.orig/src/libxl/libxl_driver.c -+++ libvirt-3.10.0/src/libxl/libxl_driver.c +--- libvirt-4.0.0.orig/src/libxl/libxl_driver.c ++++ libvirt-4.0.0/src/libxl/libxl_driver.c @@ -6100,6 +6100,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; @@ -99,10 +99,10 @@ goto cleanup; } -Index: libvirt-3.10.0/src/libxl/libxl_migration.c +Index: libvirt-4.0.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-3.10.0.orig/src/libxl/libxl_migration.c -+++ libvirt-3.10.0/src/libxl/libxl_migration.c +--- libvirt-4.0.0.orig/src/libxl/libxl_migration.c ++++ libvirt-4.0.0/src/libxl/libxl_migration.c @@ -359,18 +359,39 @@ libxlMigrateReceive(virNetSocketPtr sock static int libxlDoMigrateSend(libxlDriverPrivatePtr driver, @@ -263,10 +263,10 @@ virObjectLock(vm); cleanup: -Index: libvirt-3.10.0/src/libxl/libxl_migration.h +Index: libvirt-4.0.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-3.10.0.orig/src/libxl/libxl_migration.h -+++ libvirt-3.10.0/src/libxl/libxl_migration.h +--- libvirt-4.0.0.orig/src/libxl/libxl_migration.h ++++ libvirt-4.0.0/src/libxl/libxl_migration.h @@ -39,6 +39,10 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ @@ -311,11 +311,11 @@ virDomainPtr libxlDomainMigrationFinish(virConnectPtr dconn, -Index: libvirt-3.10.0/tools/virsh-domain.c +Index: libvirt-4.0.0/tools/virsh-domain.c =================================================================== ---- libvirt-3.10.0.orig/tools/virsh-domain.c -+++ libvirt-3.10.0/tools/virsh-domain.c -@@ -10536,6 +10536,22 @@ static const vshCmdOptDef opts_migrate[] +--- libvirt-4.0.0.orig/tools/virsh-domain.c ++++ libvirt-4.0.0/tools/virsh-domain.c +@@ -10540,6 +10540,22 @@ static const vshCmdOptDef opts_migrate[] .type = VSH_OT_BOOL, .help = N_("use TLS for migration") }, @@ -338,7 +338,7 @@ {.name = NULL} }; -@@ -10559,6 +10575,7 @@ doMigrate(void *opaque) +@@ -10563,6 +10579,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -346,7 +346,7 @@ sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); -@@ -10678,6 +10695,27 @@ doMigrate(void *opaque) +@@ -10682,6 +10699,27 @@ doMigrate(void *opaque) goto save_error; } @@ -374,10 +374,10 @@ if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { -Index: libvirt-3.10.0/tools/virsh.pod +Index: libvirt-4.0.0/tools/virsh.pod =================================================================== ---- libvirt-3.10.0.orig/tools/virsh.pod -+++ libvirt-3.10.0/tools/virsh.pod +--- libvirt-4.0.0.orig/tools/virsh.pod ++++ libvirt-4.0.0/tools/virsh.pod @@ -1849,6 +1849,14 @@ Providing I<--tls> causes the migration the migration of the domain. Usage requires proper TLS setup for both source and target. ++++++ libxl-support-block-script.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.348952999 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.352952813 +0100 @@ -7,11 +7,11 @@ For more details, see bsc#954872 and FATE#319810 -Index: libvirt-3.10.0/src/libxl/libxl_conf.c +Index: libvirt-4.0.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-3.10.0.orig/src/libxl/libxl_conf.c -+++ libvirt-3.10.0/src/libxl/libxl_conf.c -@@ -735,6 +735,25 @@ libxlDiskSetDiscard(libxl_device_disk *x +--- libvirt-4.0.0.orig/src/libxl/libxl_conf.c ++++ libvirt-4.0.0/src/libxl/libxl_conf.c +@@ -736,6 +736,25 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } @@ -37,7 +37,7 @@ static void libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode) { -@@ -880,6 +899,7 @@ libxlMakeNetworkDiskSrc(virStorageSource +@@ -881,6 +900,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); -@@ -895,7 +915,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -896,7 +916,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) return -1; } else { @@ -54,7 +54,7 @@ return -1; } -@@ -1008,6 +1028,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1009,6 +1029,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.4ewtTg/_old 2018-01-25 12:35:26.364952253 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.368952066 +0100 @@ -13,10 +13,10 @@ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-3.10.0/src/lxc/lxc_controller.c +Index: libvirt-4.0.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-3.10.0.orig/src/lxc/lxc_controller.c -+++ libvirt-3.10.0/src/lxc/lxc_controller.c +--- libvirt-4.0.0.orig/src/lxc/lxc_controller.c ++++ libvirt-4.0.0/src/lxc/lxc_controller.c @@ -73,6 +73,7 @@ #include "rpc/virnetdaemon.h" #include "virstring.h" @@ -33,10 +33,10 @@ return ret; } -Index: libvirt-3.10.0/src/lxc/lxc_driver.c +Index: libvirt-4.0.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-3.10.0.orig/src/lxc/lxc_driver.c -+++ libvirt-3.10.0/src/lxc/lxc_driver.c +--- libvirt-4.0.0.orig/src/lxc/lxc_driver.c ++++ libvirt-4.0.0/src/lxc/lxc_driver.c @@ -76,6 +76,7 @@ #include "virtime.h" #include "virtypedparam.h" @@ -61,10 +61,10 @@ break; /* It'd be nice to support this, but with macvlan -Index: libvirt-3.10.0/src/lxc/lxc_process.c +Index: libvirt-4.0.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-3.10.0.orig/src/lxc/lxc_process.c -+++ libvirt-3.10.0/src/lxc/lxc_process.c +--- libvirt-4.0.0.orig/src/lxc/lxc_process.c ++++ libvirt-4.0.0/src/lxc/lxc_process.c @@ -52,6 +52,7 @@ #include "viratomic.h" #include "virprocess.h" ++++++ network-don-t-use-dhcp-authoritative-on-static-netwo.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.380951506 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.380951506 +0100 @@ -17,10 +17,10 @@ tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-3.10.0/src/network/bridge_driver.c +Index: libvirt-4.0.0/src/network/bridge_driver.c =================================================================== ---- libvirt-3.10.0.orig/src/network/bridge_driver.c -+++ libvirt-3.10.0/src/network/bridge_driver.c +--- libvirt-4.0.0.orig/src/network/bridge_driver.c ++++ libvirt-4.0.0/src/network/bridge_driver.c @@ -1393,7 +1393,14 @@ networkDnsmasqConfContents(virNetworkObj if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { @@ -37,10 +37,10 @@ } if (ipdef->tftproot) { -Index: libvirt-3.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-4.0.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-3.10.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-3.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-4.0.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-4.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.4ewtTg/_old 2018-01-25 12:35:26.388951132 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.388951132 +0100 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-3.10.0/src/util/virarch.c +Index: libvirt-4.0.0/src/util/virarch.c =================================================================== ---- libvirt-3.10.0.orig/src/util/virarch.c -+++ libvirt-3.10.0/src/util/virarch.c +--- libvirt-4.0.0.orig/src/util/virarch.c ++++ libvirt-4.0.0/src/util/virarch.c @@ -169,6 +169,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_I686; } else if (STREQ(ut.machine, "amd64")) { ++++++ qemu-apparmor-screenshot.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.408950199 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.408950199 +0100 @@ -1,11 +1,11 @@ -Index: libvirt-3.10.0/examples/apparmor/libvirt-qemu +Index: libvirt-4.0.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-3.10.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-3.10.0/examples/apparmor/libvirt-qemu -@@ -191,3 +191,6 @@ - /sys/devices/system/node/ r, - /sys/devices/system/node/node[0-9]*/meminfo r, - /sys/module/vhost/parameters/max_mem_regions r, +--- libvirt-4.0.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-4.0.0/examples/apparmor/libvirt-qemu +@@ -193,3 +193,6 @@ + # silence refusals to open lttng files (see LP: #1432644) + deny /dev/shm/lttng-ust-wait-* r, + deny /run/shm/lttng-ust-wait-* r, + + # Temporary screendump rule -- See bsc#904426 + /var/cache/libvirt/qemu/qemu.screendump.* rw, ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.424949452 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.428949265 +0100 @@ -8,10 +8,10 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-3.10.0/src/xenconfig/xen_common.c +Index: libvirt-4.0.0/src/xenconfig/xen_common.c =================================================================== ---- libvirt-3.10.0.orig/src/xenconfig/xen_common.c -+++ libvirt-3.10.0/src/xenconfig/xen_common.c +--- libvirt-4.0.0.orig/src/xenconfig/xen_common.c ++++ libvirt-4.0.0/src/xenconfig/xen_common.c @@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe { virConfValuePtr list = virConfGetValue(conf, "pci"); @@ -66,10 +66,10 @@ hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; hostdev->source.subsys.u.pci.addr.domain = domainID; hostdev->source.subsys.u.pci.addr.bus = busID; -Index: libvirt-3.10.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.0.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-3.10.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-3.10.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.0.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.0.0/src/xenconfig/xen_sxpr.c @@ -1057,6 +1057,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; ++++++ suse-apparmor-libnl-paths.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.440948705 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.440948705 +0100 @@ -8,10 +8,10 @@ to squelch a denial when starting confined domains. Found while investigating bsc#1058847 -Index: libvirt-3.10.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-4.0.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-3.10.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper -+++ libvirt-3.10.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-4.0.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper ++++ libvirt-4.0.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper @@ -17,7 +17,7 @@ profile virt-aa-helper /usr/{lib,lib64}/ owner @{PROC}/[0-9]*/status r, @{PROC}/filesystems r, @@ -21,10 +21,10 @@ # for hostdev /sys/devices/ r, -Index: libvirt-3.10.0/examples/apparmor/libvirt-qemu +Index: libvirt-4.0.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-3.10.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-3.10.0/examples/apparmor/libvirt-qemu +--- libvirt-4.0.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-4.0.0/examples/apparmor/libvirt-qemu @@ -62,6 +62,7 @@ #/dev/fb* rw, ++++++ suse-apparmor-signal.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.448948332 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.448948332 +0100 @@ -10,17 +10,16 @@ profile="/usr/sbin/libvirtd" pid=18891 comm="libvirtd" requested_mask="send" denied_mask="send" signal=term peer="unconfined" -Index: libvirt-3.10.0/examples/apparmor/usr.sbin.libvirtd +Index: libvirt-4.0.0/examples/apparmor/usr.sbin.libvirtd =================================================================== ---- libvirt-3.10.0.orig/examples/apparmor/usr.sbin.libvirtd -+++ libvirt-3.10.0/examples/apparmor/usr.sbin.libvirtd -@@ -60,6 +60,9 @@ +--- libvirt-4.0.0.orig/examples/apparmor/usr.sbin.libvirtd ++++ libvirt-4.0.0/examples/apparmor/usr.sbin.libvirtd +@@ -63,7 +63,7 @@ signal (send) peer=/usr/sbin/dnsmasq, signal (read, send) peer=libvirt-*, -+ # When confinement is not enforced (security_default_confined = 0), qemu -+ # processes run unconfined, hence 'peer=unconfined' -+ signal send set=(hup,kill,term) peer=unconfined, +- signal (send) set=("kill") peer=unconfined, ++ signal (send) set=("kill", "term", "hup") peer=unconfined, # Very lenient profile for libvirtd since we want to first focus on confining # the guests. Guests will have a very restricted profile. ++++++ suse-libvirt-guests-service.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.460947771 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.464947584 +0100 @@ -1,9 +1,9 @@ Adjust libvirt-guests service to conform to SUSE standards -Index: libvirt-3.10.0/tools/libvirt-guests.init.in +Index: libvirt-4.0.0/tools/libvirt-guests.init.in =================================================================== ---- libvirt-3.10.0.orig/tools/libvirt-guests.init.in -+++ libvirt-3.10.0/tools/libvirt-guests.init.in +--- libvirt-4.0.0.orig/tools/libvirt-guests.init.in ++++ libvirt-4.0.0/tools/libvirt-guests.init.in @@ -4,27 +4,27 @@ # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # @@ -46,10 +46,10 @@ + exec @libexecdir@/libvirt-guests.sh "$@" -Index: libvirt-3.10.0/tools/libvirt-guests.sh.in +Index: libvirt-4.0.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-3.10.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-3.10.0/tools/libvirt-guests.sh.in +--- libvirt-4.0.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-4.0.0/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. @@ -209,10 +209,10 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-3.10.0/tools/libvirt-guests.sysconf +Index: libvirt-4.0.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-3.10.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-3.10.0/tools/libvirt-guests.sysconf +--- libvirt-4.0.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-4.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.4ewtTg/_old 2018-01-25 12:35:26.472947211 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.476947025 +0100 @@ -3,10 +3,10 @@ On SUSE distros, the default is for libvirtd to listen only on the Unix Domain Socket. The libvirt client still provides remote access via a SSH tunnel. -Index: libvirt-3.10.0/daemon/libvirtd.conf +Index: libvirt-4.0.0/daemon/libvirtd.conf =================================================================== ---- libvirt-3.10.0.orig/daemon/libvirtd.conf -+++ libvirt-3.10.0/daemon/libvirtd.conf +--- libvirt-4.0.0.orig/daemon/libvirtd.conf ++++ libvirt-4.0.0/daemon/libvirtd.conf @@ -18,8 +18,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -18,10 +18,10 @@ # Listen for unencrypted TCP connections on the public TCP/IP port. # NB, must pass the --listen flag to the libvirtd process for this to -Index: libvirt-3.10.0/daemon/libvirtd-config.c +Index: libvirt-4.0.0/daemon/libvirtd-config.c =================================================================== ---- libvirt-3.10.0.orig/daemon/libvirtd-config.c -+++ libvirt-3.10.0/daemon/libvirtd-config.c +--- libvirt-4.0.0.orig/daemon/libvirtd-config.c ++++ libvirt-4.0.0/daemon/libvirtd-config.c @@ -110,7 +110,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; @@ -31,10 +31,10 @@ data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-3.10.0/daemon/test_libvirtd.aug.in +Index: libvirt-4.0.0/daemon/test_libvirtd.aug.in =================================================================== ---- libvirt-3.10.0.orig/daemon/test_libvirtd.aug.in -+++ libvirt-3.10.0/daemon/test_libvirtd.aug.in +--- libvirt-4.0.0.orig/daemon/test_libvirtd.aug.in ++++ libvirt-4.0.0/daemon/test_libvirtd.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd = ::CONFIG:: ++++++ suse-libvirtd-service-xen.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.484946651 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.484946651 +0100 @@ -7,10 +7,10 @@ tools. If a user installs libvirt on their SUSE Xen host, then libvirt should be king and override xendomains. See bsc#1015348 -Index: libvirt-3.10.0/daemon/libvirtd.service.in +Index: libvirt-4.0.0/daemon/libvirtd.service.in =================================================================== ---- libvirt-3.10.0.orig/daemon/libvirtd.service.in -+++ libvirt-3.10.0/daemon/libvirtd.service.in +--- libvirt-4.0.0.orig/daemon/libvirtd.service.in ++++ libvirt-4.0.0/daemon/libvirtd.service.in @@ -14,6 +14,8 @@ After=iscsid.service After=apparmor.service After=local-fs.target ++++++ suse-libvirtd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.496946091 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.496946091 +0100 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-3.10.0/daemon/libvirtd.sysconf +Index: libvirt-4.0.0/daemon/libvirtd.sysconf =================================================================== ---- libvirt-3.10.0.orig/daemon/libvirtd.sysconf -+++ libvirt-3.10.0/daemon/libvirtd.sysconf +--- libvirt-4.0.0.orig/daemon/libvirtd.sysconf ++++ libvirt-4.0.0/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ suse-ovmf-paths.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.508945531 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.508945531 +0100 @@ -1,9 +1,9 @@ Adjust paths of OVMF firmwares on SUSE distros -Index: libvirt-3.10.0/src/qemu/qemu.conf +Index: libvirt-4.0.0/src/qemu/qemu.conf =================================================================== ---- libvirt-3.10.0.orig/src/qemu/qemu.conf -+++ libvirt-3.10.0/src/qemu/qemu.conf +--- libvirt-4.0.0.orig/src/qemu/qemu.conf ++++ libvirt-4.0.0/src/qemu/qemu.conf @@ -743,10 +743,9 @@ security_default_confined = 0 # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # follows this scheme. @@ -18,10 +18,10 @@ #] # The backend to use for handling stdout/stderr output from -Index: libvirt-3.10.0/src/qemu/qemu_conf.c +Index: libvirt-4.0.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-3.10.0.orig/src/qemu/qemu_conf.c -+++ libvirt-3.10.0/src/qemu/qemu_conf.c +--- libvirt-4.0.0.orig/src/qemu/qemu_conf.c ++++ libvirt-4.0.0/src/qemu/qemu_conf.c @@ -127,10 +127,9 @@ void qemuDomainCmdlineDefFree(qemuDomain #ifndef DEFAULT_LOADER_NVRAM ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.520944970 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.524944784 +0100 @@ -7,10 +7,10 @@ etc.), but for now they are all lumped together in this single patch. -Index: libvirt-3.10.0/src/qemu/qemu.conf +Index: libvirt-4.0.0/src/qemu/qemu.conf =================================================================== ---- libvirt-3.10.0.orig/src/qemu/qemu.conf -+++ libvirt-3.10.0/src/qemu/qemu.conf +--- libvirt-4.0.0.orig/src/qemu/qemu.conf ++++ libvirt-4.0.0/src/qemu/qemu.conf @@ -380,11 +380,20 @@ # isolation, but it cannot appear in a list of drivers. # ++++++ suse-virtlockd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.548943663 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.548943663 +0100 @@ -1,9 +1,9 @@ Adjust virtlockd sysconfig file to conform to SUSE standards -Index: libvirt-3.10.0/src/locking/virtlockd.sysconf +Index: libvirt-4.0.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-3.10.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-3.10.0/src/locking/virtlockd.sysconf +--- libvirt-4.0.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-4.0.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + ++++++ suse-virtlogd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.560943103 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.560943103 +0100 @@ -1,9 +1,9 @@ Adjust virtlogd sysconfig file to conform to SUSE standards -Index: libvirt-3.10.0/src/logging/virtlogd.sysconf +Index: libvirt-4.0.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-3.10.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-3.10.0/src/logging/virtlogd.sysconf +--- libvirt-4.0.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-4.0.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + ++++++ virt-create-rootfs.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.572942543 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.572942543 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-3.10.0/tools/Makefile.am +Index: libvirt-4.0.0/tools/Makefile.am =================================================================== ---- libvirt-3.10.0.orig/tools/Makefile.am -+++ libvirt-3.10.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 \ @@ -10,7 +10,7 @@ $(NULL) MANINFILES = \ -@@ -85,7 +86,7 @@ MAINTAINERCLEANFILES = +@@ -86,7 +87,7 @@ MAINTAINERCLEANFILES = confdir = $(sysconfdir)/libvirt conf_DATA = @@ -19,7 +19,7 @@ bin_PROGRAMS = virsh virt-admin libexec_SCRIPTS = libvirt-guests.sh man1_MANS = \ -@@ -111,6 +112,8 @@ bin_PROGRAMS += virt-host-validate +@@ -112,6 +113,8 @@ bin_PROGRAMS += virt-host-validate man1_MANS += virt-host-validate.1 endif WITH_HOST_VALIDATE @@ -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-3.10.0/tools/virt-create-rootfs +Index: libvirt-4.0.0/tools/virt-create-rootfs =================================================================== --- /dev/null -+++ libvirt-3.10.0/tools/virt-create-rootfs ++++ libvirt-4.0.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-3.10.0/tools/virt-create-rootfs.pod +Index: libvirt-4.0.0/tools/virt-create-rootfs.pod =================================================================== --- /dev/null -+++ libvirt-3.10.0/tools/virt-create-rootfs.pod ++++ libvirt-4.0.0/tools/virt-create-rootfs.pod @@ -0,0 +1,77 @@ +=head1 NAME + ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.584941983 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.584941983 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-3.10.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.0.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-3.10.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-3.10.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.0.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.0.0/src/xenconfig/xen_sxpr.c @@ -387,7 +387,7 @@ xenParseSxprVifRate(const char *rate, un static int xenParseSxprDisks(virDomainDefPtr def, ++++++ xen-sxpr-disk-type.patch ++++++ --- /var/tmp/diff_new_pack.4ewtTg/_old 2018-01-25 12:35:26.596941423 +0100 +++ /var/tmp/diff_new_pack.4ewtTg/_new 2018-01-25 12:35:26.596941423 +0100 @@ -6,10 +6,10 @@ https://bugzilla.suse.com/show_bug.cgi?id=938228 -Index: libvirt-3.10.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.0.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-3.10.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-3.10.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.0.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.0.0/src/xenconfig/xen_sxpr.c @@ -501,10 +501,11 @@ xenParseSxprDisks(virDomainDefPtr def, omnipotent, we can revisit this, perhaps stat()'ing the src file in question */
