diff mbox

[for-2.3] pc: acpi: fix pvpanic regression

Message ID 1427717907-25027-1-git-send-email-imammedo@redhat.com
State New
Headers show

Commit Message

Igor Mammedov March 30, 2015, 12:18 p.m. UTC
Commit cd61cb2  pc: acpi-build: generate pvpanic device description dynamically

introduced regression changing pvpanic device HID from
QEMU0001 to QEMU0002.
Fix AML generated code so that pvpanic device
would keep its original HID. i.e. QEMU0001

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reported-by: Gal Hammer <ghammer@redhat.com>
---
 hw/i386/acpi-build.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Paolo Bonzini March 30, 2015, 12:27 p.m. UTC | #1
On 30/03/2015 14:18, Igor Mammedov wrote:
> Commit cd61cb2  pc: acpi-build: generate pvpanic device description dynamically
> 
> introduced regression changing pvpanic device HID from
> QEMU0001 to QEMU0002.
> Fix AML generated code so that pvpanic device
> would keep its original HID. i.e. QEMU0001
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reported-by: Gal Hammer <ghammer@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 d0a5c85..e761005 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -788,7 +788,7 @@ build_ssdt(GArray *table_data, GArray *linker,
>          scope = aml_scope("\\_SB.PCI0.ISA");
>  
>          dev = aml_device("PEVR");
> -        aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0002")));
> +        aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001")));
>  
>          crs = aml_resource_template();
>          aml_append(crs,
> 

Pretty obvious, so I can take this through my tree.

Paolo
Igor Mammedov March 30, 2015, 12:39 p.m. UTC | #2
On Mon, 30 Mar 2015 14:27:05 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:

> 
> 
> On 30/03/2015 14:18, Igor Mammedov wrote:
> > Commit cd61cb2  pc: acpi-build: generate pvpanic device description dynamically
> > 
> > introduced regression changing pvpanic device HID from
> > QEMU0001 to QEMU0002.
> > Fix AML generated code so that pvpanic device
> > would keep its original HID. i.e. QEMU0001
> > 
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > Reported-by: Gal Hammer <ghammer@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 d0a5c85..e761005 100644
> > --- a/hw/i386/acpi-build.c
> > +++ b/hw/i386/acpi-build.c
> > @@ -788,7 +788,7 @@ build_ssdt(GArray *table_data, GArray *linker,
> >          scope = aml_scope("\\_SB.PCI0.ISA");
> >  
> >          dev = aml_device("PEVR");
> > -        aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0002")));
> > +        aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001")));
> >  
> >          crs = aml_resource_template();
> >          aml_append(crs,
> > 
> 
> Pretty obvious, so I can take this through my tree.
Thanks!

I'll post additional test patch for 2.4
> 
> Paolo
>
Michael S. Tsirkin March 30, 2015, 4:20 p.m. UTC | #3
On Mon, Mar 30, 2015 at 02:18:27PM +0200, Igor Mammedov wrote:
> Commit cd61cb2  pc: acpi-build: generate pvpanic device description dynamically
> 
> introduced regression changing pvpanic device HID from
> QEMU0001 to QEMU0002.
> Fix AML generated code so that pvpanic device
> would keep its original HID. i.e. QEMU0001
> 
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reported-by: Gal Hammer <ghammer@redhat.com>

Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@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 d0a5c85..e761005 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -788,7 +788,7 @@ build_ssdt(GArray *table_data, GArray *linker,
>          scope = aml_scope("\\_SB.PCI0.ISA");
>  
>          dev = aml_device("PEVR");
> -        aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0002")));
> +        aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001")));
>  
>          crs = aml_resource_template();
>          aml_append(crs,
> -- 
> 2.1.0
diff mbox

Patch

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index d0a5c85..e761005 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -788,7 +788,7 @@  build_ssdt(GArray *table_data, GArray *linker,
         scope = aml_scope("\\_SB.PCI0.ISA");
 
         dev = aml_device("PEVR");
-        aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0002")));
+        aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001")));
 
         crs = aml_resource_template();
         aml_append(crs,