conf: Rename max_balloon to total_memory

The name of the variable was misleading. Rename it and it's setting
accessor before other fixes.

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index bda4d4e7df8484d2cce1546ba3cb427238a1e2d7..0f58f58f3fc7f52aa5c27aca66f14b7a9d3eceae 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7706,27 +7706,27 @@ virDomainDefGetMemoryInitial(virDomainDefPtr def)
     if ((ret = virDomainNumaGetMemorySize(def->numa)) > 0) {
         return ret;
     } else {
-        ret = def->mem.max_balloon;
+        ret = def->mem.total_memory;
         for (i = 0; i < def->nmems; i++)
             ret -= def->mems[i]->size;
     }
 
-    return def->mem.max_balloon;
+    return def->mem.total_memory;
 }
 
 
 /**
- * virDomainDefSetMemoryInitial:
+ * virDomainDefSetMemoryTotal:
  * @def: domain definition
  * @size: size to set
  *
- * Sets the initial memory size in @def.
+ * Sets the total memory size in @def.
  */
 void
-virDomainDefSetMemoryInitial(virDomainDefPtr def,
-                             unsigned long long size)
+virDomainDefSetMemoryTotal(virDomainDefPtr def,
+                           unsigned long long size)
 {
-    def->mem.max_balloon = size;
+    def->mem.total_memory = size;
 }
 
 
@@ -7748,7 +7748,7 @@ virDomainDefGetMemoryActual(virDomainDefPtr def)
         for (i = 0; i < def->nmems; i++)
             ret += def->mems[i]->size;
     } else {
-        ret = def->mem.max_balloon;
+        ret = def->mem.total_memory;
     }
 
     return ret;
