From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 30 Apr 2013 13:57:03 +0000 (+0100)
Subject: Simplify the Xen get max vcpus / node get info driver methods
X-Git-Tag: CVE-2013-1962~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17f985273463e57c5292dba5de6d8370c56dfd8b;p=thirdparty%2Flibvirt.git

Simplify the Xen get max vcpus / node get info driver methods

Unconditionally call into xenHypervisorGetMaxVcpus and
xenDaemonNodeGetInfo respectively, since those drivers
are both mandatory

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 74c31f78a5..3d4d118096 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -552,29 +552,18 @@ xenUnifiedConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED)
 int
 xenUnifiedConnectGetMaxVcpus(virConnectPtr conn, const char *type)
 {
-    xenUnifiedPrivatePtr priv = conn->privateData;
-
     if (type && STRCASENEQ(type, "Xen")) {
         virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
         return -1;
     }
 
-    if (priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET])
-        return xenHypervisorGetMaxVcpus(conn, type);
-    else {
-        virReportError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
-        return -1;
-    }
+    return xenHypervisorGetMaxVcpus(conn, type);
 }
 
 static int
 xenUnifiedNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info)
 {
-    xenUnifiedPrivatePtr priv = conn->privateData;
-
-    if (priv->opened[XEN_UNIFIED_XEND_OFFSET])
-        return xenDaemonNodeGetInfo(conn, info);
-    return -1;
+    return xenDaemonNodeGetInfo(conn, info);
 }
 
 static char *