Re: [Qemu-stable] [PULL 07/15] tests/bios-tables-test: fix assert

[Dr. David Alan Gilbert]

I think this one is probably useful on stable as well.

Dave

* Michael S. Tsirkin (address@hidden) wrote:
> From: Marcel Apfelbaum <address@hidden>
> 
> Newer iasl does not add the aml file name to the Definition Block.
> See acpica tools commit  1ecbb3d5:
>   "Emit the AMLFilename as a zero-length string. Allows the compiler to create
>    the name later -- making it easier to rename the parent ASL (DSL) file."
> 
> That causes an assert in acpi tests:
>    tests/bios-tables-test.c:455:normalize_asl: assertion failed: (block_name)
> 
> Fix it by striping the start of the definition block line until the first 
> comma.
> The block name is always the first parameter and
> the grammar does not allow comma in between, so it is safe.
> 
> Reported-by: Dr. David Alan Gilbert <address@hidden>
> Signed-off-by: Marcel Apfelbaum <address@hidden>
> Reviewed-by: Michael S. Tsirkin <address@hidden>
> Signed-off-by: Michael S. Tsirkin <address@hidden>
> ---
>  tests/bios-tables-test.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> index 0a80ddf..0352814 100644
> --- a/tests/bios-tables-test.c
> +++ b/tests/bios-tables-test.c
> @@ -432,7 +432,7 @@ static bool load_asl(GArray *sdts, AcpiSdtTable *sdt)
>  
>  #define COMMENT_END "*/"
>  #define DEF_BLOCK "DefinitionBlock ("
> -#define BLOCK_NAME_END ".aml"
> +#define BLOCK_NAME_END ","
>  
>  static GString *normalize_asl(gchar *asl_code)
>  {
> -- 
> MST
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK