diff --git a/apparmor-fixes.patch b/apparmor-fixes.patch index 710c511..3a458aa 100644 --- a/apparmor-fixes.patch +++ b/apparmor-fixes.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.16/examples/apparmor/libvirt-qemu +Index: libvirt-1.2.17/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.2.16.orig/examples/apparmor/libvirt-qemu -+++ libvirt-1.2.16/examples/apparmor/libvirt-qemu +--- libvirt-1.2.17.orig/examples/apparmor/libvirt-qemu ++++ libvirt-1.2.17/examples/apparmor/libvirt-qemu @@ -124,6 +124,9 @@ # for restore /bin/bash rmix, diff --git a/apparmor-no-mount.patch b/apparmor-no-mount.patch index 9feba98..9399a21 100644 --- a/apparmor-no-mount.patch +++ b/apparmor-no-mount.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.16/examples/apparmor/libvirt-lxc +Index: libvirt-1.2.17/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-1.2.16.orig/examples/apparmor/libvirt-lxc -+++ libvirt-1.2.16/examples/apparmor/libvirt-lxc +--- libvirt-1.2.17.orig/examples/apparmor/libvirt-lxc ++++ libvirt-1.2.17/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 8b5cb4b..d17ca75 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.2.16/src/qemu/qemu_driver.c +Index: libvirt-1.2.17/src/qemu/qemu_driver.c =================================================================== ---- libvirt-1.2.16.orig/src/qemu/qemu_driver.c -+++ libvirt-1.2.16/src/qemu/qemu_driver.c -@@ -16993,6 +16993,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-1.2.17.orig/src/qemu/qemu_driver.c ++++ libvirt-1.2.17/src/qemu/qemu_driver.c +@@ -16684,6 +16684,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt _("non-file destination not supported yet")); goto endjob; } diff --git a/disable-virCgroupGetPercpuStats-test.patch b/disable-virCgroupGetPercpuStats-test.patch index 682f72e..151c8b6 100644 --- a/disable-virCgroupGetPercpuStats-test.patch +++ b/disable-virCgroupGetPercpuStats-test.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.16/tests/vircgrouptest.c +Index: libvirt-1.2.17/tests/vircgrouptest.c =================================================================== ---- libvirt-1.2.16.orig/tests/vircgrouptest.c -+++ libvirt-1.2.16/tests/vircgrouptest.c +--- libvirt-1.2.17.orig/tests/vircgrouptest.c ++++ libvirt-1.2.17/tests/vircgrouptest.c @@ -34,7 +34,6 @@ # include "virfile.h" # include "virbuffer.h" diff --git a/libvirt-1.2.16.tar.gz b/libvirt-1.2.16.tar.gz deleted file mode 100644 index 3bd8dce..0000000 --- a/libvirt-1.2.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:419bee553442024b9ee8a1fa94023b1189bb52b7c3021fa37d8e4c108490060d -size 29157627 diff --git a/libvirt-1.2.16.tar.gz.asc b/libvirt-1.2.16.tar.gz.asc deleted file mode 100644 index 3c731e5..0000000 --- a/libvirt-1.2.16.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlVrxCsACgkQRga4pd6VvB9/SACfTRAvdCSH06+3RROrlKSNz7+P -2mgAnjcvia90gZinoVxUER/hA4v/fkND -=KdhP ------END PGP SIGNATURE----- diff --git a/libvirt-1.2.17.tar.gz b/libvirt-1.2.17.tar.gz new file mode 100644 index 0000000..b7fa357 --- /dev/null +++ b/libvirt-1.2.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e07eaf20b0590fae05ba3b53ad4dac3e5fbd771437563cc78b692f23ddd02fad +size 29320317 diff --git a/libvirt-1.2.17.tar.gz.asc b/libvirt-1.2.17.tar.gz.asc new file mode 100644 index 0000000..24e8708 --- /dev/null +++ b/libvirt-1.2.17.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlWUy+AACgkQRga4pd6VvB9AhACfT/hThYm7biG8nwcDkOHEuS8B +7AEAn1v3VdAwinxah46RWLiDdVtScU84 +=BcWI +-----END PGP SIGNATURE----- diff --git a/libvirt-guests-init-script.patch b/libvirt-guests-init-script.patch index 09490e8..053b45f 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.2.16/tools/libvirt-guests.init.in +Index: libvirt-1.2.17/tools/libvirt-guests.init.in =================================================================== ---- libvirt-1.2.16.orig/tools/libvirt-guests.init.in -+++ libvirt-1.2.16/tools/libvirt-guests.init.in +--- libvirt-1.2.17.orig/tools/libvirt-guests.init.in ++++ libvirt-1.2.17/tools/libvirt-guests.init.in @@ -3,15 +3,15 @@ # the following is the LSB init header # @@ -28,10 +28,10 @@ Index: libvirt-1.2.16/tools/libvirt-guests.init.in ### END INIT INFO # the following is chkconfig init header -Index: libvirt-1.2.16/tools/libvirt-guests.sh.in +Index: libvirt-1.2.17/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-1.2.16.orig/tools/libvirt-guests.sh.in -+++ libvirt-1.2.16/tools/libvirt-guests.sh.in +--- libvirt-1.2.17.orig/tools/libvirt-guests.sh.in ++++ libvirt-1.2.17/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # . @@ -191,10 +191,10 @@ Index: libvirt-1.2.16/tools/libvirt-guests.sh.in esac -exit $RETVAL +rc_exit -Index: libvirt-1.2.16/tools/libvirt-guests.sysconf +Index: libvirt-1.2.17/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-1.2.16.orig/tools/libvirt-guests.sysconf -+++ libvirt-1.2.16/tools/libvirt-guests.sysconf +--- libvirt-1.2.17.orig/tools/libvirt-guests.sysconf ++++ libvirt-1.2.17/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 5cba0dc..6f795ca 100644 --- a/libvirt-power8-models.patch +++ b/libvirt-power8-models.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.16/src/cpu/cpu_map.xml +Index: libvirt-1.2.17/src/cpu/cpu_map.xml =================================================================== ---- libvirt-1.2.16.orig/src/cpu/cpu_map.xml -+++ libvirt-1.2.16/src/cpu/cpu_map.xml +--- libvirt-1.2.17.orig/src/cpu/cpu_map.xml ++++ libvirt-1.2.17/src/cpu/cpu_map.xml @@ -668,6 +668,16 @@ diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index 3eafe09..57e48e9 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,8 +1,8 @@ -Index: libvirt-1.2.16/configure.ac +Index: libvirt-1.2.17/configure.ac =================================================================== ---- libvirt-1.2.16.orig/configure.ac -+++ libvirt-1.2.16/configure.ac -@@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE +--- libvirt-1.2.17.orig/configure.ac ++++ libvirt-1.2.17/configure.ac +@@ -241,6 +241,7 @@ LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_HAL LIBVIRT_CHECK_NETCF @@ -10,7 +10,7 @@ Index: libvirt-1.2.16/configure.ac LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_PCIACCESS -@@ -2495,11 +2496,12 @@ if test "$with_libvirtd" = "no" ; then +@@ -2492,11 +2493,12 @@ if test "$with_libvirtd" = "no" ; then with_interface=no fi @@ -26,7 +26,7 @@ Index: libvirt-1.2.16/configure.ac esac if test "$with_interface" = "yes" ; then -@@ -2887,6 +2889,7 @@ LIBVIRT_RESULT_FUSE +@@ -2885,6 +2887,7 @@ LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_HAL LIBVIRT_RESULT_NETCF @@ -34,11 +34,11 @@ Index: libvirt-1.2.16/configure.ac LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS -Index: libvirt-1.2.16/src/Makefile.am +Index: libvirt-1.2.17/src/Makefile.am =================================================================== ---- libvirt-1.2.16.orig/src/Makefile.am -+++ libvirt-1.2.16/src/Makefile.am -@@ -848,6 +848,10 @@ if WITH_NETCF +--- libvirt-1.2.17.orig/src/Makefile.am ++++ libvirt-1.2.17/src/Makefile.am +@@ -872,6 +872,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c endif WITH_NETCF @@ -49,7 +49,7 @@ Index: libvirt-1.2.16/src/Makefile.am if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1466,6 +1470,10 @@ if WITH_NETCF +@@ -1491,6 +1495,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.2.16/src/Makefile.am if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) -Index: libvirt-1.2.16/tools/virsh.c +Index: libvirt-1.2.17/tools/virsh.c =================================================================== ---- libvirt-1.2.16.orig/tools/virsh.c -+++ libvirt-1.2.16/tools/virsh.c -@@ -3327,6 +3327,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE +--- libvirt-1.2.17.orig/tools/virsh.c ++++ libvirt-1.2.17/tools/virsh.c +@@ -3383,6 +3383,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); @@ -73,10 +73,10 @@ Index: libvirt-1.2.16/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-1.2.16/src/interface/interface_backend_netcf.c +Index: libvirt-1.2.17/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-1.2.16.orig/src/interface/interface_backend_netcf.c -+++ libvirt-1.2.16/src/interface/interface_backend_netcf.c +--- libvirt-1.2.17.orig/src/interface/interface_backend_netcf.c ++++ libvirt-1.2.17/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include @@ -160,10 +160,10 @@ Index: libvirt-1.2.16/src/interface/interface_backend_netcf.c if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) return -1; if (virRegisterStateDriver(&interfaceStateDriver) < 0) -Index: libvirt-1.2.16/src/interface/interface_driver.c +Index: libvirt-1.2.17/src/interface/interface_driver.c =================================================================== ---- libvirt-1.2.16.orig/src/interface/interface_driver.c -+++ libvirt-1.2.16/src/interface/interface_driver.c +--- libvirt-1.2.17.orig/src/interface/interface_driver.c ++++ libvirt-1.2.17/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -181,10 +181,10 @@ Index: libvirt-1.2.16/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-1.2.16/m4/virt-netcontrol.m4 +Index: libvirt-1.2.17/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-1.2.16/m4/virt-netcontrol.m4 ++++ libvirt-1.2.17/m4/virt-netcontrol.m4 @@ -0,0 +1,35 @@ +dnl The libnetcontrol library +dnl diff --git a/libvirt.changes b/libvirt.changes index f43edeb..773298b 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jul 2 11:23:15 MDT 2015 - jfehlig@suse.com + +- Update to libvirt 1.2.17 + - parallels driver renamed to vz (Virtuozzo) + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html +- spec: re-enable tests that have received upstream fixes and + are now passing + ------------------------------------------------------------------- Wed Jun 3 11:29:32 MDT 2015 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 2470b65..b456fb7 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -51,7 +51,7 @@ %define with_esx 0%{!?_without_esx:1} %define with_hyperv 0%{!?_without_hyperv:0} %define with_xenapi 0%{!?_without_xenapi:1} -%define with_parallels 0%{!?_without_parallels:1} +%define with_vz 0%{!?_without_vz:1} # Then the secondary host drivers, which run inside libvirtd %define with_interface 0%{!?_without_interface:%{server_drivers}} @@ -119,7 +119,7 @@ %endif # SLES doesn't contain OpenVZ, VBox, UML, ESX, VMWare, Citrix XenAPI, -# or hyper-v +# hyper-v, or vz (Virtuozzo) %if 0%{?sles_version} %define with_openvz 0 %define with_vbox 0 @@ -128,7 +128,7 @@ %define with_vmware 0 %define with_xenapi 0 %define with_hyperv 0 - %define with_parallels 0 + %define with_vz 0 %endif # Enable phyp driver for IBM Power systems @@ -240,7 +240,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 1.2.16 +Version: 1.2.17 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ @@ -1030,8 +1030,8 @@ Provides a dissector for the libvirt RPC protocol to help debugging it. %if ! %{with_hyperv} %define _without_hyperv --without-hyperv %endif -%if ! %{with_parallels} - %define _without_parallels --without-parallels +%if ! %{with_vz} + %define _without_vz --without-vz %endif %if ! %{with_libxl} %define _without_libxl --without-libxl @@ -1166,7 +1166,7 @@ export CFLAGS="$RPM_OPT_FLAGS" %{?_without_esx} \ %{?_without_hyperv} \ %{?_without_vmware} \ - %{?_without_parallels} \ + %{?_without_vz} \ %{?_without_interface} \ %{?_without_network} \ %{?_without_storage_fs} \ @@ -1233,6 +1233,10 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/vi_VN %endif # temporarily remove polkit ACL policiy configuration - bnc#827644 rm -f $RPM_BUILD_ROOT/%{_datadir}/polkit-1/actions/org.libvirt.api.policy + +# Until libvirt 1.3.0, follow upstream and remove libvirt-admin.so +rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-admin.so + mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/libvirt mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/libvirt/hooks %find_lang %{name} @@ -1359,26 +1363,21 @@ rm -rf $RPM_BUILD_ROOT %check cd tests -make +SKIP_TESTS="" # These tests don't current work in a mock build root # virnetsockettest: needs unsupported linux-user syscalls -EXTRA="" - %if 0%{?qemu_user_space_build:1} -EXTRA="$EXTRA virnetsockettest" - %endif +SKIP_TESTS="$SKIP_TESTS virnetsockettest" # virportallocatortest fails on aarch64 due to unsupported IPV6_V6ONLY flag %ifarch aarch64 -EXTRA="$EXTRA virportallocatortest" +SKIP_TESTS="$SKIP_TESTS virportallocatortest" %endif -# temporarily disable failing virt-aa-helper-test -EXTRA="$EXTRA virt-aa-helper-test" -for i in nodeinfotest seclabeltest $EXTRA +for i in $SKIP_TESTS do rm -f $i printf 'int main(void) { return 0; }' > $i.c - printf '#!/bin/sh\nexit 0\n' > $i - chmod +x $i done +make + if ! make check VIR_TEST_DEBUG=1 then cat test-suite.log || true @@ -1791,6 +1790,7 @@ fi %{_libdir}/libvirt.so.* %{_libdir}/libvirt-qemu.so.* %{_libdir}/libvirt-lxc.so.* +%{_libdir}/libvirt-admin.so.* %attr(0755, root, root) %{_libdir}/%{name}/libvirt-guests.sh %{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests %if %{with_systemd} diff --git a/libvirtd-defaults.patch b/libvirtd-defaults.patch index 026f729..784a46c 100644 --- a/libvirtd-defaults.patch +++ b/libvirtd-defaults.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.16/daemon/libvirtd.conf +Index: libvirt-1.2.17/daemon/libvirtd.conf =================================================================== ---- libvirt-1.2.16.orig/daemon/libvirtd.conf -+++ libvirt-1.2.16/daemon/libvirtd.conf +--- libvirt-1.2.17.orig/daemon/libvirtd.conf ++++ libvirt-1.2.17/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.2.16/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.2.16/daemon/libvirtd-config.c +Index: libvirt-1.2.17/daemon/libvirtd-config.c =================================================================== ---- libvirt-1.2.16.orig/daemon/libvirtd-config.c -+++ libvirt-1.2.16/daemon/libvirtd-config.c +--- libvirt-1.2.17.orig/daemon/libvirtd-config.c ++++ libvirt-1.2.17/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.2.16/daemon/libvirtd-config.c data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-1.2.16/daemon/test_libvirtd.aug.in +Index: libvirt-1.2.17/daemon/test_libvirtd.aug.in =================================================================== ---- libvirt-1.2.16.orig/daemon/test_libvirtd.aug.in -+++ libvirt-1.2.16/daemon/test_libvirtd.aug.in +--- libvirt-1.2.17.orig/daemon/test_libvirtd.aug.in ++++ libvirt-1.2.17/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 170c316..9ffab02 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.2.16/daemon/libvirtd.sysconf +Index: libvirt-1.2.17/daemon/libvirtd.sysconf =================================================================== ---- libvirt-1.2.16.orig/daemon/libvirtd.sysconf -+++ libvirt-1.2.16/daemon/libvirtd.sysconf +--- libvirt-1.2.17.orig/daemon/libvirtd.sysconf ++++ libvirt-1.2.17/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + diff --git a/libvirtd-systemd-socket.patch b/libvirtd-systemd-socket.patch index 9b5586e..138deec 100644 --- a/libvirtd-systemd-socket.patch +++ b/libvirtd-systemd-socket.patch @@ -9,10 +9,10 @@ as See bsc#933043 -Index: libvirt-1.2.16/daemon/libvirtd.socket.in +Index: libvirt-1.2.17/daemon/libvirtd.socket.in =================================================================== ---- libvirt-1.2.16.orig/daemon/libvirtd.socket.in -+++ libvirt-1.2.16/daemon/libvirtd.socket.in +--- libvirt-1.2.17.orig/daemon/libvirtd.socket.in ++++ libvirt-1.2.17/daemon/libvirtd.socket.in @@ -2,10 +2,8 @@ ListenStream=@runstatedir@/libvirt/libvirt-sock ListenStream=@runstatedir@/libvirt/libvirt-sock-ro diff --git a/ppc64le-canonical-name.patch b/ppc64le-canonical-name.patch index e1b8f00..59f76d9 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.2.16/src/util/virarch.c +Index: libvirt-1.2.17/src/util/virarch.c =================================================================== ---- libvirt-1.2.16.orig/src/util/virarch.c -+++ libvirt-1.2.16/src/util/virarch.c +--- libvirt-1.2.17.orig/src/util/virarch.c ++++ libvirt-1.2.17/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 906e62b..a4f1e13 100644 --- a/qemu-apparmor-screenshot.patch +++ b/qemu-apparmor-screenshot.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.16/examples/apparmor/libvirt-qemu +Index: libvirt-1.2.17/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.2.16.orig/examples/apparmor/libvirt-qemu -+++ libvirt-1.2.16/examples/apparmor/libvirt-qemu +--- libvirt-1.2.17.orig/examples/apparmor/libvirt-qemu ++++ libvirt-1.2.17/examples/apparmor/libvirt-qemu @@ -133,6 +133,9 @@ /sys/bus/ r, /sys/class/ r, diff --git a/support-managed-pci-xen-driver.patch b/support-managed-pci-xen-driver.patch index c410171..ea6c0d1 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.2.16/src/xenconfig/xen_common.c +Index: libvirt-1.2.17/src/xenconfig/xen_common.c =================================================================== ---- libvirt-1.2.16.orig/src/xenconfig/xen_common.c -+++ libvirt-1.2.16/src/xenconfig/xen_common.c +--- libvirt-1.2.17.orig/src/xenconfig/xen_common.c ++++ libvirt-1.2.17/src/xenconfig/xen_common.c @@ -403,6 +403,8 @@ xenParsePCI(virConfPtr conf, virDomainDe { virConfValuePtr list = virConfGetValue(conf, "pci"); @@ -66,10 +66,10 @@ Index: libvirt-1.2.16/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.2.16/src/xenconfig/xen_sxpr.c +Index: libvirt-1.2.17/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.2.16.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.2.16/src/xenconfig/xen_sxpr.c +--- libvirt-1.2.17.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.2.17/src/xenconfig/xen_sxpr.c @@ -999,6 +999,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch index 6a5e2dd..3c28b84 100644 --- a/suse-qemu-conf.patch +++ b/suse-qemu-conf.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.16/src/qemu/qemu.conf +Index: libvirt-1.2.17/src/qemu/qemu.conf =================================================================== ---- libvirt-1.2.16.orig/src/qemu/qemu.conf -+++ libvirt-1.2.16/src/qemu/qemu.conf +--- libvirt-1.2.17.orig/src/qemu/qemu.conf ++++ libvirt-1.2.17/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 e770105..e3cb281 100644 --- a/systemd-service-xen.patch +++ b/systemd-service-xen.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.16/daemon/libvirtd.service.in +Index: libvirt-1.2.17/daemon/libvirtd.service.in =================================================================== ---- libvirt-1.2.16.orig/daemon/libvirtd.service.in -+++ libvirt-1.2.16/daemon/libvirtd.service.in +--- libvirt-1.2.17.orig/daemon/libvirtd.service.in ++++ libvirt-1.2.17/daemon/libvirtd.service.in @@ -5,6 +5,8 @@ After=network.target After=dbus.service After=iscsid.service diff --git a/virtlockd-init-script.patch b/virtlockd-init-script.patch index 9c4ebaf..c909643 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.2.16/src/locking/virtlockd.sysconf +Index: libvirt-1.2.17/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-1.2.16.orig/src/locking/virtlockd.sysconf -+++ libvirt-1.2.16/src/locking/virtlockd.sysconf +--- libvirt-1.2.17.orig/src/locking/virtlockd.sysconf ++++ libvirt-1.2.17/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,10 +12,10 @@ Index: libvirt-1.2.16/src/locking/virtlockd.sysconf # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-1.2.16/src/locking/virtlockd.init.in +Index: libvirt-1.2.17/src/locking/virtlockd.init.in =================================================================== ---- libvirt-1.2.16.orig/src/locking/virtlockd.init.in -+++ libvirt-1.2.16/src/locking/virtlockd.init.in +--- libvirt-1.2.17.orig/src/locking/virtlockd.init.in ++++ libvirt-1.2.17/src/locking/virtlockd.init.in @@ -4,12 +4,14 @@ # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV # diff --git a/xen-pv-cdrom.patch b/xen-pv-cdrom.patch index 6592c1b..e4d1ca2 100644 --- a/xen-pv-cdrom.patch +++ b/xen-pv-cdrom.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.16/src/xenconfig/xen_sxpr.c +Index: libvirt-1.2.17/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.2.16.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.2.16/src/xenconfig/xen_sxpr.c +--- libvirt-1.2.17.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.2.17/src/xenconfig/xen_sxpr.c @@ -334,7 +334,7 @@ xenParseSxprChar(const char *value, static int xenParseSxprDisks(virDomainDefPtr def,