From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Tue, 14 Jun 2016 08:45:55 +0000 (+0300)
Subject: vz: make error handling idiomatic in prlsdkCreateVm
X-Git-Tag: v2.1.0-rc1~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2f5dc24c53a4b696db1e31a8571072d568e2885;p=thirdparty%2Flibvirt.git

vz: make error handling idiomatic in prlsdkCreateVm

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
---

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 500c6697d0..cdda8eb281 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -3900,13 +3900,14 @@ prlsdkCreateVm(vzDriverPtr driver, virDomainDefPtr def)
     pret = PrlVmCfg_SetOfflineManagementEnabled(sdkdom, 0);
     prlsdkCheckRetGoto(pret, cleanup);
 
-    ret = prlsdkDoApplyConfig(driver, sdkdom, def, NULL);
-    if (ret)
+    if (prlsdkDoApplyConfig(driver, sdkdom, def, NULL) < 0)
         goto cleanup;
 
     job = PrlVm_Reg(sdkdom, "", 1);
     if (PRL_FAILED(waitJob(job)))
-        ret = -1;
+        goto cleanup;
+
+    ret = 0;
 
  cleanup:
     PrlHandle_Free(sdkdom);