From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54150)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1VOqMU-0007TG-0B
	for qemu-devel@nongnu.org; Wed, 25 Sep 2013 10:46:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1VOqMN-0002Iy-T3
	for qemu-devel@nongnu.org; Wed, 25 Sep 2013 10:46:41 -0400
Received: from mx1.redhat.com ([209.132.183.28]:60214)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1VOqMN-0002Ip-KO
	for qemu-devel@nongnu.org; Wed, 25 Sep 2013 10:46:35 -0400
Date: Wed, 25 Sep 2013 17:48:50 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20130925144850.GA29330@redhat.com>
References: <1380108120-18700-1-git-send-email-mst@redhat.com>
	<1380114776.3625.50.camel@nilsson.home.kraxel.org>
	<1380118503.3625.86.camel@nilsson.home.kraxel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1380118503.3625.86.camel@nilsson.home.kraxel.org>
Subject: Re: [Qemu-devel] [PATCH v5 00/23] qemu: generate acpi tables for
	the guest
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: pbonzini@redhat.com, qemu-devel@nongnu.org, Anthony Liguori <anthony@codemonkey.ws>, afaerber@suse.de

On Wed, Sep 25, 2013 at 04:15:03PM +0200, Gerd Hoffmann wrote:
> On Mi, 2013-09-25 at 15:12 +0200, Gerd Hoffmann wrote:
> >   Hi,
> > 
> > > This code can also be found here:
> > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git acpi
> > 
> > Crashes on coreboot with -M q35:
> > 
> > qemu-system-x86_64: /home/kraxel/projects/qemu/hw/i386/acpi-build.c:965:
> > acpi_build_update: Assertion `mcfg_size' failed.
> > 
> > I'll go send a coreboot rom with separate mail to not spam the list with
> > the blob.
> 
> Ahem, no need to dig out coreboot, with seabios it happens too if you
> pick the correct version (i.e. one with the table loader patches
> applied).
> 
> cheers,
>   Gerd
> 
> 

Looks like q35 scripts forgot to specify bios binary  :(
I fixed that, pushed.
It seems to work but I will have to redo all q35 testing it seems.

Thanks for the test!

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 1ba86d0..d1ccdf7 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -961,8 +961,8 @@ static void acpi_build_update(void *build_opaque, uint32_t offset)
     if (build_state->mcfg_base) {
         AcpiMcfgAllocation *a;
         mcfg_base = qint_get_int(build_state->mcfg_base);
+        assert(build_state->mcfg_size);
         mcfg_size = qint_get_int(build_state->mcfg_size);
-        assert(mcfg_size);
 
         a = ACPI_BUILD_STATE_PTR(build_state, off_mcfg_allocation,
                                  AcpiMcfgAllocation);