From patchwork Fri Dec 18 16:37:51 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Re: [SeaBIOS] [PATCH 0/4] qemu option loading
From: Gerd Hoffmann <kraxel@redhat.com>
X-Patchwork-Id: 41420
Message-Id: <4B2BAFDF.50700@redhat.com>
To: Anthony Liguori <anthony@codemonkey.ws>
Cc: seabios@seabios.org, qemu-devel@nongnu.org
Date: Fri, 18 Dec 2009 17:37:51 +0100

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


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;