diff options
| author |   Avi Kivity <avi@qumranet.com> | 2006-12-29 16:49:37 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-30 10:56:44 -0800 |
| commit | a9058ecd3cd72634cf548588ce79b3f225c9ca32 (patch) | |
| tree | 11d1edd2dfdcec03ba6b54b3b06d41cae826b940 /drivers/kvm/kvm_main.c | |
| parent | [PATCH] KVM: Use boot_cpu_data instead of current_cpu_data (diff) | |
| download | linux-dev-a9058ecd3cd72634cf548588ce79b3f225c9ca32.tar.xz linux-dev-a9058ecd3cd72634cf548588ce79b3f225c9ca32.zip | |
[PATCH] KVM: Simplify is_long_mode()
Instead of doing tricky stuff with the arch dependent virtualization
registers, take a peek at the guest's efer.
This simlifies some code, and fixes some confusion in the mmu branch.
Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/kvm/kvm_main.c')
| -rw-r--r-- | drivers/kvm/kvm_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index 9f24f22e4cb2..38375e2bb703 100644 --- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c @@ -398,7 +398,7 @@ void set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) return; } - if (kvm_arch_ops->is_long_mode(vcpu)) { + if (is_long_mode(vcpu)) { if (!(cr4 & CR4_PAE_MASK)) { printk(KERN_DEBUG "set_cr4: #GP, clearing PAE while " "in long mode\n"); @@ -425,7 +425,7 @@ EXPORT_SYMBOL_GPL(set_cr4); void set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3) { - if (kvm_arch_ops->is_long_mode(vcpu)) { + if (is_long_mode(vcpu)) { if ( cr3 & CR3_L_MODE_RESEVED_BITS) { printk(KERN_DEBUG "set_cr3: #GP, reserved bits\n"); inject_gp(vcpu); |