提交 0177d110 编写于 作者: D Daniel P. Berrange

Simplify the Xen domain create driver method

Unconditionally call xenDaemonCreateXML in the
xenUnifiedDomainCreateXML driver, since the XenD
driver is always present.
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 ef3f38be
......@@ -596,11 +596,9 @@ static virDomainPtr
xenUnifiedDomainCreateXML(virConnectPtr conn,
const char *xmlDesc, unsigned int flags)
{
xenUnifiedPrivatePtr priv = conn->privateData;
virCheckFlags(0, NULL);
if (priv->opened[XEN_UNIFIED_XEND_OFFSET])
return xenDaemonCreateXML(conn, xmlDesc, flags);
return NULL;
return xenDaemonCreateXML(conn, xmlDesc);
}
/* Assumption made in underlying drivers:
......
......@@ -2288,7 +2288,7 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
* Returns a new domain object or NULL in case of failure
*/
virDomainPtr
xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags)
xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc)
{
int ret;
char *sexpr;
......@@ -2296,8 +2296,6 @@ xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags)
xenUnifiedPrivatePtr priv = conn->privateData;
virDomainDefPtr def;
virCheckFlags(0, NULL);
if (!(def = virDomainDefParseString(xmlDesc, priv->caps, priv->xmlopt,
1 << VIR_DOMAIN_VIRT_XEN,
VIR_DOMAIN_XML_INACTIVE)))
......
......@@ -152,8 +152,7 @@ int xenDaemonDomainSetAutostart (virDomainPtr domain,
extern struct xenUnifiedDriver xenDaemonDriver;
int xenDaemonInit (void);
virDomainPtr xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc,
unsigned int flags);
virDomainPtr xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc);
virDomainPtr xenDaemonLookupByID(virConnectPtr conn, int id);
virDomainPtr xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid);
virDomainPtr xenDaemonLookupByName(virConnectPtr conn, const char *domname);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册