From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c6baw-00010B-02 for qemu-devel@nongnu.org; Tue, 15 Nov 2016 06:08:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c6bas-0000Ok-Lw for qemu-devel@nongnu.org; Tue, 15 Nov 2016 06:08:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44914) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c6bas-0000OE-Gi for qemu-devel@nongnu.org; Tue, 15 Nov 2016 06:08:02 -0500 Date: Tue, 15 Nov 2016 12:07:58 +0100 From: Igor Mammedov Message-ID: <20161115120758.08e26811@nial.brq.redhat.com> In-Reply-To: <20161114224401-mutt-send-email-mst@kernel.org> References: <1478877672-73759-1-git-send-email-imammedo@redhat.com> <20161114224401-mutt-send-email-mst@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [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: "Michael S. Tsirkin" Cc: qemu-devel@nongnu.org, Eduardo Habkost , Stefan Hajnoczi , Kevin O'Connor , Gerd Hoffmann , Laszlo Ersek On Mon, 14 Nov 2016 22:46:14 +0200 "Michael S. Tsirkin" wrote: > On Fri, Nov 11, 2016 at 04:21:10PM +0100, Igor Mammedov wrote: > > > > 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 > > I agree we shouldn't commit to a bad host/guest API > but I think we need to format it differently. > First revert the boot-cpus patch for 2.8. > On top of that, add a patch fixing FW_CFG_NB_CPUS. Sure, I'll respin. > > > > 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