From patchwork Wed Feb 8 20:30:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 140216 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EBCECB6EF7 for ; Thu, 9 Feb 2012 07:32:51 +1100 (EST) Received: from localhost ([::1]:53008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvEB2-0004No-FU for incoming@patchwork.ozlabs.org; Wed, 08 Feb 2012 15:31:40 -0500 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 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q18KUuAp028451 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 8 Feb 2012 15:30:57 -0500 Received: from localhost (ovpn-116-68.ams2.redhat.com [10.36.116.68]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q18KUtRF015573; Wed, 8 Feb 2012 15:30:56 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: eblake@redhat.com, aliguori@us.ibm.com, armbru@redhat.com, agl@us.ibm.com Subject: [Qemu-devel] [PATCH 4/6] balloon: Refactor kvm sync mmu check 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 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; }