From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:32790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvEAR-0002jR-GV for qemu-devel@nongnu.org; Wed, 08 Feb 2012 15:31:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RvEAM-0001CV-07 for qemu-devel@nongnu.org; Wed, 08 Feb 2012 15:31:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17068) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvEAL-0001CE-NB for qemu-devel@nongnu.org; Wed, 08 Feb 2012 15:30:57 -0500 From: Luiz Capitulino Date: Wed, 8 Feb 2012 18:30:38 -0200 Message-Id: <1328733040-16697-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1328733040-16697-1-git-send-email-lcapitulino@redhat.com> References: <1328733040-16697-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 4/6] balloon: Refactor kvm sync mmu check List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: eblake@redhat.com, aliguori@us.ibm.com, armbru@redhat.com, agl@us.ibm.com qmp_query_balloon() and qmp_balloon() perform the same check, move it to check_kvm_sync_mmu(). Signed-off-by: Luiz Capitulino --- balloon.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/balloon.c b/balloon.c index b32b487..d340ae3 100644 --- a/balloon.c +++ b/balloon.c @@ -80,12 +80,20 @@ static int qemu_balloon_info(BalloonInfo *info) return 1; } +static bool check_kvm_sync_mmu(Error **errp) +{ + if (kvm_enabled() && !kvm_has_sync_mmu()) { + error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon"); + return false; + } + return true; +} + 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"); + if (!check_kvm_sync_mmu(errp)) { return NULL; } @@ -102,8 +110,7 @@ BalloonInfo *qmp_query_balloon(Error **errp) void qmp_balloon(int64_t value, Error **errp) { - if (kvm_enabled() && !kvm_has_sync_mmu()) { - error_set(errp, QERR_KVM_MISSING_CAP, "synchronous MMU", "balloon"); + if (!check_kvm_sync_mmu(errp)) { return; } -- 1.7.9.111.gf3fb0.dirty