From: Guido Günther <agx@sigxcpu.org>
Date: Fri, 25 May 2012 17:48:33 +0000 (+0200)
Subject: openvz: add persist parameter to openvzSetDiskQuota
X-Git-Tag: v0.9.13-rc1~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d82540adfa0221d96c74ca910b73934510b15f6;p=thirdparty%2Flibvirt.git

openvz: add persist parameter to openvzSetDiskQuota

with persist=false the domain config file will not be updated.
---

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index fb72cdea52..02a01330ce 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -191,7 +191,8 @@ cleanup:
 
 static int
 openvzSetDiskQuota(virDomainDefPtr vmdef,
-                   virDomainFSDefPtr fss)
+                   virDomainFSDefPtr fss,
+                   bool persist)
 {
     int ret = -1;
     unsigned long long sl, hl;
@@ -199,8 +200,9 @@ openvzSetDiskQuota(virDomainDefPtr vmdef,
                                              "--quiet",
                                              "set",
                                              vmdef->name,
-                                             "--save",
                                              NULL);
+    if (persist)
+        virCommandAddArg(cmd, "--save");
 
     if (fss->type == VIR_DOMAIN_FS_TYPE_TEMPLATE) {
         if (fss->space_hard_limit) {
@@ -938,7 +940,7 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml)
     }
 
     if (vm->def->nfss == 1) {
-        if (openvzSetDiskQuota(vm->def, vm->def->fss[0]) < 0) {
+        if (openvzSetDiskQuota(vm->def, vm->def->fss[0], true) < 0) {
             openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
                         _("Could not set disk quota"));
             goto cleanup;
@@ -1026,7 +1028,7 @@ openvzDomainCreateXML(virConnectPtr conn, const char *xml,
     }
 
     if (vm->def->nfss == 1) {
-        if (openvzSetDiskQuota(vm->def, vm->def->fss[0]) < 0) {
+        if (openvzSetDiskQuota(vm->def, vm->def->fss[0], true) < 0) {
             openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
                         _("Could not set disk quota"));
             goto cleanup;