diff options
| author | Carsten Otte <cotte@de.ibm.com> | 2007-10-29 16:09:10 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 17:52:58 +0200 |
| commit | 6866b83ed7240bf4a7c50836ee10f61c8534503f (patch) | |
| tree | ca4ca86b554537998ff0ee7c78d00ea723c3f537 | |
| parent | 5fb76f9be1a050a25e21a44ab2003c9d36a72a77 (diff) | |
| download | op-kernel-dev-6866b83ed7240bf4a7c50836ee10f61c8534503f.zip op-kernel-dev-6866b83ed7240bf4a7c50836ee10f61c8534503f.tar.gz | |
KVM: Portability: move get/set_apic_base to x86.c
This patch moves the implementation of get_apic_base and set_apic_base
from kvm_main.c to x86.c
Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
| -rw-r--r-- | drivers/kvm/kvm_main.c | 19 | ||||
| -rw-r--r-- | drivers/kvm/x86.c | 19 |
2 files changed, 19 insertions, 19 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index cf163bd..e8972a8 100644 --- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c @@ -556,25 +556,6 @@ unsigned long get_cr8(struct kvm_vcpu *vcpu) } EXPORT_SYMBOL_GPL(get_cr8); -u64 kvm_get_apic_base(struct kvm_vcpu *vcpu) -{ - if (irqchip_in_kernel(vcpu->kvm)) - return vcpu->apic_base; - else - return vcpu->apic_base; -} -EXPORT_SYMBOL_GPL(kvm_get_apic_base); - -void kvm_set_apic_base(struct kvm_vcpu *vcpu, u64 data) -{ - /* TODO: reserve bits check */ - if (irqchip_in_kernel(vcpu->kvm)) - kvm_lapic_set_base(vcpu, data); - else - vcpu->apic_base = data; -} -EXPORT_SYMBOL_GPL(kvm_set_apic_base); - void fx_init(struct kvm_vcpu *vcpu) { unsigned after_mxcsr_mask; diff --git a/drivers/kvm/x86.c b/drivers/kvm/x86.c index 5a95922..c26e371 100644 --- a/drivers/kvm/x86.c +++ b/drivers/kvm/x86.c @@ -59,6 +59,25 @@ unsigned long segment_base(u16 selector) } EXPORT_SYMBOL_GPL(segment_base); +u64 kvm_get_apic_base(struct kvm_vcpu *vcpu) +{ + if (irqchip_in_kernel(vcpu->kvm)) + return vcpu->apic_base; + else + return vcpu->apic_base; +} +EXPORT_SYMBOL_GPL(kvm_get_apic_base); + +void kvm_set_apic_base(struct kvm_vcpu *vcpu, u64 data) +{ + /* TODO: reserve bits check */ + if (irqchip_in_kernel(vcpu->kvm)) + kvm_lapic_set_base(vcpu, data); + else + vcpu->apic_base = data; +} +EXPORT_SYMBOL_GPL(kvm_set_apic_base); + /* * List of msr numbers which we expose to userspace through KVM_GET_MSRS * and KVM_SET_MSRS, and KVM_GET_MSR_INDEX_LIST. |
