Re: [Qemu-devel] [PATCH 05/14] tests: acpi: fetch X_DSDT if pointer to DSDT is 0

[Igor Mammedov]

On Thu, 17 Jan 2019 15:02:57 +0100
Philippe Mathieu-Daudé <address@hidden> wrote:

> On 1/15/19 4:40 PM, Igor Mammedov wrote:
> > that way it would be possible to test a DSDT pointed by
> > 64bit X_DSDT field in FADT.
> > 
> > PS:
> > it will allow to enable testing arm/virt board, which sets
> > only newer X_DSDT field.
> > 
> > Signed-off-by: Igor Mammedov <address@hidden>
> > ---
> >  tests/bios-tables-test.c | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> > 
> > diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
> > index c28c5c7..0f04a0a 100644
> > --- a/tests/bios-tables-test.c
> > +++ b/tests/bios-tables-test.c
> > @@ -140,6 +140,8 @@ static void test_acpi_fadt_table(test_data *data)
> >      AcpiSdtTable table = g_array_index(data->tables, typeof(table), 0);
> >      uint8_t *fadt_aml = table.aml;
> >      uint32_t fadt_len = table.aml_len;
> > +    uint32_t val;
> > +    int dsdt_offset = 40 /* DSDT */;
> >  
> >      g_assert(compare_signature(&table, "FACP"));
> >  
> > @@ -148,8 +150,12 @@ static void test_acpi_fadt_table(test_data *data)
> >                       fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false);
> >      g_array_append_val(data->tables, table);
> >  
> > +    memcpy(&val, fadt_aml + dsdt_offset, 4);  
> 
> Maybe in case someone extend this test, add:
> 
>        val = le32_to_cpu(val);
I've skipped this conversion intentionally as we only care about
0 vs non 0. If we would care about concrete value then le32_to_cpu()
would be must have. I can put le32_to_cpu() there if you prefer
as it doesn't hurt and documents that value is in LE.

> Regardless:
> Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> 
> > +    if (!val) {
> > +        dsdt_offset = 140 /* X_DSDT */;
> > +    }
> >      acpi_fetch_table(data->qts, &table.aml, &table.aml_len,
> > -                     fadt_aml + 40 /* DSDT */, "DSDT", true);
> > +                     fadt_aml + dsdt_offset, "DSDT", true);
> >      g_array_append_val(data->tables, table);
> >  
> >      memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */
> >   
>