diff --git a/apparmor-fixes.patch b/apparmor-fixes.patch index 2170491..d35d634 100644 --- a/apparmor-fixes.patch +++ b/apparmor-fixes.patch @@ -1,30 +1,11 @@ -Index: libvirt-1.2.14/examples/apparmor/libvirt-qemu +Index: libvirt-1.2.15/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.2.14.orig/examples/apparmor/libvirt-qemu -+++ libvirt-1.2.14/examples/apparmor/libvirt-qemu -@@ -59,6 +59,7 @@ - # access to firmware's etc - /usr/share/kvm/** r, - /usr/share/qemu/** r, -+ /usr/share/qemu-kvm/** r, - /usr/share/bochs/** r, - /usr/share/openbios/** r, - /usr/share/openhackware/** r, -@@ -73,6 +74,7 @@ - # the various binaries - /usr/bin/kvm rmix, - /usr/bin/qemu rmix, -+ /usr/bin/qemu-kvm rmix, - /usr/bin/qemu-system-arm rmix, - /usr/bin/qemu-system-cris rmix, - /usr/bin/qemu-system-i386 rmix, -@@ -118,6 +120,12 @@ - /bin/dd rmix, - /bin/cat rmix, +--- libvirt-1.2.15.orig/examples/apparmor/libvirt-qemu ++++ libvirt-1.2.15/examples/apparmor/libvirt-qemu +@@ -124,6 +124,9 @@ + # for restore + /bin/bash rmix, -+ # for restore -+ /bin/bash rmix, -+ + /run/nscd/passwd r, + /run/nscd/group r, + diff --git a/apparmor-no-mount.patch b/apparmor-no-mount.patch index 2a699e6..b5f043e 100644 --- a/apparmor-no-mount.patch +++ b/apparmor-no-mount.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.14/examples/apparmor/libvirt-lxc +Index: libvirt-1.2.15/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-1.2.14.orig/examples/apparmor/libvirt-lxc -+++ libvirt-1.2.14/examples/apparmor/libvirt-lxc +--- libvirt-1.2.15.orig/examples/apparmor/libvirt-lxc ++++ libvirt-1.2.15/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 ea69992..cec0652 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.14/src/qemu/qemu_driver.c +Index: libvirt-1.2.15/src/qemu/qemu_driver.c =================================================================== ---- libvirt-1.2.14.orig/src/qemu/qemu_driver.c -+++ libvirt-1.2.14/src/qemu/qemu_driver.c -@@ -16644,6 +16644,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-1.2.15.orig/src/qemu/qemu_driver.c ++++ libvirt-1.2.15/src/qemu/qemu_driver.c +@@ -17019,6 +17019,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt _("non-file destination not supported yet")); goto endjob; } diff --git a/da33a1ac-lxc-init-statedir.patch b/da33a1ac-lxc-init-statedir.patch deleted file mode 100644 index a549087..0000000 --- a/da33a1ac-lxc-init-statedir.patch +++ /dev/null @@ -1,38 +0,0 @@ -From da33a1ac1f6c0ae2ebe72bc385bbc7c407026956 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Wed, 8 Apr 2015 19:16:52 +0200 -Subject: [PATCH] lxc: create the required directories upon driver start - -/var/run may reside on a tmpfs and we fail to create the PID file if -/var/run/lxc does not exist. - -Since commit 0a8addc1, the lxc driver's state directory isn't -automatically created before starting a domain. Now, the lxc driver -makes sure the state directory exists when it initializes. - -Signed-off-by: Lubomir Rintel ---- - src/lxc/lxc_driver.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c -index 245000d..8dfa686 100644 ---- a/src/lxc/lxc_driver.c -+++ b/src/lxc/lxc_driver.c -@@ -1648,6 +1648,13 @@ static int lxcStateInitialize(bool privileged, - if (!(caps = virLXCDriverGetCapabilities(lxc_driver, false))) - goto cleanup; - -+ if (virFileMakePath(cfg->stateDir) < 0) { -+ virReportSystemError(errno, -+ _("Failed to mkdir %s"), -+ cfg->stateDir); -+ goto cleanup; -+ } -+ - /* Get all the running persistent or transient configs first */ - if (virDomainObjListLoadAllConfigs(lxc_driver->domains, - cfg->stateDir, --- -2.1.4 - diff --git a/disable-virCgroupGetPercpuStats-test.patch b/disable-virCgroupGetPercpuStats-test.patch index 99ef60e..e80a821 100644 --- a/disable-virCgroupGetPercpuStats-test.patch +++ b/disable-virCgroupGetPercpuStats-test.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.14/tests/vircgrouptest.c +Index: libvirt-1.2.15/tests/vircgrouptest.c =================================================================== ---- libvirt-1.2.14.orig/tests/vircgrouptest.c -+++ libvirt-1.2.14/tests/vircgrouptest.c +--- libvirt-1.2.15.orig/tests/vircgrouptest.c ++++ libvirt-1.2.15/tests/vircgrouptest.c @@ -34,7 +34,6 @@ # include "virfile.h" # include "virbuffer.h" @@ -10,8 +10,8 @@ Index: libvirt-1.2.14/tests/vircgrouptest.c # define VIR_FROM_THIS VIR_FROM_NONE -@@ -586,91 +585,6 @@ static int testCgroupAvailable(const voi - return 0; +@@ -607,91 +606,6 @@ static int testCgroupControllerAvailable + return ret; } -static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED) @@ -24,25 +24,25 @@ Index: libvirt-1.2.14/tests/vircgrouptest.c - - unsigned long long expected[EXPECTED_NCPUS] = { - 0, 0, 0, 0, 0, 0, 0, 0, -- 7059492996, 0, 0, 0, 0, 0, 0, 0, -- 4180532496, 0, 0, 0, 0, 0, 0, 0, +- 7059492996ULL, 0, 0, 0, 0, 0, 0, 0, +- 4180532496ULL, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -- 1957541268, 0, 0, 0, 0, 0, 0, 0, -- 2065932204, 0, 0, 0, 0, 0, 0, 0, -- 18228689414, 0, 0, 0, 0, 0, 0, 0, -- 4245525148, 0, 0, 0, 0, 0, 0, 0, -- 2911161568, 0, 0, 0, 0, 0, 0, 0, -- 1407758136, 0, 0, 0, 0, 0, 0, 0, -- 1836807700, 0, 0, 0, 0, 0, 0, 0, -- 1065296618, 0, 0, 0, 0, 0, 0, 0, -- 2046213266, 0, 0, 0, 0, 0, 0, 0, -- 747889778, 0, 0, 0, 0, 0, 0, 0, -- 709566900, 0, 0, 0, 0, 0, 0, 0, -- 444777342, 0, 0, 0, 0, 0, 0, 0, -- 5683512916, 0, 0, 0, 0, 0, 0, 0, -- 635751356, 0, 0, 0, 0, 0, 0, 0, +- 1957541268ULL, 0, 0, 0, 0, 0, 0, 0, +- 2065932204ULL, 0, 0, 0, 0, 0, 0, 0, +- 18228689414ULL, 0, 0, 0, 0, 0, 0, 0, +- 4245525148ULL, 0, 0, 0, 0, 0, 0, 0, +- 2911161568ULL, 0, 0, 0, 0, 0, 0, 0, +- 1407758136ULL, 0, 0, 0, 0, 0, 0, 0, +- 1836807700ULL, 0, 0, 0, 0, 0, 0, 0, +- 1065296618ULL, 0, 0, 0, 0, 0, 0, 0, +- 2046213266ULL, 0, 0, 0, 0, 0, 0, 0, +- 747889778ULL, 0, 0, 0, 0, 0, 0, 0, +- 709566900ULL, 0, 0, 0, 0, 0, 0, 0, +- 444777342ULL, 0, 0, 0, 0, 0, 0, 0, +- 5683512916ULL, 0, 0, 0, 0, 0, 0, 0, +- 635751356ULL, 0, 0, 0, 0, 0, 0, 0, - }; - - if (VIR_ALLOC_N(params, EXPECTED_NCPUS) < 0) @@ -102,7 +102,7 @@ Index: libvirt-1.2.14/tests/vircgrouptest.c static int testCgroupGetMemoryUsage(const void *args ATTRIBUTE_UNUSED) { virCgroupPtr cgroup = NULL; -@@ -895,9 +809,6 @@ mymain(void) +@@ -919,9 +833,6 @@ mymain(void) if (virtTestRun("virCgroupGetMemoryUsage works", testCgroupGetMemoryUsage, NULL) < 0) ret = -1; diff --git a/libvirt-1.2.14.tar.gz b/libvirt-1.2.14.tar.gz deleted file mode 100644 index a50d2d1..0000000 --- a/libvirt-1.2.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8e8e6f1fc91eb8694fa21f9c57a736fa4a5af10562e14e4aa2c7e23510c4c07 -size 28947850 diff --git a/libvirt-1.2.14.tar.gz.asc b/libvirt-1.2.14.tar.gz.asc deleted file mode 100644 index 8f6c26c..0000000 --- a/libvirt-1.2.14.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlUc9BMACgkQRga4pd6VvB9YcwCeKTfxcm3uFtYaWRJVLLygtIHV -cdYAnRTKsdMBJBTSzlFRLvKt1rBGtsVo -=LYrN ------END PGP SIGNATURE----- diff --git a/libvirt-1.2.15.tar.gz b/libvirt-1.2.15.tar.gz new file mode 100644 index 0000000..bcd2c05 --- /dev/null +++ b/libvirt-1.2.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f88041b8c212f8f687c672fe583108833240d6175b512ce4de92ab6660194c6 +size 29094868 diff --git a/libvirt-1.2.15.tar.gz.asc b/libvirt-1.2.15.tar.gz.asc new file mode 100644 index 0000000..868d495 --- /dev/null +++ b/libvirt-1.2.15.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlVG6IgACgkQRga4pd6VvB8pUACfe0uCYnQVlAKIZz0R4ImEO37J +3zgAoImjy0DQTneMNMp3saPUc+NwONYH +=kDa/ +-----END PGP SIGNATURE----- diff --git a/libvirt-guests-init-script.patch b/libvirt-guests-init-script.patch index 9042b4e..ee4e3c1 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.14/tools/libvirt-guests.init.in +Index: libvirt-1.2.15/tools/libvirt-guests.init.in =================================================================== ---- libvirt-1.2.14.orig/tools/libvirt-guests.init.in -+++ libvirt-1.2.14/tools/libvirt-guests.init.in +--- libvirt-1.2.15.orig/tools/libvirt-guests.init.in ++++ libvirt-1.2.15/tools/libvirt-guests.init.in @@ -3,15 +3,15 @@ # the following is the LSB init header # @@ -28,10 +28,10 @@ Index: libvirt-1.2.14/tools/libvirt-guests.init.in ### END INIT INFO # the following is chkconfig init header -Index: libvirt-1.2.14/tools/libvirt-guests.sh.in +Index: libvirt-1.2.15/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-1.2.14.orig/tools/libvirt-guests.sh.in -+++ libvirt-1.2.14/tools/libvirt-guests.sh.in +--- libvirt-1.2.15.orig/tools/libvirt-guests.sh.in ++++ libvirt-1.2.15/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.14/tools/libvirt-guests.sh.in esac -exit $RETVAL +rc_exit -Index: libvirt-1.2.14/tools/libvirt-guests.sysconf +Index: libvirt-1.2.15/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-1.2.14.orig/tools/libvirt-guests.sysconf -+++ libvirt-1.2.14/tools/libvirt-guests.sysconf +--- libvirt-1.2.15.orig/tools/libvirt-guests.sysconf ++++ libvirt-1.2.15/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 1f9e8a4..72c3f85 100644 --- a/libvirt-power8-models.patch +++ b/libvirt-power8-models.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.14/src/cpu/cpu_map.xml +Index: libvirt-1.2.15/src/cpu/cpu_map.xml =================================================================== ---- libvirt-1.2.14.orig/src/cpu/cpu_map.xml -+++ libvirt-1.2.14/src/cpu/cpu_map.xml +--- libvirt-1.2.15.orig/src/cpu/cpu_map.xml ++++ libvirt-1.2.15/src/cpu/cpu_map.xml @@ -668,6 +668,16 @@ diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index fc22f96..82618b5 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.14/configure.ac +Index: libvirt-1.2.15/configure.ac =================================================================== ---- libvirt-1.2.14.orig/configure.ac -+++ libvirt-1.2.14/configure.ac +--- libvirt-1.2.15.orig/configure.ac ++++ libvirt-1.2.15/configure.ac @@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_HAL @@ -34,11 +34,11 @@ Index: libvirt-1.2.14/configure.ac LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS -Index: libvirt-1.2.14/src/Makefile.am +Index: libvirt-1.2.15/src/Makefile.am =================================================================== ---- libvirt-1.2.14.orig/src/Makefile.am -+++ libvirt-1.2.14/src/Makefile.am -@@ -847,6 +847,10 @@ if WITH_NETCF +--- libvirt-1.2.15.orig/src/Makefile.am ++++ libvirt-1.2.15/src/Makefile.am +@@ -848,6 +848,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c endif WITH_NETCF @@ -49,7 +49,7 @@ Index: libvirt-1.2.14/src/Makefile.am if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1455,6 +1459,10 @@ if WITH_NETCF +@@ -1464,6 +1468,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.14/src/Makefile.am if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) -Index: libvirt-1.2.14/tools/virsh.c +Index: libvirt-1.2.15/tools/virsh.c =================================================================== ---- libvirt-1.2.14.orig/tools/virsh.c -+++ libvirt-1.2.14/tools/virsh.c -@@ -3360,6 +3360,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE +--- libvirt-1.2.15.orig/tools/virsh.c ++++ libvirt-1.2.15/tools/virsh.c +@@ -3327,6 +3327,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); @@ -73,10 +73,10 @@ Index: libvirt-1.2.14/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-1.2.14/src/interface/interface_backend_netcf.c +Index: libvirt-1.2.15/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-1.2.14.orig/src/interface/interface_backend_netcf.c -+++ libvirt-1.2.14/src/interface/interface_backend_netcf.c +--- libvirt-1.2.15.orig/src/interface/interface_backend_netcf.c ++++ libvirt-1.2.15/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include @@ -160,10 +160,10 @@ Index: libvirt-1.2.14/src/interface/interface_backend_netcf.c if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) return -1; if (virRegisterStateDriver(&interfaceStateDriver) < 0) -Index: libvirt-1.2.14/src/interface/interface_driver.c +Index: libvirt-1.2.15/src/interface/interface_driver.c =================================================================== ---- libvirt-1.2.14.orig/src/interface/interface_driver.c -+++ libvirt-1.2.14/src/interface/interface_driver.c +--- libvirt-1.2.15.orig/src/interface/interface_driver.c ++++ libvirt-1.2.15/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -181,10 +181,10 @@ Index: libvirt-1.2.14/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-1.2.14/m4/virt-netcontrol.m4 +Index: libvirt-1.2.15/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-1.2.14/m4/virt-netcontrol.m4 ++++ libvirt-1.2.15/m4/virt-netcontrol.m4 @@ -0,0 +1,35 @@ +dnl The libnetcontrol library +dnl diff --git a/libvirt.changes b/libvirt.changes index 3e12094..b2513aa 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon May 4 09:00:24 MDT 2015 - jfehlig@suse.com + +- Update to libvirt 1.2.15 + - Implement virDomainAddIOThread and virDomainDelIOThread + - libxl: Introduce configuration file for libxl driver + - Add VIR_DOMAIN_EVENT_ID_DEVICE_ADDED event + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Drop upstream patches da33a1ac-lxc-init-statedir.patch and + open-ns-files-readonly.patch +- spec file fixups for building --without-driver-modules + ------------------------------------------------------------------- Mon Apr 20 13:19:09 UTC 2015 - cbosdonnat@suse.com diff --git a/libvirt.spec b/libvirt.spec index 125eb4b..bec61d3 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -1,7 +1,7 @@ # # spec file for package libvirt # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -245,7 +245,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 1.2.14 +Version: 1.2.15 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ @@ -449,9 +449,7 @@ Source4: libvirtd-relocation-server.fw Source5: polkit-10-virt.rules Source99: baselibs.conf # Upstream patches -Patch0: da33a1ac-lxc-init-statedir.patch # Patches pending upstream review -Patch100: open-ns-files-readonly.patch # Need to go upstream Patch150: xen-pv-cdrom.patch Patch151: blockcopy-check-dst-identical-device.patch @@ -980,8 +978,6 @@ Provides a dissector for the libvirt RPC protocol to help debugging it. %prep %setup -q -%patch0 -p1 -%patch100 -p1 %patch150 -p1 %patch151 -p1 %patch152 -p1 @@ -1308,6 +1304,11 @@ Any empty package encapsulating requirements for a libvirtd capable of managing Xen. EOF %endif +%if ! %{with_libxl} +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libxl.conf +rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_libxl.aug +rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug +%endif %if ! %{with_sanlock} rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirt_sanlock.aug rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug @@ -1326,7 +1327,7 @@ install %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/init.d/libvirtd ln -s /etc/init.d/libvirtd $RPM_BUILD_ROOT%{_sbindir}/rclibvirtd %endif mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd -rm -f $RPM_BUILD_ROOT/usr/lib/sysctl.d/libvirtd.conf +rm -f $RPM_BUILD_ROOT/usr/lib/sysctl.d/60-libvirtd.conf # For other services, use the in-tree scripts %if %{with_systemd} rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/virtlockd @@ -1554,8 +1555,6 @@ fi %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ %attr(0755, root, root) %{_libdir}/%{name}/libvirt_leaseshelper -%dir %{_datadir}/libvirt/networks/ -%{_datadir}/libvirt/networks/default.xml %endif %if %{with_nwfilter} %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ @@ -1566,8 +1565,6 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug @@ -1580,6 +1577,7 @@ fi %attr(0755, root, root) %{_libdir}/%{name}/libvirt_lxc %{_datadir}/augeas/lenses/libvirtd_lxc.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug +%attr(0755, root, root) %{_bindir}/virt-lxc-convert %endif %if %{with_uml} %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml @@ -1587,8 +1585,12 @@ fi %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/ %endif %if %{with_libxl} +%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf +%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ +%{_datadir}/augeas/lenses/libvirtd_libxl.aug +%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug %endif %if %{with_storage_disk} %attr(0755, root, root) %{_libdir}/%{name}/libvirt_parthelper @@ -1677,8 +1679,6 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug @@ -1725,6 +1725,10 @@ fi %files daemon-driver-libxl %defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf +%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf +%{_datadir}/augeas/lenses/libvirtd_libxl.aug +%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ %dir %{_libdir}/%{name}/connection-driver @@ -1862,6 +1866,9 @@ fi %if %{with_qemu} %config(noreplace) %{_sysconfdir}/%{name}/qemu-sanlock.conf %endif + %if %{with_libxl} +%config(noreplace) %{_sysconfdir}/%{name}/libxl-sanlock.conf + %endif %dir %{_libdir}/%{name}/lock-driver/ %attr(0755, root, root) %{_libdir}/%{name}/lock-driver/sanlock.so %dir %{_datadir}/augeas/ diff --git a/libvirtd-defaults.patch b/libvirtd-defaults.patch index 6e93b0b..5badfe5 100644 --- a/libvirtd-defaults.patch +++ b/libvirtd-defaults.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.14/daemon/libvirtd.conf +Index: libvirt-1.2.15/daemon/libvirtd.conf =================================================================== ---- libvirt-1.2.14.orig/daemon/libvirtd.conf -+++ libvirt-1.2.14/daemon/libvirtd.conf +--- libvirt-1.2.15.orig/daemon/libvirtd.conf ++++ libvirt-1.2.15/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.14/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.14/daemon/libvirtd-config.c +Index: libvirt-1.2.15/daemon/libvirtd-config.c =================================================================== ---- libvirt-1.2.14.orig/daemon/libvirtd-config.c -+++ libvirt-1.2.14/daemon/libvirtd-config.c +--- libvirt-1.2.15.orig/daemon/libvirtd-config.c ++++ libvirt-1.2.15/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.14/daemon/libvirtd-config.c data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-1.2.14/daemon/test_libvirtd.aug.in +Index: libvirt-1.2.15/daemon/test_libvirtd.aug.in =================================================================== ---- libvirt-1.2.14.orig/daemon/test_libvirtd.aug.in -+++ libvirt-1.2.14/daemon/test_libvirtd.aug.in +--- libvirt-1.2.15.orig/daemon/test_libvirtd.aug.in ++++ libvirt-1.2.15/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 dbe6646..2cdf5a4 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.14/daemon/libvirtd.sysconf +Index: libvirt-1.2.15/daemon/libvirtd.sysconf =================================================================== ---- libvirt-1.2.14.orig/daemon/libvirtd.sysconf -+++ libvirt-1.2.14/daemon/libvirtd.sysconf +--- libvirt-1.2.15.orig/daemon/libvirtd.sysconf ++++ libvirt-1.2.15/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + diff --git a/open-ns-files-readonly.patch b/open-ns-files-readonly.patch deleted file mode 100644 index b425142..0000000 --- a/open-ns-files-readonly.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cc21badc5c30ddeeb89abfa9ecdfbacd512f33c2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= -Date: Thu, 9 Apr 2015 09:22:43 +0200 -Subject: [PATCH] Open /proc/PID/ns/* read-only to avoid getting permission - denied - -lxc-enter-namespace stopped working on recent kernels (at least 3.19+) -due to /proc/PID/ns/* file descriptors being opened RW. From outside -the namespace these can only be opened RO. ---- - src/util/virprocess.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/util/virprocess.c b/src/util/virprocess.c -index ab1e039..7a79970 100644 ---- a/src/util/virprocess.c -+++ b/src/util/virprocess.c -@@ -628,7 +628,7 @@ int virProcessGetNamespaces(pid_t pid, - ns[i]) < 0) - goto cleanup; - -- if ((fd = open(nsfile, O_RDWR)) >= 0) { -+ if ((fd = open(nsfile, O_RDONLY)) >= 0) { - if (VIR_EXPAND_N(*fdlist, *nfdlist, 1) < 0) { - VIR_FORCE_CLOSE(fd); - goto cleanup; --- -2.1.4 - diff --git a/ppc64le-canonical-name.patch b/ppc64le-canonical-name.patch index 273160b..8edc2d5 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.14/src/util/virarch.c +Index: libvirt-1.2.15/src/util/virarch.c =================================================================== ---- libvirt-1.2.14.orig/src/util/virarch.c -+++ libvirt-1.2.14/src/util/virarch.c +--- libvirt-1.2.15.orig/src/util/virarch.c ++++ libvirt-1.2.15/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 c3721b0..cb3929b 100644 --- a/qemu-apparmor-screenshot.patch +++ b/qemu-apparmor-screenshot.patch @@ -1,8 +1,8 @@ -Index: libvirt-1.2.14/examples/apparmor/libvirt-qemu +Index: libvirt-1.2.15/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.2.14.orig/examples/apparmor/libvirt-qemu -+++ libvirt-1.2.14/examples/apparmor/libvirt-qemu -@@ -132,6 +132,9 @@ +--- libvirt-1.2.15.orig/examples/apparmor/libvirt-qemu ++++ libvirt-1.2.15/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 4f3c52e..7609d63 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.14/src/xenconfig/xen_common.c +Index: libvirt-1.2.15/src/xenconfig/xen_common.c =================================================================== ---- libvirt-1.2.14.orig/src/xenconfig/xen_common.c -+++ libvirt-1.2.14/src/xenconfig/xen_common.c +--- libvirt-1.2.15.orig/src/xenconfig/xen_common.c ++++ libvirt-1.2.15/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.14/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.14/src/xenconfig/xen_sxpr.c +Index: libvirt-1.2.15/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.2.14.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.2.14/src/xenconfig/xen_sxpr.c +--- libvirt-1.2.15.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.2.15/src/xenconfig/xen_sxpr.c @@ -999,6 +999,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; @@ -93,7 +93,7 @@ Index: libvirt-1.2.14/src/xenconfig/xen_sxpr.c dev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; dev->source.subsys.u.pci.addr.domain = domainID; dev->source.subsys.u.pci.addr.bus = busID; -@@ -2006,11 +2009,15 @@ static void +@@ -2012,11 +2015,15 @@ static void xenFormatSxprPCI(virDomainHostdevDefPtr def, virBufferPtr buf) { @@ -110,7 +110,7 @@ Index: libvirt-1.2.14/src/xenconfig/xen_sxpr.c } -@@ -2029,12 +2036,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP +@@ -2035,12 +2042,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP virBufferPtr buf, int detach) { @@ -123,7 +123,7 @@ Index: libvirt-1.2.14/src/xenconfig/xen_sxpr.c virBufferAddLit(buf, "(pci "); xenFormatSxprPCI(def, buf); if (detach) -@@ -2089,12 +2090,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def, +@@ -2095,12 +2096,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def, for (i = 0; i < def->nhostdevs; i++) { if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch index 03037f6..28365e8 100644 --- a/suse-qemu-conf.patch +++ b/suse-qemu-conf.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.14/src/qemu/qemu.conf +Index: libvirt-1.2.15/src/qemu/qemu.conf =================================================================== ---- libvirt-1.2.14.orig/src/qemu/qemu.conf -+++ libvirt-1.2.14/src/qemu/qemu.conf +--- libvirt-1.2.15.orig/src/qemu/qemu.conf ++++ libvirt-1.2.15/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 b88e8c3..09e4654 100644 --- a/systemd-service-xen.patch +++ b/systemd-service-xen.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.14/daemon/libvirtd.service.in +Index: libvirt-1.2.15/daemon/libvirtd.service.in =================================================================== ---- libvirt-1.2.14.orig/daemon/libvirtd.service.in -+++ libvirt-1.2.14/daemon/libvirtd.service.in +--- libvirt-1.2.15.orig/daemon/libvirtd.service.in ++++ libvirt-1.2.15/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 cac9d48..7957fef 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.14/src/locking/virtlockd.sysconf +Index: libvirt-1.2.15/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-1.2.14.orig/src/locking/virtlockd.sysconf -+++ libvirt-1.2.14/src/locking/virtlockd.sysconf +--- libvirt-1.2.15.orig/src/locking/virtlockd.sysconf ++++ libvirt-1.2.15/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,10 +12,10 @@ Index: libvirt-1.2.14/src/locking/virtlockd.sysconf # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-1.2.14/src/locking/virtlockd.init.in +Index: libvirt-1.2.15/src/locking/virtlockd.init.in =================================================================== ---- libvirt-1.2.14.orig/src/locking/virtlockd.init.in -+++ libvirt-1.2.14/src/locking/virtlockd.init.in +--- libvirt-1.2.15.orig/src/locking/virtlockd.init.in ++++ libvirt-1.2.15/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 1775531..bd44536 100644 --- a/xen-pv-cdrom.patch +++ b/xen-pv-cdrom.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.14/src/xenconfig/xen_sxpr.c +Index: libvirt-1.2.15/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.2.14.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.2.14/src/xenconfig/xen_sxpr.c +--- libvirt-1.2.15.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.2.15/src/xenconfig/xen_sxpr.c @@ -334,7 +334,7 @@ xenParseSxprChar(const char *value, static int xenParseSxprDisks(virDomainDefPtr def,