From da0e8f4458e6c92da895e617334ce6b056a20e748f1a5af8e5af68a92a7e4df9 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 8 Apr 2016 07:39:28 +0000 Subject: [PATCH 1/2] Accepting request 384426 from Virtualization baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/384426 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=520 --- libvirt.changes | 5 ----- libvirt.spec | 1 - 2 files changed, 6 deletions(-) diff --git a/libvirt.changes b/libvirt.changes index a36b0d7..1117a9d 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Apr 4 15:26:41 UTC 2016 - ohering@suse.de - -- Force LIBXL_API_VERSION=0x040500 to fix build with xen-4.7 - ------------------------------------------------------------------- Fri Mar 18 20:13:41 UTC 2016 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 4400d1b..1036327 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -1153,7 +1153,6 @@ Wireshark dissector plugin for better analysis of libvirt RPC traffic. autoreconf -f -i export CFLAGS="$RPM_OPT_FLAGS" -export CFLAGS="$CFLAGS -DLIBXL_API_VERSION=0x040500" %configure --disable-static --with-pic \ %{?_without_xen} \ %{?_without_qemu} \ From 7ebd24a2beb56aa3b66d1b32da14f7878f17236b8defdbdc689cf98ec2ff1acc Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Wed, 13 Apr 2016 00:22:05 +0000 Subject: [PATCH 2/2] Accepting request 388407 from home:jfehlig:branches:Virtualization - Update to libvirt 1.3.3 - perf events - post-copy migration support - NSS module - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Add rpmlintrc file to filter shlib-policy-name-error for new libnss_libvirt plugin - Fix build with Xen4.7 216650f1-libxl-build-fix.patch OBS-URL: https://build.opensuse.org/request/show/388407 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=521 --- 216650f1-libxl-build-fix.patch | 34 +++++++++++++++++ apparmor-fixes.patch | 6 +-- apparmor-no-mount.patch | 6 +-- blockcopy-check-dst-identical-device.patch | 8 ++-- libvirt-1.3.2.tar.gz | 3 -- libvirt-1.3.2.tar.gz.asc | 7 ---- libvirt-1.3.3.tar.gz | 3 ++ libvirt-1.3.3.tar.gz.asc | 7 ++++ libvirt-guests-init-script.patch | 18 ++++----- libvirt-power8-models.patch | 6 +-- libvirt-rpmlintrc | 1 + libvirt-suse-netcontrol.patch | 44 +++++++++++----------- libvirt.changes | 14 +++++++ libvirt.spec | 35 ++++++++++++++++- libvirtd-defaults.patch | 18 ++++----- libvirtd-init-script.patch | 6 +-- libvirtd-systemd-socket.patch | 6 +-- libxl-qemu-emulator-caps.patch | 6 +-- libxl-support-block-script.patch | 14 +++---- lxc-wait-after-eth-del.patch | 18 ++++----- ppc64le-canonical-name.patch | 6 +-- qemu-apparmor-screenshot.patch | 6 +-- support-managed-pci-xen-driver.patch | 12 +++--- suse-qemu-conf.patch | 6 +-- 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, 206 insertions(+), 126 deletions(-) create mode 100644 216650f1-libxl-build-fix.patch delete mode 100644 libvirt-1.3.2.tar.gz delete mode 100644 libvirt-1.3.2.tar.gz.asc create mode 100644 libvirt-1.3.3.tar.gz create mode 100644 libvirt-1.3.3.tar.gz.asc create mode 100644 libvirt-rpmlintrc diff --git a/216650f1-libxl-build-fix.patch b/216650f1-libxl-build-fix.patch new file mode 100644 index 0000000..0742c79 --- /dev/null +++ b/216650f1-libxl-build-fix.patch @@ -0,0 +1,34 @@ +commit 216650f14b35ad11a45505405347f8027bc294d7 +Author: Wei Liu +Date: Tue Apr 5 15:20:12 2016 +0100 + + libxl: libxl_domain_create_restore has an extra argument + + In the latest libxenlight code, libxl_domain_create_restore accepts a + new argument. Update libvirt's libxl driver for that. Use the macro + provided by libxenlight to detect which version should be used. + + The new parameter (send_back_fd) is set to -1 because libvirt provides + no such fd. + + Signed-off-by: Wei Liu + Message-id: 1459866012-27081-1-git-send-email-wei.liu2@citrix.com + +Index: libvirt-1.3.3/src/libxl/libxl_domain.c +=================================================================== +--- libvirt-1.3.3.orig/src/libxl/libxl_domain.c ++++ libvirt-1.3.3/src/libxl/libxl_domain.c +@@ -1070,7 +1070,12 @@ libxlDomainStart(libxlDriverPrivatePtr d + ret = libxl_domain_create_new(cfg->ctx, &d_config, + &domid, NULL, &aop_console_how); + } else { +-#ifdef LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS ++#if defined(LIBXL_HAVE_DOMAIN_CREATE_RESTORE_SEND_BACK_FD) ++ params.checkpointed_stream = 0; ++ ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid, ++ restore_fd, -1, ¶ms, NULL, ++ &aop_console_how); ++#elif defined(LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS) + params.checkpointed_stream = 0; + ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid, + restore_fd, ¶ms, NULL, diff --git a/apparmor-fixes.patch b/apparmor-fixes.patch index 17403c1..ce550e1 100644 --- a/apparmor-fixes.patch +++ b/apparmor-fixes.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.2/examples/apparmor/libvirt-qemu +Index: libvirt-1.3.3/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.3.2.orig/examples/apparmor/libvirt-qemu -+++ libvirt-1.3.2/examples/apparmor/libvirt-qemu +--- libvirt-1.3.3.orig/examples/apparmor/libvirt-qemu ++++ libvirt-1.3.3/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 806f79c..d012fbd 100644 --- a/apparmor-no-mount.patch +++ b/apparmor-no-mount.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.2/examples/apparmor/libvirt-lxc +Index: libvirt-1.3.3/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-1.3.2.orig/examples/apparmor/libvirt-lxc -+++ libvirt-1.3.2/examples/apparmor/libvirt-lxc +--- libvirt-1.3.3.orig/examples/apparmor/libvirt-lxc ++++ libvirt-1.3.3/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 eda33d4..524958e 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-1.3.2/src/qemu/qemu_driver.c +Index: libvirt-1.3.3/src/qemu/qemu_driver.c =================================================================== ---- libvirt-1.3.2.orig/src/qemu/qemu_driver.c -+++ libvirt-1.3.2/src/qemu/qemu_driver.c -@@ -16595,6 +16595,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-1.3.3.orig/src/qemu/qemu_driver.c ++++ libvirt-1.3.3/src/qemu/qemu_driver.c +@@ -16763,6 +16763,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt _("non-file destination not supported yet")); goto endjob; } diff --git a/libvirt-1.3.2.tar.gz b/libvirt-1.3.2.tar.gz deleted file mode 100644 index e7d407b..0000000 --- a/libvirt-1.3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3c6fc2683178660b371efb3ac7a1103a3f4b78efac7ffe560bc5917974ccf05 -size 30056101 diff --git a/libvirt-1.3.2.tar.gz.asc b/libvirt-1.3.2.tar.gz.asc deleted file mode 100644 index ddcd7c3..0000000 --- a/libvirt-1.3.2.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlbVDFIACgkQRga4pd6VvB/xyQCfZr3odTFUTdXUEGowUU0WnQHk -gsYAn3rarEqsgFXXnweG/sXZj+BMSi3G -=jzIM ------END PGP SIGNATURE----- diff --git a/libvirt-1.3.3.tar.gz b/libvirt-1.3.3.tar.gz new file mode 100644 index 0000000..31a0647 --- /dev/null +++ b/libvirt-1.3.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99603b8dba574bc592673fdf5c77e96cf5221e21104ab0477efeb8aba133858f +size 30272467 diff --git a/libvirt-1.3.3.tar.gz.asc b/libvirt-1.3.3.tar.gz.asc new file mode 100644 index 0000000..660191d --- /dev/null +++ b/libvirt-1.3.3.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlcEuZkACgkQRga4pd6VvB95LwCffa1in0su2UqPvFg/WeuNA/6W +STQAn2v+qsxw4VEbOVFgZo6zDf49RYYO +=z+cN +-----END PGP SIGNATURE----- diff --git a/libvirt-guests-init-script.patch b/libvirt-guests-init-script.patch index a7f95df..945938b 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-1.3.2/tools/libvirt-guests.init.in +Index: libvirt-1.3.3/tools/libvirt-guests.init.in =================================================================== ---- libvirt-1.3.2.orig/tools/libvirt-guests.init.in -+++ libvirt-1.3.2/tools/libvirt-guests.init.in +--- libvirt-1.3.3.orig/tools/libvirt-guests.init.in ++++ libvirt-1.3.3/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-1.3.2/tools/libvirt-guests.init.in # exec @libexecdir@/libvirt-guests.sh "$@" -Index: libvirt-1.3.2/tools/libvirt-guests.sh.in +Index: libvirt-1.3.3/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-1.3.2.orig/tools/libvirt-guests.sh.in -+++ libvirt-1.3.2/tools/libvirt-guests.sh.in +--- libvirt-1.3.3.orig/tools/libvirt-guests.sh.in ++++ libvirt-1.3.3/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # . @@ -208,10 +208,10 @@ Index: libvirt-1.3.2/tools/libvirt-guests.sh.in esac -exit $RETVAL +rc_exit -Index: libvirt-1.3.2/tools/libvirt-guests.sysconf +Index: libvirt-1.3.3/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-1.3.2.orig/tools/libvirt-guests.sysconf -+++ libvirt-1.3.2/tools/libvirt-guests.sysconf +--- libvirt-1.3.3.orig/tools/libvirt-guests.sysconf ++++ libvirt-1.3.3/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 b216854..600e1ad 100644 --- a/libvirt-power8-models.patch +++ b/libvirt-power8-models.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.2/src/cpu/cpu_map.xml +Index: libvirt-1.3.3/src/cpu/cpu_map.xml =================================================================== ---- libvirt-1.3.2.orig/src/cpu/cpu_map.xml -+++ libvirt-1.3.2/src/cpu/cpu_map.xml +--- libvirt-1.3.3.orig/src/cpu/cpu_map.xml ++++ libvirt-1.3.3/src/cpu/cpu_map.xml @@ -1424,6 +1424,16 @@ diff --git a/libvirt-rpmlintrc b/libvirt-rpmlintrc new file mode 100644 index 0000000..be4ee7e --- /dev/null +++ b/libvirt-rpmlintrc @@ -0,0 +1 @@ +addFilter("shlib-policy-name-error") diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index fd4e3a1..6235dbb 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.2/configure.ac +Index: libvirt-1.3.3/configure.ac =================================================================== ---- libvirt-1.3.2.orig/configure.ac -+++ libvirt-1.3.2/configure.ac +--- libvirt-1.3.3.orig/configure.ac ++++ libvirt-1.3.3/configure.ac @@ -246,6 +246,7 @@ LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_HAL @@ -10,7 +10,7 @@ Index: libvirt-1.3.2/configure.ac LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_PCIACCESS -@@ -2449,11 +2450,12 @@ if test "$with_libvirtd" = "no" ; then +@@ -2450,11 +2451,12 @@ if test "$with_libvirtd" = "no" ; then with_interface=no fi @@ -26,7 +26,7 @@ Index: libvirt-1.3.2/configure.ac esac if test "$with_interface" = "yes" ; then -@@ -2832,6 +2834,7 @@ LIBVIRT_RESULT_FUSE +@@ -2833,6 +2835,7 @@ LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_HAL LIBVIRT_RESULT_NETCF @@ -34,11 +34,11 @@ Index: libvirt-1.3.2/configure.ac LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS -Index: libvirt-1.3.2/src/Makefile.am +Index: libvirt-1.3.3/src/Makefile.am =================================================================== ---- libvirt-1.3.2.orig/src/Makefile.am -+++ libvirt-1.3.2/src/Makefile.am -@@ -928,6 +928,10 @@ if WITH_NETCF +--- libvirt-1.3.3.orig/src/Makefile.am ++++ libvirt-1.3.3/src/Makefile.am +@@ -930,6 +930,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c endif WITH_NETCF @@ -49,7 +49,7 @@ Index: libvirt-1.3.2/src/Makefile.am if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1553,6 +1557,10 @@ if WITH_NETCF +@@ -1555,6 +1559,10 @@ if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) endif WITH_NETCF @@ -60,11 +60,11 @@ Index: libvirt-1.3.2/src/Makefile.am if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) -Index: libvirt-1.3.2/tools/virsh.c +Index: libvirt-1.3.3/tools/virsh.c =================================================================== ---- libvirt-1.3.2.orig/tools/virsh.c -+++ libvirt-1.3.2/tools/virsh.c -@@ -589,6 +589,8 @@ virshShowVersion(vshControl *ctl ATTRIBU +--- libvirt-1.3.3.orig/tools/virsh.c ++++ libvirt-1.3.3/tools/virsh.c +@@ -620,6 +620,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); @@ -73,10 +73,10 @@ Index: libvirt-1.3.2/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-1.3.2/src/interface/interface_backend_netcf.c +Index: libvirt-1.3.3/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-1.3.2.orig/src/interface/interface_backend_netcf.c -+++ libvirt-1.3.2/src/interface/interface_backend_netcf.c +--- libvirt-1.3.3.orig/src/interface/interface_backend_netcf.c ++++ libvirt-1.3.3/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include @@ -160,10 +160,10 @@ Index: libvirt-1.3.2/src/interface/interface_backend_netcf.c if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) return -1; if (virRegisterStateDriver(&interfaceStateDriver) < 0) -Index: libvirt-1.3.2/src/interface/interface_driver.c +Index: libvirt-1.3.3/src/interface/interface_driver.c =================================================================== ---- libvirt-1.3.2.orig/src/interface/interface_driver.c -+++ libvirt-1.3.2/src/interface/interface_driver.c +--- libvirt-1.3.3.orig/src/interface/interface_driver.c ++++ libvirt-1.3.3/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -181,10 +181,10 @@ Index: libvirt-1.3.2/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-1.3.2/m4/virt-netcontrol.m4 +Index: libvirt-1.3.3/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-1.3.2/m4/virt-netcontrol.m4 ++++ libvirt-1.3.3/m4/virt-netcontrol.m4 @@ -0,0 +1,35 @@ +dnl The libnetcontrol library +dnl diff --git a/libvirt.changes b/libvirt.changes index 1117a9d..045686e 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Apr 12 22:01:50 UTC 2016 - jfehlig@suse.com + +- Update to libvirt 1.3.3 + - perf events + - post-copy migration support + - NSS module + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Add rpmlintrc file to filter shlib-policy-name-error for + new libnss_libvirt plugin +- Fix build with Xen4.7 + 216650f1-libxl-build-fix.patch + ------------------------------------------------------------------- Fri Mar 18 20:13:41 UTC 2016 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 1036327..4c22826 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -99,6 +99,7 @@ # Non-server/HV driver defaults which are always enabled %define with_sasl 0%{!?_without_sasl:1} +%define with_nss_plugin 0%{!?_without_nss_plugin:1} # Set the OS / architecture specific special cases @@ -245,7 +246,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 1.3.2 +Version: 1.3.3 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ @@ -457,7 +458,9 @@ Source2: %{name}.keyring Source3: libvirtd.init Source4: libvirtd-relocation-server.fw Source99: baselibs.conf +Source100: %{name}-rpmlintrc # Upstream patches +Patch0: 216650f1-libxl-build-fix.patch # Patches pending upstream review # Need to go upstream Patch150: xen-pv-cdrom.patch @@ -974,8 +977,19 @@ Requires: wireshark Wireshark dissector plugin for better analysis of libvirt RPC traffic. %endif +%if %{with_nss_plugin} +%package nss +Summary: Libvirt plugin for Name Service Switch +Group: Development/Libraries/C and C++ +Requires: libvirt-daemon-driver-network = %{version}-%{release} + +%description nss +libvirt plugin for NSS for translating domain names into IP addresses. +%endif + %prep %setup -q +%patch0 -p1 %patch150 -p1 %patch151 -p1 %patch152 -p1 @@ -1146,7 +1160,9 @@ Wireshark dissector plugin for better analysis of libvirt RPC traffic. %if ! %{with_systemd_daemon} %define _without_systemd_daemon --without-systemd-daemon %endif - +%if ! %{with_nss_plugin} + %define _without_nss_plugin --without-nss-plugin +%endif %if %{with_selinux} %define with_selinux_mount --with-selinux-mount="/sys/fs/selinux" %endif @@ -1202,6 +1218,7 @@ export CFLAGS="$RPM_OPT_FLAGS" %{?_with_firewalld} \ %{?_without_wireshark} \ %{?_without_systemd_daemon} \ + %{?_without_nss_plugin} \ --libexecdir=%{_libdir}/%{name} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ @@ -1520,6 +1537,14 @@ fi %endif %insserv_cleanup +%if %{with_nss_plugin} +%post nss +/sbin/ldconfig + +%postun nss +/sbin/ldconfig +%endif + %files %defattr(-, root, root) %doc %{_docdir}/%{name}/libvirt.README @@ -1953,4 +1978,10 @@ fi %{_libdir}/wireshark/plugins/libvirt.so %endif +%if %{with_nss_plugin} + +%files nss +%{_libdir}/libnss_libvirt.so.2 +%endif + %changelog diff --git a/libvirtd-defaults.patch b/libvirtd-defaults.patch index c1a584a..032a02d 100644 --- a/libvirtd-defaults.patch +++ b/libvirtd-defaults.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.2/daemon/libvirtd.conf +Index: libvirt-1.3.3/daemon/libvirtd.conf =================================================================== ---- libvirt-1.3.2.orig/daemon/libvirtd.conf -+++ libvirt-1.3.2/daemon/libvirtd.conf +--- libvirt-1.3.3.orig/daemon/libvirtd.conf ++++ libvirt-1.3.3/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-1.3.2/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-1.3.2/daemon/libvirtd-config.c +Index: libvirt-1.3.3/daemon/libvirtd-config.c =================================================================== ---- libvirt-1.3.2.orig/daemon/libvirtd-config.c -+++ libvirt-1.3.2/daemon/libvirtd-config.c +--- libvirt-1.3.3.orig/daemon/libvirtd-config.c ++++ libvirt-1.3.3/daemon/libvirtd-config.c @@ -242,7 +242,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; @@ -26,10 +26,10 @@ Index: libvirt-1.3.2/daemon/libvirtd-config.c data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-1.3.2/daemon/test_libvirtd.aug.in +Index: libvirt-1.3.3/daemon/test_libvirtd.aug.in =================================================================== ---- libvirt-1.3.2.orig/daemon/test_libvirtd.aug.in -+++ libvirt-1.3.2/daemon/test_libvirtd.aug.in +--- libvirt-1.3.3.orig/daemon/test_libvirtd.aug.in ++++ libvirt-1.3.3/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 a92db39..3930715 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-1.3.2/daemon/libvirtd.sysconf +Index: libvirt-1.3.3/daemon/libvirtd.sysconf =================================================================== ---- libvirt-1.3.2.orig/daemon/libvirtd.sysconf -+++ libvirt-1.3.2/daemon/libvirtd.sysconf +--- libvirt-1.3.3.orig/daemon/libvirtd.sysconf ++++ libvirt-1.3.3/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + diff --git a/libvirtd-systemd-socket.patch b/libvirtd-systemd-socket.patch index 8ad2370..541e868 100644 --- a/libvirtd-systemd-socket.patch +++ b/libvirtd-systemd-socket.patch @@ -9,10 +9,10 @@ as See bsc#933043 -Index: libvirt-1.3.2/daemon/libvirtd.socket.in +Index: libvirt-1.3.3/daemon/libvirtd.socket.in =================================================================== ---- libvirt-1.3.2.orig/daemon/libvirtd.socket.in -+++ libvirt-1.3.2/daemon/libvirtd.socket.in +--- libvirt-1.3.3.orig/daemon/libvirtd.socket.in ++++ libvirt-1.3.3/daemon/libvirtd.socket.in @@ -2,10 +2,8 @@ ListenStream=@runstatedir@/libvirt/libvirt-sock ListenStream=@runstatedir@/libvirt/libvirt-sock-ro diff --git a/libxl-qemu-emulator-caps.patch b/libxl-qemu-emulator-caps.patch index 7e915a1..efe342c 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-1.3.2/src/libxl/libxl_conf.c +Index: libvirt-1.3.3/src/libxl/libxl_conf.c =================================================================== ---- libvirt-1.3.2.orig/src/libxl/libxl_conf.c -+++ libvirt-1.3.2/src/libxl/libxl_conf.c +--- libvirt-1.3.3.orig/src/libxl/libxl_conf.c ++++ libvirt-1.3.3/src/libxl/libxl_conf.c @@ -439,7 +439,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virC if ((guest = virCapabilitiesAddGuest(caps, guest_archs[i].hvm ? VIR_DOMAIN_OSTYPE_HVM : VIR_DOMAIN_OSTYPE_XEN, diff --git a/libxl-support-block-script.patch b/libxl-support-block-script.patch index 5e5d251..7b9a6f4 100644 --- a/libxl-support-block-script.patch +++ b/libxl-support-block-script.patch @@ -7,11 +7,11 @@ and npiv. For more details, see bsc#954872 and FATE#319810 -Index: libvirt-1.3.2/src/libxl/libxl_conf.c +Index: libvirt-1.3.3/src/libxl/libxl_conf.c =================================================================== ---- libvirt-1.3.2.orig/src/libxl/libxl_conf.c -+++ libvirt-1.3.2/src/libxl/libxl_conf.c -@@ -891,6 +891,25 @@ libxlDiskSetDiscard(libxl_device_disk *x +--- libvirt-1.3.3.orig/src/libxl/libxl_conf.c ++++ libvirt-1.3.3/src/libxl/libxl_conf.c +@@ -905,6 +905,25 @@ libxlDiskSetDiscard(libxl_device_disk *x } @@ -37,7 +37,7 @@ Index: libvirt-1.3.2/src/libxl/libxl_conf.c #define LIBXL_QEMU_DM_STR "Options specific to the Xen version:" int -@@ -1108,6 +1127,7 @@ libxlMakeNetworkDiskSrc(virStorageSource +@@ -1122,6 +1141,7 @@ libxlMakeNetworkDiskSrc(virStorageSource int libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) { @@ -45,7 +45,7 @@ Index: libvirt-1.3.2/src/libxl/libxl_conf.c const char *driver; int format; int actual_type = virStorageSourceGetActualType(l_disk->src); -@@ -1118,7 +1138,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1132,7 +1152,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) return -1; } else { @@ -54,7 +54,7 @@ Index: libvirt-1.3.2/src/libxl/libxl_conf.c return -1; } -@@ -1227,6 +1247,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1241,6 +1261,9 @@ 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; diff --git a/lxc-wait-after-eth-del.patch b/lxc-wait-after-eth-del.patch index 6b32121..25ddea3 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-1.3.2/src/lxc/lxc_controller.c +Index: libvirt-1.3.3/src/lxc/lxc_controller.c =================================================================== ---- libvirt-1.3.2.orig/src/lxc/lxc_controller.c -+++ libvirt-1.3.2/src/lxc/lxc_controller.c +--- libvirt-1.3.3.orig/src/lxc/lxc_controller.c ++++ libvirt-1.3.3/src/lxc/lxc_controller.c @@ -2002,6 +2002,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; @@ -25,10 +25,10 @@ Index: libvirt-1.3.2/src/lxc/lxc_controller.c return ret; } -Index: libvirt-1.3.2/src/lxc/lxc_driver.c +Index: libvirt-1.3.3/src/lxc/lxc_driver.c =================================================================== ---- libvirt-1.3.2.orig/src/lxc/lxc_driver.c -+++ libvirt-1.3.2/src/lxc/lxc_driver.c +--- libvirt-1.3.3.orig/src/lxc/lxc_driver.c ++++ libvirt-1.3.3/src/lxc/lxc_driver.c @@ -4261,6 +4261,7 @@ lxcDomainAttachDeviceNetLive(virConnectP case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: @@ -45,10 +45,10 @@ Index: libvirt-1.3.2/src/lxc/lxc_driver.c break; /* It'd be nice to support this, but with macvlan -Index: libvirt-1.3.2/src/lxc/lxc_process.c +Index: libvirt-1.3.3/src/lxc/lxc_process.c =================================================================== ---- libvirt-1.3.2.orig/src/lxc/lxc_process.c -+++ libvirt-1.3.2/src/lxc/lxc_process.c +--- libvirt-1.3.3.orig/src/lxc/lxc_process.c ++++ libvirt-1.3.3/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 dccb87d..de30bc9 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-1.3.2/src/util/virarch.c +Index: libvirt-1.3.3/src/util/virarch.c =================================================================== ---- libvirt-1.3.2.orig/src/util/virarch.c -+++ libvirt-1.3.2/src/util/virarch.c +--- libvirt-1.3.3.orig/src/util/virarch.c ++++ libvirt-1.3.3/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 fac4abb..eeb9e4c 100644 --- a/qemu-apparmor-screenshot.patch +++ b/qemu-apparmor-screenshot.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.2/examples/apparmor/libvirt-qemu +Index: libvirt-1.3.3/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.3.2.orig/examples/apparmor/libvirt-qemu -+++ libvirt-1.3.2/examples/apparmor/libvirt-qemu +--- libvirt-1.3.3.orig/examples/apparmor/libvirt-qemu ++++ libvirt-1.3.3/examples/apparmor/libvirt-qemu @@ -152,6 +152,9 @@ /sys/bus/ r, /sys/class/ r, diff --git a/support-managed-pci-xen-driver.patch b/support-managed-pci-xen-driver.patch index 3f4c03e..6917af7 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-1.3.2/src/xenconfig/xen_common.c +Index: libvirt-1.3.3/src/xenconfig/xen_common.c =================================================================== ---- libvirt-1.3.2.orig/src/xenconfig/xen_common.c -+++ libvirt-1.3.2/src/xenconfig/xen_common.c +--- libvirt-1.3.3.orig/src/xenconfig/xen_common.c ++++ libvirt-1.3.3/src/xenconfig/xen_common.c @@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe { virConfValuePtr list = virConfGetValue(conf, "pci"); @@ -66,10 +66,10 @@ Index: libvirt-1.3.2/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-1.3.2/src/xenconfig/xen_sxpr.c +Index: libvirt-1.3.3/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.3.2.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.3.2/src/xenconfig/xen_sxpr.c +--- libvirt-1.3.3.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.3.3/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 86d0a32..cab520d 100644 --- a/suse-qemu-conf.patch +++ b/suse-qemu-conf.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.2/src/qemu/qemu.conf +Index: libvirt-1.3.3/src/qemu/qemu.conf =================================================================== ---- libvirt-1.3.2.orig/src/qemu/qemu.conf -+++ libvirt-1.3.2/src/qemu/qemu.conf +--- libvirt-1.3.3.orig/src/qemu/qemu.conf ++++ libvirt-1.3.3/src/qemu/qemu.conf @@ -201,11 +201,20 @@ # isolation, but it cannot appear in a list of drivers. # diff --git a/systemd-service-xen.patch b/systemd-service-xen.patch index 221f5f9..05540bc 100644 --- a/systemd-service-xen.patch +++ b/systemd-service-xen.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.2/daemon/libvirtd.service.in +Index: libvirt-1.3.3/daemon/libvirtd.service.in =================================================================== ---- libvirt-1.3.2.orig/daemon/libvirtd.service.in -+++ libvirt-1.3.2/daemon/libvirtd.service.in +--- libvirt-1.3.3.orig/daemon/libvirtd.service.in ++++ libvirt-1.3.3/daemon/libvirtd.service.in @@ -7,6 +7,7 @@ After=iscsid.service After=apparmor.service After=local-fs.target diff --git a/virtlockd-init-script.patch b/virtlockd-init-script.patch index e15d05a..f3614f8 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-1.3.2/src/locking/virtlockd.sysconf +Index: libvirt-1.3.3/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-1.3.2.orig/src/locking/virtlockd.sysconf -+++ libvirt-1.3.2/src/locking/virtlockd.sysconf +--- libvirt-1.3.3.orig/src/locking/virtlockd.sysconf ++++ libvirt-1.3.3/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,10 +12,10 @@ Index: libvirt-1.3.2/src/locking/virtlockd.sysconf # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-1.3.2/src/locking/virtlockd.init.in +Index: libvirt-1.3.3/src/locking/virtlockd.init.in =================================================================== ---- libvirt-1.3.2.orig/src/locking/virtlockd.init.in -+++ libvirt-1.3.2/src/locking/virtlockd.init.in +--- libvirt-1.3.3.orig/src/locking/virtlockd.init.in ++++ libvirt-1.3.3/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 c7a7754..b250f87 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-1.3.2/src/logging/virtlogd.init.in +Index: libvirt-1.3.3/src/logging/virtlogd.init.in =================================================================== ---- libvirt-1.3.2.orig/src/logging/virtlogd.init.in -+++ libvirt-1.3.2/src/logging/virtlogd.init.in +--- libvirt-1.3.3.orig/src/logging/virtlogd.init.in ++++ libvirt-1.3.3/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-1.3.2/src/logging/virtlogd.init.in esac -exit $RETVAL +rc_exit -Index: libvirt-1.3.2/src/logging/virtlogd.sysconf +Index: libvirt-1.3.3/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-1.3.2.orig/src/logging/virtlogd.sysconf -+++ libvirt-1.3.2/src/logging/virtlogd.sysconf +--- libvirt-1.3.3.orig/src/logging/virtlogd.sysconf ++++ libvirt-1.3.3/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 338b6c4..d47cb8b 100644 --- a/xen-pv-cdrom.patch +++ b/xen-pv-cdrom.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.3.2/src/xenconfig/xen_sxpr.c +Index: libvirt-1.3.3/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.3.2.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.3.2/src/xenconfig/xen_sxpr.c +--- libvirt-1.3.3.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.3.3/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 49ad9ac..8c55ca4 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-1.3.2/src/xenconfig/xen_sxpr.c +Index: libvirt-1.3.3/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.3.2.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.3.2/src/xenconfig/xen_sxpr.c +--- libvirt-1.3.3.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.3.3/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 */