On Thu, 2014-05-15 at 14:45 +0200, Igor Mammedov wrote: > On Thu, 8 May 2014 15:58:40 +0300 > Marcel Apfelbaum <[email protected]> wrote: > > > A wrong offset was added to the tables pointed by RSDT > > if the HPET table is not present. > > > > Signed-off-by: Marcel Apfelbaum <[email protected]> > > --- > > hw/i386/acpi-build.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > > index c98df88..d65fab0 100644 > > --- a/hw/i386/acpi-build.c > > +++ b/hw/i386/acpi-build.c > > @@ -1417,8 +1417,8 @@ void acpi_build(PcGuestInfo *guest_info, > > AcpiBuildTables *tables) > > acpi_add_table(table_offsets, tables->table_data); > > > > build_madt(tables->table_data, tables->linker, &cpu, guest_info); > > - acpi_add_table(table_offsets, tables->table_data); > > if (misc.has_hpet) { > > + acpi_add_table(table_offsets, tables->table_data); > > build_hpet(tables->table_data, tables->linker); > > } > > if (guest_info->numa_nodes) { > > Reviewed-By: Igor Mammedov <[email protected]>
Hi Igor, Thanks for the review, but Michael beat me and pushed a fix sooner :) Marcel
