From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 30 Apr 2013 14:12:47 +0000 (+0100)
Subject: Simplify the Xen domain is persistent driver method
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=aead5166a5e9ba7a1687ea57902a4cdcbcd02bc1;p=libvirt.git

Simplify the Xen domain is persistent driver method

Unconditionally call xenDaemonLookupByUUID, since the XenD
driver must always be 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 b3a539dd47..f8eca48c19 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -702,29 +702,26 @@ xenUnifiedDomainIsPersistent(virDomainPtr dom)
             ret = 0;
     } else {
         /* New Xen with inactive domain management */
-        if (priv->opened[XEN_UNIFIED_XEND_OFFSET]) {
-            currdom = xenDaemonLookupByUUID(dom->conn, dom->uuid);
-            if (currdom) {
-                if (currdom->id == -1) {
-                    /* If its inactive, then trivially, it must be persistent */
-                    ret = 1;
-                } else {
-                    char *path;
-                    char uuidstr[VIR_UUID_STRING_BUFLEN];
-
-                    /* If its running there's no official way to tell, so we
-                     * go behind xend's back & look at the config dir */
-
-                    virUUIDFormat(dom->uuid, uuidstr);
-                    if (virAsprintf(&path, "%s/%s", XEND_DOMAINS_DIR, uuidstr) < 0) {
-                        virReportOOMError();
-                        goto done;
-                    }
-                    if (access(path, R_OK) == 0)
-                        ret = 1;
-                    else if (errno == ENOENT)
-                        ret = 0;
+        currdom = xenDaemonLookupByUUID(dom->conn, dom->uuid);
+        if (currdom) {
+            if (currdom->id == -1) {
+                /* If its inactive, then trivially, it must be persistent */
+                ret = 1;
+            } else {
+                char *path;
+                char uuidstr[VIR_UUID_STRING_BUFLEN];
+
+                /* If its running there's no official way to tell, so we
+                 * go behind xend's back & look at the config dir */
+                virUUIDFormat(dom->uuid, uuidstr);
+                if (virAsprintf(&path, "%s/%s", XEND_DOMAINS_DIR, uuidstr) < 0) {
+                    virReportOOMError();
+                    goto done;
                 }
+                if (access(path, R_OK) == 0)
+                    ret = 1;
+                else if (errno == ENOENT)
+                    ret = 0;
             }
         }
     }