summaryrefslogtreecommitdiffstats
path: root/hw/sparc
diff options
context:
space:
mode:
authorIgor Mammedov2016-11-15 13:17:15 +0100
committerEduardo Habkost2016-11-16 15:09:58 +0100
commit5836d16812cda6b93380632802d56411972e3148 (patch)
tree0f0a57d9d50446c6560b6546339d99527ee93c16 /hw/sparc
parentRevert "pc: Add 'etc/boot-cpus' fw_cfg file for machine with more than 255 CPUs" (diff)
downloadqemu-5836d16812cda6b93380632802d56411972e3148.tar.gz
qemu-5836d16812cda6b93380632802d56411972e3148.tar.xz
qemu-5836d16812cda6b93380632802d56411972e3148.zip
fw_cfg: move FW_CFG_NB_CPUS out of fw_cfg_init1()
PC will use this field in other way, so move it outside the common code so PC could set a different value, i.e. all CPUs regardless of where they are coming from (-smp X | -device cpu...). It's quick and dirty hack as it could be implemented in more generic way in MashineClass. But do it in simple way since only PC is affected so far. Later we can generalize it when another affected target gets support for -device cpu. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Message-Id: <1479212236-183810-3-git-send-email-imammedo@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/sparc')
-rw-r--r--hw/sparc/sun4m.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 6224288ac3..f5b6efddf8 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -1033,6 +1033,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
hwdef->ecc_version);
fw_cfg = fw_cfg_init_mem(CFG_ADDR, CFG_ADDR + 2);
+ fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)smp_cpus);
fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)max_cpus);
fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);