From f2577f99c5828b33092b315305d100a2da5b1f2f20ccf38c66d69773d1368783 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Wed, 2 Nov 2016 21:55:27 +0000 Subject: [PATCH] Accepting request 438412 from home:jfehlig:branches:Virtualization - Update to libvirt 2.4.0 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html OBS-URL: https://build.opensuse.org/request/show/438412 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=569 --- apparmor-fixes.patch | 6 +-- apparmor-no-mount.patch | 6 +-- blockcopy-check-dst-identical-device.patch | 8 +-- libvirt-2.3.0.tar.xz | 3 -- libvirt-2.3.0.tar.xz.asc | 6 --- libvirt-2.4.0.tar.xz | 3 ++ libvirt-2.4.0.tar.xz.asc | 6 +++ libvirt-guests-init-script.patch | 18 +++---- libvirt-power8-models.patch | 12 ++--- libvirt-suse-netcontrol.patch | 34 ++++++------ libvirt.changes | 7 +++ libvirt.spec | 2 +- libvirtd-defaults.patch | 18 +++---- libvirtd-init-script.patch | 6 +-- libxl-dom-reset.patch | 6 +-- libxl-qemu-emulator-caps.patch | 6 +-- libxl-set-cach-mode.patch | 6 +-- libxl-set-migration-constraints.patch | 60 +++++++++++----------- libxl-support-block-script.patch | 6 +-- lxc-wait-after-eth-del.patch | 22 ++++---- ppc64le-canonical-name.patch | 6 +-- qemu-apparmor-screenshot.patch | 6 +-- support-managed-pci-xen-driver.patch | 12 ++--- suse-qemu-conf.patch | 12 ++--- systemd-service-xen.patch | 6 +-- virtlockd-init-script.patch | 12 ++--- virtlogd-init-script.patch | 12 ++--- xen-pv-cdrom.patch | 6 +-- xen-sxpr-disk-type.patch | 6 +-- 29 files changed, 163 insertions(+), 156 deletions(-) delete mode 100644 libvirt-2.3.0.tar.xz delete mode 100644 libvirt-2.3.0.tar.xz.asc create mode 100644 libvirt-2.4.0.tar.xz create mode 100644 libvirt-2.4.0.tar.xz.asc diff --git a/apparmor-fixes.patch b/apparmor-fixes.patch index a2ed5c6..d1f254c 100644 --- a/apparmor-fixes.patch +++ b/apparmor-fixes.patch @@ -1,7 +1,7 @@ -Index: libvirt-2.3.0/examples/apparmor/libvirt-qemu +Index: libvirt-2.4.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-2.3.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-2.3.0/examples/apparmor/libvirt-qemu +--- libvirt-2.4.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-2.4.0/examples/apparmor/libvirt-qemu @@ -143,6 +143,9 @@ # for restore /bin/bash rmix, diff --git a/apparmor-no-mount.patch b/apparmor-no-mount.patch index 7ec6afc..3677521 100644 --- a/apparmor-no-mount.patch +++ b/apparmor-no-mount.patch @@ -1,7 +1,7 @@ -Index: libvirt-2.3.0/examples/apparmor/libvirt-lxc +Index: libvirt-2.4.0/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-2.3.0.orig/examples/apparmor/libvirt-lxc -+++ libvirt-2.3.0/examples/apparmor/libvirt-lxc +--- libvirt-2.4.0.orig/examples/apparmor/libvirt-lxc ++++ libvirt-2.4.0/examples/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include diff --git a/blockcopy-check-dst-identical-device.patch b/blockcopy-check-dst-identical-device.patch index b1b86f1..750cae9 100644 --- a/blockcopy-check-dst-identical-device.patch +++ b/blockcopy-check-dst-identical-device.patch @@ -11,11 +11,11 @@ Signed-off-by: Chunyan Liu src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: libvirt-2.3.0/src/qemu/qemu_driver.c +Index: libvirt-2.4.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-2.3.0.orig/src/qemu/qemu_driver.c -+++ libvirt-2.3.0/src/qemu/qemu_driver.c -@@ -16622,6 +16622,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-2.4.0.orig/src/qemu/qemu_driver.c ++++ libvirt-2.4.0/src/qemu/qemu_driver.c +@@ -16650,6 +16650,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt _("non-file destination not supported yet")); goto endjob; } diff --git a/libvirt-2.3.0.tar.xz b/libvirt-2.3.0.tar.xz deleted file mode 100644 index 672ddff..0000000 --- a/libvirt-2.3.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e430e69b27d3f6c97255e638617b59b179618d531d81ac7dfe0783a1c1eeafd1 -size 13224384 diff --git a/libvirt-2.3.0.tar.xz.asc b/libvirt-2.3.0.tar.xz.asc deleted file mode 100644 index 54bbcd3..0000000 --- a/libvirt-2.3.0.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iEYEABECAAYFAlfz22MACgkQRga4pd6VvB+odwCdHUMccQTnLQfnwqcRCY+T2m5t -9rkAn2EsUm3CmPF+M0PX3+5GMdnjJW8X -=tiI+ ------END PGP SIGNATURE----- diff --git a/libvirt-2.4.0.tar.xz b/libvirt-2.4.0.tar.xz new file mode 100644 index 0000000..a6251a2 --- /dev/null +++ b/libvirt-2.4.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b727c5f43ed3d7337ec2c2f2031ebd4207507978f68d00ad13d4f0f84aad6224 +size 13237652 diff --git a/libvirt-2.4.0.tar.xz.asc b/libvirt-2.4.0.tar.xz.asc new file mode 100644 index 0000000..970e67c --- /dev/null +++ b/libvirt-2.4.0.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iEYEABECAAYFAlgY/h8ACgkQRga4pd6VvB/frACfe7j1WXBSmST4QBhZcn3tqMKC +/6oAnjEquHVIMalD/Z5KmZHIeJ8qfsCp +=y5ZG +-----END PGP SIGNATURE----- diff --git a/libvirt-guests-init-script.patch b/libvirt-guests-init-script.patch index 61925bc..34e525d 100644 --- a/libvirt-guests-init-script.patch +++ b/libvirt-guests-init-script.patch @@ -1,9 +1,9 @@ Adjust libvirt-guests init files to conform to SUSE standards -Index: libvirt-2.3.0/tools/libvirt-guests.init.in +Index: libvirt-2.4.0/tools/libvirt-guests.init.in =================================================================== ---- libvirt-2.3.0.orig/tools/libvirt-guests.init.in -+++ libvirt-2.3.0/tools/libvirt-guests.init.in +--- libvirt-2.4.0.orig/tools/libvirt-guests.init.in ++++ libvirt-2.4.0/tools/libvirt-guests.init.in @@ -4,27 +4,27 @@ # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # @@ -45,10 +45,10 @@ Index: libvirt-2.3.0/tools/libvirt-guests.init.in # exec @libexecdir@/libvirt-guests.sh "$@" -Index: libvirt-2.3.0/tools/libvirt-guests.sh.in +Index: libvirt-2.4.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-2.3.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-2.3.0/tools/libvirt-guests.sh.in +--- libvirt-2.4.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-2.4.0/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # . @@ -208,10 +208,10 @@ Index: libvirt-2.3.0/tools/libvirt-guests.sh.in esac -exit $RETVAL +rc_exit -Index: libvirt-2.3.0/tools/libvirt-guests.sysconf +Index: libvirt-2.4.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-2.3.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-2.3.0/tools/libvirt-guests.sysconf +--- libvirt-2.4.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-2.4.0/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + diff --git a/libvirt-power8-models.patch b/libvirt-power8-models.patch index f3c90e5..e5077ab 100644 --- a/libvirt-power8-models.patch +++ b/libvirt-power8-models.patch @@ -2,10 +2,10 @@ Add POWER8 v2.0 and v2.1 to cpu map XML From: -Index: libvirt-2.3.0/src/cpu/cpu_map.xml +Index: libvirt-2.4.0/src/cpu/cpu_map.xml =================================================================== ---- libvirt-2.3.0.orig/src/cpu/cpu_map.xml -+++ libvirt-2.3.0/src/cpu/cpu_map.xml +--- libvirt-2.4.0.orig/src/cpu/cpu_map.xml ++++ libvirt-2.4.0/src/cpu/cpu_map.xml @@ -1542,6 +1542,16 @@ @@ -23,10 +23,10 @@ Index: libvirt-2.3.0/src/cpu/cpu_map.xml -Index: libvirt-2.3.0/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml +Index: libvirt-2.4.0/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml =================================================================== ---- libvirt-2.3.0.orig/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml -+++ libvirt-2.3.0/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml +--- libvirt-2.4.0.orig/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml ++++ libvirt-2.4.0/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml @@ -26,6 +26,7 @@ POWER8 diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index 60f32ed..fd6a8dc 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,7 +1,7 @@ -Index: libvirt-2.3.0/configure.ac +Index: libvirt-2.4.0/configure.ac =================================================================== ---- libvirt-2.3.0.orig/configure.ac -+++ libvirt-2.3.0/configure.ac +--- libvirt-2.4.0.orig/configure.ac ++++ libvirt-2.4.0/configure.ac @@ -248,6 +248,7 @@ LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_HAL @@ -34,10 +34,10 @@ Index: libvirt-2.3.0/configure.ac LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS -Index: libvirt-2.3.0/src/Makefile.am +Index: libvirt-2.4.0/src/Makefile.am =================================================================== ---- libvirt-2.3.0.orig/src/Makefile.am -+++ libvirt-2.3.0/src/Makefile.am +--- libvirt-2.4.0.orig/src/Makefile.am ++++ libvirt-2.4.0/src/Makefile.am @@ -952,6 +952,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c @@ -60,10 +60,10 @@ Index: libvirt-2.3.0/src/Makefile.am if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) -Index: libvirt-2.3.0/tools/virsh.c +Index: libvirt-2.4.0/tools/virsh.c =================================================================== ---- libvirt-2.3.0.orig/tools/virsh.c -+++ libvirt-2.3.0/tools/virsh.c +--- libvirt-2.4.0.orig/tools/virsh.c ++++ libvirt-2.4.0/tools/virsh.c @@ -602,6 +602,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -73,10 +73,10 @@ Index: libvirt-2.3.0/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-2.3.0/src/interface/interface_backend_netcf.c +Index: libvirt-2.4.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-2.3.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-2.3.0/src/interface/interface_backend_netcf.c +--- libvirt-2.4.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-2.4.0/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include @@ -160,10 +160,10 @@ Index: libvirt-2.3.0/src/interface/interface_backend_netcf.c if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) return -1; if (virRegisterStateDriver(&interfaceStateDriver) < 0) -Index: libvirt-2.3.0/src/interface/interface_driver.c +Index: libvirt-2.4.0/src/interface/interface_driver.c =================================================================== ---- libvirt-2.3.0.orig/src/interface/interface_driver.c -+++ libvirt-2.3.0/src/interface/interface_driver.c +--- libvirt-2.4.0.orig/src/interface/interface_driver.c ++++ libvirt-2.4.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -181,10 +181,10 @@ Index: libvirt-2.3.0/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-2.3.0/m4/virt-netcontrol.m4 +Index: libvirt-2.4.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-2.3.0/m4/virt-netcontrol.m4 ++++ libvirt-2.4.0/m4/virt-netcontrol.m4 @@ -0,0 +1,35 @@ +dnl The libnetcontrol library +dnl diff --git a/libvirt.changes b/libvirt.changes index 15dde6f..cdd6971 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 2 16:44:57 UTC 2016 - jfehlig@suse.com + +- Update to libvirt 2.4.0 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + ------------------------------------------------------------------- Wed Oct 5 13:58:27 UTC 2016 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 9d17b50..ee231d3 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -174,7 +174,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 2.3.0 +Version: 2.4.0 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ diff --git a/libvirtd-defaults.patch b/libvirtd-defaults.patch index 96086ec..f751d69 100644 --- a/libvirtd-defaults.patch +++ b/libvirtd-defaults.patch @@ -1,7 +1,7 @@ -Index: libvirt-2.3.0/daemon/libvirtd.conf +Index: libvirt-2.4.0/daemon/libvirtd.conf =================================================================== ---- libvirt-2.3.0.orig/daemon/libvirtd.conf -+++ libvirt-2.3.0/daemon/libvirtd.conf +--- libvirt-2.4.0.orig/daemon/libvirtd.conf ++++ libvirt-2.4.0/daemon/libvirtd.conf @@ -18,8 +18,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -13,10 +13,10 @@ Index: libvirt-2.3.0/daemon/libvirtd.conf # Listen for unencrypted TCP connections on the public TCP/IP port. # NB, must pass the --listen flag to the libvirtd process for this to -Index: libvirt-2.3.0/daemon/libvirtd-config.c +Index: libvirt-2.4.0/daemon/libvirtd-config.c =================================================================== ---- libvirt-2.3.0.orig/daemon/libvirtd-config.c -+++ libvirt-2.3.0/daemon/libvirtd-config.c +--- libvirt-2.4.0.orig/daemon/libvirtd-config.c ++++ libvirt-2.4.0/daemon/libvirtd-config.c @@ -109,7 +109,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; @@ -26,10 +26,10 @@ Index: libvirt-2.3.0/daemon/libvirtd-config.c data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-2.3.0/daemon/test_libvirtd.aug.in +Index: libvirt-2.4.0/daemon/test_libvirtd.aug.in =================================================================== ---- libvirt-2.3.0.orig/daemon/test_libvirtd.aug.in -+++ libvirt-2.3.0/daemon/test_libvirtd.aug.in +--- libvirt-2.4.0.orig/daemon/test_libvirtd.aug.in ++++ libvirt-2.4.0/daemon/test_libvirtd.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd = ::CONFIG:: diff --git a/libvirtd-init-script.patch b/libvirtd-init-script.patch index c96303e..f3eea40 100644 --- a/libvirtd-init-script.patch +++ b/libvirtd-init-script.patch @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-2.3.0/daemon/libvirtd.sysconf +Index: libvirt-2.4.0/daemon/libvirtd.sysconf =================================================================== ---- libvirt-2.3.0.orig/daemon/libvirtd.sysconf -+++ libvirt-2.3.0/daemon/libvirtd.sysconf +--- libvirt-2.4.0.orig/daemon/libvirtd.sysconf ++++ libvirt-2.4.0/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + diff --git a/libxl-dom-reset.patch b/libxl-dom-reset.patch index c453ff3..7b01c0b 100644 --- a/libxl-dom-reset.patch +++ b/libxl-dom-reset.patch @@ -8,10 +8,10 @@ Date: Mon Jun 23 15:51:20 2014 -0600 option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. -Index: libvirt-2.3.0/src/libxl/libxl_driver.c +Index: libvirt-2.4.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-2.3.0.orig/src/libxl/libxl_driver.c -+++ libvirt-2.3.0/src/libxl/libxl_driver.c +--- libvirt-2.4.0.orig/src/libxl/libxl_driver.c ++++ libvirt-2.4.0/src/libxl/libxl_driver.c @@ -1384,6 +1384,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } diff --git a/libxl-qemu-emulator-caps.patch b/libxl-qemu-emulator-caps.patch index a5167f1..d3656d9 100644 --- a/libxl-qemu-emulator-caps.patch +++ b/libxl-qemu-emulator-caps.patch @@ -8,10 +8,10 @@ as the default , instead of the qemu-xen one. See FATE#320638 for details. -Index: libvirt-2.3.0/src/libxl/libxl_capabilities.c +Index: libvirt-2.4.0/src/libxl/libxl_capabilities.c =================================================================== ---- libvirt-2.3.0.orig/src/libxl/libxl_capabilities.c -+++ libvirt-2.3.0/src/libxl/libxl_capabilities.c +--- libvirt-2.4.0.orig/src/libxl/libxl_capabilities.c ++++ libvirt-2.4.0/src/libxl/libxl_capabilities.c @@ -38,6 +38,7 @@ #include "libxl_capabilities.h" #include "cpu/cpu_x86.h" diff --git a/libxl-set-cach-mode.patch b/libxl-set-cach-mode.patch index f3638c4..360bf5f 100644 --- a/libxl-set-cach-mode.patch +++ b/libxl-set-cach-mode.patch @@ -3,10 +3,10 @@ https://bugzilla.novell.com/show_bug.cgi?id=879425 src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-2.3.0/src/libxl/libxl_conf.c +Index: libvirt-2.4.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-2.3.0.orig/src/libxl/libxl_conf.c -+++ libvirt-2.3.0/src/libxl/libxl_conf.c +--- libvirt-2.4.0.orig/src/libxl/libxl_conf.c ++++ libvirt-2.4.0/src/libxl/libxl_conf.c @@ -584,6 +584,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } diff --git a/libxl-set-migration-constraints.patch b/libxl-set-migration-constraints.patch index b1ccdeb..61ad0fa 100644 --- a/libxl-set-migration-constraints.patch +++ b/libxl-set-migration-constraints.patch @@ -16,10 +16,10 @@ Signed-off-by: Jim Fehlig tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-2.3.0/include/libvirt/libvirt-domain.h +Index: libvirt-2.4.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-2.3.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-2.3.0/include/libvirt/libvirt-domain.h +--- libvirt-2.4.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-2.4.0/include/libvirt/libvirt-domain.h @@ -889,6 +889,31 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment" @@ -52,10 +52,10 @@ Index: libvirt-2.3.0/include/libvirt/libvirt-domain.h /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-2.3.0/src/libxl/libxl_driver.c +Index: libvirt-2.4.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-2.3.0.orig/src/libxl/libxl_driver.c -+++ libvirt-2.3.0/src/libxl/libxl_driver.c +--- libvirt-2.4.0.orig/src/libxl/libxl_driver.c ++++ libvirt-2.4.0/src/libxl/libxl_driver.c @@ -6044,6 +6044,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; @@ -99,10 +99,10 @@ Index: libvirt-2.3.0/src/libxl/libxl_driver.c goto cleanup; } -Index: libvirt-2.3.0/src/libxl/libxl_migration.c +Index: libvirt-2.4.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-2.3.0.orig/src/libxl/libxl_migration.c -+++ libvirt-2.3.0/src/libxl/libxl_migration.c +--- libvirt-2.4.0.orig/src/libxl/libxl_migration.c ++++ libvirt-2.4.0/src/libxl/libxl_migration.c @@ -358,18 +358,39 @@ libxlMigrateReceive(virNetSocketPtr sock static int libxlDoMigrateSend(libxlDriverPrivatePtr driver, @@ -145,7 +145,7 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c if (ret != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to send migration data to destination host")); -@@ -723,7 +744,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr +@@ -727,7 +748,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr const char *dconnuri ATTRIBUTE_UNUSED, const char *dname, const char *uri, @@ -154,7 +154,7 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c { virDomainPtr ddomain = NULL; virTypedParameterPtr params = NULL; -@@ -760,7 +781,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr +@@ -764,7 +785,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr /* We don't require the destination to have P2P support * as it looks to be normal migration from the receiver perpective. */ @@ -163,7 +163,7 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c VIR_DEBUG("Prepare3"); virObjectUnlock(vm); -@@ -785,7 +806,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr +@@ -789,7 +810,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL, @@ -172,7 +172,7 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c if (ret < 0) orig_err = virSaveLastError(); -@@ -817,7 +838,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr +@@ -821,7 +842,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr orig_err = virSaveLastError(); VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm); @@ -181,7 +181,7 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c if (ret < 0) VIR_WARN("Guest %s probably left in 'paused' state on source", -@@ -866,7 +887,7 @@ libxlDomainMigrationPerformP2P(libxlDriv +@@ -870,7 +891,7 @@ libxlDomainMigrationPerformP2P(libxlDriv const char *dconnuri, const char *uri_str ATTRIBUTE_UNUSED, const char *dname, @@ -190,7 +190,7 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c { int ret = -1; bool useParams; -@@ -901,7 +922,7 @@ libxlDomainMigrationPerformP2P(libxlDriv +@@ -905,7 +926,7 @@ libxlDomainMigrationPerformP2P(libxlDriv } ret = libxlDoMigrateP2P(driver, vm, sconn, xmlin, dconn, dconnuri, @@ -199,7 +199,7 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c cleanup: orig_err = virSaveLastError(); -@@ -923,7 +944,7 @@ libxlDomainMigrationPerform(libxlDriverP +@@ -927,7 +948,7 @@ libxlDomainMigrationPerform(libxlDriverP const char *dconnuri ATTRIBUTE_UNUSED, const char *uri_str, const char *dname ATTRIBUTE_UNUSED, @@ -208,7 +208,7 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c { libxlDomainObjPrivatePtr priv = vm->privateData; char *hostname = NULL; -@@ -963,7 +984,7 @@ libxlDomainMigrationPerform(libxlDriverP +@@ -967,7 +988,7 @@ libxlDomainMigrationPerform(libxlDriverP /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); @@ -217,10 +217,10 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.c virObjectLock(vm); cleanup: -Index: libvirt-2.3.0/src/libxl/libxl_migration.h +Index: libvirt-2.4.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-2.3.0.orig/src/libxl/libxl_migration.h -+++ libvirt-2.3.0/src/libxl/libxl_migration.h +--- libvirt-2.4.0.orig/src/libxl/libxl_migration.h ++++ libvirt-2.4.0/src/libxl/libxl_migration.h @@ -38,6 +38,10 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ @@ -265,11 +265,11 @@ Index: libvirt-2.3.0/src/libxl/libxl_migration.h virDomainPtr libxlDomainMigrationFinish(virConnectPtr dconn, -Index: libvirt-2.3.0/tools/virsh-domain.c +Index: libvirt-2.4.0/tools/virsh-domain.c =================================================================== ---- libvirt-2.3.0.orig/tools/virsh-domain.c -+++ libvirt-2.3.0/tools/virsh-domain.c -@@ -9980,6 +9980,22 @@ static const vshCmdOptDef opts_migrate[] +--- libvirt-2.4.0.orig/tools/virsh-domain.c ++++ libvirt-2.4.0/tools/virsh-domain.c +@@ -10104,6 +10104,22 @@ static const vshCmdOptDef opts_migrate[] .type = VSH_OT_INT, .help = N_("CPU throttling rate increment for auto-convergence") }, @@ -292,7 +292,7 @@ Index: libvirt-2.3.0/tools/virsh-domain.c {.name = NULL} }; -@@ -10003,6 +10019,7 @@ doMigrate(void *opaque) +@@ -10127,6 +10143,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -300,7 +300,7 @@ Index: libvirt-2.3.0/tools/virsh-domain.c sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); -@@ -10122,6 +10139,27 @@ doMigrate(void *opaque) +@@ -10246,6 +10263,27 @@ doMigrate(void *opaque) goto save_error; } @@ -328,11 +328,11 @@ Index: libvirt-2.3.0/tools/virsh-domain.c if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { -Index: libvirt-2.3.0/tools/virsh.pod +Index: libvirt-2.4.0/tools/virsh.pod =================================================================== ---- libvirt-2.3.0.orig/tools/virsh.pod -+++ libvirt-2.3.0/tools/virsh.pod -@@ -1668,6 +1668,14 @@ compression. I<--comp-mt-threads> and I< +--- libvirt-2.4.0.orig/tools/virsh.pod ++++ libvirt-2.4.0/tools/virsh.pod +@@ -1699,6 +1699,14 @@ compression. I<--comp-mt-threads> and I< of compress threads on source and the number of decompress threads on target respectively. I<--comp-xbzrle-cache> sets size of page cache in bytes. diff --git a/libxl-support-block-script.patch b/libxl-support-block-script.patch index 0e46acd..f972394 100644 --- a/libxl-support-block-script.patch +++ b/libxl-support-block-script.patch @@ -7,10 +7,10 @@ and npiv. For more details, see bsc#954872 and FATE#319810 -Index: libvirt-2.3.0/src/libxl/libxl_conf.c +Index: libvirt-2.4.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-2.3.0.orig/src/libxl/libxl_conf.c -+++ libvirt-2.3.0/src/libxl/libxl_conf.c +--- libvirt-2.4.0.orig/src/libxl/libxl_conf.c ++++ libvirt-2.4.0/src/libxl/libxl_conf.c @@ -584,6 +584,25 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } diff --git a/lxc-wait-after-eth-del.patch b/lxc-wait-after-eth-del.patch index ee86e54..f40ef77 100644 --- a/lxc-wait-after-eth-del.patch +++ b/lxc-wait-after-eth-del.patch @@ -13,10 +13,10 @@ device with the same name that is being created. src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-2.3.0/src/lxc/lxc_controller.c +Index: libvirt-2.4.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-2.3.0.orig/src/lxc/lxc_controller.c -+++ libvirt-2.3.0/src/lxc/lxc_controller.c +--- libvirt-2.4.0.orig/src/lxc/lxc_controller.c ++++ libvirt-2.4.0/src/lxc/lxc_controller.c @@ -2009,6 +2009,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; @@ -25,11 +25,11 @@ Index: libvirt-2.3.0/src/lxc/lxc_controller.c return ret; } -Index: libvirt-2.3.0/src/lxc/lxc_driver.c +Index: libvirt-2.4.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-2.3.0.orig/src/lxc/lxc_driver.c -+++ libvirt-2.3.0/src/lxc/lxc_driver.c -@@ -4025,6 +4025,7 @@ lxcDomainAttachDeviceNetLive(virConnectP +--- libvirt-2.4.0.orig/src/lxc/lxc_driver.c ++++ libvirt-2.4.0/src/lxc/lxc_driver.c +@@ -4031,6 +4031,7 @@ lxcDomainAttachDeviceNetLive(virConnectP case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_ETHERNET: ignore_value(virNetDevVethDelete(veth)); @@ -37,7 +37,7 @@ Index: libvirt-2.3.0/src/lxc/lxc_driver.c break; case VIR_DOMAIN_NET_TYPE_DIRECT: -@@ -4454,6 +4455,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -4465,6 +4466,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb virDomainAuditNet(vm, detach, NULL, "detach", false); goto cleanup; } @@ -45,10 +45,10 @@ Index: libvirt-2.3.0/src/lxc/lxc_driver.c break; /* It'd be nice to support this, but with macvlan -Index: libvirt-2.3.0/src/lxc/lxc_process.c +Index: libvirt-2.4.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-2.3.0.orig/src/lxc/lxc_process.c -+++ libvirt-2.3.0/src/lxc/lxc_process.c +--- libvirt-2.4.0.orig/src/lxc/lxc_process.c ++++ libvirt-2.4.0/src/lxc/lxc_process.c @@ -221,6 +221,7 @@ static void virLXCProcessCleanup(virLXCD } networkReleaseActualDevice(vm->def, iface); diff --git a/ppc64le-canonical-name.patch b/ppc64le-canonical-name.patch index cb95408..ab6b53a 100644 --- a/ppc64le-canonical-name.patch +++ b/ppc64le-canonical-name.patch @@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64 See bnc#894956 -Index: libvirt-2.3.0/src/util/virarch.c +Index: libvirt-2.4.0/src/util/virarch.c =================================================================== ---- libvirt-2.3.0.orig/src/util/virarch.c -+++ libvirt-2.3.0/src/util/virarch.c +--- libvirt-2.4.0.orig/src/util/virarch.c ++++ libvirt-2.4.0/src/util/virarch.c @@ -169,6 +169,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_I686; } else if (STREQ(ut.machine, "amd64")) { diff --git a/qemu-apparmor-screenshot.patch b/qemu-apparmor-screenshot.patch index c3ed855..b7c23c7 100644 --- a/qemu-apparmor-screenshot.patch +++ b/qemu-apparmor-screenshot.patch @@ -1,7 +1,7 @@ -Index: libvirt-2.3.0/examples/apparmor/libvirt-qemu +Index: libvirt-2.4.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-2.3.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-2.3.0/examples/apparmor/libvirt-qemu +--- libvirt-2.4.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-2.4.0/examples/apparmor/libvirt-qemu @@ -151,3 +151,6 @@ /etc/udev/udev.conf r, /sys/bus/ r, diff --git a/support-managed-pci-xen-driver.patch b/support-managed-pci-xen-driver.patch index 6157ca1..9cbeb79 100644 --- a/support-managed-pci-xen-driver.patch +++ b/support-managed-pci-xen-driver.patch @@ -8,10 +8,10 @@ Subject: [PATCH] support managed pci devices in xen driver src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-2.3.0/src/xenconfig/xen_common.c +Index: libvirt-2.4.0/src/xenconfig/xen_common.c =================================================================== ---- libvirt-2.3.0.orig/src/xenconfig/xen_common.c -+++ libvirt-2.3.0/src/xenconfig/xen_common.c +--- libvirt-2.4.0.orig/src/xenconfig/xen_common.c ++++ libvirt-2.4.0/src/xenconfig/xen_common.c @@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe { virConfValuePtr list = virConfGetValue(conf, "pci"); @@ -66,10 +66,10 @@ Index: libvirt-2.3.0/src/xenconfig/xen_common.c hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; hostdev->source.subsys.u.pci.addr.domain = domainID; hostdev->source.subsys.u.pci.addr.bus = busID; -Index: libvirt-2.3.0/src/xenconfig/xen_sxpr.c +Index: libvirt-2.4.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-2.3.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-2.3.0/src/xenconfig/xen_sxpr.c +--- libvirt-2.4.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-2.4.0/src/xenconfig/xen_sxpr.c @@ -1062,6 +1062,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch index 09462ce..5e0053d 100644 --- a/suse-qemu-conf.patch +++ b/suse-qemu-conf.patch @@ -7,11 +7,11 @@ suse-qemu-conf-secdriver.patch, suse-qemu-conf-lockmgr.patch, etc.), but for now they are all lumped together in this single patch. -Index: libvirt-2.3.0/src/qemu/qemu.conf +Index: libvirt-2.4.0/src/qemu/qemu.conf =================================================================== ---- libvirt-2.3.0.orig/src/qemu/qemu.conf -+++ libvirt-2.3.0/src/qemu/qemu.conf -@@ -259,11 +259,20 @@ +--- libvirt-2.4.0.orig/src/qemu/qemu.conf ++++ libvirt-2.4.0/src/qemu/qemu.conf +@@ -283,11 +283,20 @@ # isolation, but it cannot appear in a list of drivers. # #security_driver = "selinux" @@ -34,7 +34,7 @@ Index: libvirt-2.3.0/src/qemu/qemu.conf # If set to non-zero, then attempts to create unconfined # guests will be blocked. Defaults to 0. -@@ -507,11 +516,22 @@ +@@ -531,11 +540,22 @@ #allow_disk_format_probing = 1 @@ -62,7 +62,7 @@ Index: libvirt-2.3.0/src/qemu/qemu.conf # #lock_manager = "lockd" -@@ -602,9 +622,8 @@ +@@ -626,9 +646,8 @@ # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # follows this scheme. #nvram = [ diff --git a/systemd-service-xen.patch b/systemd-service-xen.patch index 1e791c4..c14bc5c 100644 --- a/systemd-service-xen.patch +++ b/systemd-service-xen.patch @@ -1,7 +1,7 @@ -Index: libvirt-2.3.0/daemon/libvirtd.service.in +Index: libvirt-2.4.0/daemon/libvirtd.service.in =================================================================== ---- libvirt-2.3.0.orig/daemon/libvirtd.service.in -+++ libvirt-2.3.0/daemon/libvirtd.service.in +--- libvirt-2.4.0.orig/daemon/libvirtd.service.in ++++ libvirt-2.4.0/daemon/libvirtd.service.in @@ -13,6 +13,7 @@ After=iscsid.service After=apparmor.service After=local-fs.target diff --git a/virtlockd-init-script.patch b/virtlockd-init-script.patch index cde8ed1..4f03f9e 100644 --- a/virtlockd-init-script.patch +++ b/virtlockd-init-script.patch @@ -1,9 +1,9 @@ Adjust virtlockd init files to conform to SUSE standards -Index: libvirt-2.3.0/src/locking/virtlockd.sysconf +Index: libvirt-2.4.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-2.3.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-2.3.0/src/locking/virtlockd.sysconf +--- libvirt-2.4.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-2.4.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,10 +12,10 @@ Index: libvirt-2.3.0/src/locking/virtlockd.sysconf # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-2.3.0/src/locking/virtlockd.init.in +Index: libvirt-2.4.0/src/locking/virtlockd.init.in =================================================================== ---- libvirt-2.3.0.orig/src/locking/virtlockd.init.in -+++ libvirt-2.3.0/src/locking/virtlockd.init.in +--- libvirt-2.4.0.orig/src/locking/virtlockd.init.in ++++ libvirt-2.4.0/src/locking/virtlockd.init.in @@ -4,59 +4,57 @@ # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # diff --git a/virtlogd-init-script.patch b/virtlogd-init-script.patch index b8d8a31..45cdb0d 100644 --- a/virtlogd-init-script.patch +++ b/virtlogd-init-script.patch @@ -1,9 +1,9 @@ Adjust virtlogd init files to conform to SUSE standards -Index: libvirt-2.3.0/src/logging/virtlogd.init.in +Index: libvirt-2.4.0/src/logging/virtlogd.init.in =================================================================== ---- libvirt-2.3.0.orig/src/logging/virtlogd.init.in -+++ libvirt-2.3.0/src/logging/virtlogd.init.in +--- libvirt-2.4.0.orig/src/logging/virtlogd.init.in ++++ libvirt-2.4.0/src/logging/virtlogd.init.in @@ -4,59 +4,56 @@ # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # @@ -126,10 +126,10 @@ Index: libvirt-2.3.0/src/logging/virtlogd.init.in esac -exit $RETVAL +rc_exit -Index: libvirt-2.3.0/src/logging/virtlogd.sysconf +Index: libvirt-2.4.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-2.3.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-2.3.0/src/logging/virtlogd.sysconf +--- libvirt-2.4.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-2.4.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + diff --git a/xen-pv-cdrom.patch b/xen-pv-cdrom.patch index 7c60e38..eaeb2db 100644 --- a/xen-pv-cdrom.patch +++ b/xen-pv-cdrom.patch @@ -1,7 +1,7 @@ -Index: libvirt-2.3.0/src/xenconfig/xen_sxpr.c +Index: libvirt-2.4.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-2.3.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-2.3.0/src/xenconfig/xen_sxpr.c +--- libvirt-2.4.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-2.4.0/src/xenconfig/xen_sxpr.c @@ -392,7 +392,7 @@ xenParseSxprVifRate(const char *rate, un static int xenParseSxprDisks(virDomainDefPtr def, diff --git a/xen-sxpr-disk-type.patch b/xen-sxpr-disk-type.patch index fe783cc..0fc740a 100644 --- a/xen-sxpr-disk-type.patch +++ b/xen-sxpr-disk-type.patch @@ -6,10 +6,10 @@ and 'file'. This was implicitly done prior to commit 9673418c. https://bugzilla.suse.com/show_bug.cgi?id=938228 -Index: libvirt-2.3.0/src/xenconfig/xen_sxpr.c +Index: libvirt-2.4.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-2.3.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-2.3.0/src/xenconfig/xen_sxpr.c +--- libvirt-2.4.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-2.4.0/src/xenconfig/xen_sxpr.c @@ -506,10 +506,11 @@ xenParseSxprDisks(virDomainDefPtr def, omnipotent, we can revisit this, perhaps stat()'ing the src file in question */