[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.10_rc1-1

[Guido Günther]

The following commit has been merged in the experimental branch:
commit 8d776a5478676579cd72139a58783f1badf46237
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Feb 7 14:01:54 2012 +0100

    Drop xen-Don-t-crash-when-we-fail-to-init-caps.patch
    
    applied upstream.

diff --git a/debian/patches/series b/debian/patches/series
index 6a87dd3..53c08fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@ Disable-daemon-start-test.patch
 Disable-gnulib-s-test-nonplocking-pipe.sh.patch
 Disable-failing-virnetsockettest.patch
 Don-t-fail-if-we-can-t-setup-avahi.patch
-xen-Don-t-crash-when-we-fail-to-init-caps.patch
diff --git a/debian/patches/xen-Don-t-crash-when-we-fail-to-init-caps.patch b/debian/patches/xen-Don-t-crash-when-we-fail-to-init-caps.patch
deleted file mode 100644
index d41a677..0000000
--- a/debian/patches/xen-Don-t-crash-when-we-fail-to-init-caps.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Fri, 20 Jan 2012 08:56:39 +0100
-Subject: xen: Don't crash when we fail to init caps
-
-by dereferencing a NULL pointer in the call to
-virNodeSuspendGetTargetMask.
----
- src/xen/xen_hypervisor.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 5357ac1..6d8dda7 100644
---- a/src/xen/xen_hypervisor.c
-+++ b/src/xen/xen_hypervisor.c
-@@ -2802,6 +2802,8 @@ xenHypervisorMakeCapabilities(virConnectPtr conn)
-                                                  utsname.machine,
-                                                  cpuinfo,
-                                                  capabilities);
-+    if (caps == NULL)
-+        return NULL;
- 
-     if (virNodeSuspendGetTargetMask(&caps->host.powerMgmt) < 0)
-         VIR_WARN("Failed to get host power management capabilities");

-- 
Libvirt Debian packaging