From patchwork Tue Jan 13 17:50:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 428555 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 0E73D14017B for ; Wed, 14 Jan 2015 04:53:32 +1100 (AEDT) Received: from localhost ([::1]:40600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YB5ek-0006UV-2A for incoming@patchwork.ozlabs.org; Tue, 13 Jan 2015 12:53:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55410) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YB5c2-0001Uw-2Y for qemu-devel@nongnu.org; Tue, 13 Jan 2015 12:50:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YB5bx-0004Nq-D0 for qemu-devel@nongnu.org; Tue, 13 Jan 2015 12:50:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41289) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YB5bx-0004NK-2t 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 t0DHoaHr016535 (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 t0DHoYWv016506 (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 9CCB330A4C02; Tue, 13 Jan 2015 18:50:32 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 13 Jan 2015 18:50:30 +0100 Message-Id: <1421171432-8733-8-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 7/9] balloon: Inline qemu_balloon(), qemu_balloon_status() 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 ... and simplify a bit. Permits factoring out common error checks in the next commit. Signed-off-by: Markus Armbruster --- balloon.c | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/balloon.c b/balloon.c index b70da4f..2884c2d 100644 --- a/balloon.c +++ b/balloon.c @@ -62,25 +62,6 @@ void qemu_remove_balloon_handler(void *opaque) 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 *info; @@ -90,30 +71,33 @@ BalloonInfo *qmp_query_balloon(Error **errp) return NULL; } + if (!balloon_stat_fn) { + error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon"); + return NULL; + } + info = g_malloc0(sizeof(*info)); - - if (qemu_balloon_status(info) == 0) { - error_set(errp, QERR_DEVICE_NOT_ACTIVE, "balloon"); - qapi_free_BalloonInfo(info); - return NULL; - } - + balloon_stat_fn(balloon_opaque, 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()) { error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon"); return; } - if (value <= 0) { + if (target <= 0) { error_set(errp, QERR_INVALID_PARAMETER_VALUE, "target", "a size"); return; } - if (qemu_balloon(value) == 0) { + 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); }