Commit decdc283 authored by Radim Krčmář's avatar Radim Krčmář Committed by Paolo Bonzini

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: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c69d3d9b
...@@ -1887,7 +1887,7 @@ int kvm_x2apic_msr_write(struct kvm_vcpu *vcpu, u32 msr, u64 data) ...@@ -1887,7 +1887,7 @@ int kvm_x2apic_msr_write(struct kvm_vcpu *vcpu, u32 msr, u64 data)
return 1; return 1;
/* if this is ICR write vector before command */ /* if this is ICR write vector before command */
if (msr == 0x830) if (reg == APIC_ICR)
apic_reg_write(apic, APIC_ICR2, (u32)(data >> 32)); apic_reg_write(apic, APIC_ICR2, (u32)(data >> 32));
return apic_reg_write(apic, reg, (u32)data); return apic_reg_write(apic, reg, (u32)data);
} }
...@@ -1908,7 +1908,7 @@ int kvm_x2apic_msr_read(struct kvm_vcpu *vcpu, u32 msr, u64 *data) ...@@ -1908,7 +1908,7 @@ int kvm_x2apic_msr_read(struct kvm_vcpu *vcpu, u32 msr, u64 *data)
if (apic_reg_read(apic, reg, 4, &low)) if (apic_reg_read(apic, reg, 4, &low))
return 1; return 1;
if (msr == 0x830) if (reg == APIC_ICR)
apic_reg_read(apic, APIC_ICR2, 4, &high); apic_reg_read(apic, APIC_ICR2, 4, &high);
*data = (((u64)high) << 32) | low; *data = (((u64)high) << 32) | low;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment