External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the Xen domain create driver method

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

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-04-30 15:01:22 +01:00
parent ef3f38bed7
commit 0177d11074
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/xen/xen_driver.c
View File

@ -596,11 +596,9 @@ static virDomainPtr
xenUnifiedDomainCreateXML(virConnectPtr conn, xenUnifiedDomainCreateXML(virConnectPtr conn,
const char *xmlDesc, unsigned int flags) const char *xmlDesc, unsigned int flags)
{ {
xenUnifiedPrivatePtr priv = conn->privateData; virCheckFlags(0, NULL);
if (priv->opened[XEN_UNIFIED_XEND_OFFSET]) return xenDaemonCreateXML(conn, xmlDesc);
return xenDaemonCreateXML(conn, xmlDesc, flags);
return NULL;
} }
/* Assumption made in underlying drivers: /* Assumption made in underlying drivers:

4
src/xen/xend_internal.c
View File

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

3
src/xen/xend_internal.h
View File

@ -152,8 +152,7 @@ int xenDaemonDomainSetAutostart (virDomainPtr domain,
extern struct xenUnifiedDriver xenDaemonDriver; extern struct xenUnifiedDriver xenDaemonDriver;
int xenDaemonInit (void); int xenDaemonInit (void);
virDomainPtr xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc, virDomainPtr xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc);
unsigned int flags);
virDomainPtr xenDaemonLookupByID(virConnectPtr conn, int id); virDomainPtr xenDaemonLookupByID(virConnectPtr conn, int id);
virDomainPtr xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid); virDomainPtr xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid);
virDomainPtr xenDaemonLookupByName(virConnectPtr conn, const char *domname); virDomainPtr xenDaemonLookupByName(virConnectPtr conn, const char *domname);