Changes since v1:
revert commit 080ac219cc7d9 and redo FW_CFG_NB_CPUS fixes on top of it
Commit 080ac219cc7d9c55adf925c3545b7450055ad625
pc: Add 'etc/boot-cpus' fw_cfg file for machine with more than 255 CPUs
added "etc/boot-cpus" fw_cfg file durung 2.8 merge window, however
QEMU alredy had similar legacy FW_CFG_NB_CPUS fw_cfg entry that
should do practically the same. Considering FW_CFG_NB_CPUS's been
around for a long time and is used by external projects (firmwares)
we can't replace it with 'etc/boot-cpus' fw_cfg file.
Drop redundant 'etc/boot-cpus' fw_cfg file and reuse FW_CFG_NB_CPUS
instead.
So here goes QEMU part of fixup
CC: Eduardo Habkost <ehabk...@redhat.com>
CC: "Michael S. Tsirkin" <m...@redhat.com>
CC: Stefan Hajnoczi <stefa...@gmail.com>
CC: "Kevin O'Connor" <ke...@koconnor.net>
CC: Gerd Hoffmann <kra...@redhat.com>
CC: Laszlo Ersek <ler...@redhat.com>
CC: Alexander Graf <ag...@suse.de>
CC: Paolo Bonzini <pbonz...@redhat.com>
CC: David Gibson <da...@gibson.dropbear.id.au>
CC: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
CC: Artyom Tarasenko <atar4q...@gmail.com>
CC: Peter Maydell <peter.mayd...@linaro.org>
CC: Richard Henderson <r...@twiddle.net>
Igor Mammedov (3):
Revert "pc: Add 'etc/boot-cpus' fw_cfg file for machine with more than
255 CPUs"
fw_cfg: move FW_CFG_NB_CPUS out of fw_cfg_init1()
pc: fix FW_CFG_NB_CPUS to account for -device added CPUs
include/hw/i386/pc.h | 4 ++--
hw/arm/virt.c | 4 +++-
hw/i386/pc.c | 24 ++++++++++--------------
hw/nvram/fw_cfg.c | 1 -
hw/ppc/mac_newworld.c | 1 +
hw/ppc/mac_oldworld.c | 1 +
hw/sparc/sun4m.c | 1 +
hw/sparc64/sun4u.c | 1 +
8 files changed, 19 insertions(+), 18 deletions(-)
--
2.7.4
