[Qemu-devel] [PATCH for-2.8 v2 0/3] pc: remove redundant fw_cfg file "etc/boot-cpus"

[Igor Mammedov]

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 <address@hidden>
CC: "Michael S. Tsirkin" <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
CC: "Kevin O'Connor" <address@hidden>
CC: Gerd Hoffmann <address@hidden>
CC: Laszlo Ersek <address@hidden>
CC: Alexander Graf <address@hidden>
CC: Paolo Bonzini <address@hidden> 
CC: David Gibson <address@hidden>
CC: Mark Cave-Ayland <address@hidden>
CC: Artyom Tarasenko <address@hidden>
CC: Peter Maydell <address@hidden>
CC: Richard Henderson <address@hidden>

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