KVM: Portability: move vpic and vioapic to kvm_arch
This patches moves two fields vpid and vioapic to kvm_arch
Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
Acked-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
diff --git a/drivers/kvm/irq.h b/drivers/kvm/irq.h
index a688c51..6e023dc 100644
--- a/drivers/kvm/irq.h
+++ b/drivers/kvm/irq.h
@@ -148,12 +148,12 @@
static inline struct kvm_pic *pic_irqchip(struct kvm *kvm)
{
- return kvm->vpic;
+ return kvm->arch.vpic;
}
static inline struct kvm_ioapic *ioapic_irqchip(struct kvm *kvm)
{
- return kvm->vioapic;
+ return kvm->arch.vioapic;
}
static inline int irqchip_in_kernel(struct kvm *kvm)