@@ -14763,7 +14763,7 @@ virDomainDefParseXML(xmlDocPtr xml,
 
     /* Extract domain memory */
     if (virDomainParseMemory("./memory[1]", NULL, ctxt,
-                             &def->mem.max_balloon, false, true) < 0)
+                             &def->mem.total_memory, false, true) < 0)
         goto error;
 
     if (virDomainParseMemory("./currentMemory[1]", NULL, ctxt,

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index a1221ba693ad24eaae8743f0a2e44a65c352aa56..74c29bd7fdb8c44e10e45b3d56e304bcafa3fe22 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2142,8 +2142,9 @@ typedef struct _virDomainMemtune virDomainMemtune;
 typedef virDomainMemtune *virDomainMemtunePtr;
 
 struct _virDomainMemtune {
-    unsigned long long max_balloon; /* in kibibytes, capped at ulong thanks
-                                       to virDomainGetMaxMemory */
+    /* total memory size including memory modules in kibibytes, this field
+     * should be accessed only via accessors */
+    unsigned long long total_memory;
     unsigned long long cur_balloon; /* in kibibytes, capped at ulong thanks
                                        to virDomainGetInfo */
 
@@ -2322,7 +2323,7 @@ struct _virDomainDef {
 };
 
 unsigned long long virDomainDefGetMemoryInitial(virDomainDefPtr def);
-void virDomainDefSetMemoryInitial(virDomainDefPtr def, unsigned long long size);
+void virDomainDefSetMemoryTotal(virDomainDefPtr def, unsigned long long size);
 unsigned long long virDomainDefGetMemoryActual(virDomainDefPtr def);
 bool virDomainDefHasMemoryHotplug(const virDomainDef *def);
 

diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index b5395412750726b43da0774a909d754bf4a76fd9..1958bbe769aa6951e3ffb39f1a5e43851e563c82 100644 (file)
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -870,7 +870,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
     if (VIR_STRDUP(def->description, virtualSystemSettingData->data->Notes) < 0)
         goto cleanup;
 
-    virDomainDefSetMemoryInitial(def, memorySettingData->data->Limit * 1024); /* megabyte to kilobyte */
+    virDomainDefSetMemoryTotal(def, memorySettingData->data->Limit * 1024); /* megabyte to kilobyte */
     def->mem.cur_balloon = memorySettingData->data->VirtualQuantity * 1024; /* megabyte to kilobyte */
 
     def->vcpus = processorSettingData->data->VirtualQuantity;

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 1a9242293aec219a4c5a22a155d0a4a795b4106d..d31687d12bfc9771c4c68f7755d82ab42205167e 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -227,7 +227,7 @@ virDomainDefParseFile;
 virDomainDefParseNode;
 virDomainDefParseString;
 virDomainDefPostParse;
-virDomainDefSetMemoryInitial;
+virDomainDefSetMemoryTotal;
 virDomainDeleteConfig;
 virDomainDeviceAddressIsValid;
 virDomainDeviceAddressTypeToString;

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 019f04f7713f21296333de680598717d247a94e1..504895754170dc6110060c770d9e7d71e259559e 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -553,7 +553,7 @@ libxlAddDom0(libxlDriverPrivatePtr driver)
     vm->def->vcpus = d_info.vcpu_online;
     vm->def->maxvcpus = d_info.vcpu_max_id + 1;
     vm->def->mem.cur_balloon = d_info.current_memkb;
-    virDomainDefSetMemoryInitial(vm->def, d_info.max_memkb);
+    virDomainDefSetMemoryTotal(vm->def, d_info.max_memkb);
 
     ret = 0;
 
@@ -1498,7 +1498,7 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
         if (flags & VIR_DOMAIN_MEM_CONFIG) {
             /* Help clang 2.8 decipher the logic flow.  */
             sa_assert(persistentDef);
-            virDomainDefSetMemoryInitial(persistentDef, newmem);
+            virDomainDefSetMemoryTotal(persistentDef, newmem);
             if (persistentDef->mem.cur_balloon > newmem)
                 persistentDef->mem.cur_balloon = newmem;
             ret = virDomainSaveConfig(cfg->configDir, persistentDef);

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 71be9c7de8a6dbdb1cb114de3f2db02505a51260..a9f0005f55b3a184994403920b7d508be26fc562 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -734,7 +734,7 @@ static int lxcDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
         }
 
         if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
-            virDomainDefSetMemoryInitial(persistentDef, newmem);
+            virDomainDefSetMemoryTotal(persistentDef, newmem);
             if (persistentDef->mem.cur_balloon > newmem)
                 persistentDef->mem.cur_balloon = newmem;
             if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0)

diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index 6faa70139b3f1faacada27fbb3344bb8474c50c6..2f9559735a46f8f3ca7928fa6899eb64a2f66b72 100644 (file)
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -770,7 +770,7 @@ lxcSetMemTune(virDomainDefPtr def, virConfPtr properties)
         if (lxcConvertSize(value->str, &size) < 0)
             return -1;
         size = size / 1024;
-        virDomainDefSetMemoryInitial(def, size);
+        virDomainDefSetMemoryTotal(def, size);
         def->mem.hard_limit = virMemoryLimitTruncate(size);
     }
 
@@ -1010,7 +1010,7 @@ lxcParseConfigString(const char *config)
     }
 
     vmdef->id = -1;
-    virDomainDefSetMemoryInitial(vmdef, 64 * 1024);
+    virDomainDefSetMemoryTotal(vmdef, 64 * 1024);
 
     vmdef->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART;
     vmdef->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY;

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 54dec70b7e7ea0175a97e26cd691f8b355f6266e..2912fc40294dbd276d9d9b1d6104719571522136 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -3281,7 +3281,7 @@ phypDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
         goto err;
     }
 
