From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38769) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG61s-00043E-Fv for qemu-devel@nongnu.org; Thu, 23 Jun 2016 10:54:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bG61m-0007KN-BC for qemu-devel@nongnu.org; Thu, 23 Jun 2016 10:54:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48821) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG61m-0007KB-51 for qemu-devel@nongnu.org; Thu, 23 Jun 2016 10:54:46 -0400 From: Igor Mammedov Date: Thu, 23 Jun 2016 16:54:24 +0200 Message-Id: <1466693669-139967-7-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> Subject: [Qemu-devel] [PATCH 06/11] target-i386: add socket/core/thread properties to X86CPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, mst@redhat.com, armbru@redhat.com, eduardo.otubo@profitbricks.com, zhugh.fnst@cn.fujitsu.com, eblake@redhat.com these properties will be used by as address where to plug CPU with help -device/device_add commands. Signed-off-by: Igor Mammedov --- hw/i386/pc.c | 12 ++++++++++++ target-i386/cpu.c | 3 +++ target-i386/cpu.h | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 6ba6343..87352ae 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1775,6 +1775,18 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, cpu->apic_id); return; } + + /* set 'address' properties socket/core/thread for initial and cpu-add + * 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; + cpu->socket = topo.pkg_id; + } } static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 9294b3d..8c651f2 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -3186,6 +3186,9 @@ static Property x86_cpu_properties[] = { DEFINE_PROP_UINT32("xlevel2", X86CPU, env.cpuid_xlevel2, 0), DEFINE_PROP_STRING("hv-vendor-id", X86CPU, hyperv_vendor_id), DEFINE_PROP_BOOL("cpuid-0xb", X86CPU, enable_cpuid_0xb, true), + DEFINE_PROP_INT32("thread", X86CPU, thread, -1), + DEFINE_PROP_INT32("core", X86CPU, core, -1), + DEFINE_PROP_INT32("socket", X86CPU, socket, -1), DEFINE_PROP_END_OF_LIST() }; diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 8b09cfa..a04d334 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1190,6 +1190,10 @@ struct X86CPU { Notifier machine_done; struct kvm_msrs *kvm_msr_buf; + + int32_t socket; + int32_t core; + int32_t thread; }; static inline X86CPU *x86_env_get_cpu(CPUX86State *env) -- 1.8.3.1