ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

monitor: do_balloon(): Check for errors 

do_balloon() should check for ballooning availability as
do_info_balloon() does.

Noted by Daniel P. Berrange <berrange@redhat.com>.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Luiz Capitulino 2009-12-14 18:53:22 -02:00 committed by Anthony Liguori
parent 78d714e08f
commit cfdf2c4057
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
monitor.c
View File

@ -2053,14 +2053,34 @@ static void do_info_status(Monitor *mon, QObject **ret_data)
vm_running, singlestep); vm_running, singlestep);
} }
static ram_addr_t balloon_get_value(void)
{
ram_addr_t actual;
if (kvm_enabled() && !kvm_has_sync_mmu()) {
qemu_error_new(QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon");
return 0;
}
actual = qemu_balloon_status();
if (actual == 0) {
qemu_error_new(QERR_DEVICE_NOT_ACTIVE, "balloon");
return 0;
}
return actual;
}
/** /**
* do_balloon(): Request VM to change its memory allocation * do_balloon(): Request VM to change its memory allocation
*/ */
static void do_balloon(Monitor *mon, const QDict *qdict, QObject **ret_data) static void do_balloon(Monitor *mon, const QDict *qdict, QObject **ret_data)
{ {
int value = qdict_get_int(qdict, "value"); if (balloon_get_value()) {
ram_addr_t target = value; /* ballooning is active */
qemu_balloon(target << 20); ram_addr_t value = qdict_get_int(qdict, "value");
qemu_balloon(value << 20);
}
} }
static void monitor_print_balloon(Monitor *mon, const QObject *data) static void monitor_print_balloon(Monitor *mon, const QObject *data)
@ -2088,14 +2108,11 @@ static void do_info_balloon(Monitor *mon, QObject **ret_data)
{ {
ram_addr_t actual; ram_addr_t actual;
actual = qemu_balloon_status(); actual = balloon_get_value();
if (kvm_enabled() && !kvm_has_sync_mmu()) if (actual != 0) {
qemu_error_new(QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon");
else if (actual == 0)
qemu_error_new(QERR_DEVICE_NOT_ACTIVE, "balloon");
else
*ret_data = qobject_from_jsonf("{ 'balloon': %" PRId64 "}", *ret_data = qobject_from_jsonf("{ 'balloon': %" PRId64 "}",
(int64_t) actual); (int64_t) actual);
}
} }
static qemu_acl *find_acl(Monitor *mon, const char *name) static qemu_acl *find_acl(Monitor *mon, const char *name)