-    virDomainDefSetMemoryInitial(&def, memory);
+    virDomainDefSetMemoryTotal(&def, memory);
 
     if ((def.mem.cur_balloon =
          phypGetLparMem(dom->conn, managed_system, dom->id, 1)) == 0) {

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index e1f199c225a8eebf305db583a71b86c281e6df8e..3044b11b205323081ba2f1f4d916ca6048beae16 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -13010,7 +13010,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
 
     def->id = -1;
     def->mem.cur_balloon = 64 * 1024;
-    virDomainDefSetMemoryInitial(def, def->mem.cur_balloon);
+    virDomainDefSetMemoryTotal(def, def->mem.cur_balloon);
     def->maxvcpus = 1;
     def->vcpus = 1;
     def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC;
@@ -13216,7 +13216,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
                                _("cannot parse memory level '%s'"), val);
                 goto error;
             }
-            virDomainDefSetMemoryInitial(def, mem * 1024);
+            virDomainDefSetMemoryTotal(def, mem * 1024);
             def->mem.cur_balloon = mem * 1024;
         } else if (STREQ(arg, "-smp")) {
             WANT_VALUE();

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 405a9008469251c1d6c7f1f8d430c3bd5ef2f8ab..e3cd17f46377d6d487aac873d6b41da38d95f1de 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3387,7 +3387,7 @@ qemuDomainAlignMemorySizes(virDomainDefPtr def)
 
     /* align initial memory size */
     mem = virDomainDefGetMemoryInitial(def);
-    virDomainDefSetMemoryInitial(def, VIR_ROUND_UP(mem, align));
+    virDomainDefSetMemoryTotal(def, VIR_ROUND_UP(mem, align));
 
     def->mem.max_memory = VIR_ROUND_UP(def->mem.max_memory, align);
 

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3c959f6f516017394f652a3033d8a8d23fd075aa..2387cf3f96994f841a0b513aea11e1d3dc525763 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2357,7 +2357,7 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
                 goto endjob;
             }
 
-            virDomainDefSetMemoryInitial(persistentDef, newmem);
+            virDomainDefSetMemoryTotal(persistentDef, newmem);
 
             if (persistentDef->mem.cur_balloon > newmem)
                 persistentDef->mem.cur_balloon = newmem;

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 90ab09f723048a58f42756e26bad315826b23285..d11cda1f72124fc14be0dfe6973b605eb6c04cee 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2256,7 +2256,7 @@ static int testDomainSetMaxMemory(virDomainPtr domain,
         return -1;
 
     /* XXX validate not over host memory wrt to other domains */
-    virDomainDefSetMemoryInitial(privdom->def, memory);
+    virDomainDefSetMemoryTotal(privdom->def, memory);
 
     virDomainObjEndAPI(&privdom);
     return 0;

diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index c3c5fa7d9ac523e472ade4b2aeacfc34377078e3..2b61f73affdaae5612b0a07658500495de4692ee 100644 (file)
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -1828,7 +1828,7 @@ static int umlDomainSetMaxMemory(virDomainPtr dom, unsigned long newmax)
         goto cleanup;
     }
 
-    virDomainDefSetMemoryInitial(vm->def, newmax);
+    virDomainDefSetMemoryTotal(vm->def, newmax);
     ret = 0;
 
  cleanup:

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 91a61f8854c5aa3b48cb693f9ef7ba0def4c2c83..3e6ed7a2c3ac7126f8c9770fa4b54d770c810b26 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -3898,7 +3898,7 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
      * reading and while dumping xml
      */
     /* def->mem.max_balloon = maxMemorySize * 1024; */
-    virDomainDefSetMemoryInitial(def, memorySize * 1024);
+    virDomainDefSetMemoryTotal(def, memorySize * 1024);
 
     gVBoxAPI.UIMachine.GetCPUCount(machine, &CPUCount);
     def->maxvcpus = def->vcpus = CPUCount;
@@ -6051,7 +6051,7 @@ static char *vboxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
          * the notation here seems to be inconsistent while
          * reading and while dumping xml
          */
