From 422e0501a842fb4b3f42494f341707e809c3c6ad Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 13 Jan 2015 17:44:14 +0100 Subject: balloon: Factor out common "is balloon active" test Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- balloon.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'balloon.c') diff --git a/balloon.c b/balloon.c index 2884c2d37a..728bb707bf 100644 --- a/balloon.c +++ b/balloon.c @@ -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) { @@ -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; } @@ -83,8 +90,7 @@ 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; } @@ -92,11 +98,6 @@ void qmp_balloon(int64_t target, Error **errp) 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); -- cgit v1.2.1