Re: [Qemu-devel] [PATCH v3 09/13] pc: kvm_apic: pass APIC ID depending on xAPIC/x2APIC mode

[Eduardo Habkost]

On Tue, Oct 18, 2016 at 09:17:48AM +0200, Igor Mammedov wrote:
> On Mon, 17 Oct 2016 19:51:12 -0200
> Eduardo Habkost <address@hidden> wrote:
> 
> > On Thu, Oct 13, 2016 at 11:52:43AM +0200, Igor Mammedov wrote:
> > > Signed-off-by: Igor Mammedov <address@hidden>
> > > ---
> > > v4:
> > >  - drop kvm_has_x2apic_api() and reuse kvm_enable_x2apic() instead
> > > ---
> > >  hw/i386/kvm/apic.c | 12 ++++++++++--
> > >  1 file changed, 10 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c
> > > index be55102..9a7dd03 100644
> > > --- a/hw/i386/kvm/apic.c
> > > +++ b/hw/i386/kvm/apic.c
> > > @@ -34,7 +34,11 @@ static void kvm_put_apic_state(APICCommonState *s, 
> > > struct kvm_lapic_state *kapic
> > >      int i;
> > >  
> > >      memset(kapic, 0, sizeof(*kapic));
> > > -    kvm_apic_set_reg(kapic, 0x2, s->id << 24);
> > > +    if (kvm_enable_x2apic() && s->apicbase & MSR_IA32_APICBASE_EXTD) {  
> > 
> > This is going to enable x2apic unconditionally (not just check if
> > x2apic was enabled). Is this really what you want to do?
> Fixed,
>  v4 is in reply to the same note from Radim

Oops, didn't notice v4 was already there. Sorry for the noise.

-- 
Eduardo