From patchwork Fri Dec 18 16:37:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 41420 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 871BCB6F0C for ; Sat, 19 Dec 2009 03:38:35 +1100 (EST) Received: from localhost ([127.0.0.1]:59327 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLfqa-0001E6-Mt for incoming@patchwork.ozlabs.org; Fri, 18 Dec 2009 11:38:32 -0500 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 ) id 1NLfq2-0004yh-A4 for qemu-devel@nongnu.org; Fri, 18 Dec 2009 11:37:58 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBIGbufe003132 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 18 Dec 2009 11:37:56 -0500 Received: from zweiblum.home.kraxel.org (vpn1-6-159.ams2.redhat.com [10.36.6.159]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBIGbqKU026010 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 18 Dec 2009 11:37:55 -0500 Message-ID: <4B2BAFDF.50700@redhat.com> Date: Fri, 18 Dec 2009 17:37:51 +0100 From: Gerd Hoffmann User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.4pre) Gecko/20090922 Fedora/3.0-3.9.b4.fc12 Lightning/1.0pre Thunderbird/3.0b4 MIME-Version: 1.0 To: Anthony Liguori 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: seabios@seabios.org, qemu-devel@nongnu.org Subject: [Qemu-devel] Re: [SeaBIOS] [PATCH 0/4] qemu option loading X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;