aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2009-12-18 13:25:05 -0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-19 08:26:03 -0600
commit3b0bd6ec5bde2a1a26c4c87f3912cd25256eb58d (patch)
tree265fd9966af288ed706bf52ea8b2102f55c20ddb
parentb6e098d79f661c7d2a631d9c6c8e119f00c3069d (diff)
downloadqemu-3b0bd6ec5bde2a1a26c4c87f3912cd25256eb58d.zip
qemu-3b0bd6ec5bde2a1a26c4c87f3912cd25256eb58d.tar.gz
qemu-3b0bd6ec5bde2a1a26c4c87f3912cd25256eb58d.tar.bz2
monitor: do_balloon(): Use 'M' argument type
This makes do_balloon() accept megabyte values from the user Monitor while accepting byte values for QMP. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--monitor.c3
-rw-r--r--qemu-monitor.hx2
2 files changed, 2 insertions, 3 deletions
diff --git a/monitor.c b/monitor.c
index 53a4674..c0dc48e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2083,8 +2083,7 @@ static void do_balloon(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
if (balloon_get_value()) {
/* ballooning is active */
- ram_addr_t value = qdict_get_int(qdict, "value");
- qemu_balloon(value << 20);
+ qemu_balloon(qdict_get_int(qdict, "value"));
}
}
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 338e30e..aac0f3e 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -887,7 +887,7 @@ ETEXI
{
.name = "balloon",
- .args_type = "value:i",
+ .args_type = "value:M",
.params = "target",
.help = "request VM to change it's memory allocation (in MB)",
.user_print = monitor_user_noop,