]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
conf: some code cleanup
authorWang Huaqiang <huaqiang.wang@intel.com>
Tue, 11 Jun 2019 03:31:09 +0000 (11:31 +0800)
committerMichal Privoznik <mprivozn@redhat.com>
Mon, 5 Aug 2019 17:41:12 +0000 (19:41 +0200)
Creating object and judging if it is successfully created in fewer
lines.

Signed-off-by: Wang Huaqiang <huaqiang.wang@intel.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/conf/domain_conf.c

index 72e8757a84509c815509862bb89fa045288cd75f..08df300b592583580c5946224a80080f6a87c1d1 100644 (file)
@@ -19389,8 +19389,7 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
         return -1;
 
     if (!alloc) {
-        alloc = virResctrlAllocNew();
-        if (!alloc)
+        if (!(alloc = virResctrlAllocNew()))
             return -1;
     } else {
         virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -19403,8 +19402,7 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
             return -1;
     }
 
-    resctrl = virDomainResctrlNew(node, alloc, vcpus, flags);
-    if (!resctrl)
+    if (!(resctrl = virDomainResctrlNew(node, alloc, vcpus, flags)))
         return -1;
 
     if (virDomainResctrlMonDefParse(def, ctxt, node,
@@ -19593,8 +19591,7 @@ virDomainMemorytuneDefParse(virDomainDefPtr def,
         return -1;
 
     if (!alloc) {
-        alloc = virResctrlAllocNew();
-        if (!alloc)
+        if (!(alloc = virResctrlAllocNew()))
             return -1;
         new_alloc = true;
     }
@@ -19612,8 +19609,7 @@ virDomainMemorytuneDefParse(virDomainDefPtr def,
      * just update the existing alloc information, which is done in above
      * virDomainMemorytuneDefParseMemory */
     if (new_alloc) {
-        resctrl = virDomainResctrlNew(node, alloc, vcpus, flags);
-        if (!resctrl)
+        if (!(resctrl = virDomainResctrlNew(node, alloc, vcpus, flags)))
             return -1;
 
         if (VIR_APPEND_ELEMENT(def->resctrls, def->nresctrls, resctrl) < 0)