diff options
| -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) |