From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [PATCH] KVM: x86: use MSR_ICR instead of a number Date: Thu, 27 Nov 2014 18:07:55 +0100 Message-ID: <54775A6B.9060905@redhat.com> References: <1417018025-1189-1-git-send-email-rkrcmar@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: kvm@vger.kernel.org To: =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , linux-kernel@vger.kernel.org Return-path: In-Reply-To: <1417018025-1189-1-git-send-email-rkrcmar@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org On 26/11/2014 17:07, Radim Kr=C4=8Dm=C3=A1=C5=99 wrote: > 0x830 MSR is 0x300 xAPIC MMIO, which is MSR_ICR. >=20 > Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 > --- > This applies on top of Amit's > [PATCH v2] KVM: x86: Fix reserved x2apic registers > in which I noticed this minor deficit. >=20 > arch/x86/kvm/lapic.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c > index 9c90d31..687874f 100644 > --- a/arch/x86/kvm/lapic.c > +++ b/arch/x86/kvm/lapic.c > @@ -1887,7 +1887,7 @@ int kvm_x2apic_msr_write(struct kvm_vcpu *vcpu,= u32 msr, u64 data) > return 1; > =20 > /* if this is ICR write vector before command */ > - if (msr =3D=3D 0x830) > + if (reg =3D=3D 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) > =20 > if (apic_reg_read(apic, reg, 4, &low)) > return 1; > - if (msr =3D=3D 0x830) > + if (reg =3D=3D APIC_ICR) > apic_reg_read(apic, APIC_ICR2, 4, &high); > =20 > *data =3D (((u64)high) << 32) | low; >=20 Applied, thanks. Paolo