qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel]  [PATCH] apci: fix ACPI tables for -no-hpet option
@ 2014-05-08 12:58 Marcel Apfelbaum
  2014-05-15 12:45 ` Igor Mammedov
  0 siblings, 1 reply; 3+ messages in thread
From: Marcel Apfelbaum @ 2014-05-08 12:58 UTC (permalink / raw)
  To: qemu-devel; +Cc: marcel.a, aliguori, mst

A wrong offset was added to the tables pointed by RSDT
if the HPET table is not present.

Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
---
 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) {
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Qemu-devel] [PATCH] apci: fix ACPI tables for -no-hpet option
  2014-05-08 12:58 [Qemu-devel] [PATCH] apci: fix ACPI tables for -no-hpet option Marcel Apfelbaum
@ 2014-05-15 12:45 ` Igor Mammedov
  2014-05-15 12:51   ` Marcel Apfelbaum
  0 siblings, 1 reply; 3+ messages in thread
From: Igor Mammedov @ 2014-05-15 12:45 UTC (permalink / raw)
  To: Marcel Apfelbaum; +Cc: qemu-devel, aliguori, mst

On Thu,  8 May 2014 15:58:40 +0300
Marcel Apfelbaum <marcel.a@redhat.com> wrote:

> A wrong offset was added to the tables pointed by RSDT
> if the HPET table is not present.
> 
> Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
> ---
>  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 <imammedo@redhat.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Qemu-devel] [PATCH] apci: fix ACPI tables for -no-hpet option
  2014-05-15 12:45 ` Igor Mammedov
@ 2014-05-15 12:51   ` Marcel Apfelbaum
  0 siblings, 0 replies; 3+ messages in thread
From: Marcel Apfelbaum @ 2014-05-15 12:51 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel, aliguori, mst

On Thu, 2014-05-15 at 14:45 +0200, Igor Mammedov wrote:
> On Thu,  8 May 2014 15:58:40 +0300
> Marcel Apfelbaum <marcel.a@redhat.com> wrote:
> 
> > A wrong offset was added to the tables pointed by RSDT
> > if the HPET table is not present.
> > 
> > Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
> > ---
> >  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 <imammedo@redhat.com>

Hi Igor,

Thanks for the review, but Michael beat me and pushed a fix sooner :)
Marcel

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-05-15 12:51 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-08 12:58 [Qemu-devel] [PATCH] apci: fix ACPI tables for -no-hpet option Marcel Apfelbaum
2014-05-15 12:45 ` Igor Mammedov
2014-05-15 12:51   ` Marcel Apfelbaum

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).