NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the Xen domain is persistent driver method

Browse Source 
Unconditionally call xenDaemonLookupByUUID, since the XenD
driver must always be present.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-04-30 15:12:47 +01:00
parent e920c5b6c9
commit aead5166a5
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/xen/xen_driver.c
View File

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