Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

KVM: x86: use MSR_ICR instead of a number 



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

Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c69d3d9b

arch/x86/kvm/lapic.c

+2 −2
Original line number Diff line number Diff line
@@ -1887,7 +1887,7 @@ int kvm_x2apic_msr_write(struct kvm_vcpu *vcpu, u32 msr, u64 data) 
		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 @@ int kvm_x2apic_msr_read(struct kvm_vcpu *vcpu, u32 msr, u64 *data) 


	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;