diff mbox

acpi: add a missing backslash to the \_SB scope.

Message ID 1429604772-2257-1-git-send-email-ghammer@redhat.com
State New
Headers show

Commit Message

Gal Hammer April 21, 2015, 8:26 a.m. UTC
A predefined scope in the ACPI specs is precede with a backslash.

Signed-off-by: Gal Hammer <ghammer@redhat.com>
---
 hw/i386/acpi-build.c        | 2 +-
 include/hw/acpi/aml-build.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Igor Mammedov April 21, 2015, 9:38 a.m. UTC | #1
On Tue, 21 Apr 2015 11:26:12 +0300
Gal Hammer <ghammer@redhat.com> wrote:

> A predefined scope in the ACPI specs is precede with a backslash.
> 
> Signed-off-by: Gal Hammer <ghammer@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  hw/i386/acpi-build.c        | 2 +-
>  include/hw/acpi/aml-build.h | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 8d1a761..05c1d34 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -856,7 +856,7 @@ build_ssdt(GArray *table_data, GArray *linker,
>          aml_append(ssdt, scope);
>      }
>  
> -    sb_scope = aml_scope("_SB");
> +    sb_scope = aml_scope("\\_SB");
>      {
>          /* create PCI0.PRES device and its _CRS to reserve CPU hotplug MMIO */
>          dev = aml_device("PCI0." stringify(CPU_HOTPLUG_RESOURCE_DEVICE));
> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
> index 48afb72..cb80f2a 100644
> --- a/include/hw/acpi/aml-build.h
> +++ b/include/hw/acpi/aml-build.h
> @@ -120,7 +120,7 @@ void free_aml_allocator(void);
>   * Joins Aml elements together and helps to construct AML tables
>   * Examle of usage:
>   *   Aml *table = aml_def_block("SSDT", ...);
> - *   Aml *sb = aml_scope("\_SB");
> + *   Aml *sb = aml_scope("\\_SB");
>   *   Aml *dev = aml_device("PCI0");
>   *
>   *   aml_append(dev, aml_name_decl("HID", aml_eisaid("PNP0A03")));
Michael S. Tsirkin April 21, 2015, 10:09 a.m. UTC | #2
On Tue, Apr 21, 2015 at 11:26:12AM +0300, Gal Hammer wrote:
> A predefined scope in the ACPI specs is precede with a backslash.
> 
> Signed-off-by: Gal Hammer <ghammer@redhat.com>

s/precede/preceded/

This is correct, but do we need this in 2.3?
I'm split on this. Thoughts?
If yes, commit log needs better explanation on what
the effect on guests is.


> ---
>  hw/i386/acpi-build.c        | 2 +-
>  include/hw/acpi/aml-build.h | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 8d1a761..05c1d34 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -856,7 +856,7 @@ build_ssdt(GArray *table_data, GArray *linker,
>          aml_append(ssdt, scope);
>      }
>  
> -    sb_scope = aml_scope("_SB");
> +    sb_scope = aml_scope("\\_SB");
>      {
>          /* create PCI0.PRES device and its _CRS to reserve CPU hotplug MMIO */
>          dev = aml_device("PCI0." stringify(CPU_HOTPLUG_RESOURCE_DEVICE));
> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
> index 48afb72..cb80f2a 100644
> --- a/include/hw/acpi/aml-build.h
> +++ b/include/hw/acpi/aml-build.h
> @@ -120,7 +120,7 @@ void free_aml_allocator(void);
>   * Joins Aml elements together and helps to construct AML tables
>   * Examle of usage:
>   *   Aml *table = aml_def_block("SSDT", ...);
> - *   Aml *sb = aml_scope("\_SB");
> + *   Aml *sb = aml_scope("\\_SB");
>   *   Aml *dev = aml_device("PCI0");
>   *
>   *   aml_append(dev, aml_name_decl("HID", aml_eisaid("PNP0A03")));
> -- 
> 2.1.0
Peter Maydell April 21, 2015, 11:33 a.m. UTC | #3
On 21 April 2015 at 11:09, Michael S. Tsirkin <mst@redhat.com> wrote:
> On Tue, Apr 21, 2015 at 11:26:12AM +0300, Gal Hammer wrote:
>> A predefined scope in the ACPI specs is precede with a backslash.
>>
>> Signed-off-by: Gal Hammer <ghammer@redhat.com>
>
> s/precede/preceded/
>
> This is correct, but do we need this in 2.3?
> I'm split on this. Thoughts?
> If yes, commit log needs better explanation on what
> the effect on guests is.

Unless the effect is absolutely catastrophic you've missed
the boat for 2.3, and should settle for 2.4 + cc:stable.

thanks
-- PMM
Michael S. Tsirkin April 21, 2015, 12:53 p.m. UTC | #4
On Tue, Apr 21, 2015 at 12:33:36PM +0100, Peter Maydell wrote:
> On 21 April 2015 at 11:09, Michael S. Tsirkin <mst@redhat.com> wrote:
> > On Tue, Apr 21, 2015 at 11:26:12AM +0300, Gal Hammer wrote:
> >> A predefined scope in the ACPI specs is precede with a backslash.
> >>
> >> Signed-off-by: Gal Hammer <ghammer@redhat.com>
> >
> > s/precede/preceded/
> >
> > This is correct, but do we need this in 2.3?
> > I'm split on this. Thoughts?
> > If yes, commit log needs better explanation on what
> > the effect on guests is.
> 
> Unless the effect is absolutely catastrophic you've missed
> the boat for 2.3, and should settle for 2.4 + cc:stable.
> 
> thanks
> -- PMM

I rechecked a bunch of guests and they all seem to behave identically
with and without the patch.
2.4 it is.

Thanks.
Igor Mammedov April 22, 2015, 6:13 a.m. UTC | #5
On Tue, 21 Apr 2015 14:53:54 +0200
"Michael S. Tsirkin" <mst@redhat.com> wrote:

> On Tue, Apr 21, 2015 at 12:33:36PM +0100, Peter Maydell wrote:
> > On 21 April 2015 at 11:09, Michael S. Tsirkin <mst@redhat.com> wrote:
> > > On Tue, Apr 21, 2015 at 11:26:12AM +0300, Gal Hammer wrote:
> > >> A predefined scope in the ACPI specs is precede with a backslash.
> > >>
> > >> Signed-off-by: Gal Hammer <ghammer@redhat.com>
> > >
> > > s/precede/preceded/
> > >
> > > This is correct, but do we need this in 2.3?
> > > I'm split on this. Thoughts?
> > > If yes, commit log needs better explanation on what
> > > the effect on guests is.
> > 
> > Unless the effect is absolutely catastrophic you've missed
> > the boat for 2.3, and should settle for 2.4 + cc:stable.
> > 
> > thanks
> > -- PMM
> 
> I rechecked a bunch of guests and they all seem to behave identically
> with and without the patch.
> 2.4 it is.
Yep, it's cosmetic change, since that _SB was at the top level it's automatically
attributed to root scope. Having explicit root in name doesn't hurt though
and makes it consistent with other _SB declarations in the code.

> 
> Thanks.
>
diff mbox

Patch

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 8d1a761..05c1d34 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -856,7 +856,7 @@  build_ssdt(GArray *table_data, GArray *linker,
         aml_append(ssdt, scope);
     }
 
-    sb_scope = aml_scope("_SB");
+    sb_scope = aml_scope("\\_SB");
     {
         /* create PCI0.PRES device and its _CRS to reserve CPU hotplug MMIO */
         dev = aml_device("PCI0." stringify(CPU_HOTPLUG_RESOURCE_DEVICE));
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index 48afb72..cb80f2a 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -120,7 +120,7 @@  void free_aml_allocator(void);
  * Joins Aml elements together and helps to construct AML tables
  * Examle of usage:
  *   Aml *table = aml_def_block("SSDT", ...);
- *   Aml *sb = aml_scope("\_SB");
+ *   Aml *sb = aml_scope("\\_SB");
  *   Aml *dev = aml_device("PCI0");
  *
  *   aml_append(dev, aml_name_decl("HID", aml_eisaid("PNP0A03")));