commit decdc28382b93dc642b83b32758b7440036cab76
author Radim Krčmář <rkrcmar@redhat.com> Wed Nov 26 17:07:05 2014 +0100
committer Paolo Bonzini <pbonzini@redhat.com> Thu Dec 04 15:29:05 2014 +0100
tree 4cde6dd4bc8c8a4d9a4bac766418dee5b48492a4
parent c69d3d9bc168b31de2072bf91c7e6879943b1381

KVM: x86: use MSR_ICR instead of a number

0x830 MSR is 0x300 xAPIC MMIO, which is MSR_ICR.

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/lapic.c

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 1b9bf96..3634303 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -1887,7 +1887,7 @@
 		return 1;
 
 	/* if this is ICR write vector before command */
-	if (msr == 0x830)
+	if (reg == APIC_ICR)
 		apic_reg_write(apic, APIC_ICR2, (u32)(data >> 32));
 	return apic_reg_write(apic, reg, (u32)data);
 }
@@ -1908,7 +1908,7 @@
 
 	if (apic_reg_read(apic, reg, 4, &low))
 		return 1;
-	if (msr == 0x830)
+	if (reg == APIC_ICR)
 		apic_reg_read(apic, APIC_ICR2, 4, &high);
 
 	*data = (((u64)high) << 32) | low;