From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NLfq7-0001De-O9
	for qemu-devel@nongnu.org; Fri, 18 Dec 2009 11:38:03 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NLfq3-0001CX-9M
	for qemu-devel@nongnu.org; Fri, 18 Dec 2009 11:38:03 -0500
Received: from [199.232.76.173] (port=47079 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NLfq3-0001CS-4u
	for qemu-devel@nongnu.org; Fri, 18 Dec 2009 11:37:59 -0500
Received: from mx1.redhat.com ([209.132.183.28]:15192)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <kraxel@redhat.com>) id 1NLfq2-0004yh-A4
	for qemu-devel@nongnu.org; Fri, 18 Dec 2009 11:37:58 -0500
Message-ID: <4B2BAFDF.50700@redhat.com>
Date: Fri, 18 Dec 2009 17:37:51 +0100
From: Gerd Hoffmann <kraxel@redhat.com>
MIME-Version: 1.0
References: <1261134964-12427-1-git-send-email-kraxel@redhat.com>
	<4B2BA2B4.3030508@codemonkey.ws> <4B2BA528.9080104@redhat.com>
	<4B2BAC2D.4090605@codemonkey.ws>
In-Reply-To: <4B2BAC2D.4090605@codemonkey.ws>
Content-Type: multipart/mixed; boundary="------------010809080700010507020901"
Subject: [Qemu-devel] Re: [SeaBIOS] [PATCH 0/4] qemu option loading
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Anthony Liguori <anthony@codemonkey.ws>
Cc: seabios@seabios.org, qemu-devel@nongnu.org

This is a multi-part message in MIME format.
--------------010809080700010507020901
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

On 12/18/09 17:22, Anthony Liguori wrote:
> I think your fw_cfg.h changes also broke the optionroms/multiboot build.
> Haven't debugged yet though.

That one is easy to fix, see attachment

cheers,
   Gerd

--------------010809080700010507020901
Content-Type: text/plain;
 name="fix"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="fix"

diff --git a/hw/fw_cfg.h b/hw/fw_cfg.h
index a63f54f..c1019d0 100644
--- a/hw/fw_cfg.h
+++ b/hw/fw_cfg.h
@@ -38,6 +38,7 @@
 
 #define FW_CFG_INVALID          0xffff
 
+#ifndef NO_QEMU_PROTOS
 typedef struct FWCfgFile {
     uint32_t  size;        /* file size */
     uint16_t  select;      /* write this to 0x510 to read it */
@@ -50,7 +51,6 @@ typedef struct FWCfgFiles {
     FWCfgFile f[];
 } FWCfgFiles;
 
-#ifndef NO_QEMU_PROTOS
 typedef void (*FWCfgCallback)(void *opaque, uint8_t *data);
 
 typedef struct _FWCfgState FWCfgState;

--------------010809080700010507020901--