From patchwork Tue Jan 13 17:50:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 428553 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 581D214017B for ; Wed, 14 Jan 2015 04:51:31 +1100 (AEDT) Received: from localhost ([::1]:40582 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YB5cn-0002n9-AZ for incoming@patchwork.ozlabs.org; Tue, 13 Jan 2015 12:51:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YB5c5-0001Xf-Ey for qemu-devel@nongnu.org; Tue, 13 Jan 2015 12:50:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YB5bx-0004Nw-DH for qemu-devel@nongnu.org; Tue, 13 Jan 2015 12:50:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41290) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YB5bx-0004NO-3x for qemu-devel@nongnu.org; Tue, 13 Jan 2015 12:50:37 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0DHoaJk016537 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 13 Jan 2015 12:50:36 -0500 Received: from blackfin.pond.sub.org (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t0DHoYHo016508 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 13 Jan 2015 12:50:36 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A701530A46BC; Tue, 13 Jan 2015 18:50:32 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 13 Jan 2015 18:50:31 +0100 Message-Id: <1421171432-8733-9-git-send-email-armbru@redhat.com> In-Reply-To: <1421171432-8733-1-git-send-email-armbru@redhat.com> References: <1421171432-8733-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kraxel@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 8/9] balloon: Factor out common "is balloon active" test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- balloon.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/balloon.c b/balloon.c index 2884c2d..aa30617 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 int have_ballon(Error **errp) +{ + if (kvm_enabled() && !kvm_has_sync_mmu()) { + error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon"); + return 0; + } + if (!balloon_event_fn) { + error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon"); + return 0; + } + return 1; +} + 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);