From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwOet-0000bf-Ql for qemu-devel@nongnu.org; Tue, 18 Oct 2016 03:18:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwOep-0000jz-SG for qemu-devel@nongnu.org; Tue, 18 Oct 2016 03:17:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33020) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwOep-0000jZ-MW for qemu-devel@nongnu.org; Tue, 18 Oct 2016 03:17:55 -0400 Date: Tue, 18 Oct 2016 09:17:48 +0200 From: Igor Mammedov Message-ID: <20161018091748.3e1ba99d@nial.brq.redhat.com> In-Reply-To: <20161017215112.GF3275@thinpad.lan.raisama.net> References: <1476352367-69400-1-git-send-email-imammedo@redhat.com> <1476352367-69400-10-git-send-email-imammedo@redhat.com> <20161017215112.GF3275@thinpad.lan.raisama.net> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 09/13] pc: kvm_apic: pass APIC ID depending on xAPIC/x2APIC mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: qemu-devel@nongnu.org, kraxel@redhat.com, liuxiaojian6@huawei.com, mst@redhat.com, rkrcmar@redhat.com, peterx@redhat.com, kevin@koconnor.net, pbonzini@redhat.com, lersek@redhat.com, chao.gao@intel.com On Mon, 17 Oct 2016 19:51:12 -0200 Eduardo Habkost wrote: > On Thu, Oct 13, 2016 at 11:52:43AM +0200, Igor Mammedov wrote: > > Signed-off-by: Igor Mammedov > > --- > > 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 > > > > + kvm_apic_set_reg(kapic, 0x2, s->initial_apic_id); > > + } else { > > + kvm_apic_set_reg(kapic, 0x2, s->id << 24); > > + } > > kvm_apic_set_reg(kapic, 0x8, s->tpr); > > kvm_apic_set_reg(kapic, 0xd, s->log_dest << 24); > > kvm_apic_set_reg(kapic, 0xe, s->dest_mode << 28 | 0x0fffffff); > > @@ -59,7 +63,11 @@ void kvm_get_apic_state(DeviceState *dev, struct kvm_lapic_state *kapic) > > APICCommonState *s = APIC_COMMON(dev); > > int i, v; > > > > - s->id = kvm_apic_get_reg(kapic, 0x2) >> 24; > > + if (kvm_enable_x2apic() && s->apicbase & MSR_IA32_APICBASE_EXTD) { > > + assert(kvm_apic_get_reg(kapic, 0x2) == s->initial_apic_id); > > + } else { > > + s->id = kvm_apic_get_reg(kapic, 0x2) >> 24; > > + } > > s->tpr = kvm_apic_get_reg(kapic, 0x8); > > s->arb_id = kvm_apic_get_reg(kapic, 0x9); > > s->log_dest = kvm_apic_get_reg(kapic, 0xd) >> 24; > > -- > > 2.7.4 > > >