[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v5 00/23] qemu: generate acpi tables for the gue
From: |
Michael S. Tsirkin |
Subject: |
Re: [Qemu-devel] [PATCH v5 00/23] qemu: generate acpi tables for the guest |
Date: |
Fri, 27 Sep 2013 00:50:23 +0300 |
On Thu, Sep 26, 2013 at 08:26:51AM +0200, Gerd Hoffmann wrote:
> Hi,
>
> > 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);
>
> Well, that fixes the assert, but it still isn't working correctly. No
> mcfg table in acpi, even though the mcfg bar is programmed correctly.
>
> Seeing this with both seabios+coreboot.
>
> cheers,
> Gerd
>
OK here's a quick fix - it's ugly, I'll clean it up
a bit before reposting.
It's pushed, you can take the final one from my tree.
Thanks for the testing!
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index d1ccdf7..e4fe196 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -938,6 +938,8 @@ struct AcpiBuildState {
build_state->table_size, \
build_state->off, sizeof(type))))
+/* Hack: we don't really need this */
+static void acpi_set_pci_info(AcpiBuildState *build_state);
static void acpi_build_update(void *build_opaque, uint32_t offset)
{
AcpiBuildState *build_state = build_opaque;
@@ -954,6 +956,7 @@ static void acpi_build_update(void *build_opaque, uint32_t
offset)
acpi_get_pci_info(&pci_info);
acpi_get_pm_info(&pm);
+ acpi_set_pci_info(build_state);
fadt_update(ACPI_BUILD_STATE_PTR(build_state, off_fadt_base,
AcpiFadtDescriptorRev1), &pm);
- Re: [Qemu-devel] [PATCH v5 00/23] qemu: generate acpi tables for the guest, (continued)
- Re: [Qemu-devel] [PATCH v5 00/23] qemu: generate acpi tables for the guest, Gerd Hoffmann, 2013/09/25
- Re: [Qemu-devel] [PATCH v5 00/23] qemu: generate acpi tables for the guest, Michael S. Tsirkin, 2013/09/25
- Re: [Qemu-devel] [PATCH v5 00/23] qemu: generate acpi tables for the guest, Gerd Hoffmann, 2013/09/25
- Re: [Qemu-devel] [PATCH v5 00/23] qemu: generate acpi tables for the guest, Michael S. Tsirkin, 2013/09/26
- Re: [Qemu-devel] [PATCH v5 00/23] qemu: generate acpi tables for the guest, Gerd Hoffmann, 2013/09/27
Re: [Qemu-devel] [PATCH v5 00/23] qemu: generate acpi tables for the guest, Gerd Hoffmann, 2013/09/25