Re: [Qemu-devel] [PATCH v3 06/52] pc: acpi-build: use aml_def_block() for declaring SSDT table

[Michael S. Tsirkin]

On Wed, Feb 18, 2015 at 10:57:18AM +0100, Igor Mammedov wrote:
> On Tue, 17 Feb 2015 17:42:00 +0100
> "Michael S. Tsirkin" <address@hidden> wrote:
> 
> > On Mon, Feb 09, 2015 at 10:53:28AM +0000, Igor Mammedov wrote:
> > > it replaces prebuilt SSDT table header template copying/patching
> > > with AML API
> > > 
> > > Signed-off-by: Igor Mammedov <address@hidden>
> > 
> > I note that this changed the SSDT signature in random ways,
> > for example, it used to be named BXPCSSDT, now it's BXPC.
> > 
> > Pls keep using build_header, this problem will go away then.
> [...]
> > > +    /* Init SSDT Definition Block */
> > > +    ssdt = aml_def_block("SSDT", 1, ACPI_BUILD_APPNAME6,
> > > +                         ACPI_BUILD_APPNAME4, 1,
> I've missed that build_header() composes oem_table_id implicitly
> by merging table signature and ACPI_BUILD_APPNAME4.
> 
> following should fix issue:
> -                         ACPI_BUILD_APPNAME4, 1,
> +                         "BXPCSSDT", 1,

True but that's the result of code duplication.

Let's reuse build_header at step 1,
and in step 2, we'll replace it with something
else everywhere.

> > > +                         ACPI_BUILD_APPNAME4_HEX, 1);