diff options
author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2010-06-22 14:25:40 +0200 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-06-22 15:40:16 +0300 |
commit | eb453b8c9db6327155ca171fa7644dc959218d85 (patch) | |
tree | 8c876e699397613c8dd62c6911b9776389fb3d36 /qemu-kvm.h | |
parent | fee8dc4956f4608f514cf41639873613b0f53b70 (diff) |
Remove duplicate kvm_init() stub from qemu-kvm.h
Avoid build conflicts and move prototype out of CONFIG_KVM to make the
stub in kvm-stub.c visible.
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-kvm.h')
-rw-r--r-- | qemu-kvm.h | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/qemu-kvm.h b/qemu-kvm.h index 3ace503f7..c9b93dc5c 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); |