External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the Xen domain start driver method

Browse Source 
Directly call either the XenD or XM driver when starting
a persistent domain

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-04-30 17:33:48 +01:00
parent f53ffba6aa
commit 2fc0660848
4 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/xen/xen_driver.c
View File

@ -1344,7 +1344,6 @@ static int
xenUnifiedDomainCreateWithFlags(virDomainPtr dom, unsigned int flags)
{
xenUnifiedPrivatePtr priv = dom->conn->privateData;
int i;
int ret = -1;
char *name = NULL;
@ -1355,21 +1354,16 @@ xenUnifiedDomainCreateWithFlags(virDomainPtr dom, unsigned int flags)
goto cleanup;
if (virFileExists(name)) {
if (priv->opened[XEN_UNIFIED_XEND_OFFSET]) {
ret = xenDaemonDomainRestore(dom->conn, name);
if (ret == 0)
unlink(name);
}
ret = xenDaemonDomainRestore(dom->conn, name);
if (ret == 0)
unlink(name);
goto cleanup;
}
for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) {
if (priv->opened[i] && drivers[i]->xenDomainCreate &&
drivers[i]->xenDomainCreate(dom) == 0) {
ret = 0;
goto cleanup;
}
}
if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
ret = xenXMDomainCreate(dom);
else
ret = xenDaemonDomainCreate(dom);
cleanup:
VIR_FREE(name);

1
src/xen/xen_driver.h
View File

@ -93,7 +93,6 @@ extern int xenRegister (void);
* structure with direct calls in xen_unified.c.
*/
struct xenUnifiedDriver {
virDrvDomainCreate xenDomainCreate;
virDrvDomainDefineXML xenDomainDefineXML;
virDrvDomainUndefine xenDomainUndefine;
virDrvDomainAttachDeviceFlags xenDomainAttachDeviceFlags;

19
src/xen/xend_internal.c
View File

@ -2898,23 +2898,17 @@ xenDaemonDomainDefineXML(virConnectPtr conn, const char *xmlDesc)
int
xenDaemonDomainCreate(virDomainPtr domain)
{
xenUnifiedPrivatePtr priv = domain->conn->privateData;
int ret;
virDomainPtr tmp;
if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
return -1;
ret = xend_op(domain->conn, domain->name, "op", "start", NULL);
if (ret != -1) {
/* Need to force a refresh of this object's ID */
tmp = virDomainLookupByName(domain->conn, domain->name);
if (tmp) {
domain->id = tmp->id;
virDomainFree(tmp);
}
if (ret == 0) {
int id = xenDaemonDomainLookupByName_ids(domain->conn, domain->name,
domain->uuid);
if (id > 0)
domain->id = id;
}
return ret;
}
@ -3376,7 +3370,6 @@ xenDaemonDomainBlockPeek(virDomainPtr domain,
}
struct xenUnifiedDriver xenDaemonDriver = {
.xenDomainCreate = xenDaemonDomainCreate,
.xenDomainDefineXML = xenDaemonDomainDefineXML,
.xenDomainUndefine = xenDaemonDomainUndefine,
.xenDomainAttachDeviceFlags = xenDaemonAttachDeviceFlags,

4
src/xen/xm_internal.c
View File

@ -81,7 +81,6 @@ static int xenXMDomainDetachDeviceFlags(virDomainPtr domain, const char *xml,
#define XM_XML_ERROR "Invalid xml"
struct xenUnifiedDriver xenXMDriver = {
.xenDomainCreate = xenXMDomainCreate,
.xenDomainDefineXML = xenXMDomainDefineXML,
.xenDomainUndefine = xenXMDomainUndefine,
.xenDomainAttachDeviceFlags = xenXMDomainAttachDeviceFlags,
@ -918,9 +917,6 @@ xenXMDomainCreate(virDomainPtr domain)
const char *filename;
xenXMConfCachePtr entry;
if (domain->id != -1)
return -1;
xenUnifiedLock(priv);
if (!(filename = virHashLookup(priv->nameConfigMap, domain->name)))