From patchwork Tue Jun 22 12:55:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 56480 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 277D7B6F10 for ; Tue, 22 Jun 2010 23:03:56 +1000 (EST) Received: from localhost ([127.0.0.1]:35726 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OR38r-0003G8-F6 for incoming@patchwork.ozlabs.org; Tue, 22 Jun 2010 09:03:53 -0400 Received: from [140.186.70.92] (port=49935 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OR31U-0000Fa-Ac for qemu-devel@nongnu.org; Tue, 22 Jun 2010 08:56:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OR31S-0003ev-PQ for qemu-devel@nongnu.org; Tue, 22 Jun 2010 08:56:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46868) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OR31S-0003el-Iy for qemu-devel@nongnu.org; Tue, 22 Jun 2010 08:56:14 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5MCuD7g024203 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 22 Jun 2010 08:56:13 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5MCu6ta002896; Tue, 22 Jun 2010 08:56:11 -0400 From: Jes.Sorensen@redhat.com To: avi@redhat.com Date: Tue, 22 Jun 2010 14:55:59 +0200 Message-Id: <1277211364-12451-3-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1277211364-12451-1-git-send-email-Jes.Sorensen@redhat.com> References: <1277211364-12451-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Jes Sorensen , qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 2/7] Remove duplicate kvm_init() stub from qemu-kvm.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jes Sorensen Avoid build conflicts and move prototype out of CONFIG_KVM to make the stub in kvm-stub.c visible. Signed-off-by: Jes Sorensen --- qemu-kvm.h | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/qemu-kvm.h b/qemu-kvm.h index 3ace503..c9b93dc 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -107,18 +107,6 @@ int kvm_set_mce(CPUState *env, struct kvm_x86_mce *mce); #endif /*! - * \brief Create new KVM context - * - * This creates a new kvm_context. A KVM context is a small area of data that - * holds information about the KVM instance that gets created by this call.\n - * This should always be your first call to KVM. - * - * \param opaque Not used - * \return NULL on failure - */ -int kvm_init(int smp_cpus); - -/*! * \brief Disable the in-kernel IRQCHIP creation * * In-kernel irqchip is enabled by default. If userspace irqchip is to be used, @@ -806,11 +794,6 @@ typedef struct kvm_vcpu_context *kvm_vcpu_context_t; struct kvm_pit_state { }; -static inline int kvm_init(int smp_cpus) -{ - return 0; -} - static inline void kvm_inject_x86_mce(CPUState *cenv, int bank, uint64_t status, uint64_t mcg_status, uint64_t addr, uint64_t misc, @@ -823,6 +806,18 @@ static inline void kvm_inject_x86_mce(CPUState *cenv, int bank, #endif /* !CONFIG_KVM */ +/*! + * \brief Create new KVM context + * + * This creates a new kvm_context. A KVM context is a small area of data that + * holds information about the KVM instance that gets created by this call.\n + * This should always be your first call to KVM. + * + * \param opaque Not used + * \return NULL on failure + */ +int kvm_init(int smp_cpus); + int kvm_main_loop(void); int kvm_init_ap(void); int kvm_vcpu_inited(CPUState *env);