mirror of
https://github.com/libvirt/libvirt.git
synced 2026-07-30 08:08:11 -05:00
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:
committed by
Michal Privoznik
parent
bc7b8a34fa
commit
14a804ee67
+12
-12
@@ -245,18 +245,18 @@ static virDomainPtr
|
||||
virshDomainDefine(virConnectPtr conn, const char *xml, unsigned int flags)
|
||||
{
|
||||
virDomainPtr dom;
|
||||
if (flags) {
|
||||
dom = virDomainDefineXMLFlags(conn, xml, flags);
|
||||
/* If validate is the only flag, just drop it and
|
||||
* try again.
|
||||
*/
|
||||
if (!dom) {
|
||||
if ((virGetLastErrorCode() == VIR_ERR_NO_SUPPORT) &&
|
||||
(flags == VIR_DOMAIN_DEFINE_VALIDATE))
|
||||
dom = virDomainDefineXML(conn, xml);
|
||||
}
|
||||
} else {
|
||||
dom = virDomainDefineXML(conn, xml);
|
||||
|
||||
if (!flags)
|
||||
return virDomainDefineXML(conn, xml);
|
||||
|
||||
dom = virDomainDefineXMLFlags(conn, xml, flags);
|
||||
/* If validate is the only flag, just drop it and
|
||||
* try again.
|
||||
*/
|
||||
if (!dom) {
|
||||
if ((virGetLastErrorCode() == VIR_ERR_NO_SUPPORT) &&
|
||||
(flags == VIR_DOMAIN_DEFINE_VALIDATE))
|
||||
dom = virDomainDefineXML(conn, xml);
|
||||
}
|
||||
return dom;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user