lkml.org 
[lkml]   [2014]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] KVM: x86: use MSR_ICR instead of a number


On 26/11/2014 17:07, Radim Krčmář wrote:
> 0x830 MSR is 0x300 xAPIC MMIO, which is MSR_ICR.
>
> Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
> ---
> This applies on top of Amit's
> [PATCH v2] KVM: x86: Fix reserved x2apic registers
> in which I noticed this minor deficit.
>
> arch/x86/kvm/lapic.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> 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;
>
> /* 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;
>

Applied, thanks.

Paolo


\
 
 \ /
  Last update: 2014-11-27 18:41    [W:0.066 / U:0.096 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site