From patchwork Thu Jun 23 14:54:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 639684 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rb4WX4LL5z9sBX for ; Fri, 24 Jun 2016 01:04:56 +1000 (AEST) Received: from localhost ([::1]:37200 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG6Ba-0005VS-50 for incoming@patchwork.ozlabs.org; Thu, 23 Jun 2016 11:04:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG61q-0003zb-Ap for qemu-devel@nongnu.org; Thu, 23 Jun 2016 10:54:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bG61o-0007L3-B7 for qemu-devel@nongnu.org; Thu, 23 Jun 2016 10:54:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51137) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG61o-0007Kr-4I for qemu-devel@nongnu.org; Thu, 23 Jun 2016 10:54:48 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 920FFC0467CB; Thu, 23 Jun 2016 14:54:47 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5NEsUlf032275; Thu, 23 Jun 2016 10:54:45 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 23 Jun 2016 16:54:25 +0200 Message-Id: <1466693669-139967-8-git-send-email-imammedo@redhat.com> In-Reply-To: <1466693669-139967-1-git-send-email-imammedo@redhat.com> References: <1466693669-139967-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 23 Jun 2016 14:54:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 07/11] pc: set APIC ID based on socket/core/thread ids if it's not been set yet X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhugh.fnst@cn.fujitsu.com, ehabkost@redhat.com, mst@redhat.com, armbru@redhat.com, eduardo.otubo@profitbricks.com, pbonzini@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" CPU added with device_add help won't have APIC ID set, so set it according to socket/core/thread ids provided with device_add command. Signed-off-by: Igor Mammedov --- hw/i386/pc.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 87352ae..63e9bb6 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1758,13 +1758,23 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { int idx; + CPUArchId *cpu_slot; + X86CPUTopoInfo topo; X86CPU *cpu = X86_CPU(dev); PCMachineState *pcms = PC_MACHINE(hotplug_dev); - CPUArchId *cpu_slot = pc_find_cpu(pcms, CPU(dev), &idx); + if (cpu->apic_id == 0xFFFFFFFF) { + /* APIC ID not set, set it based on socket/core/thread properties */ + X86CPUTopoInfo topo = { cpu->socket, cpu->core, cpu->thread }; + cpu->apic_id = apicid_from_topo_ids(smp_cores, smp_threads, &topo); + } + + cpu_slot = pc_find_cpu(pcms, CPU(dev), &idx); if (!cpu_slot) { - error_setg(errp, "Invalid CPU index with APIC ID (%" PRIu32 - "), valid range 0:%d", cpu->apic_id, + x86_topo_ids_from_apicid(cpu->apic_id, smp_cores, smp_threads, &topo); + error_setg(errp, "Invalid CPU[socket: %d, core: %d, thread: %d] with" + " APIC ID (%" PRIu32 "), valid index range 0:%d", + topo.pkg_id, topo.core_id, topo.smt_id, cpu->apic_id, pcms->possible_cpus->len - 1); return; } @@ -1780,8 +1790,6 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, * added CPUs so that query_hotpluggable_cpus would show correct values */ if (cpu->thread == -1 || cpu->core == -1 || cpu->socket == -1) { - X86CPUTopoInfo topo; - x86_topo_ids_from_apicid(cpu->apic_id, smp_cores, smp_threads, &topo); cpu->thread = topo.smt_id; cpu->core = topo.core_id;