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

balloon: Inline qemu_balloon(), qemu_balloon_status() 

... and simplify a bit.  Permits factoring out common error checks in
the next commit.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2015-01-13 17:43:25 +01:00
parent a6c90cbccd
commit 6502a14734
1 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
balloon.c
View File

@ -62,25 +62,6 @@ void qemu_remove_balloon_handler(void *opaque)
balloon_opaque = NULL; balloon_opaque = NULL;
} }
static int qemu_balloon(ram_addr_t target)
{
if (!balloon_event_fn) {
return 0;
}
trace_balloon_event(balloon_opaque, target);
balloon_event_fn(balloon_opaque, target);
return 1;
}
static int qemu_balloon_status(BalloonInfo *info)
{
if (!balloon_stat_fn) {
return 0;
}
balloon_stat_fn(balloon_opaque, info);
return 1;
}
BalloonInfo *qmp_query_balloon(Error **errp) BalloonInfo *qmp_query_balloon(Error **errp)
{ {
BalloonInfo *info; BalloonInfo *info;
@ -90,30 +71,33 @@ BalloonInfo *qmp_query_balloon(Error **errp)
return NULL; return NULL;
} }
info = g_malloc0(sizeof(*info)); if (!balloon_stat_fn) {
if (qemu_balloon_status(info) == 0) {
error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon"); error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon");
qapi_free_BalloonInfo(info);
return NULL; return NULL;
} }
info = g_malloc0(sizeof(*info));
balloon_stat_fn(balloon_opaque, info);
return info; return info;
} }
void qmp_balloon(int64_t value, Error **errp) void qmp_balloon(int64_t target, Error **errp)
{ {
if (kvm_enabled() && !kvm_has_sync_mmu()) { if (kvm_enabled() && !kvm_has_sync_mmu()) {
error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon"); error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon");
return; return;
} }
if (value <= 0) { if (target <= 0) {
error_set(errp, QERR_INVALID_PARAMETER_VALUE, "target", "a size"); error_set(errp, QERR_INVALID_PARAMETER_VALUE, "target", "a size");
return; return;
} }
if (qemu_balloon(value) == 0) { if (!balloon_event_fn) {
error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon"); error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon");
return;
} }
trace_balloon_event(balloon_opaque, target);
balloon_event_fn(balloon_opaque, target);
} }