From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40628) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLFix-0004cB-Dg for qemu-devel@nongnu.org; Tue, 10 Feb 2015 13:39:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLFis-0007Jq-P9 for qemu-devel@nongnu.org; Tue, 10 Feb 2015 13:39:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42748) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLFis-0007JX-G7 for qemu-devel@nongnu.org; Tue, 10 Feb 2015 13:39:46 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1AIdjK5010808 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 10 Feb 2015 13:39:46 -0500 Date: Tue, 10 Feb 2015 18:39:41 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20150210183941.GF2376@work-vm> References: <1421171432-8733-1-git-send-email-armbru@redhat.com> <1421171432-8733-9-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1421171432-8733-9-git-send-email-armbru@redhat.com> Subject: Re: [Qemu-devel] [PATCH 8/9] balloon: Factor out common "is balloon active" test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: lcapitulino@redhat.com, qemu-devel@nongnu.org, kraxel@redhat.com * Markus Armbruster (armbru@redhat.com) wrote: > Signed-off-by: Markus Armbruster > --- > 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) ^ An 'o' escaped from your balloon. Dave > +{ > + 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); > -- > 1.9.3 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK