From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBQQn-0006nf-KF for qemu-devel@nongnu.org; Fri, 10 Jun 2016 13:41:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bBQQl-0000Wo-Ox for qemu-devel@nongnu.org; Fri, 10 Jun 2016 13:41:16 -0400 From: Andrew Jones Date: Fri, 10 Jun 2016 19:40:25 +0200 Message-Id: <1465580427-13596-15-git-send-email-drjones@redhat.com> In-Reply-To: <1465580427-13596-1-git-send-email-drjones@redhat.com> References: <1465580427-13596-1-git-send-email-drjones@redhat.com> Subject: [Qemu-devel] [PATCH RFC 14/16] hw/arm/virt: stash cpu topo info in VirtGuestInfo List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, qemu-arm@nongnu.org Cc: imammedo@redhat.com, ehabkost@redhat.com, pbonzini@redhat.com, peter.maydell@linaro.org, david@gibson.dropbear.id.au, dgibson@redhat.com, agraf@suse.de This is a first step to preparing mach-virt for configurable cpu topology, and is necessary now to prepare to move smbios code away from using cpu topology globals smp_cores,smp_threads. Signed-off-by: Andrew Jones --- hw/arm/virt.c | 6 +++++- include/hw/arm/virt-acpi-build.h | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 134b6e36623ba..769a49aa5be77 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1281,7 +1281,11 @@ static void machvirt_init(MachineState *machine) create_fw_cfg(vbi, &address_space_memory); rom_set_fw(fw_cfg_find()); - guest_info->cpus = vbi->cpus; + guest_info->sockets = machine->sockets; + guest_info->cores = machine->cores; + guest_info->threads = machine->threads; + guest_info->maxcpus = machine->maxcpus; + guest_info->cpus = machine->cpus; guest_info->fw_cfg = fw_cfg_find(); guest_info->memmap = vbi->memmap; guest_info->irqmap = vbi->irqmap; diff --git a/include/hw/arm/virt-acpi-build.h b/include/hw/arm/virt-acpi-build.h index d6c5982960403..a34fb04230e66 100644 --- a/include/hw/arm/virt-acpi-build.h +++ b/include/hw/arm/virt-acpi-build.h @@ -27,6 +27,10 @@ #define ACPI_GICC_ENABLED 1 typedef struct VirtGuestInfo { + int sockets; + int cores; + int threads; + int maxcpus; int cpus; FWCfgState *fw_cfg; const MemMapEntry *memmap; -- 2.4.11