KVM: Portability: Introduce kvm_vcpu_arch

Move all the architecture-specific fields in kvm_vcpu into a new struct
kvm_vcpu_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>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/kvm/ioapic.c b/drivers/kvm/ioapic.c
index e7debfafca50..04910368c251 100644
--- a/drivers/kvm/ioapic.c
+++ b/drivers/kvm/ioapic.c
@@ -158,7 +158,7 @@ static u32 ioapic_get_delivery_bitmask(struct kvm_ioapic *ioapic, u8 dest,
         if (dest_mode == 0) {   /* Physical mode. */
                 if (dest == 0xFF) {     /* Broadcast. */
                         for (i = 0; i < KVM_MAX_VCPUS; ++i)
-                                if (kvm->vcpus[i] && kvm->vcpus[i]->apic)
+                                if (kvm->vcpus[i] && kvm->vcpus[i]->arch.apic)
                                         mask |= 1 << i;
                         return mask;
                 }
@@ -166,8 +166,8 @@ static u32 ioapic_get_delivery_bitmask(struct kvm_ioapic *ioapic, u8 dest,
                         vcpu = kvm->vcpus[i];
                         if (!vcpu)
                                 continue;
-                        if (kvm_apic_match_physical_addr(vcpu->apic, dest)) {
-                                if (vcpu->apic)
+                        if (kvm_apic_match_physical_addr(vcpu->arch.apic, dest)) {
+                                if (vcpu->arch.apic)
                                         mask = 1 << i;
                                 break;
                         }
@@ -177,8 +177,8 @@ static u32 ioapic_get_delivery_bitmask(struct kvm_ioapic *ioapic, u8 dest,
                         vcpu = kvm->vcpus[i];
                         if (!vcpu)
                                 continue;
-                        if (vcpu->apic &&
-                            kvm_apic_match_logical_addr(vcpu->apic, dest))
+                        if (vcpu->arch.apic &&
+                            kvm_apic_match_logical_addr(vcpu->arch.apic, dest))
                                 mask |= 1 << vcpu->vcpu_id;
                 }
         ioapic_debug("mask %x\n", mask);