-        virDomainDefSetMemoryInitial(def->dom, memorySize * 1024);
+        virDomainDefSetMemoryTotal(def->dom, memorySize * 1024);
         def->dom->os.type = VIR_DOMAIN_OSTYPE_HVM;
         def->dom->os.arch = virArchFromHost();
         gVBoxAPI.UIMachine.GetCPUCount(machine, &CPUCount);

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index c6d97f840a203a0799486b0041a812a51f95c6e8..7c3c10a29b36cf0b5e57ef70095754317e9ad057 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -1416,7 +1416,7 @@ virVMXParseConfig(virVMXContext *ctx,
         goto cleanup;
     }
 
-    virDomainDefSetMemoryInitial(def, memsize * 1024); /* Scale from megabytes to kilobytes */
+    virDomainDefSetMemoryTotal(def, memsize * 1024); /* Scale from megabytes to kilobytes */
 
     /* vmx:sched.mem.max -> def:mem.cur_balloon */
     if (virVMXGetConfigLong(conf, "sched.mem.max", &sched_mem_max, memsize,

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 58c77abc88ebf5bd89ae6cac89e9aa5fdcfdade4..7a2afd6340d15b6af97d762a41f5a52c140b7fd6 100644 (file)
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -1299,7 +1299,7 @@ prlsdkLoadDomain(vzConnPtr privconn,
     /* get RAM parameters */
     pret = PrlVmCfg_GetRamSize(sdkdom, &ram);
     prlsdkCheckRetGoto(pret, error);
-    virDomainDefSetMemoryInitial(def, ram << 10); /* RAM size obtained in Mbytes,
+    virDomainDefSetMemoryTotal(def, ram << 10); /* RAM size obtained in Mbytes,
                                                      convert to Kbytes */
     def->mem.cur_balloon = ram << 10;
 

diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 07b9eb46e6223e9b7a9cebf3cc4045debc895770..75f98b14e5f42038301f8b9757bc5bf4e28e1cc3 100644 (file)
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -605,7 +605,7 @@ xenXMDomainSetMaxMemory(virConnectPtr conn,
     if (entry->def->mem.cur_balloon > memory)
         entry->def->mem.cur_balloon = memory;
 
-    virDomainDefSetMemoryInitial(entry->def, memory);
+    virDomainDefSetMemoryTotal(entry->def, memory);
     /* If this fails, should we try to undo our changes to the
      * in-memory representation of the config file. I say not!
      */

diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 11f6e91db1d1b50de0a00c1548af49fb41370d0b..3045c5ac5e2da4c6267499fe35f2a58d04126519 100644 (file)
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -1492,7 +1492,7 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
         VIR_FREE(val);
     }
     memory = xenapiDomainGetMaxMemory(dom);
-    virDomainDefSetMemoryInitial(defPtr, memory);
+    virDomainDefSetMemoryTotal(defPtr, memory);
     if (xen_vm_get_memory_dynamic_max(session, &dynamic_mem, vm)) {
         defPtr->mem.cur_balloon = (unsigned long) (dynamic_mem / 1024);
     } else {

diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index 0dfe60e8999ecdce696643f6e696642063fb8c39..0890c73b8d53370a4d99f8720aecb580fe3849a7 100644 (file)
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -316,7 +316,7 @@ xenParseMem(virConfPtr conf, virDomainDefPtr def)
         return -1;
 
     def->mem.cur_balloon *= 1024;
-    virDomainDefSetMemoryInitial(def, memory * 1024);
+    virDomainDefSetMemoryTotal(def, memory * 1024);
 
     return 0;
 }

diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 1d43ec17a309e7fa93f71a8c019376f7a98b0bdf..033b0ebb0d9ea0a50ce6a96ff5a3fc3454a2d058 100644 (file)
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -1154,7 +1154,7 @@ xenParseSxpr(const struct sexpr *root,
         }
     }
 
-    virDomainDefSetMemoryInitial(def, (sexpr_u64(root, "domain/maxmem") << 10));
+    virDomainDefSetMemoryTotal(def, (sexpr_u64(root, "domain/maxmem") << 10));
     def->mem.cur_balloon = (sexpr_u64(root, "domain/memory") << 10);
 
     if (def->mem.cur_balloon > virDomainDefGetMemoryActual(def))