From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37345) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c5Ddq-00036b-KD for qemu-devel@nongnu.org; Fri, 11 Nov 2016 10:21:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c5Ddn-0007LS-Eq for qemu-devel@nongnu.org; Fri, 11 Nov 2016 10:21:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52798) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c5Ddn-0007LN-9H for qemu-devel@nongnu.org; Fri, 11 Nov 2016 10:21:19 -0500 From: Igor Mammedov Date: Fri, 11 Nov 2016 16:21:10 +0100 Message-Id: <1478877672-73759-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH for-2.8 0/2] pc: remove redundant fw_cfg file "etc/boot-cpus" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , mst@redhat.com, Stefan Hajnoczi , Kevin O'Connor , Gerd Hoffmann , Laszlo Ersek 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 CC: mst@redhat.com CC: Stefan Hajnoczi CC: "Kevin O'Connor" CC: Gerd Hoffmann CC: Laszlo Ersek 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