From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Fri, 24 Jun 2016 14:32:35 +0000 (+0300)
Subject: vz: expand setting memory API calls
X-Git-Tag: v2.2.0-rc1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a78ef91faa317966cf95a1ed358d168d291813a;p=thirdparty%2Flibvirt.git

vz: expand setting memory API calls

We need it to prepare the calls for ACL checks otherwise ACL checking
script will fail.

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

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 75cec6ced5..194548289c 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -1886,8 +1886,8 @@ vzConnectUnregisterCloseCallback(virConnectPtr conn, virConnectCloseFunc cb)
     return ret;
 }
 
-static int vzDomainSetMemoryFlagsImpl(virDomainPtr domain, unsigned long memory,
-                                      unsigned int flags, bool useflags)
+static int vzDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory,
+                                  unsigned int flags)
 {
     virDomainObjPtr dom = NULL;
     int ret = -1;
@@ -1899,7 +1899,7 @@ static int vzDomainSetMemoryFlagsImpl(virDomainPtr domain, unsigned long memory,
     if (!(dom = vzDomObjFromDomainRef(domain)))
         return -1;
 
-    if (useflags && vzCheckConfigUpdateFlags(dom, &flags) < 0)
+    if (vzCheckConfigUpdateFlags(dom, &flags) < 0)
         goto cleanup;
 
     if (vzDomainObjBeginJob(dom) < 0)
@@ -1919,15 +1919,30 @@ static int vzDomainSetMemoryFlagsImpl(virDomainPtr domain, unsigned long memory,
     return ret;
 }
 
-static int vzDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory,
-                                  unsigned int flags)
-{
-    return vzDomainSetMemoryFlagsImpl(domain, memory, flags, true);
-}
-
 static int vzDomainSetMemory(virDomainPtr domain, unsigned long memory)
 {
-    return vzDomainSetMemoryFlagsImpl(domain, memory, 0, false);
+    virDomainObjPtr dom = NULL;
+    int ret = -1;
+    bool job = false;
+
+    if (!(dom = vzDomObjFromDomainRef(domain)))
+        return -1;
+
+    if (vzDomainObjBeginJob(dom) < 0)
+        goto cleanup;
+    job = true;
+
+    if (vzEnsureDomainExists(dom) < 0)
+        goto cleanup;
+
+    ret = prlsdkSetMemsize(dom, memory >> 10);
+
+ cleanup:
+
+    if (job)
+        vzDomainObjEndJob(dom);
+    virDomainObjEndAPI(&dom);
+    return ret;
 }
 
 static virDomainSnapshotObjPtr