Skip to content

Commit

Permalink
balloon: Factor out common "is balloon active" test
Browse files Browse the repository at this point in the history
Signed-off-by: Markus Armbruster <[email protected]>
Reviewed-by: Eric Blake <[email protected]>
  • Loading branch information
Markus Armbruster committed Jan 29, 2015
1 parent 6502a14 commit 422e050
Showing 1 changed file with 15 additions and 14 deletions.
29 changes: 15 additions & 14 deletions balloon.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,19 @@ static QEMUBalloonEvent *balloon_event_fn;
static QEMUBalloonStatus *balloon_stat_fn;
static void *balloon_opaque;

static bool have_ballon(Error **errp)
{
if (kvm_enabled() && !kvm_has_sync_mmu()) {
error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon");
return false;
}
if (!balloon_event_fn) {
error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon");
return false;
}
return true;
}

int qemu_add_balloon_handler(QEMUBalloonEvent *event_func,
QEMUBalloonStatus *stat_func, void *opaque)
{
Expand Down Expand Up @@ -66,13 +79,7 @@ BalloonInfo *qmp_query_balloon(Error **errp)
{
BalloonInfo *info;

if (kvm_enabled() && !kvm_has_sync_mmu()) {
error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon");
return NULL;
}

if (!balloon_stat_fn) {
error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon");
if (!have_ballon(errp)) {
return NULL;
}

Expand All @@ -83,20 +90,14 @@ BalloonInfo *qmp_query_balloon(Error **errp)

void qmp_balloon(int64_t target, Error **errp)
{
if (kvm_enabled() && !kvm_has_sync_mmu()) {
error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon");
if (!have_ballon(errp)) {
return;
}

if (target <= 0) {
error_set(errp, QERR_INVALID_PARAMETER_VALUE, "target", "a size");
return;
}

if (!balloon_event_fn) {
error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon");
return;
}

trace_balloon_event(balloon_opaque, target);
balloon_event_fn(balloon_opaque, target);
Expand Down

0 comments on commit 422e050

Please sign in to comment.