From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Jes.Sorensen@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> Subject: [Qemu-devel] [PATCH 2/7] Remove duplicate kvm_init() stub from qemu-kvm.h List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: avi@redhat.com Cc: Jes Sorensen , qemu-devel@nongnu.org, kvm@vger.kernel.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); -- 1.7.0.1