Re: [PATCH v1 08/11] KVM: x86: directly call recalculate_apic_map on lapic restore

Paolo Bonzini
2016-07-01T08:46:28Z

On 30/06/2016 22:54, Radim Krčmář wrote:
> The get/set dance was just for that.
>
> Reviewed-by: Peter Xu <peterx@redhat.com>
> Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
> ---
> 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 d914b5351fdc..143df33f451e 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -2013,8 +2013,8 @@ void kvm_apic_post_state_restore(struct kvm_vcpu *vcpu,
> /* set SPIV separately to get count of SW disabled APICs right */
> apic_set_spiv(apic, *((u32 *)(s->regs + APIC_SPIV)));
> memcpy(vcpu->arch.apic->regs, s->regs, sizeof *s);
> - /* call kvm_apic_set_id() to put apic into apic_map */
> - kvm_apic_set_id(apic, kvm_apic_id(apic));
> + /* put apic into apic_map */
> + recalculate_apic_map(vcpu->kvm);
> kvm_apic_set_version(vcpu);
>
> apic_update_ppr(apic);
>

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>