[Pkg-libvirt-commits] [SCM] Libvirt debian packaging branch, experimental, updated. debian/0.4.6-6-16-gbaff048

[Guido Guenther]

The following commit has been merged in the experimental branch:
commit bdb80b20276ec6f856ee1acc4788a3723f87dee1
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri Dec 5 09:50:24 2008 +0100

    drop 0004-xen-prefer-xenstoraged-driver-for-listDomains.patch
    
    applied upstream

diff --git a/debian/patches/0004-xen-prefer-xenstoraged-driver-for-listDomains.patch b/debian/patches/0004-xen-prefer-xenstoraged-driver-for-listDomains.patch
deleted file mode 100644
index 592c541..0000000
--- a/debian/patches/0004-xen-prefer-xenstoraged-driver-for-listDomains.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 47cfd0a5ebb19ea222d6ec758c44878c9e8714cd Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Wed, 26 Nov 2008 10:54:51 +0100
-Subject: [PATCH] xen: prefer xenstoraged driver for listDomains
-
-at least Debian's xen 3.2.1 reports ghost ids of already shutdown domains when
-using the HV driver.
----
- src/proxy_internal.c |    3 +--
- src/proxy_internal.h |    2 ++
- src/xen_unified.c    |   29 +++++++++++++++++++++++------
- src/xend_internal.c  |    2 +-
- src/xend_internal.h  |    1 +
- 5 files changed, 28 insertions(+), 9 deletions(-)
-
-diff --git a/src/proxy_internal.c b/src/proxy_internal.c
-index 2e801d9..0254ebc 100644
---- a/src/proxy_internal.c
-+++ b/src/proxy_internal.c
-@@ -40,7 +40,6 @@ static int xenProxyOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags);
- static int xenProxyGetVersion(virConnectPtr conn, unsigned long *hvVer);
- static int xenProxyNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info);
- static char *xenProxyGetCapabilities(virConnectPtr conn);
--static int xenProxyListDomains(virConnectPtr conn, int *ids, int maxids);
- static int xenProxyNumOfDomains(virConnectPtr conn);
- static unsigned long xenProxyDomainGetMaxMemory(virDomainPtr domain);
- static int xenProxyDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info);
-@@ -566,7 +565,7 @@ xenProxyGetVersion(virConnectPtr conn, unsigned long *hvVer)
-  *
-  * Returns the number of domain found or -1 in case of error
-  */
--static int
-+int
- xenProxyListDomains(virConnectPtr conn, int *ids, int maxids)
- {
-     virProxyPacket req;
-diff --git a/src/proxy_internal.h b/src/proxy_internal.h
-index 56dc867..0f31752 100644
---- a/src/proxy_internal.h
-+++ b/src/proxy_internal.h
-@@ -94,4 +94,6 @@ extern virDomainPtr xenProxyLookupByName(virConnectPtr conn,
- 
- extern char *       xenProxyDomainDumpXML(virDomainPtr domain,
-                                           int flags);
-+extern int xenProxyListDomains(virConnectPtr conn, int *ids,
-+                               int maxids);
- #endif /* __LIBVIR_PROXY_H__ */
-diff --git a/src/xen_unified.c b/src/xen_unified.c
-index cce608c..456fe46 100644
---- a/src/xen_unified.c
-+++ b/src/xen_unified.c
-@@ -505,14 +505,31 @@ static int
- xenUnifiedListDomains (virConnectPtr conn, int *ids, int maxids)
- {
-     GET_PRIVATE(conn);
--    int i, ret;
-+    int ret;
- 
--    for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i)
--        if (priv->opened[i] && drivers[i]->listDomains) {
--            ret = drivers[i]->listDomains (conn, ids, maxids);
--            if (ret >= 0) return ret;
--        }
-+    /* Try xenstore. */
-+    if (priv->opened[XEN_UNIFIED_XS_OFFSET]) {
-+        ret = xenStoreListDomains (conn, ids, maxids);
-+        if (ret >= 0) return ret;
-+    }
- 
-+    /* Try HV. */
-+    if (priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET]) {
-+        ret = xenHypervisorListDomains (conn, ids, maxids);
-+        if (ret >= 0) return ret;
-+    }
-+
-+    /* Try xend. */
-+    if (priv->opened[XEN_UNIFIED_XEND_OFFSET]) {
-+        ret = xenDaemonListDomains (conn, ids, maxids);
-+        if (ret >= 0) return ret;
-+    }
-+
-+    /* Try proxy. */
-+    if (priv->opened[XEN_UNIFIED_PROXY_OFFSET]) {
-+        ret = xenProxyListDomains (conn, ids, maxids);
-+        if (ret >= 0) return ret;
-+    }
-     return -1;
- }
- 
-diff --git a/src/xend_internal.c b/src/xend_internal.c
-index 55eaf94..b839497 100644
---- a/src/xend_internal.c
-+++ b/src/xend_internal.c
-@@ -3411,7 +3411,7 @@ xenDaemonGetVersion(virConnectPtr conn, unsigned long *hvVer)
-  *
-  * Returns the number of domain found or -1 in case of error
-  */
--static int
-+int
- xenDaemonListDomains(virConnectPtr conn, int *ids, int maxids)
- {
-     struct sexpr *root = NULL;
-diff --git a/src/xend_internal.h b/src/xend_internal.h
-index 20645fb..768964f 100644
---- a/src/xend_internal.h
-+++ b/src/xend_internal.h
-@@ -179,5 +179,6 @@ int xenDaemonDomainMigratePrepare (virConnectPtr dconn, char **cookie, int *cook
- int xenDaemonDomainMigratePerform (virDomainPtr domain, const char *cookie, int cookielen, const char *uri, unsigned long flags, const char *dname, unsigned long resource);
- 
- int xenDaemonDomainBlockPeek (virDomainPtr domain, const char *path, unsigned long long offset, size_t size, void *buffer);
-+int xenDaemonListDomains(virConnectPtr conn, int *ids, int maxids);
- 
- #endif /* __XEND_INTERNAL_H_ */
--- 
-1.6.0.3
-

-- 
Libvirt debian packaging