virsh: domain: use early return in virshDomainDefine()

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Kristina Hanicova 2021-09-24 17:17:44 +02:00 committed by Michal Privoznik
parent bc7b8a34fa
commit 14a804ee67

View File

@ -245,18 +245,18 @@ static virDomainPtr
virshDomainDefine(virConnectPtr conn, const char *xml, unsigned int flags) virshDomainDefine(virConnectPtr conn, const char *xml, unsigned int flags)
{ {
virDomainPtr dom; virDomainPtr dom;
if (flags) {
dom = virDomainDefineXMLFlags(conn, xml, flags); if (!flags)
/* If validate is the only flag, just drop it and return virDomainDefineXML(conn, xml);
* try again.
*/ dom = virDomainDefineXMLFlags(conn, xml, flags);
if (!dom) { /* If validate is the only flag, just drop it and
if ((virGetLastErrorCode() == VIR_ERR_NO_SUPPORT) && * try again.
(flags == VIR_DOMAIN_DEFINE_VALIDATE)) */
dom = virDomainDefineXML(conn, xml); if (!dom) {
} if ((virGetLastErrorCode() == VIR_ERR_NO_SUPPORT) &&
} else { (flags == VIR_DOMAIN_DEFINE_VALIDATE))
dom = virDomainDefineXML(conn, xml); dom = virDomainDefineXML(conn, xml);
} }
return dom; return dom;
} }