Commit 0dce7cd6 authored Jan 15, 2014 by Andrew Jones Committed by Paolo Bonzini Jan 15, 2014

kvm: x86: fix apic_base enable check



Commit e66d2ae7 moved the assignment
vcpu->arch.apic_base = value above a condition with
(vcpu->arch.apic_base ^ value), causing that check
to always fail. Use old_value, vcpu->arch.apic_base's
old value, in the condition instead.

Signed-off-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 7e22e911

arch/x86/kvm/lapic.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1355,7 +1355,7 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)
		vcpu->arch.apic_base = value;

		/* update jump label if enable bit changes */
		if ((vcpu->arch.apic_base ^ value) & MSR_IA32_APICBASE_ENABLE) {
		if ((old_value ^ value) & MSR_IA32_APICBASE_ENABLE) {
		if (value & MSR_IA32_APICBASE_ENABLE)
		static_key_slow_dec_deferred(&apic_hw_disabled);
		else