From a9dad6f7589d80c01cc2f646c0929f2dea7d916e79d1bd9845335a27bf4526c8 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Thu, 2 Jun 2011 18:32:33 +0000 Subject: [PATCH] Update to libvirt 0.9.2 rc2 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=122 --- clone.patch | 10 +++++----- libvirt-0.9.1.tar.bz2 | 3 --- libvirt-0.9.2.tar.bz2 | 3 +++ libvirt.changes | 7 +++++++ libvirt.spec | 16 ++++++++-------- use-init-script-redhat.patch | 26 +++++++++++++------------- xen-name-for-devid.patch | 20 ++++++++++---------- 7 files changed, 46 insertions(+), 39 deletions(-) delete mode 100644 libvirt-0.9.1.tar.bz2 create mode 100644 libvirt-0.9.2.tar.bz2 diff --git a/clone.patch b/clone.patch index 23f40d0..65dc506 100644 --- a/clone.patch +++ b/clone.patch @@ -2,7 +2,7 @@ Index: src/lxc/lxc_container.c =================================================================== --- src/lxc/lxc_container.c.orig +++ src/lxc/lxc_container.c -@@ -883,6 +883,9 @@ int lxcContainerStart(virDomainDefPtr de +@@ -879,6 +879,9 @@ int lxcContainerStart(virDomainDefPtr de lxc_child_argv_t args = { def, nveths, veths, control, ttyPath }; /* allocate a stack for the container */ @@ -12,7 +12,7 @@ Index: src/lxc/lxc_container.c if (VIR_ALLOC_N(stack, stacksize) < 0) { virReportOOMError(); return -1; -@@ -901,7 +904,11 @@ int lxcContainerStart(virDomainDefPtr de +@@ -897,7 +900,11 @@ int lxcContainerStart(virDomainDefPtr de flags |= CLONE_NEWNET; } @@ -24,7 +24,7 @@ Index: src/lxc/lxc_container.c VIR_FREE(stack); VIR_DEBUG("clone() completed, new container PID is %d", pid); -@@ -928,6 +935,7 @@ int lxcContainerAvailable(int features) +@@ -924,6 +931,7 @@ int lxcContainerAvailable(int features) char *childStack; char *stack; int childStatus; @@ -32,7 +32,7 @@ Index: src/lxc/lxc_container.c if (features & LXC_CONTAINER_FEATURE_USER) flags |= CLONE_NEWUSER; -@@ -935,14 +943,21 @@ int lxcContainerAvailable(int features) +@@ -931,14 +939,21 @@ int lxcContainerAvailable(int features) if (features & LXC_CONTAINER_FEATURE_NET) flags |= CLONE_NEWNET; @@ -41,7 +41,7 @@ Index: src/lxc/lxc_container.c + stacksize *= 2; +#endif + if (VIR_ALLOC_N(stack, stacksize) < 0) { - VIR_DEBUG0("Unable to allocate stack"); + VIR_DEBUG("Unable to allocate stack"); return -1; } diff --git a/libvirt-0.9.1.tar.bz2 b/libvirt-0.9.1.tar.bz2 deleted file mode 100644 index c13857a..0000000 --- a/libvirt-0.9.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a2ff6a4e1855ca0d696c1c0d07674546ba893f8d74e3850e2d368e1f5dfba0d -size 10346535 diff --git a/libvirt-0.9.2.tar.bz2 b/libvirt-0.9.2.tar.bz2 new file mode 100644 index 0000000..7c0704b --- /dev/null +++ b/libvirt-0.9.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28aa67195b2e776e034eab5d4d0e3018ea53d13e263de671ec21c9a7d806ed2a +size 10778392 diff --git a/libvirt.changes b/libvirt.changes index f8ae449..ae0c06d 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jun 2 12:27:13 MDT 2011 - jfehlig@suse.de + +- Update to libvirt 0.9.2 RC2 +- spec file: Adjust some directory attributes to support running + non-privileged qemu domains + ------------------------------------------------------------------- Mon May 15 15:53:21 MDT 2011 - jfehlig@suse.de diff --git a/libvirt.spec b/libvirt.spec index f6d8c8a..f9c4120 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -269,7 +269,7 @@ Url: http://libvirt.org/ License: LGPLv2.1+ Group: Development/Libraries/C and C++ AutoReqProv: yes -Version: 0.9.1 +Version: 0.9.2 Release: 1 Summary: A C toolkit to interract with the virtualization capabilities of Linux @@ -727,9 +727,9 @@ fi %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd %dir %{_localstatedir}/lib/libvirt/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/ -%dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/ +%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/ +%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/ +%dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ %if %{with_polkit} %if 0%{?suse_version} > 1110 @@ -742,8 +742,8 @@ fi %if %{with_qemu} %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/qemu/ -%dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/qemu/ +%dir %attr(0750, root, root) %{_localstatedir}/lib/libvirt/qemu/ +%dir %attr(0750, root, root) %{_localstatedir}/cache/libvirt/qemu/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %endif %if %{with_lxc} @@ -763,9 +763,9 @@ fi %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ %endif %if %{with_storage_disk} -%{_libdir}/%{name}/libvirt_parthelper +%attr(0755, root, root) %{_libdir}/%{name}/libvirt_parthelper %endif -%{_libdir}/%{name}/libvirt_iohelper +%attr(0755, root, root) %{_libdir}/%{name}/libvirt_iohelper %doc %{_mandir}/man8/libvirtd.8* %endif diff --git a/use-init-script-redhat.patch b/use-init-script-redhat.patch index deef77d..560ae5a 100644 --- a/use-init-script-redhat.patch +++ b/use-init-script-redhat.patch @@ -1,7 +1,7 @@ -Index: libvirt-0.9.1/tools/Makefile.am +Index: libvirt-0.9.2/tools/Makefile.am =================================================================== ---- libvirt-0.9.1.orig/tools/Makefile.am -+++ libvirt-0.9.1/tools/Makefile.am +--- libvirt-0.9.2.orig/tools/Makefile.am ++++ libvirt-0.9.2/tools/Makefile.am @@ -131,16 +131,17 @@ uninstall-local: uninstall-init if LIBVIRT_INIT_SCRIPT_RED_HAT @@ -26,10 +26,10 @@ Index: libvirt-0.9.1/tools/Makefile.am BUILT_SOURCES += libvirt-guests.init -Index: libvirt-0.9.1/tools/libvirt-guests.sysconf +Index: libvirt-0.9.2/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-0.9.1.orig/tools/libvirt-guests.sysconf -+++ libvirt-0.9.1/tools/libvirt-guests.sysconf +--- libvirt-0.9.2.orig/tools/libvirt-guests.sysconf ++++ libvirt-0.9.2/tools/libvirt-guests.sysconf @@ -1,18 +1,28 @@ +## Path: System/Virtualization/libvirt + @@ -74,10 +74,10 @@ Index: libvirt-0.9.1/tools/libvirt-guests.sysconf # number of seconds we're willing to wait for a guest to shut down -#SHUTDOWN_TIMEOUT=0 +SHUTDOWN_TIMEOUT=120 -Index: libvirt-0.9.1/tools/libvirt-guests.init.sh +Index: libvirt-0.9.2/tools/libvirt-guests.init.sh =================================================================== ---- libvirt-0.9.1.orig/tools/libvirt-guests.init.sh -+++ libvirt-0.9.1/tools/libvirt-guests.init.sh +--- libvirt-0.9.2.orig/tools/libvirt-guests.init.sh ++++ libvirt-0.9.2/tools/libvirt-guests.init.sh @@ -4,10 +4,10 @@ # ### BEGIN INIT INFO @@ -220,11 +220,11 @@ Index: libvirt-0.9.1/tools/libvirt-guests.init.sh esac -exit $RETVAL +rc_exit -Index: libvirt-0.9.1/daemon/Makefile.am +Index: libvirt-0.9.2/daemon/Makefile.am =================================================================== ---- libvirt-0.9.1.orig/daemon/Makefile.am -+++ libvirt-0.9.1/daemon/Makefile.am -@@ -281,16 +281,12 @@ install-logrotate: $(LOGROTATE_CONFS) +--- libvirt-0.9.2.orig/daemon/Makefile.am ++++ libvirt-0.9.2/daemon/Makefile.am +@@ -302,16 +302,12 @@ install-logrotate: $(LOGROTATE_CONFS) if LIBVIRT_INIT_SCRIPT_RED_HAT install-init: libvirtd.init diff --git a/xen-name-for-devid.patch b/xen-name-for-devid.patch index cd96daa..b745b68 100644 --- a/xen-name-for-devid.patch +++ b/xen-name-for-devid.patch @@ -13,11 +13,11 @@ Date: Wed Jan 27 16:11:41 2010 -0700 This approach allows removing a disk when domain is inactive. We obviously can't search xenstore when the domain is inactive. -Index: libvirt-0.9.1/src/xen/xend_internal.c +Index: libvirt-0.9.2/src/xen/xend_internal.c =================================================================== ---- libvirt-0.9.1.orig/src/xen/xend_internal.c -+++ libvirt-0.9.1/src/xen/xend_internal.c -@@ -62,6 +62,7 @@ +--- libvirt-0.9.2.orig/src/xen/xend_internal.c ++++ libvirt-0.9.2/src/xen/xend_internal.c +@@ -60,6 +60,7 @@ static int virDomainXMLDevID(virDomainPtr domain, @@ -25,7 +25,7 @@ Index: libvirt-0.9.1/src/xen/xend_internal.c virDomainDeviceDefPtr dev, char *class, char *ref, -@@ -2731,7 +2732,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr +@@ -2780,7 +2781,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr sexpr = virBufferContentAndReset(&buf); @@ -34,7 +34,7 @@ Index: libvirt-0.9.1/src/xen/xend_internal.c /* device doesn't exist, define it */ ret = xend_op(domain->conn, domain->name, "op", "device_create", "config", sexpr, NULL); -@@ -2854,7 +2855,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr +@@ -2903,7 +2904,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr sexpr = virBufferContentAndReset(&buf); @@ -43,7 +43,7 @@ Index: libvirt-0.9.1/src/xen/xend_internal.c virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("requested device does not exist")); goto cleanup; -@@ -2947,7 +2948,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr +@@ -2996,7 +2997,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr def, xml, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; @@ -52,7 +52,7 @@ Index: libvirt-0.9.1/src/xen/xend_internal.c goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { -@@ -3900,6 +3901,7 @@ struct xenUnifiedDriver xenDaemonDriver +@@ -3961,6 +3962,7 @@ struct xenUnifiedDriver xenDaemonDriver */ static int virDomainXMLDevID(virDomainPtr domain, @@ -60,7 +60,7 @@ Index: libvirt-0.9.1/src/xen/xend_internal.c virDomainDeviceDefPtr dev, char *class, char *ref, -@@ -3908,8 +3910,12 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -3969,8 +3971,12 @@ virDomainXMLDevID(virDomainPtr domain, xenUnifiedPrivatePtr priv = domain->conn->privateData; char *xref; char *tmp; @@ -73,7 +73,7 @@ Index: libvirt-0.9.1/src/xen/xend_internal.c if (dev->data.disk->driverName && STREQ(dev->data.disk->driverName, "tap")) strcpy(class, "tap"); -@@ -3919,19 +3925,21 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -3980,19 +3986,21 @@ virDomainXMLDevID(virDomainPtr domain, else strcpy(class, "vbd");