diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-07-25 08:22:12 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2007-07-25 13:31:13 +0200 |
| commit | 4c981b43d7ec18818754bf85b829865abd0ce340 (patch) | |
| tree | 2db7c22e03393e32ea4cdb0d55e5d13c71ed2ef2 | |
| parent | Revert "KVM: Avoid useless memory write when possible" (diff) | |
| download | linux-4c981b43d7ec18818754bf85b829865abd0ce340.tar.xz linux-4c981b43d7ec18818754bf85b829865abd0ce340.zip | |
KVM: Fix removal of nx capability from guest cpuid
Testing the wrong bit caused kvm not to disable nx on the guest when it is
disabled on the host (an mmu optimization relies on the nx bits being the
same in the guest and host).
This allows Windows to boot when nx is disabled on te host (e.g. when
host pae is disabled).
Signed-off-by: Avi Kivity <avi@qumranet.com>
| -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 a8d8db8e3ccb..96856097d15b 100644 --- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c @@ -2432,9 +2432,9 @@ static void cpuid_fix_nx_cap(struct kvm_vcpu *vcpu) break; } } - if (entry && (entry->edx & EFER_NX) && !(efer & EFER_NX)) { + if (entry && (entry->edx & (1 << 20)) && !(efer & EFER_NX)) { entry->edx &= ~(1 << 20); - printk(KERN_INFO ": guest NX capability removed\n"); + printk(KERN_INFO "kvm: guest NX capability removed\n"); } } |