From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Wed, 20 Jul 2016 15:00:30 +0000 (+0300)
Subject: vz: use state variable sdkdom in prlsdkApplyConfig
X-Git-Tag: v2.1.0-rc1~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2abef7fb55fd4f763eb21555dea5a6da86f25249;p=thirdparty%2Flibvirt.git

vz: use state variable sdkdom in prlsdkApplyConfig

sdk domain handle is unique per connection so there is
no sense to query it again if we have it in vzDomObjPtr.
Side effect of prlsdkSdkDomainLookupByUUID is refreshing
domain config is of no use too as PrlVm_BeginEdit do it too.
---

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 5e36a8b1e8..6b5adbf96b 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -3906,28 +3906,22 @@ prlsdkApplyConfig(vzDriverPtr driver,
                   virDomainObjPtr dom,
                   virDomainDefPtr new)
 {
-    PRL_HANDLE sdkdom = PRL_INVALID_HANDLE;
+    vzDomObjPtr privdom = dom->privateData;
     PRL_HANDLE job = PRL_INVALID_HANDLE;
     int ret;
 
-    sdkdom = prlsdkSdkDomainLookupByUUID(driver, dom->def->uuid);
-    if (sdkdom == PRL_INVALID_HANDLE)
-        return -1;
-
-    job = PrlVm_BeginEdit(sdkdom);
+    job = PrlVm_BeginEdit(privdom->sdkdom);
     if (PRL_FAILED(waitJob(job)))
         return -1;
 
-    ret = prlsdkDoApplyConfig(driver, sdkdom, new, dom->def);
+    ret = prlsdkDoApplyConfig(driver, privdom->sdkdom, new, dom->def);
 
     if (ret == 0) {
-        job = PrlVm_CommitEx(sdkdom, PVCF_DETACH_HDD_BUNDLE);
+        job = PrlVm_CommitEx(privdom->sdkdom, PVCF_DETACH_HDD_BUNDLE);
         if (PRL_FAILED(waitJob(job)))
             ret = -1;
     }
 
-    PrlHandle_Free(sdkdom);
-
     return ret;
 }