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

[Igor Mammedov <imammedo@redhat.com>]

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 <ehabkost@redhat.com>
CC: mst@redhat.com
CC: Stefan Hajnoczi <stefanha@gmail.com>
CC: "Kevin O'Connor" <kevin@koconnor.net>
CC: Gerd Hoffmann <kraxel@redhat.com>
CC: Laszlo Ersek <lersek@redhat.com>

Igor Mammedov (2):
  fw_cfg: move FW_CFG_NB_CPUS out of fw_cfg_init1()
  pc: drop "etc/boot-cpus" fw_cfg file and use FW_CFG_NB_CPUS instead

 include/hw/i386/pc.h  |  4 ++--
 hw/arm/virt.c         |  4 +++-
 hw/i386/pc.c          | 20 ++++++++------------
 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, 17 insertions(+), 16 deletions(-)

-- 
2.7.4