Rename VIR_DOMAIN_SWAP_HARD_LIMIT to VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT

To get them under the common VIR_DOMAIN_MEMORY_* prefix.

diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index 4cdf5b476b8ec6dfb552c1dc713e1a551f6c8e63..81db3a269cff66a5255e12c61e653e649342cff0 100644 (file)
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -722,13 +722,13 @@ typedef enum {
 #define VIR_DOMAIN_MEMORY_MIN_GUARANTEE "min_guarantee"
 
 /**
- * VIR_DOMAIN_SWAP_HARD_LIMIT:
+ * VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT:
  *
  * Macro for the swap tunable swap_hard_limit: it represents the maximum swap
  * the guest can use.
  */
 
-#define VIR_DOMAIN_SWAP_HARD_LIMIT "swap_hard_limit"
+#define VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT "swap_hard_limit"
 
 /**
  * virDomainMemoryParameter:

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 0145d5e0b43bb3ec9681d1fd9e184f79f7f497f7..d39b60e0afb257cd689387904878e18ef07ed150 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -746,7 +746,7 @@ static int lxcDomainSetMemoryParameters(virDomainPtr dom,
                                      _("unable to set memory soft_limit tunable"));
                 ret = -1;
             }
-        } else if (STREQ(param->field, VIR_DOMAIN_SWAP_HARD_LIMIT)) {
+        } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) {
             int rc;
             if (param->type != VIR_DOMAIN_MEMORY_PARAM_ULLONG) {
                 lxcError(VIR_ERR_INVALID_ARG, "%s",
@@ -873,7 +873,7 @@ static int lxcDomainGetMemoryParameters(virDomainPtr dom,
                 ret = -1;
                 continue;
             }
-            if (virStrcpyStatic(param->field, VIR_DOMAIN_SWAP_HARD_LIMIT) == NULL) {
+            if (virStrcpyStatic(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT) == NULL) {
                 lxcError(VIR_ERR_INTERNAL_ERROR,
                          "%s", _("Field swap hard limit too long for destination"));
                 ret = -1;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d1ab12854e7a3709efc54b1e4b04c44fffefe720..6395c93871141fbb97f80fe1bb3f2e01deecb94b 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9594,7 +9594,7 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom,
                                      _("unable to set memory soft_limit tunable"));
                 ret = -1;
             }
-        } else if (STREQ(param->field, VIR_DOMAIN_SWAP_HARD_LIMIT)) {
+        } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) {
             int rc;
             if (param->type != VIR_DOMAIN_MEMORY_PARAM_ULLONG) {
                 qemuReportError(VIR_ERR_INVALID_ARG, "%s",
@@ -9726,7 +9726,7 @@ static int qemuDomainGetMemoryParameters(virDomainPtr dom,
                 ret = -1;
                 continue;
             }
-            if (virStrcpyStatic(param->field, VIR_DOMAIN_SWAP_HARD_LIMIT) == NULL) {
+            if (virStrcpyStatic(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT) == NULL) {
                 qemuReportError(VIR_ERR_INTERNAL_ERROR,
                                 "%s", _("Field swap hard limit too long for destination"));
                 ret = -1;

diff --git a/tools/virsh.c b/tools/virsh.c
index 7fb7fbd010eb3e8b0db47bd00a2749923252408b..d1ef6981ca61e4ccc1b17c3aed5787d29c352f42 100644 (file)
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -2894,7 +2894,7 @@ static const vshCmdOptDef opts_memtune[] = {
      N_("Max memory in kilobytes")},
     {VIR_DOMAIN_MEMORY_SOFT_LIMIT, VSH_OT_STRING, VSH_OFLAG_NONE,
      N_("Memory during contention in kilobytes")},
-    {VIR_DOMAIN_SWAP_HARD_LIMIT, VSH_OT_STRING, VSH_OFLAG_NONE,
+    {VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, VSH_OT_STRING, VSH_OFLAG_NONE,
      N_("Max swap in kilobytes")},
     {VIR_DOMAIN_MEMORY_MIN_GUARANTEE, VSH_OT_STRING, VSH_OFLAG_NONE,
      N_("Min guaranteed memory in kilobytes")},
@@ -2928,7 +2928,7 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd)
         nparams++;
 
     swap_hard_limit =
-        vshCommandOptInt(cmd, VIR_DOMAIN_SWAP_HARD_LIMIT,
+        vshCommandOptInt(cmd, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT,
                          &swap_hard_limit);
     if (swap_hard_limit)
         nparams++;
@@ -3015,7 +3015,7 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd)
                 hard_limit = 0;
             } else if (swap_hard_limit) {
                 temp->value.ul = swap_hard_limit;
-                strncpy(temp->field, VIR_DOMAIN_SWAP_HARD_LIMIT,
+                strncpy(temp->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT,
                         sizeof(temp->field));
                 swap_hard_limit = 0;
             } else if (min_guarantee) {