Simplify the Xen domain create driver method

Unconditionally call xenDaemonCreateXML in the
xenUnifiedDomainCreateXML driver, since the XenD
driver is always present.

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

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 63295357b61fe97b93e75a6de889c2c9d43092f2..ec5ef0703e4de604f274824218dd345b814349d0 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -596,11 +596,9 @@ static virDomainPtr
 xenUnifiedDomainCreateXML(virConnectPtr conn,
                           const char *xmlDesc, unsigned int flags)
 {
-    xenUnifiedPrivatePtr priv = conn->privateData;
+    virCheckFlags(0, NULL);
 
-    if (priv->opened[XEN_UNIFIED_XEND_OFFSET])
-        return xenDaemonCreateXML(conn, xmlDesc, flags);
-    return NULL;
+    return xenDaemonCreateXML(conn, xmlDesc);
 }
 
 /* Assumption made in underlying drivers:

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 6cd5469ffc01ac8dd6348f0c368705e3d6663a98..8981065c9664a6d7c950d6a850736790e36b78d2 100644 (file)
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -2288,7 +2288,7 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
  * Returns a new domain object or NULL in case of failure
  */
 virDomainPtr
-xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags)
+xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc)
 {
     int ret;
     char *sexpr;
@@ -2296,8 +2296,6 @@ xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags)
     xenUnifiedPrivatePtr priv = conn->privateData;
     virDomainDefPtr def;
 
-    virCheckFlags(0, NULL);
-
     if (!(def = virDomainDefParseString(xmlDesc, priv->caps, priv->xmlopt,
                                         1 << VIR_DOMAIN_VIRT_XEN,
                                         VIR_DOMAIN_XML_INACTIVE)))

diff --git a/src/xen/xend_internal.h b/src/xen/xend_internal.h
index f6760a2f1c7b6620ab50b5771445d778670b8267..5f82f045ebfc516e4c24655f703985f915746b93 100644 (file)
--- a/src/xen/xend_internal.h
+++ b/src/xen/xend_internal.h
@@ -152,8 +152,7 @@ int xenDaemonDomainSetAutostart          (virDomainPtr domain,
 extern struct xenUnifiedDriver xenDaemonDriver;
 int xenDaemonInit (void);
 
-virDomainPtr xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc,
-                                unsigned int flags);
+virDomainPtr xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc);
 virDomainPtr xenDaemonLookupByID(virConnectPtr conn, int id);
 virDomainPtr xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid);
 virDomainPtr xenDaemonLookupByName(virConnectPtr conn, const char *domname);