[libvirt] [PATCH 1/3] Add new flags for setting memory parameters
This enables users to modify memory parameters for inactive domains
---
include/libvirt/libvirt.h.in | 7 +++++++
tools/virsh.c | 22 +++++++++++++++++++++-
tools/virsh.pod | 7 +++++++
3 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index a174201..b213b13 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -840,6 +840,13 @@ typedef enum {
VIR_DOMAIN_MEMORY_PARAM_BOOLEAN = 6 /* boolean(character) case */
} virMemoryParameterType;
+/* flags for setting memory parameters */
+typedef enum {
+ VIR_DOMAIN_MEMORY_PARAM_CURRENT = 0, /* affect current domain state */
+ VIR_DOMAIN_MEMORY_PARAM_LIVE = (1 << 0), /* affect active domain */
+ VIR_DOMAIN_MEMORY_PARAM_CONFIG = (1 << 1) /* affect next boot */
+} virMemoryParamFlags;
+
/**
* VIR_DOMAIN_MEMORY_FIELD_LENGTH:
*
diff --git a/tools/virsh.c b/tools/virsh.c
index 77cadcb..b2a5a8d 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -3294,6 +3294,9 @@ static const vshCmdOptDef opts_memtune[] = {
N_("Max memory plus swap in kilobytes")},
{"min-guarantee", VSH_OT_INT, VSH_OFLAG_NONE,
N_("Min guaranteed memory in kilobytes")},
+ {"config", VSH_OT_BOOL, 0, N_("affect next boot")},
+ {"live", VSH_OT_BOOL, 0, N_("affect running domain")},
+ {"current", VSH_OT_BOOL, 0, N_("affect current domain")},
{NULL, 0, 0, NULL}
};
@@ -3307,6 +3310,23 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd)
unsigned int i = 0;
virMemoryParameterPtr params = NULL, temp = NULL;
bool ret = false;
+ unsigned int flags = 0;
+ int current = vshCommandOptBool(cmd, "current");
+ int config = vshCommandOptBool(cmd, "config");
+ int live = vshCommandOptBool(cmd, "live");
+
+ if (current) {
+ if (live || config) {
+ vshError(ctl, "%s", _("--current must be specified
exclusively"));
+ return false;
+ }
+ flags = VIR_DOMAIN_MEMORY_PARAM_CURRENT;
+ } else {
+ if (config)
+ flags |= VIR_DOMAIN_MEMORY_PARAM_CONFIG;
+ if (live)
+ flags |= VIR_DOMAIN_MEMORY_PARAM_LIVE;
+ }
if (!vshConnectionUsability(ctl, ctl->conn))
return false;
@@ -3431,7 +3451,7 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd)
if (temp->value.ul == -1)
temp->value.ul = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
}
- if (virDomainSetMemoryParameters(dom, params, nparams, 0) != 0)
+ if (virDomainSetMemoryParameters(dom, params, nparams, flags) != 0)
vshError(ctl, "%s", _("Unable to change memory
parameters"));
else
ret = true;
diff --git a/tools/virsh.pod b/tools/virsh.pod
index ef01f41..9251db6 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -644,6 +644,13 @@ flags, the current settings are displayed; with a flag, the
appropriate limit is adjusted if supported by the hypervisor. LXC and
QEMU/KVM support I<--hard-limit>, I<--soft-limit>, and
I<--swap-hard-limit>.
+If I<--live> is specified, affect a running guest.
+If I<--config> is specified, affect the next boot of a persistent guest.
+If I<--current> is specified, affect the current guest state.
+Both I<--live> and I<--current> flags may be given, but I<--current>
is
+exclusive. If no flag is specified, behavior is different depending
+on hypervisor.
+
For QEMU/KVM, the parameters are applied to the QEMU process as a whole.
Thus, when counting them, one needs to add up guest RAM, guest video RAM, and
some memory overhead of QEMU itself. The last piece is hard to determine so
--
1.7.3.1