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 <drjo...@redhat.com>
---
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
