diff options
| author |   Avi Kivity <avi@qumranet.com> | 2006-12-12 16:19:10 +0000 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2006-12-12 16:19:10 +0000 |
| commit | b0ac96ef3aecb78a9021cd7dee2660a4ad636d62 (patch) | |
| tree | fa0000502a140a12d55beb86bb0ab584f7e1ccc7 | |
| parent | b2649695b294a770e3114122ef7716de1af71ad2 (diff) | |
kvm: release: merge from trunkkvm-7
........
r4085 | avi | 2006-12-12 16:20:13 +0200 (Tue, 12 Dec 2006) | 2 lines
kvm: web: document -no-apic better; also mention amd support more
........
r4086 | avi | 2006-12-12 16:50:21 +0200 (Tue, 12 Dec 2006) | 2 lines
kvm: re-re-fix hardware_enable() on macbooks
........
r4087 | avi | 2006-12-12 17:15:01 +0200 (Tue, 12 Dec 2006) | 2 lines
kvm: web: mention live migration
........
r4088 | uri | 2006-12-12 17:32:30 +0200 (Tue, 12 Dec 2006) | 2 lines
qemu-kvm: fix cr-number typo
........
| -rw-r--r-- | kvm/kernel/vmx.c | 2 | ||||
| -rw-r--r-- | qemu-kvm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kvm/kernel/vmx.c b/kvm/kernel/vmx.c index cc42cab27..f0f0b1a78 100644 --- a/kvm/kernel/vmx.c +++ b/kvm/kernel/vmx.c @@ -534,7 +534,7 @@ static __init void hardware_enable(void *garbage) u64 old; rdmsrl(MSR_IA32_FEATURE_CONTROL, old); - if ((old & 4) == 0) + if ((old & 5) != 5) /* enable and lock */ wrmsrl(MSR_IA32_FEATURE_CONTROL, old | 5); write_cr4(read_cr4() | CR4_VMXE); /* FIXME: not cpu hotplug safe */ diff --git a/qemu-kvm.c b/qemu-kvm.c index 0c7a7f289..05b036295 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -379,7 +379,7 @@ static inline void push_interrupts(CPUState *env) // for now using cpu 0 kvm_inject_irq(kvm_context, 0, cpu_get_pic_interrupt(env)); - } while ( (env->interrupt_request & CPU_INTERRUPT_HARD) && (env->cr[2] & CR0_PG_MASK) ); + } while ( (env->interrupt_request & CPU_INTERRUPT_HARD) && (env->cr[0] & CR0_PG_MASK) ); } void kvm_load_registers(CPUState *env) |