From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdJ5u-0005eJ-Ej for qemu-devel@nongnu.org; Mon, 04 Nov 2013 07:17:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdJ5o-0007so-K7 for qemu-devel@nongnu.org; Mon, 04 Nov 2013 07:17:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:26053) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdJ5o-0007sh-Bx for qemu-devel@nongnu.org; Mon, 04 Nov 2013 07:17:16 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rA4CHFYk015184 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 4 Nov 2013 07:17:15 -0500 From: Gerd Hoffmann Date: Mon, 4 Nov 2013 13:17:09 +0100 Message-Id: <1383567431-13540-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL for-1.7 0/2] pc: e820 fw_cfg fixup. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Hi, After some discussion with Andrea Arcangeli the initial approach of extending the FW_CFG_E820_TABLE was scratched. Unfortunaly that patch wasn't formally NACK'ed and became commit 0624c7f916b4d97f17726d9b295d6a6b0dc5076d, so we need to fixup the mess now, before 1.7. The new approach is to leave FW_CFG_E820_TABLE alone and add a new fw_cfg file instead, to avoid any compatibility issues for sure (patch thread here: http://comments.gmane.org/gmane.comp.emulators.qemu/238860). This pull is the new-approach patch series rebased to latest master (i.e. solve the conflict with 0624c7f916b4d97f17726d9b295d6a6b0dc5076d). I suggest to pull this to fix things up. The alternative is to revert 0624c7f916b4d97f17726d9b295d6a6b0dc5076d and delay the new interface to the 1.8 devel cycle. cheers, Gerd The following changes since commit a126050a103c924b03388a9a64ce9af8c96b0969: Merge remote-tracking branch 'kwolf/tags/for-anthony' into staging (2013-10-31 17:02:26 +0100) are available in the git repository at: git://git.kraxel.org/qemu e820.1 for you to fetch changes up to 7db16f2480db5e246d34d0c453cff4f58549df0e: pc: register e820 entries for ram (2013-11-04 12:31:33 +0100) ---------------------------------------------------------------- Gerd Hoffmann (2): pc: add etc/e820 fw_cfg file pc: register e820 entries for ram hw/i386/pc.c | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-)