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: 107383 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5MCuMGZ018628 for ; Tue, 22 Jun 2010 12:56:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755952Ab0FVM4R (ORCPT ); Tue, 22 Jun 2010 08:56:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58904 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755655Ab0FVM4O (ORCPT ); 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 Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Jes Sorensen Subject: [PATCH 2/7] Remove duplicate kvm_init() stub from qemu-kvm.h 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 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 22 Jun 2010 12:56:22 +0000 (UTC) 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);