External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 06:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the Xen domain get XML driver method

Browse Source 
The xenUnifiedDomainGetXMLDesc driver can assume that
the XM and XenD drivers are always present

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-04-30 17:26:30 +01:00
parent 7c21e500a4
commit 970092dcde
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xen/xen_driver.c
View File

@ -1117,11 +1117,9 @@ xenUnifiedDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
{ {
xenUnifiedPrivatePtr priv = dom->conn->privateData; xenUnifiedPrivatePtr priv = dom->conn->privateData;
if (dom->id == -1 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { if (dom->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) {
if (priv->opened[XEN_UNIFIED_XM_OFFSET])
return xenXMDomainGetXMLDesc(dom, flags); return xenXMDomainGetXMLDesc(dom, flags);
} else { } else {
if (priv->opened[XEN_UNIFIED_XEND_OFFSET]) {
char *cpus, *res; char *cpus, *res;
xenUnifiedLock(priv); xenUnifiedLock(priv);
cpus = xenDomainUsedCpus(dom); cpus = xenDomainUsedCpus(dom);
@ -1132,10 +1130,6 @@ xenUnifiedDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
} }
} }
virReportError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
return NULL;
}
static char * static char *
xenUnifiedConnectDomainXMLFromNative(virConnectPtr conn, xenUnifiedConnectDomainXMLFromNative(virConnectPtr conn,

6
src/xen/xend_internal.c
View File

@ -1610,17 +1610,11 @@ xenDaemonDomainGetXMLDesc(virDomainPtr domain,
unsigned int flags, unsigned int flags,
const char *cpus) const char *cpus)
{ {
xenUnifiedPrivatePtr priv = domain->conn->privateData;
virDomainDefPtr def; virDomainDefPtr def;
char *xml; char *xml;
/* Flags checked by virDomainDefFormat */ /* Flags checked by virDomainDefFormat */
if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) {
/* fall-through to the next driver to handle */
return NULL;
}
if (!(def = xenDaemonDomainFetch(domain->conn, if (!(def = xenDaemonDomainFetch(domain->conn,
domain->id, domain->id,
domain->name, domain->name,