diff options
| author | Zhang Xiantao <xiantao.zhang@intel.com> | 2007-12-11 20:36:00 +0800 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 17:53:22 +0200 |
| commit | 682c59a3f3f211ed555b17144f2d82eb8286a1db (patch) | |
| tree | 939bb2644ec6d556d27e82ecfb0cdf8ec9e7378a | |
| parent | 2bacc55c7c3c61e356aef06b9a319b4cee90b519 (diff) | |
| download | op-kernel-dev-682c59a3f3f211ed555b17144f2d82eb8286a1db.zip op-kernel-dev-682c59a3f3f211ed555b17144f2d82eb8286a1db.tar.gz | |
KVM: Portability: Move kvm{pic,ioapic} accesors to x86 specific code
Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
| -rw-r--r-- | drivers/kvm/irq.h | 18 | ||||
| -rw-r--r-- | drivers/kvm/kvm.h | 18 | ||||
| -rw-r--r-- | drivers/kvm/x86.h | 1 |
3 files changed, 19 insertions, 18 deletions
diff --git a/drivers/kvm/irq.h b/drivers/kvm/irq.h index 730a87c1..e88d939 100644 --- a/drivers/kvm/irq.h +++ b/drivers/kvm/irq.h @@ -26,6 +26,7 @@ #include <linux/hrtimer.h> #include <asm/kvm.h> #include "iodev.h" +#include "x86.h" struct kvm; struct kvm_vcpu; @@ -63,8 +64,6 @@ struct kvm_pic { struct kvm_pic *kvm_create_pic(struct kvm *kvm); void kvm_pic_set_irq(void *opaque, int irq, int level); int kvm_pic_read_irq(struct kvm_pic *s); -int kvm_cpu_get_interrupt(struct kvm_vcpu *v); -int kvm_cpu_has_interrupt(struct kvm_vcpu *v); void kvm_pic_update_irq(struct kvm_pic *s); #define IOAPIC_NUM_PINS KVM_IOAPIC_NUM_PINS @@ -147,6 +146,21 @@ do { \ #define ASSERT(x) do { } while (0) #endif +static inline struct kvm_pic *pic_irqchip(struct kvm *kvm) +{ + return kvm->vpic; +} + +static inline struct kvm_ioapic *ioapic_irqchip(struct kvm *kvm) +{ + return kvm->vioapic; +} + +static inline int irqchip_in_kernel(struct kvm *kvm) +{ + return pic_irqchip(kvm) != NULL; +} + void kvm_vcpu_kick(struct kvm_vcpu *vcpu); int kvm_apic_has_interrupt(struct kvm_vcpu *vcpu); int kvm_apic_accept_pic_intr(struct kvm_vcpu *vcpu); diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h index ceefb442..668a830 100644 --- a/drivers/kvm/kvm.h +++ b/drivers/kvm/kvm.h @@ -273,21 +273,6 @@ struct kvm { struct kvm_vm_stat stat; }; -static inline struct kvm_pic *pic_irqchip(struct kvm *kvm) -{ - return kvm->vpic; -} - -static inline struct kvm_ioapic *ioapic_irqchip(struct kvm *kvm) -{ - return kvm->vioapic; -} - -static inline int irqchip_in_kernel(struct kvm *kvm) -{ - return pic_irqchip(kvm) != NULL; -} - /* The guest did something we don't support. */ #define pr_unimpl(vcpu, fmt, ...) \ do { \ @@ -417,6 +402,9 @@ void kvm_free_physmem(struct kvm *kvm); struct kvm *kvm_arch_create_vm(void); void kvm_arch_destroy_vm(struct kvm *kvm); +int kvm_cpu_get_interrupt(struct kvm_vcpu *v); +int kvm_cpu_has_interrupt(struct kvm_vcpu *v); + static inline void kvm_guest_enter(void) { account_system_vtime(current); diff --git a/drivers/kvm/x86.h b/drivers/kvm/x86.h index 78396d6..0fc7020 100644 --- a/drivers/kvm/x86.h +++ b/drivers/kvm/x86.h @@ -12,7 +12,6 @@ #define KVM_X86_H #include "kvm.h" -#include "irq.h" #include <linux/types.h> #include <linux/mm.h> |
