Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2013-09-07 07:36:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvirt (Old)
and /work/SRC/openSUSE:Factory/.libvirt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2013-08-15 13:22:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2013-09-07 07:36:03.000000000 +0200
@@ -1,0 +2,16 @@
+Tue Sep 3 11:04:45 MDT 2013 - jfehlig@suse.com
+
+- Update to libvirt 1.1.2
+ - various improvements to libxl driver
+ - systemd integration improvements
+ - Add flag to BaselineCPU API to return detailed CPU features
+ - Introduce a virt-login-shell binary
+ - conf: add startupPolicy attribute for harddisk
+ - Many incremental improvements and bug fixes, see
+ http://libvirt.org/news.html
+ - Drop upstream patches: bcef0f01-libxl-console.patch,
+ 9d0557b9-legacy-xen-double-free.patch,
+ d7a45bf2-legacy-xen-dumpxml.patch, 0e671a16-CVE-2013-4239.patch
+ - Includes fixes for bnc#837530, bnc#837531, bnc#837999
+
+-------------------------------------------------------------------
Old:
----
0e671a16-CVE-2013-4239.patch
9d0557b9-legacy-xen-double-free.patch
bcef0f01-libxl-console.patch
d7a45bf2-legacy-xen-dumpxml.patch
libvirt-1.1.1.tar.bz2
New:
----
libvirt-1.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.054smq/_old 2013-09-07 07:36:05.000000000 +0200
+++ /var/tmp/diff_new_pack.054smq/_new 2013-09-07 07:36:05.000000000 +0200
@@ -225,7 +225,7 @@
Name: libvirt
Url: http://libvirt.org/
-Version: 1.1.1
+Version: 1.1.2
Release: 0
Summary: Library providing a simple virtualization API
License: LGPL-2.1+
@@ -404,10 +404,6 @@
Source2: libvirtd-relocation-server.fw
Source99: baselibs.conf
# Upstream patches
-Patch0: bcef0f01-libxl-console.patch
-Patch1: 9d0557b9-legacy-xen-double-free.patch
-Patch2: d7a45bf2-legacy-xen-dumpxml.patch
-Patch3: 0e671a16-CVE-2013-4239.patch
# Need to go upstream
Patch100: xen-name-for-devid.patch
Patch101: clone.patch
@@ -906,10 +902,6 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%patch100 -p1
%patch101
%patch102 -p1
@@ -1369,11 +1361,14 @@
%endif
%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
+%config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf
%dir %{_datadir}/augeas/
%dir %{_datadir}/augeas/lenses
%dir %{_datadir}/augeas/lenses/tests
%{_datadir}/augeas/lenses/libvirtd.aug
%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
+%{_datadir}/augeas/lenses/virtlockd.aug
+%{_datadir}/augeas/lenses/tests/test_virtlockd.aug
%{_datadir}/augeas/lenses/libvirt_lockd.aug
%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
%if %{with_dtrace}
@@ -1401,6 +1396,8 @@
%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
@@ -1428,6 +1425,7 @@
%endif
%attr(0755, root, root) %{_libdir}/%{name}/libvirt_iohelper
%doc %{_mandir}/man8/libvirtd.8*
+%{_mandir}/man8/virtlockd.8*
%if %{with_apparmor}
%dir %{_sysconfdir}/apparmor.d
%dir %{_sysconfdir}/apparmor.d/abstractions
@@ -1584,11 +1582,17 @@
%doc %{_mandir}/man1/virt-xml-validate.1*
%doc %{_mandir}/man1/virt-pki-validate.1*
%doc %{_mandir}/man1/virt-host-validate.1*
+%doc %{_mandir}/man1/virt-login-shell.1*
%config(noreplace) %{_sysconfdir}/%{name}/libvirt.conf
+%config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf
%{_bindir}/virsh
%{_bindir}/virt-xml-validate
%{_bindir}/virt-pki-validate
%{_bindir}/virt-host-validate
+# setuid binary that needs security audit - bnc#837609
+# In the meantime, don't install setuid
+#%attr(4755, root, root) %{_bindir}/virt-login-shell
+%{_bindir}/virt-login-shell
%dir %{_libdir}/%{name}
%{_libdir}/lib*.so.*
%attr(0755, root, root) %{_libdir}/%{name}/libvirt-guests.sh
@@ -1676,7 +1680,6 @@
%{py_sitedir}/libvirt_qemu.py*
%{py_sitedir}/libvirt_lxc.py*
%{py_sitedir}/libvirtmod*
-%doc python/tests/*.py
%doc examples/python
%doc examples/domain-events/events-python
%endif
++++++ clone.patch ++++++
--- /var/tmp/diff_new_pack.054smq/_old 2013-09-07 07:36:05.000000000 +0200
+++ /var/tmp/diff_new_pack.054smq/_new 2013-09-07 07:36:05.000000000 +0200
@@ -32,7 +32,7 @@
VIR_FREE(stack);
if (cpid < 0) {
virReportSystemError(errno, "%s",
-@@ -1879,7 +1887,11 @@ int lxcContainerStart(virDomainDefPtr de
+@@ -1893,7 +1901,11 @@ int lxcContainerStart(virDomainDefPtr de
cflags |= CLONE_NEWNET;
}
@@ -44,7 +44,7 @@
VIR_FREE(stack);
VIR_DEBUG("clone() completed, new container PID is %d", pid);
-@@ -1905,6 +1917,7 @@ int lxcContainerAvailable(int features)
+@@ -1919,6 +1931,7 @@ int lxcContainerAvailable(int features)
int cpid;
char *childStack;
char *stack;
@@ -52,7 +52,7 @@
if (features & LXC_CONTAINER_FEATURE_USER)
flags |= CLONE_NEWUSER;
-@@ -1912,14 +1925,21 @@ int lxcContainerAvailable(int features)
+@@ -1926,14 +1939,21 @@ int lxcContainerAvailable(int features)
if (features & LXC_CONTAINER_FEATURE_NET)
flags |= CLONE_NEWNET;
++++++ fix-pci-attach-xen-driver.patch ++++++
--- /var/tmp/diff_new_pack.054smq/_old 2013-09-07 07:36:05.000000000 +0200
+++ /var/tmp/diff_new_pack.054smq/_new 2013-09-07 07:36:05.000000000 +0200
@@ -8,10 +8,10 @@
This patch changes the xend driver to always call 'device_configure' for
PCI devices to be consistent with the usage in the xen tools.
-Index: libvirt-1.1.1/src/xen/xend_internal.c
+Index: libvirt-1.1.2/src/xen/xend_internal.c
===================================================================
---- libvirt-1.1.1.orig/src/xen/xend_internal.c
-+++ libvirt-1.1.1/src/xen/xend_internal.c
+--- libvirt-1.1.2.orig/src/xen/xend_internal.c
++++ libvirt-1.1.2/src/xen/xend_internal.c
@@ -2206,6 +2206,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr
virBuffer buf = VIR_BUFFER_INITIALIZER;
char class[8], ref[80];
++++++ install-apparmor-profiles.patch ++++++
--- /var/tmp/diff_new_pack.054smq/_old 2013-09-07 07:36:05.000000000 +0200
+++ /var/tmp/diff_new_pack.054smq/_new 2013-09-07 07:36:05.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.1.1/examples/apparmor/Makefile.am
+Index: libvirt-1.1.2/examples/apparmor/Makefile.am
===================================================================
---- libvirt-1.1.1.orig/examples/apparmor/Makefile.am
-+++ libvirt-1.1.1/examples/apparmor/Makefile.am
+--- libvirt-1.1.2.orig/examples/apparmor/Makefile.am
++++ libvirt-1.1.2/examples/apparmor/Makefile.am
@@ -14,8 +14,45 @@
## License along with this library. If not, see
## http://www.gnu.org/licenses/.
@@ -53,10 +53,10 @@
+ rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE
+
+endif
-Index: libvirt-1.1.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+Index: libvirt-1.1.2/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
===================================================================
--- /dev/null
-+++ libvirt-1.1.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
++++ libvirt-1.1.2/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -0,0 +1,40 @@
+# Last Modified: Fri Aug 19 11:21:48 2011
+#include
@@ -98,9 +98,9 @@
+ /var/lib/kvm/images/ r,
+ /var/lib/kvm/images/** r,
+}
-Index: libvirt-1.1.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+Index: libvirt-1.1.2/examples/apparmor/usr.lib.libvirt.virt-aa-helper
===================================================================
---- libvirt-1.1.1.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+--- libvirt-1.1.2.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ /dev/null
@@ -1,38 +0,0 @@
-# Last Modified: Mon Apr 5 15:10:27 2010
@@ -141,9 +141,9 @@
- /var/lib/libvirt/images/ r,
- /var/lib/libvirt/images/** r,
-}
-Index: libvirt-1.1.1/examples/apparmor/usr.sbin.libvirtd
+Index: libvirt-1.1.2/examples/apparmor/usr.sbin.libvirtd
===================================================================
---- libvirt-1.1.1.orig/examples/apparmor/usr.sbin.libvirtd
+--- libvirt-1.1.2.orig/examples/apparmor/usr.sbin.libvirtd
+++ /dev/null
@@ -1,52 +0,0 @@
-# Last Modified: Mon Apr 5 15:03:58 2010
@@ -198,10 +198,10 @@
- change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
-
-}
-Index: libvirt-1.1.1/examples/apparmor/usr.sbin.libvirtd.in
+Index: libvirt-1.1.2/examples/apparmor/usr.sbin.libvirtd.in
===================================================================
--- /dev/null
-+++ libvirt-1.1.1/examples/apparmor/usr.sbin.libvirtd.in
++++ libvirt-1.1.2/examples/apparmor/usr.sbin.libvirtd.in
@@ -0,0 +1,58 @@
+# Last Modified: Fri Aug 19 11:20:36 2011
+#include
@@ -261,9 +261,9 @@
+ change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
+
+}
-Index: libvirt-1.1.1/examples/apparmor/libvirt-qemu
+Index: libvirt-1.1.2/examples/apparmor/libvirt-qemu
===================================================================
---- libvirt-1.1.1.orig/examples/apparmor/libvirt-qemu
+--- libvirt-1.1.2.orig/examples/apparmor/libvirt-qemu
+++ /dev/null
@@ -1,129 +0,0 @@
-# Last Modified: Fri Mar 9 14:43:22 2012
@@ -395,10 +395,10 @@
-
- /usr/libexec/qemu-bridge-helper rmix,
- }
-Index: libvirt-1.1.1/examples/apparmor/libvirt-qemu.in
+Index: libvirt-1.1.2/examples/apparmor/libvirt-qemu.in
===================================================================
--- /dev/null
-+++ libvirt-1.1.1/examples/apparmor/libvirt-qemu.in
++++ libvirt-1.1.2/examples/apparmor/libvirt-qemu.in
@@ -0,0 +1,132 @@
+# Last Modified: Fri Mar 9 14:43:22 2012
+
++++++ libvirt-1.1.1.tar.bz2 -> libvirt-1.1.2.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libvirt/libvirt-1.1.1.tar.bz2 /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-1.1.2.tar.bz2 differ: char 11, line 1
++++++ libvirt-guests-init-script.patch ++++++
--- /var/tmp/diff_new_pack.054smq/_old 2013-09-07 07:36:05.000000000 +0200
+++ /var/tmp/diff_new_pack.054smq/_new 2013-09-07 07:36:05.000000000 +0200
@@ -1,9 +1,9 @@
Adjust libvirt-guests init files to conform to SUSE standards
-Index: libvirt-1.1.1/tools/libvirt-guests.init.in
+Index: libvirt-1.1.2/tools/libvirt-guests.init.in
===================================================================
---- libvirt-1.1.1.orig/tools/libvirt-guests.init.in
-+++ libvirt-1.1.1/tools/libvirt-guests.init.in
+--- libvirt-1.1.2.orig/tools/libvirt-guests.init.in
++++ libvirt-1.1.2/tools/libvirt-guests.init.in
@@ -3,15 +3,15 @@
# the following is the LSB init header
#
@@ -28,10 +28,10 @@
### END INIT INFO
# the following is chkconfig init header
-Index: libvirt-1.1.1/tools/libvirt-guests.sh.in
+Index: libvirt-1.1.2/tools/libvirt-guests.sh.in
===================================================================
---- libvirt-1.1.1.orig/tools/libvirt-guests.sh.in
-+++ libvirt-1.1.1/tools/libvirt-guests.sh.in
+--- libvirt-1.1.2.orig/tools/libvirt-guests.sh.in
++++ libvirt-1.1.2/tools/libvirt-guests.sh.in
@@ -16,14 +16,13 @@
# License along with this library. If not, see
# http://www.gnu.org/licenses/.
@@ -189,10 +189,10 @@
esac
-exit $RETVAL
+rc_exit
-Index: libvirt-1.1.1/tools/libvirt-guests.sysconf
+Index: libvirt-1.1.2/tools/libvirt-guests.sysconf
===================================================================
---- libvirt-1.1.1.orig/tools/libvirt-guests.sysconf
-+++ libvirt-1.1.1/tools/libvirt-guests.sysconf
+--- libvirt-1.1.2.orig/tools/libvirt-guests.sysconf
++++ libvirt-1.1.2/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests
+
++++++ libvirt-suse-netcontrol.patch ++++++
--- /var/tmp/diff_new_pack.054smq/_old 2013-09-07 07:36:05.000000000 +0200
+++ /var/tmp/diff_new_pack.054smq/_new 2013-09-07 07:36:05.000000000 +0200
@@ -1,8 +1,8 @@
-Index: libvirt-1.1.1/configure.ac
+Index: libvirt-1.1.2/configure.ac
===================================================================
---- libvirt-1.1.1.orig/configure.ac
-+++ libvirt-1.1.1/configure.ac
-@@ -172,6 +172,7 @@ LIBVIRT_CHECK_DBUS
+--- libvirt-1.1.2.orig/configure.ac
++++ libvirt-1.1.2/configure.ac
+@@ -173,6 +173,7 @@ LIBVIRT_CHECK_DBUS
LIBVIRT_CHECK_FUSE
LIBVIRT_CHECK_HAL
LIBVIRT_CHECK_NETCF
@@ -10,7 +10,7 @@
LIBVIRT_CHECK_NUMACTL
LIBVIRT_CHECK_OPENWSMAN
LIBVIRT_CHECK_PCIACCESS
-@@ -2226,11 +2227,12 @@ if test "$with_libvirtd" = "no" ; then
+@@ -2288,11 +2289,12 @@ if test "$with_libvirtd" = "no" ; then
with_interface=no
fi
@@ -26,7 +26,7 @@
esac
if test "$with_interface" = "yes" ; then
-@@ -2527,6 +2529,7 @@ LIBVIRT_RESULT_DBUS
+@@ -2600,6 +2602,7 @@ LIBVIRT_RESULT_DBUS
LIBVIRT_RESULT_FUSE
LIBVIRT_RESULT_HAL
LIBVIRT_RESULT_NETCF
@@ -34,11 +34,11 @@
LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN
LIBVIRT_RESULT_PCIACCESS
-Index: libvirt-1.1.1/src/Makefile.am
+Index: libvirt-1.1.2/src/Makefile.am
===================================================================
---- libvirt-1.1.1.orig/src/Makefile.am
-+++ libvirt-1.1.1/src/Makefile.am
-@@ -741,6 +741,10 @@ if WITH_NETCF
+--- libvirt-1.1.2.orig/src/Makefile.am
++++ libvirt-1.1.2/src/Makefile.am
+@@ -750,6 +750,10 @@ if WITH_NETCF
INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_netcf.c
endif
@@ -49,7 +49,7 @@
if WITH_UDEV
INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_udev.c
-@@ -1293,11 +1297,16 @@ if WITH_NETCF
+@@ -1310,11 +1314,16 @@ if WITH_NETCF
libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
else
@@ -66,11 +66,11 @@
if WITH_DRIVER_MODULES
libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la
libvirt_driver_interface_la_LDFLAGS += -module -avoid-version
-Index: libvirt-1.1.1/tools/virsh.c
+Index: libvirt-1.1.2/tools/virsh.c
===================================================================
---- libvirt-1.1.1.orig/tools/virsh.c
-+++ libvirt-1.1.1/tools/virsh.c
-@@ -2882,6 +2882,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
+--- libvirt-1.1.2.orig/tools/virsh.c
++++ libvirt-1.1.2/tools/virsh.c
+@@ -2864,6 +2864,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
vshPrint(ctl, " Interface");
# if defined(WITH_NETCF)
vshPrint(ctl, " netcf");
@@ -79,10 +79,10 @@
# elif defined(WITH_UDEV)
vshPrint(ctl, " udev");
# endif
-Index: libvirt-1.1.1/src/interface/interface_backend_netcf.c
+Index: libvirt-1.1.2/src/interface/interface_backend_netcf.c
===================================================================
---- libvirt-1.1.1.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-1.1.1/src/interface/interface_backend_netcf.c
+--- libvirt-1.1.2.orig/src/interface/interface_backend_netcf.c
++++ libvirt-1.1.2/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@
#include
@@ -147,10 +147,10 @@
/* open netcf */
if (ncf_init(&driverState->netcf, NULL) != 0)
{
-Index: libvirt-1.1.1/src/interface/interface_driver.c
+Index: libvirt-1.1.2/src/interface/interface_driver.c
===================================================================
---- libvirt-1.1.1.orig/src/interface/interface_driver.c
-+++ libvirt-1.1.1/src/interface/interface_driver.c
+--- libvirt-1.1.2.orig/src/interface/interface_driver.c
++++ libvirt-1.1.2/src/interface/interface_driver.c
@@ -28,8 +28,15 @@ interfaceRegister(void) {
if (netcfIfaceRegister() == 0)
return 0;
@@ -168,10 +168,10 @@
if (udevIfaceRegister() == 0)
return 0;
#endif /* WITH_UDEV */
-Index: libvirt-1.1.1/m4/virt-netcontrol.m4
+Index: libvirt-1.1.2/m4/virt-netcontrol.m4
===================================================================
--- /dev/null
-+++ libvirt-1.1.1/m4/virt-netcontrol.m4
++++ libvirt-1.1.2/m4/virt-netcontrol.m4
@@ -0,0 +1,35 @@
+dnl The libnetcontrol library
+dnl
++++++ libvirtd-defaults.patch ++++++
--- /var/tmp/diff_new_pack.054smq/_old 2013-09-07 07:36:05.000000000 +0200
+++ /var/tmp/diff_new_pack.054smq/_new 2013-09-07 07:36:05.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.1.1/daemon/libvirtd.conf
+Index: libvirt-1.1.2/daemon/libvirtd.conf
===================================================================
---- libvirt-1.1.1.orig/daemon/libvirtd.conf
-+++ libvirt-1.1.1/daemon/libvirtd.conf
+--- libvirt-1.1.2.orig/daemon/libvirtd.conf
++++ libvirt-1.1.2/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 @@
# 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.1.1/daemon/libvirtd-config.c
+Index: libvirt-1.1.2/daemon/libvirtd-config.c
===================================================================
---- libvirt-1.1.1.orig/daemon/libvirtd-config.c
-+++ libvirt-1.1.1/daemon/libvirtd-config.c
+--- libvirt-1.1.2.orig/daemon/libvirtd-config.c
++++ libvirt-1.1.2/daemon/libvirtd-config.c
@@ -222,7 +222,7 @@ daemonConfigNew(bool privileged ATTRIBUT
if (VIR_ALLOC(data) < 0)
return NULL;
++++++ libvirtd-init-script.patch ++++++
--- /var/tmp/diff_new_pack.054smq/_old 2013-09-07 07:36:05.000000000 +0200
+++ /var/tmp/diff_new_pack.054smq/_new 2013-09-07 07:36:05.000000000 +0200
@@ -1,9 +1,9 @@
Adjust libvirtd sysconfig file to conform to SUSE standards
-Index: libvirt-1.1.1/daemon/libvirtd.sysconf
+Index: libvirt-1.1.2/daemon/libvirtd.sysconf
===================================================================
---- libvirt-1.1.1.orig/daemon/libvirtd.sysconf
-+++ libvirt-1.1.1/daemon/libvirtd.sysconf
+--- libvirt-1.1.2.orig/daemon/libvirtd.sysconf
++++ libvirt-1.1.2/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt
+
++++++ support-managed-pci-xen-driver.patch ++++++
--- /var/tmp/diff_new_pack.054smq/_old 2013-09-07 07:36:05.000000000 +0200
+++ /var/tmp/diff_new_pack.054smq/_new 2013-09-07 07:36:05.000000000 +0200
@@ -8,10 +8,10 @@
src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 15 deletions(-)
-Index: libvirt-1.1.1/src/xenxs/xen_sxpr.c
+Index: libvirt-1.1.2/src/xenxs/xen_sxpr.c
===================================================================
---- libvirt-1.1.1.orig/src/xenxs/xen_sxpr.c
-+++ libvirt-1.1.1/src/xenxs/xen_sxpr.c
+--- libvirt-1.1.2.orig/src/xenxs/xen_sxpr.c
++++ libvirt-1.1.2/src/xenxs/xen_sxpr.c
@@ -993,6 +993,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID;
int slotID;
@@ -35,7 +35,7 @@
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;
-@@ -1993,11 +1996,15 @@ static void
+@@ -1990,11 +1993,15 @@ static void
xenFormatSxprPCI(virDomainHostdevDefPtr def,
virBufferPtr buf)
{
@@ -52,7 +52,7 @@
}
-@@ -2016,12 +2023,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
+@@ -2013,12 +2020,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
virBufferPtr buf,
int detach)
{
@@ -65,7 +65,7 @@
virBufferAddLit(buf, "(pci ");
xenFormatSxprPCI(def, buf);
if (detach)
-@@ -2076,12 +2077,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
+@@ -2073,12 +2074,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) {
@@ -78,10 +78,10 @@
xenFormatSxprPCI(def->hostdevs[i], buf);
}
}
-Index: libvirt-1.1.1/src/xenxs/xen_xm.c
+Index: libvirt-1.1.2/src/xenxs/xen_xm.c
===================================================================
---- libvirt-1.1.1.orig/src/xenxs/xen_xm.c
-+++ libvirt-1.1.1/src/xenxs/xen_xm.c
+--- libvirt-1.1.2.orig/src/xenxs/xen_xm.c
++++ libvirt-1.1.2/src/xenxs/xen_xm.c
@@ -802,6 +802,8 @@ xenParseXM(virConfPtr conf, int xendConf
int busID;
int slotID;
++++++ suse-qemu-conf.patch ++++++
--- /var/tmp/diff_new_pack.054smq/_old 2013-09-07 07:36:05.000000000 +0200
+++ /var/tmp/diff_new_pack.054smq/_new 2013-09-07 07:36:05.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.1.1/src/qemu/qemu.conf
+Index: libvirt-1.1.2/src/qemu/qemu.conf
===================================================================
---- libvirt-1.1.1.orig/src/qemu/qemu.conf
-+++ libvirt-1.1.1/src/qemu/qemu.conf
+--- libvirt-1.1.2.orig/src/qemu/qemu.conf
++++ libvirt-1.1.2/src/qemu/qemu.conf
@@ -175,7 +175,16 @@
# a special value; security_driver can be set to that value in
# isolation, but it cannot appear in a list of drivers.
++++++ systemd-service-xen.patch ++++++
--- /var/tmp/diff_new_pack.054smq/_old 2013-09-07 07:36:05.000000000 +0200
+++ /var/tmp/diff_new_pack.054smq/_new 2013-09-07 07:36:05.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.1.1/daemon/libvirtd.service.in
+Index: libvirt-1.1.2/daemon/libvirtd.service.in
===================================================================
---- libvirt-1.1.1.orig/daemon/libvirtd.service.in
-+++ libvirt-1.1.1/daemon/libvirtd.service.in
+--- libvirt-1.1.2.orig/daemon/libvirtd.service.in
++++ libvirt-1.1.2/daemon/libvirtd.service.in
@@ -9,6 +9,8 @@ Before=libvirt-guests.service
After=network.target
After=dbus.service
++++++ virtlockd-init-script.patch ++++++
--- /var/tmp/diff_new_pack.054smq/_old 2013-09-07 07:36:05.000000000 +0200
+++ /var/tmp/diff_new_pack.054smq/_new 2013-09-07 07:36:05.000000000 +0200
@@ -1,9 +1,9 @@
Adjust virtlockd init files to conform to SUSE standards
-Index: libvirt-1.1.1/src/locking/virtlockd.sysconf
+Index: libvirt-1.1.2/src/locking/virtlockd.sysconf
===================================================================
---- libvirt-1.1.1.orig/src/locking/virtlockd.sysconf
-+++ libvirt-1.1.1/src/locking/virtlockd.sysconf
+--- libvirt-1.1.2.orig/src/locking/virtlockd.sysconf
++++ libvirt-1.1.2/src/locking/virtlockd.sysconf
@@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlockd
+
@@ -12,10 +12,10 @@
#
# Pass extra arguments to virtlockd
#VIRTLOCKD_ARGS=
-Index: libvirt-1.1.1/src/locking/virtlockd.init.in
+Index: libvirt-1.1.2/src/locking/virtlockd.init.in
===================================================================
---- libvirt-1.1.1.orig/src/locking/virtlockd.init.in
-+++ libvirt-1.1.1/src/locking/virtlockd.init.in
+--- libvirt-1.1.2.orig/src/locking/virtlockd.init.in
++++ libvirt-1.1.2/src/locking/virtlockd.init.in
@@ -4,11 +4,13 @@
# http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-gen...
#
@@ -34,7 +34,7 @@
### END INIT INFO
# the following is chkconfig init header
-@@ -23,35 +25,39 @@
+@@ -23,35 +25,31 @@
# pidfile: @localstatedir@/run/libvirt/virtlockd.pid
#
@@ -53,12 +53,7 @@
test -f @sysconfdir@/sysconfig/virtlockd && . @sysconfdir@/sysconfig/virtlockd
-RETVAL=0
-+if [ -d @localstatedir@/lock/subsys ]; then
-+ VAR_SUBSYS_VIRTLOCKD=@localstatedir@/lock/subsys/$SERVICE
-+else
-+ VAR_SUBSYS_VIRTLOCKD=@localstatedir@/lock/$SERVICE
-+fi
-
+-
start() {
- echo -n $"Starting $SERVICE daemon: "
- daemon --pidfile $PIDFILE --check $SERVICE $PROCESS --daemon $VIRTLOCKD_ARGS
@@ -68,7 +63,6 @@
- echo
- [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE
+ rc_status -v
-+ [ $RETVAL -eq 0 ] && touch $VAR_SUBSYS_VIRTLOCKD
}
stop() {
@@ -82,11 +76,10 @@
+ rc_status -v
if [ $RETVAL -eq 0 ]; then
- rm -f @localstatedir@/lock/subsys/$SERVICE
-+ rm -f $VAR_SUBSYS_VIRTLOCKD
rm -f $PIDFILE
fi
}
-@@ -65,9 +71,7 @@ reload() {
+@@ -65,9 +63,7 @@ reload() {
echo -n $"Reloading $SERVICE configuration: "
killproc -p $PIDFILE $PROCESS -HUP
@@ -97,7 +90,7 @@
}
# See how we were called.
-@@ -76,18 +80,20 @@ case "$1" in
+@@ -76,18 +72,20 @@ case "$1" in
$1
;;
status)
@@ -112,7 +105,7 @@
;;
condrestart|try-restart)
- [ -f @localstatedir@/lock/subsys/$SERVICE ] && restart || :
-+ [ -f $VAR_SUBSYS_VIRTLOCKD ] && restart || :
++ status >/dev/null && restart || :
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload|try-restart}"
++++++ xen-name-for-devid.patch ++++++
--- /var/tmp/diff_new_pack.054smq/_old 2013-09-07 07:36:05.000000000 +0200
+++ /var/tmp/diff_new_pack.054smq/_new 2013-09-07 07:36:05.000000000 +0200
@@ -14,10 +14,10 @@
is inactive. We obviously can't search xenstore when the domain is
inactive.
-Index: libvirt-1.1.1/src/xen/xend_internal.c
+Index: libvirt-1.1.2/src/xen/xend_internal.c
===================================================================
---- libvirt-1.1.1.orig/src/xen/xend_internal.c
-+++ libvirt-1.1.1/src/xen/xend_internal.c
+--- libvirt-1.1.2.orig/src/xen/xend_internal.c
++++ libvirt-1.1.2/src/xen/xend_internal.c
@@ -70,7 +70,7 @@
#define XEND_RCV_BUF_MAX_LEN (256 * 1024)
++++++ xen-pv-cdrom.patch ++++++
--- /var/tmp/diff_new_pack.054smq/_old 2013-09-07 07:36:05.000000000 +0200
+++ /var/tmp/diff_new_pack.054smq/_new 2013-09-07 07:36:05.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.1.1/src/xenxs/xen_sxpr.c
+Index: libvirt-1.1.2/src/xenxs/xen_sxpr.c
===================================================================
---- libvirt-1.1.1.orig/src/xenxs/xen_sxpr.c
-+++ libvirt-1.1.1/src/xenxs/xen_sxpr.c
+--- libvirt-1.1.2.orig/src/xenxs/xen_sxpr.c
++++ libvirt-1.1.2/src/xenxs/xen_sxpr.c
@@ -327,7 +327,7 @@ error:
static int
xenParseSxprDisks(virDomainDefPtr def,
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org