2010/10/26 Eric Blake <eblake(a)redhat.com>:
* tools/virsh.c (opts_memtune): All other options in virsh use -
for separating words.
---
tools/virsh.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c
index cafd304..b616eef 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -2890,13 +2890,13 @@ static const vshCmdInfo info_memtune[] = {
static const vshCmdOptDef opts_memtune[] = {
{"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or
uuid")},
- {VIR_DOMAIN_MEMORY_HARD_LIMIT, VSH_OT_INT, VSH_OFLAG_NONE,
+ {"hard-limit", VSH_OT_INT, VSH_OFLAG_NONE,
N_("Max memory in kilobytes")},
- {VIR_DOMAIN_MEMORY_SOFT_LIMIT, VSH_OT_INT, VSH_OFLAG_NONE,
+ {"soft-limit", VSH_OT_INT, VSH_OFLAG_NONE,
N_("Memory during contention in kilobytes")},
- {VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, VSH_OT_INT, VSH_OFLAG_NONE,
+ {"swap-hard-limit", VSH_OT_INT, VSH_OFLAG_NONE,
N_("Max swap in kilobytes")},
- {VIR_DOMAIN_MEMORY_MIN_GUARANTEE, VSH_OT_INT, VSH_OFLAG_NONE,
+ {"min-guarantee", VSH_OT_INT, VSH_OFLAG_NONE,
N_("Min guaranteed memory in kilobytes")},
{NULL, 0, 0, NULL}
};
--
1.7.2.3
Doesn't this break calls like this in cmdMemtune:
vshCommandOptLongLong(cmd, VIR_DOMAIN_MEMORY_HARD_LIMIT, NULL);
and this needs to be replaced by:
vshCommandOptLongLong(cmd, "hard-limit", NULL);
Matthias