acpi unit-test: compare resulting aml vs expected aml
v2 cover acpi unit-test: compare resulting aml vs expected aml
The test:
- runs only if iasl is installed on the host machine.
- the test plan:
1. Dumps the ACPI tables as AML on the disk.
2. Runs iasl to disassembly the tables into ASL files.
3. Runs iasl to disassembly the offline AML files.
3. Compares them with expected offline ASL files.
- the test runs for both default machine and q35.
- in case the test fails, it can be easily tweaked to show the differences between the ASL files and understand the issue.
Patches:
1/3 - expected aml files
2/3 - creates links for the expected files
if the build directory is not current
3/3 - the test
Marcel Apfelbaum (3):
acpi unit-test: add test files
configure: added acpi unit-test files
acpi unit-test: compare DSDT and SSDT tables against expected values
configure | 4 + tests/acpi-test-data/pc/APIC | Bin 0 -> 120 bytes tests/acpi-test-data/pc/DSDT | Bin 0 -> 4407 bytes tests/acpi-test-data/pc/FACP | Bin 0 -> 116 bytes tests/acpi-test-data/pc/FACS | Bin 0 -> 64 bytes tests/acpi-test-data/pc/HPET | Bin 0 -> 56 bytes tests/acpi-test-data/pc/SSDT | Bin 0 -> 2104 bytes tests/acpi-test-data/q35/APIC | Bin 0 -> 120 bytes tests/acpi-test-data/q35/DSDT | Bin 0 -> 7344 bytes tests/acpi-test-data/q35/FACP | Bin 0 -> 116 bytes tests/acpi-test-data/q35/FACS | Bin 0 -> 64 bytes tests/acpi-test-data/q35/HPET | Bin 0 -> 56 bytes tests/acpi-test-data/q35/MCFG | Bin 0 -> 60 bytes tests/acpi-test-data/q35/SSDT | Bin 0 -> 2104 bytes tests/acpi-test.c | 257 ++++++++++++++++++++++++++++++++++++++---- 15 files changed, 240 insertions(+), 21 deletions(-) create mode 100644 tests/acpi-test-data/pc/APIC create mode 100644 tests/acpi-test-data/pc/DSDT create mode 100644 tests/acpi-test-data/pc/FACP create mode 100644 tests/acpi-test-data/pc/FACS create mode 100644 tests/acpi-test-data/pc/HPET create mode 100644 tests/acpi-test-data/pc/SSDT create mode 100644 tests/acpi-test-data/q35/APIC create mode 100644 tests/acpi-test-data/q35/DSDT create mode 100644 tests/acpi-test-data/q35/FACP create mode 100644 tests/acpi-test-data/q35/FACS create mode 100644 tests/acpi-test-data/q35/HPET create mode 100644 tests/acpi-test-data/q35/MCFG create mode 100644 tests/acpi-test-data/q35/SSDT
Signature · 1 line
1.8.3.1
PATCH v2 1/3 acpi unit-test: add test files
Added unit-test's expected aml files to be compared with the actual ACPI tables.
--- tests/acpi-test-data/pc/APIC | Bin 0 -> 120 bytes tests/acpi-test-data/pc/DSDT | Bin 0 -> 4407 bytes tests/acpi-test-data/pc/FACP | Bin 0 -> 116 bytes tests/acpi-test-data/pc/FACS | Bin 0 -> 64 bytes tests/acpi-test-data/pc/HPET | Bin 0 -> 56 bytes tests/acpi-test-data/pc/SSDT | Bin 0 -> 2104 bytes tests/acpi-test-data/q35/APIC | Bin 0 -> 120 bytes tests/acpi-test-data/q35/DSDT | Bin 0 -> 7344 bytes tests/acpi-test-data/q35/FACP | Bin 0 -> 116 bytes tests/acpi-test-data/q35/FACS | Bin 0 -> 64 bytes tests/acpi-test-data/q35/HPET | Bin 0 -> 56 bytes tests/acpi-test-data/q35/MCFG | Bin 0 -> 60 bytes tests/acpi-test-data/q35/SSDT | Bin 0 -> 2104 bytes 13 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/acpi-test-data/pc/APIC create mode 100644 tests/acpi-test-data/pc/DSDT create mode 100644 tests/acpi-test-data/pc/FACP create mode 100644 tests/acpi-test-data/pc/FACS create mode 100644 tests/acpi-test-data/pc/HPET create mode 100644 tests/acpi-test-data/pc/SSDT create mode 100644 tests/acpi-test-data/q35/APIC create mode 100644 tests/acpi-test-data/q35/DSDT create mode 100644 tests/acpi-test-data/q35/FACP create mode 100644 tests/acpi-test-data/q35/FACS create mode 100644 tests/acpi-test-data/q35/HPET create mode 100644 tests/acpi-test-data/q35/MCFG create mode 100644 tests/acpi-test-data/q35/SSDT
tests/acpi-test-data/pc/APIC new file binary +0 -0
tests/acpi-test-data/pc/DSDT new file binary +0 -0
tests/acpi-test-data/pc/FACP new file binary +0 -0
tests/acpi-test-data/pc/FACS new file binary +0 -0
tests/acpi-test-data/pc/HPET new file binary +0 -0
tests/acpi-test-data/pc/SSDT new file binary +0 -0
tests/acpi-test-data/q35/APIC new file binary +0 -0
tests/acpi-test-data/q35/DSDT new file binary +0 -0
tests/acpi-test-data/q35/FACP new file binary +0 -0
tests/acpi-test-data/q35/FACS new file binary +0 -0
tests/acpi-test-data/q35/HPET new file binary +0 -0
tests/acpi-test-data/q35/MCFG new file binary +0 -0
tests/acpi-test-data/q35/SSDT new file binary +0 -0
Signature · 1 line
1.8.3.1
PATCH v2 2/3 configure: added acpi unit-test files
In reply to Marcel ApfelbaumEnsure configure will set-up links for the files
if the build is created in other directory.
--- configure | 4 ++++ 1 file changed, 4 insertions(+)
configure +4 -0
@@ -4744,6 +4744,10 @@ for bios_file in \ do FILES="$FILES pc-bios/`basename $bios_file`" done +for test_file in `find $source_path/tests/acpi-test-data -type f` +do + FILES="$FILES tests/acpi-test-data`echo $test_file | sed -e 's/.*acpi-test-data//'`" +done mkdir -p $DIRS for f in $FILES ; do if [ -e "$source_path/$f" ] && [ "$source_path" != `pwd` ]; then
Signature · 1 line
1.8.3.1
PATCH v2 3/3 acpi unit-test: compare DSDT and SSDT tables against expected values
In reply to Marcel ApfelbaumThis test will run only if iasl is installed on the host machine. The test plan:
1. Dumps the ACPI tables as AML on the disk.
2. Runs iasl to disassembly the tables into ASL files.
3. Runs iasl to disassembly the offline AML files into ASL files.
4. Compares the ASL files.
The test runs for both default machine and q35. In case the test fails, it can be easily tweaked to show the differences between the ASL files and understand the issue.
--- tests/acpi-test.c | 257 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 236 insertions(+), 21 deletions(-)
tests/acpi-test.c +236 -21
@@ -18,14 +18,22 @@#include "qemu/compiler.h" #include "hw/i386/acpi-defs.h" +#define MACHINE_PC "pc" +#define MACHINE_Q35 "q35" +/* DSDT and SSDTs format */ typedef struct {AcpiTableHeader header; -uint8_t *aml; -int aml_len; -}AcpiSdtTable ; +gchar *aml;/* aml bytecode from guest */ +gsize aml_len; +gchar *aml_file; +gchar *asl;/* asl code generated from aml */ +gsize asl_len; +gchar *asl_file; +} QEMU_PACKED AcpiSdtTable; typedef struct { + const char *machine; uint32_t rsdp_addr; AcpiRsdpDescriptor rsdp_table; AcpiRsdtDescriptorRev1 rsdt_table;
@@ -33,8 +41,7 @@ typedef struct {AcpiFacsDescriptorRev1 facs_table;uint32_t *rsdt_tables_addr;int rsdt_tables_nr; -AcpiSdtTable dsdt_table; -GArray *ssdt_tables; +GArray *ssdt_tables;/* first is DSDT */ } test_data;#define LOW (x) ((x) & 0xff)
@@ -91,8 +98,10 @@ typedef struct {/* Boot sector code: write SIGNATURE into memory, * then halt. +* Q35 machine requires a minimum 0x7e000 bytes disk. +* (bug or feature?) */ -static uint8_t boot_sector[0x200 ] = { +static uint8_t boot_sector[0x7e000 ] = {/* 7c00: mov $0xdead,%ax */ [0x00 ] =0xb8 , [0x01 ] =LOW (SIGNATURE ),
@@ -117,17 +126,40 @@ static uint8_t boot_sector[0x200] = { };static const char *disk ="tests/acpi-test-disk.raw" ; +static const char *data_dir ="tests/acpi-test-data" ;static void free_test_data (test_data *data) { +AcpiSdtTable *temp;int i; -g_free (data->rsdt_tables_addr); +if (data->rsdt_tables_addr) { +g_free (data->rsdt_tables_addr); + } +for (i =0 ; i < data->ssdt_tables->len; ++i) { -g_free (g_array_index (data->ssdt_tables, AcpiSdtTable, i).aml); + temp = &g_array_index (data->ssdt_tables, AcpiSdtTable, i); +if (temp->aml) { +g_free (temp->aml); + } +if (temp->aml_file) { +if (g_strstr_len (temp->aml_file,-1 ,"aml-" )) { +unlink (temp->aml_file); + } +g_free (temp->aml_file); + } +if (temp->asl) { +g_free (temp->asl); + } +if (temp->asl_file) { +if (g_strstr_len (temp->asl_file,-1 ,"asl-" )) { +unlink (temp->asl_file); + } +g_free (temp->asl_file); + } } +g_array_free (data->ssdt_tables, false); -g_free (data->dsdt_table.aml); }static uint8_t acpi_checksum (const uint8_t *data,int len)
@@ -292,34 +324,203 @@ static void test_dst_table(AcpiSdtTable *sdt_table, uint32_t addr)ACPI_READ_ARRAY_PTR (sdt_table->aml, sdt_table->aml_len, addr); checksum =acpi_checksum ((uint8_t *)sdt_table,sizeof (AcpiTableHeader)) + -acpi_checksum (sdt_table->aml, sdt_table->aml_len); +acpi_checksum ((uint8_t *)sdt_table->aml, sdt_table->aml_len);g_assert (!checksum); }static void test_acpi_dsdt_table (test_data *data) { -AcpiSdtTable *dsdt_table = &data->dsdt_table; +AcpiSdtTable dsdt_table;uint32_t addr = data->fadt_table.dsdt; -test_dst_table (dsdt_table, addr); - g_assert_cmphex(dsdt_table->header.signature, ==, ACPI_DSDT_SIGNATURE); +memset (&dsdt_table,0 ,sizeof (dsdt_table)); + data->ssdt_tables =g_array_new (false, true,sizeof (AcpiSdtTable)); + +test_dst_table (&dsdt_table, addr); + g_assert_cmphex(dsdt_table.header.signature, ==, ACPI_DSDT_SIGNATURE); + +/* Place DSDT first */ +g_array_append_val (data->ssdt_tables, dsdt_table); }static void test_acpi_ssdt_tables (test_data *data) { -GArray *ssdt_tables;int ssdt_tables_nr = data->rsdt_tables_nr -1 ;/* fadt is first */ int i; - ssdt_tables =g_array_sized_new (false, true,sizeof (AcpiSdtTable), - ssdt_tables_nr);for (i =0 ; i < ssdt_tables_nr; i++) {AcpiSdtTable ssdt_table; + +memset (&ssdt_table,0 ,sizeof (ssdt_table));uint32_t addr = data->rsdt_tables_addr[i +1 ];/* fadt is first */ test_dst_table (&ssdt_table, addr); -g_array_append_val (ssdt_tables, ssdt_table); +g_array_append_val (data->ssdt_tables, ssdt_table); + } +} + +static bool iasl_installed (void ) +{ +gchar *out =NULL , *out_err =NULL ; +bool ret; + +/* pass 'out' and 'out_err' in order to be redirected */ + ret =g_spawn_command_line_sync ("iasl" , &out, &out_err,NULL ,NULL ); + +if (out_err) { + ret = ret && (out_err[0 ] =='\0' ); +g_free (out_err); } - data->ssdt_tables = ssdt_tables; + +if (out) { +g_free (out); + } + +return ret; +} + +static void dump_aml_files (test_data *data) +{ +AcpiSdtTable *sdt; +GError *error =NULL ; +gint fd; +int i; + +for (i =0 ; i < data->ssdt_tables->len; ++i) { + sdt = &g_array_index (data->ssdt_tables, AcpiSdtTable, i); +g_assert (sdt->aml); + + fd =g_file_open_tmp ("aml-XXXXXX" , &sdt->aml_file, &error); +g_assert_no_error (error); + +write (fd, sdt,sizeof (AcpiTableHeader)); +write (fd, sdt->aml, sdt->aml_len); +close (fd); + } +} + +static void load_asl (GArray *sdts,AcpiSdtTable *sdt) +{ +AcpiSdtTable *temp; +GError *error =NULL ; +GString *command_line =g_string_new ("'iasl' " ); +gint fd; +gchar *out, *out_err; +gboolean ret; +int i; + + fd =g_file_open_tmp ("asl-XXXXXX.dsl" , &sdt->asl_file, &error); +g_assert_no_error (error); +close (fd); + +/* build command line */ +g_string_append_printf (command_line,"-p %s " , sdt->asl_file); +for (i =0 ; i <2 ; ++i) {/* reference DSDT and SSDT */ + temp = &g_array_index (sdts, AcpiSdtTable, i); +g_string_append_printf (command_line,"-e %s " , temp->aml_file); + } +g_string_append_printf (command_line,"-d %s" , sdt->aml_file); + +/* pass 'out' and 'out_err' in order to be redirected */ +g_spawn_command_line_sync (command_line->str, &out, &out_err,NULL , &error); +g_assert_no_error (error); + + ret =g_file_get_contents (sdt->asl_file, (gchar **)&sdt->asl, + &sdt->asl_len, &error); +g_assert (ret); +g_assert_no_error (error); +g_assert (sdt->asl_len); + +g_free (out); +g_free (out_err); +g_string_free (command_line, true); +} + +#define COMMENT_END "*/" +#define DEF_BLOCK "DefinitionBlock (" +#define BLOCK_NAME_END ".aml" + +static GString *normalize_asl (gchar *asl_code) +{ +GString *asl =g_string_new (asl_code); +gchar *comment, *block_name; + +/* strip comments (different generation days) */ + comment =g_strstr_len (asl->str, asl->len,COMMENT_END ); +if (comment) { + asl =g_string_erase (asl,0 , comment +sizeof (COMMENT_END ) - asl->str); + } + +/* strip def block name (it has file path in it) */ +if (g_str_has_prefix (asl->str,DEF_BLOCK )) { + block_name =g_strstr_len (asl->str, asl->len,BLOCK_NAME_END ); +g_assert (block_name); + asl =g_string_erase (asl,0 , + block_name +sizeof (BLOCK_NAME_END ) - asl->str); + } + +return asl; +} + +static GArray *load_expected_aml (test_data *data) +{ +int i; +AcpiSdtTable *sdt; +gchar *aml_file; +GError *error =NULL ; +gboolean ret; + +GArray *exp_ssdt_tables =g_array_new (false, true,sizeof (AcpiSdtTable)); +for (i =0 ; i < data->ssdt_tables->len; ++i) { +AcpiSdtTable exp_sdt; + sdt = &g_array_index (data->ssdt_tables, AcpiSdtTable, i); + +memset (&exp_sdt,0 ,sizeof (exp_sdt)); + exp_sdt.header.signature = sdt->header.signature; + + aml_file =g_strdup_printf ("%s/%s/%.4s" , data_dir, data->machine, + (gchar *)&exp_sdt.header.signature); + exp_sdt.aml_file = aml_file; +g_assert (g_file_test (aml_file,G_FILE_TEST_EXISTS )); + ret =g_file_get_contents (aml_file, &exp_sdt.aml, + &exp_sdt.aml_len, &error); +g_assert (ret); +g_assert_no_error (error); +g_assert (exp_sdt.aml); +g_assert (exp_sdt.aml_len); + +g_array_append_val (exp_ssdt_tables, exp_sdt); + } + +return exp_ssdt_tables; +} + +static void test_acpi_asl (test_data *data) +{ +int i; +AcpiSdtTable *sdt, *exp_sdt; +test_data exp_data; + +memset (&exp_data,0 ,sizeof (exp_data)); + exp_data.ssdt_tables =load_expected_aml (data); +dump_aml_files (data); +for (i =0 ; i < data->ssdt_tables->len; ++i) { +GString *asl, *exp_asl; + + sdt = &g_array_index (data->ssdt_tables, AcpiSdtTable, i); + exp_sdt = &g_array_index (exp_data.ssdt_tables, AcpiSdtTable, i); + +load_asl (data->ssdt_tables, sdt); + asl =normalize_asl (sdt->asl); + +load_asl (exp_data.ssdt_tables, exp_sdt); + exp_asl =normalize_asl (exp_sdt->asl); + +g_assert (!g_strcmp0 (asl->str, exp_asl->str)); +g_string_free (asl, true); +g_string_free (exp_asl, true); + } + +free_test_data (&exp_data); }static void test_acpi_one (const char *params,test_data *data)
@@ -329,10 +530,14 @@ static void test_acpi_one(const char *params, test_data *data)uint8_t signature_high;uint16_t signature;int i; +const char *device ="" ; -memset (data,0 ,sizeof (*data)); - args =g_strdup_printf ("-net none -display none %s %s" , - params ? params :"" , disk); +if (!g_strcmp0 (data->machine,MACHINE_Q35 )) { + device =",id=hd -device ide-hd,drive=hd" ; + } + + args =g_strdup_printf ("-net none -display none %s -drive file=%s%s," , + params ? params :"" , disk, device);qtest_start (args);/* Wait at most 1 minute */
@@ -362,6 +567,10 @@ static void test_acpi_one(const char *params, test_data *data)test_acpi_dsdt_table (data);test_acpi_ssdt_tables (data); +if (iasl_installed ()) { +test_acpi_asl (data); + } +qtest_quit (global_qtest);g_free (args); }
@@ -373,8 +582,14 @@ static void test_acpi_tcg(void)/* Supplying -machine accel argument overrides the default (qtest). * This is to make guest actually run. */ +memset (&data,0 ,sizeof (data)); + data.machine =MACHINE_PC ;test_acpi_one ("-machine accel=tcg" , &data); +free_test_data (&data); +memset (&data,0 ,sizeof (data)); + data.machine =MACHINE_Q35 ; +test_acpi_one ("-machine q35,accel=tcg" , &data);free_test_data (&data); }
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH v2 3/3] acpi unit-test: compare DSDT and SSDT tables against expected values
Quoted 156 lines · Marcel Apfelbaum
This test will run only if iasl is installed on the host machine. The test plan:
1. Dumps the ACPI tables as AML on the disk.
2. Runs iasl to disassembly the tables into ASL files.
3. Runs iasl to disassembly the offline AML files into ASL files.
4. Compares the ASL files.The test runs for both default machine and q35. In case the test fails, it can be easily tweaked to show the differences between the ASL files and understand the issue.
Signed-off-by Marcel Apfelbaum <[email protected]>--- tests/acpi-test.c | 257 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 236 insertions(+), 21 deletions(-)tests/acpi-test.c +54
-17@@ -18,14 +18,22 @@#include "qemu/compiler.h" #include "hw/i386/acpi-defs.h" +#define MACHINE_PC "pc" +#define MACHINE_Q35 "q35" +/* DSDT and SSDTs format */ typedef struct {AcpiTableHeader header; -uint8_t *aml; -int aml_len; -}AcpiSdtTable ; +gchar *aml;/* aml bytecode from guest */ +gsize aml_len; +gchar *aml_file; +gchar *asl;/* asl code generated from aml */ +gsize asl_len; +gchar *asl_file; +} QEMU_PACKED AcpiSdtTable; typedef struct { + const char *machine; uint32_t rsdp_addr; AcpiRsdpDescriptor rsdp_table; AcpiRsdtDescriptorRev1 rsdt_table;@@ -33,8 +41,7 @@ typedef struct {AcpiFacsDescriptorRev1 facs_table;uint32_t *rsdt_tables_addr;int rsdt_tables_nr; -AcpiSdtTable dsdt_table; -GArray *ssdt_tables; +GArray *ssdt_tables;/* first is DSDT */ } test_data;#define LOW (x) ((x) & 0xff)@@ -91,8 +98,10 @@ typedef struct {/* Boot sector code: write SIGNATURE into memory, * then halt. +* Q35 machine requires a minimum 0x7e000 bytes disk. +* (bug or feature?) */ -static uint8_t boot_sector[0x200 ] = { +static uint8_t boot_sector[0x7e000 ] = {/* 7c00: mov $0xdead,%ax */ [0x00 ] =0xb8 , [0x01 ] =LOW (SIGNATURE ),@@ -117,17 +126,40 @@ static uint8_t boot_sector[0x200] = { };static const char *disk ="tests/acpi-test-disk.raw" ; +static const char *data_dir ="tests/acpi-test-data" ;static void free_test_data (test_data *data) { +AcpiSdtTable *temp;int i; -g_free (data->rsdt_tables_addr); +if (data->rsdt_tables_addr) { +g_free (data->rsdt_tables_addr); + } +for (i =0 ; i < data->ssdt_tables->len; ++i) { -g_free (g_array_index (data->ssdt_tables, AcpiSdtTable, i).aml); + temp = &g_array_index (data->ssdt_tables, AcpiSdtTable, i); +if (temp->aml) { +g_free (temp->aml); + } +if (temp->aml_file) { +if (g_strstr_len (temp->aml_file,-1 ,"aml-" )) { +unlink (temp->aml_file); + } +g_free (temp->aml_file); + } +if (temp->asl) { +g_free (temp->asl); + } +if (temp->asl_file) { +if (g_strstr_len (temp->asl_file,-1 ,"asl-" )) { +unlink (temp->asl_file); + } +g_free (temp->asl_file); + } } +g_array_free (data->ssdt_tables, false); -g_free (data->dsdt_table.aml); }static uint8_t acpi_checksum (const uint8_t *data,int len)@@ -292,34 +324,203 @@ static void test_dst_table(AcpiSdtTable *sdt_table, uint32_t addr)ACPI_READ_ARRAY_PTR (sdt_table->aml, sdt_table->aml_len, addr); checksum =acpi_checksum ((uint8_t *)sdt_table,sizeof (AcpiTableHeader)) + -acpi_checksum (sdt_table->aml, sdt_table->aml_len); +acpi_checksum ((uint8_t *)sdt_table->aml, sdt_table->aml_len);g_assert (!checksum); }static void test_acpi_dsdt_table (test_data *data) { -AcpiSdtTable *dsdt_table = &data->dsdt_table; +AcpiSdtTable dsdt_table;uint32_t addr = data->fadt_table.dsdt; -test_dst_table (dsdt_table, addr); - g_assert_cmphex(dsdt_table->header.signature, ==, ACPI_DSDT_SIGNATURE); +memset (&dsdt_table,0 ,sizeof (dsdt_table)); + data->ssdt_tables =g_array_new (false, true,sizeof (AcpiSdtTable)); + +test_dst_table (&dsdt_table, addr); + g_assert_cmphex(dsdt_table.header.signature, ==, ACPI_DSDT_SIGNATURE); + +/* Place DSDT first */ +g_array_append_val (data->ssdt_tables, dsdt_table); }static void test_acpi_ssdt_tables (test_data *data) { -GArray *ssdt_tables;int ssdt_tables_nr = data->rsdt_tables_nr -1 ;/* fadt is first */ int i; - ssdt_tables =g_array_sized_new (false, true,sizeof (AcpiSdtTable), - ssdt_tables_nr);for (i =0 ; i < ssdt_tables_nr; i++) {AcpiSdtTable ssdt_table; + +memset (&ssdt_table,0 ,sizeof (ssdt_table));uint32_t addr = data->rsdt_tables_addr[i +1 ];/* fadt is first */ test_dst_table (&ssdt_table, addr); -g_array_append_val (ssdt_tables, ssdt_table); +g_array_append_val (data->ssdt_tables, ssdt_table);
tests/acpi-test.c static void test_dst_table(AcpiSdtTable *sdt_table, uint32_t addr) · line 367
Quoted 10 lines
tests/acpi-test.c +10
-0+ } +} + +static bool iasl_installed (void ) +{ +gchar *out =NULL , *out_err =NULL ; +bool ret; + +/* pass 'out' and 'out_err' in order to be redirected */ + ret =g_spawn_command_line_sync ("iasl" , &out, &out_err,NULL ,NULL );
One interesting option here is to include config-hosts.mak from Makefile, then use IASL configured there.
Can be a patch on top though.
Quoted 206 lines
tests/acpi-test.c +172
-4+ +if (out_err) { + ret = ret && (out_err[0 ] =='\0' ); +g_free (out_err); } - data->ssdt_tables = ssdt_tables; + +if (out) { +g_free (out); + } + +return ret; +} + +static void dump_aml_files (test_data *data) +{ +AcpiSdtTable *sdt; +GError *error =NULL ; +gint fd; +int i; + +for (i =0 ; i < data->ssdt_tables->len; ++i) { + sdt = &g_array_index (data->ssdt_tables, AcpiSdtTable, i); +g_assert (sdt->aml); + + fd =g_file_open_tmp ("aml-XXXXXX" , &sdt->aml_file, &error); +g_assert_no_error (error); + +write (fd, sdt,sizeof (AcpiTableHeader)); +write (fd, sdt->aml, sdt->aml_len); +close (fd); + } +} + +static void load_asl (GArray *sdts,AcpiSdtTable *sdt) +{ +AcpiSdtTable *temp; +GError *error =NULL ; +GString *command_line =g_string_new ("'iasl' " ); +gint fd; +gchar *out, *out_err; +gboolean ret; +int i; + + fd =g_file_open_tmp ("asl-XXXXXX.dsl" , &sdt->asl_file, &error); +g_assert_no_error (error); +close (fd); + +/* build command line */ +g_string_append_printf (command_line,"-p %s " , sdt->asl_file); +for (i =0 ; i <2 ; ++i) {/* reference DSDT and SSDT */ + temp = &g_array_index (sdts, AcpiSdtTable, i); +g_string_append_printf (command_line,"-e %s " , temp->aml_file); + } +g_string_append_printf (command_line,"-d %s" , sdt->aml_file); + +/* pass 'out' and 'out_err' in order to be redirected */ +g_spawn_command_line_sync (command_line->str, &out, &out_err,NULL , &error); +g_assert_no_error (error); + + ret =g_file_get_contents (sdt->asl_file, (gchar **)&sdt->asl, + &sdt->asl_len, &error); +g_assert (ret); +g_assert_no_error (error); +g_assert (sdt->asl_len); + +g_free (out); +g_free (out_err); +g_string_free (command_line, true); +} + +#define COMMENT_END "*/" +#define DEF_BLOCK "DefinitionBlock (" +#define BLOCK_NAME_END ".aml" + +static GString *normalize_asl (gchar *asl_code) +{ +GString *asl =g_string_new (asl_code); +gchar *comment, *block_name; + +/* strip comments (different generation days) */ + comment =g_strstr_len (asl->str, asl->len,COMMENT_END ); +if (comment) { + asl =g_string_erase (asl,0 , comment +sizeof (COMMENT_END ) - asl->str); + } + +/* strip def block name (it has file path in it) */ +if (g_str_has_prefix (asl->str,DEF_BLOCK )) { + block_name =g_strstr_len (asl->str, asl->len,BLOCK_NAME_END ); +g_assert (block_name); + asl =g_string_erase (asl,0 , + block_name +sizeof (BLOCK_NAME_END ) - asl->str); + } + +return asl; +} + +static GArray *load_expected_aml (test_data *data) +{ +int i; +AcpiSdtTable *sdt; +gchar *aml_file; +GError *error =NULL ; +gboolean ret; + +GArray *exp_ssdt_tables =g_array_new (false, true,sizeof (AcpiSdtTable)); +for (i =0 ; i < data->ssdt_tables->len; ++i) { +AcpiSdtTable exp_sdt; + sdt = &g_array_index (data->ssdt_tables, AcpiSdtTable, i); + +memset (&exp_sdt,0 ,sizeof (exp_sdt)); + exp_sdt.header.signature = sdt->header.signature; + + aml_file =g_strdup_printf ("%s/%s/%.4s" , data_dir, data->machine, + (gchar *)&exp_sdt.header.signature); + exp_sdt.aml_file = aml_file; +g_assert (g_file_test (aml_file,G_FILE_TEST_EXISTS )); + ret =g_file_get_contents (aml_file, &exp_sdt.aml, + &exp_sdt.aml_len, &error); +g_assert (ret); +g_assert_no_error (error); +g_assert (exp_sdt.aml); +g_assert (exp_sdt.aml_len); + +g_array_append_val (exp_ssdt_tables, exp_sdt); + } + +return exp_ssdt_tables; +} + +static void test_acpi_asl (test_data *data) +{ +int i; +AcpiSdtTable *sdt, *exp_sdt; +test_data exp_data; + +memset (&exp_data,0 ,sizeof (exp_data)); + exp_data.ssdt_tables =load_expected_aml (data); +dump_aml_files (data); +for (i =0 ; i < data->ssdt_tables->len; ++i) { +GString *asl, *exp_asl; + + sdt = &g_array_index (data->ssdt_tables, AcpiSdtTable, i); + exp_sdt = &g_array_index (exp_data.ssdt_tables, AcpiSdtTable, i); + +load_asl (data->ssdt_tables, sdt); + asl =normalize_asl (sdt->asl); + +load_asl (exp_data.ssdt_tables, exp_sdt); + exp_asl =normalize_asl (exp_sdt->asl); + +g_assert (!g_strcmp0 (asl->str, exp_asl->str)); +g_string_free (asl, true); +g_string_free (exp_asl, true); + } + +free_test_data (&exp_data); }static void test_acpi_one (const char *params,test_data *data)@@ -329,10 +530,14 @@ static void test_acpi_one(const char *params, test_data *data)uint8_t signature_high;uint16_t signature;int i; +const char *device ="" ; -memset (data,0 ,sizeof (*data)); - args =g_strdup_printf ("-net none -display none %s %s" , - params ? params :"" , disk); +if (!g_strcmp0 (data->machine,MACHINE_Q35 )) { + device =",id=hd -device ide-hd,drive=hd" ; + } + + args =g_strdup_printf ("-net none -display none %s -drive file=%s%s," , + params ? params :"" , disk, device);qtest_start (args);/* Wait at most 1 minute */ @@ -362,6 +567,10 @@ static void test_acpi_one(const char *params, test_data *data)test_acpi_dsdt_table (data);test_acpi_ssdt_tables (data); +if (iasl_installed ()) { +test_acpi_asl (data); + } +qtest_quit (global_qtest);g_free (args); }@@ -373,8 +582,14 @@ static void test_acpi_tcg(void)/* Supplying -machine accel argument overrides the default (qtest). * This is to make guest actually run. */ +memset (&data,0 ,sizeof (data)); + data.machine =MACHINE_PC ;test_acpi_one ("-machine accel=tcg" , &data); +free_test_data (&data); +memset (&data,0 ,sizeof (data)); + data.machine =MACHINE_Q35 ; +test_acpi_one ("-machine q35,accel=tcg" , &data);free_test_data (&data); }Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH v2 3/3] acpi unit-test: compare DSDT and SSDT tables against expected values
Quoted 162 lines · Michael S. Tsirkin
Quoted 161 lines · Marcel Apfelbaum
This test will run only if iasl is installed on the host machine. The test plan:
1. Dumps the ACPI tables as AML on the disk.
2. Runs iasl to disassembly the tables into ASL files.
3. Runs iasl to disassembly the offline AML files into ASL files.
4. Compares the ASL files.The test runs for both default machine and q35. In case the test fails, it can be easily tweaked to show the differences between the ASL files and understand the issue.
Signed-off-by Marcel Apfelbaum <[email protected]>--- tests/acpi-test.c | 257 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 236 insertions(+), 21 deletions(-)tests/acpi-test.c +59
-17@@ -18,14 +18,22 @@#include "qemu/compiler.h" #include "hw/i386/acpi-defs.h" +#define MACHINE_PC "pc" +#define MACHINE_Q35 "q35" +/* DSDT and SSDTs format */ typedef struct {AcpiTableHeader header; -uint8_t *aml; -int aml_len; -}AcpiSdtTable ; +gchar *aml;/* aml bytecode from guest */ +gsize aml_len; +gchar *aml_file; +gchar *asl;/* asl code generated from aml */ +gsize asl_len; +gchar *asl_file; +} QEMU_PACKED AcpiSdtTable; typedef struct { + const char *machine; uint32_t rsdp_addr; AcpiRsdpDescriptor rsdp_table; AcpiRsdtDescriptorRev1 rsdt_table;@@ -33,8 +41,7 @@ typedef struct {AcpiFacsDescriptorRev1 facs_table;uint32_t *rsdt_tables_addr;int rsdt_tables_nr; -AcpiSdtTable dsdt_table; -GArray *ssdt_tables; +GArray *ssdt_tables;/* first is DSDT */ } test_data;#define LOW (x) ((x) & 0xff)@@ -91,8 +98,10 @@ typedef struct {/* Boot sector code: write SIGNATURE into memory, * then halt. +* Q35 machine requires a minimum 0x7e000 bytes disk. +* (bug or feature?) */ -static uint8_t boot_sector[0x200 ] = { +static uint8_t boot_sector[0x7e000 ] = {/* 7c00: mov $0xdead,%ax */ [0x00 ] =0xb8 , [0x01 ] =LOW (SIGNATURE ),@@ -117,17 +126,40 @@ static uint8_t boot_sector[0x200] = { };static const char *disk ="tests/acpi-test-disk.raw" ; +static const char *data_dir ="tests/acpi-test-data" ;static void free_test_data (test_data *data) { +AcpiSdtTable *temp;int i; -g_free (data->rsdt_tables_addr); +if (data->rsdt_tables_addr) { +g_free (data->rsdt_tables_addr); + } +for (i =0 ; i < data->ssdt_tables->len; ++i) { -g_free (g_array_index (data->ssdt_tables, AcpiSdtTable, i).aml); + temp = &g_array_index (data->ssdt_tables, AcpiSdtTable, i); +if (temp->aml) { +g_free (temp->aml); + } +if (temp->aml_file) { +if (g_strstr_len (temp->aml_file,-1 ,"aml-" )) { +unlink (temp->aml_file); + } +g_free (temp->aml_file); + } +if (temp->asl) { +g_free (temp->asl); + } +if (temp->asl_file) { +if (g_strstr_len (temp->asl_file,-1 ,"asl-" )) { +unlink (temp->asl_file); + } +g_free (temp->asl_file); + } } +g_array_free (data->ssdt_tables, false); -g_free (data->dsdt_table.aml); }static uint8_t acpi_checksum (const uint8_t *data,int len)@@ -292,34 +324,203 @@ static void test_dst_table(AcpiSdtTable *sdt_table, uint32_t addr)ACPI_READ_ARRAY_PTR (sdt_table->aml, sdt_table->aml_len, addr); checksum =acpi_checksum ((uint8_t *)sdt_table,sizeof (AcpiTableHeader)) + -acpi_checksum (sdt_table->aml, sdt_table->aml_len); +acpi_checksum ((uint8_t *)sdt_table->aml, sdt_table->aml_len);g_assert (!checksum); }static void test_acpi_dsdt_table (test_data *data) { -AcpiSdtTable *dsdt_table = &data->dsdt_table; +AcpiSdtTable dsdt_table;uint32_t addr = data->fadt_table.dsdt; -test_dst_table (dsdt_table, addr); - g_assert_cmphex(dsdt_table->header.signature, ==, ACPI_DSDT_SIGNATURE); +memset (&dsdt_table,0 ,sizeof (dsdt_table)); + data->ssdt_tables =g_array_new (false, true,sizeof (AcpiSdtTable)); + +test_dst_table (&dsdt_table, addr); + g_assert_cmphex(dsdt_table.header.signature, ==, ACPI_DSDT_SIGNATURE); + +/* Place DSDT first */ +g_array_append_val (data->ssdt_tables, dsdt_table); }static void test_acpi_ssdt_tables (test_data *data) { -GArray *ssdt_tables;int ssdt_tables_nr = data->rsdt_tables_nr -1 ;/* fadt is first */ int i; - ssdt_tables =g_array_sized_new (false, true,sizeof (AcpiSdtTable), - ssdt_tables_nr);for (i =0 ; i < ssdt_tables_nr; i++) {AcpiSdtTable ssdt_table; + +memset (&ssdt_table,0 ,sizeof (ssdt_table));uint32_t addr = data->rsdt_tables_addr[i +1 ];/* fadt is first */ test_dst_table (&ssdt_table, addr); -g_array_append_val (ssdt_tables, ssdt_table); +g_array_append_val (data->ssdt_tables, ssdt_table); + } +} + +static bool iasl_installed (void ) +{
Quoted 8 lines
tests/acpi-test.c static void test_dst_table(AcpiSdtTable *sdt_table, uint32_t addr) · line 367
Quoted 5 lines
tests/acpi-test.c +5
-0+gchar *out =NULL , *out_err =NULL ; +bool ret; + +/* pass 'out' and 'out_err' in order to be redirected */ + ret =g_spawn_command_line_sync ("iasl" , &out, &out_err,NULL ,NULL );One interesting option here is to include config-hosts.mak from
Makefile, then use IASL configured there.
Would be better, I agree, expect I have
no idea how to include this file. I'll look
it up and send it as different patch as you
suggested.
Thanks for the review!
Marcel
Quoted 209 lines
Can be a patch on top though.
Quoted 206 lines
tests/acpi-test.c +172
-4+ +if (out_err) { + ret = ret && (out_err[0 ] =='\0' ); +g_free (out_err); } - data->ssdt_tables = ssdt_tables; + +if (out) { +g_free (out); + } + +return ret; +} + +static void dump_aml_files (test_data *data) +{ +AcpiSdtTable *sdt; +GError *error =NULL ; +gint fd; +int i; + +for (i =0 ; i < data->ssdt_tables->len; ++i) { + sdt = &g_array_index (data->ssdt_tables, AcpiSdtTable, i); +g_assert (sdt->aml); + + fd =g_file_open_tmp ("aml-XXXXXX" , &sdt->aml_file, &error); +g_assert_no_error (error); + +write (fd, sdt,sizeof (AcpiTableHeader)); +write (fd, sdt->aml, sdt->aml_len); +close (fd); + } +} + +static void load_asl (GArray *sdts,AcpiSdtTable *sdt) +{ +AcpiSdtTable *temp; +GError *error =NULL ; +GString *command_line =g_string_new ("'iasl' " ); +gint fd; +gchar *out, *out_err; +gboolean ret; +int i; + + fd =g_file_open_tmp ("asl-XXXXXX.dsl" , &sdt->asl_file, &error); +g_assert_no_error (error); +close (fd); + +/* build command line */ +g_string_append_printf (command_line,"-p %s " , sdt->asl_file); +for (i =0 ; i <2 ; ++i) {/* reference DSDT and SSDT */ + temp = &g_array_index (sdts, AcpiSdtTable, i); +g_string_append_printf (command_line,"-e %s " , temp->aml_file); + } +g_string_append_printf (command_line,"-d %s" , sdt->aml_file); + +/* pass 'out' and 'out_err' in order to be redirected */ +g_spawn_command_line_sync (command_line->str, &out, &out_err,NULL , &error); +g_assert_no_error (error); + + ret =g_file_get_contents (sdt->asl_file, (gchar **)&sdt->asl, + &sdt->asl_len, &error); +g_assert (ret); +g_assert_no_error (error); +g_assert (sdt->asl_len); + +g_free (out); +g_free (out_err); +g_string_free (command_line, true); +} + +#define COMMENT_END "*/" +#define DEF_BLOCK "DefinitionBlock (" +#define BLOCK_NAME_END ".aml" + +static GString *normalize_asl (gchar *asl_code) +{ +GString *asl =g_string_new (asl_code); +gchar *comment, *block_name; + +/* strip comments (different generation days) */ + comment =g_strstr_len (asl->str, asl->len,COMMENT_END ); +if (comment) { + asl =g_string_erase (asl,0 , comment +sizeof (COMMENT_END ) - asl->str); + } + +/* strip def block name (it has file path in it) */ +if (g_str_has_prefix (asl->str,DEF_BLOCK )) { + block_name =g_strstr_len (asl->str, asl->len,BLOCK_NAME_END ); +g_assert (block_name); + asl =g_string_erase (asl,0 , + block_name +sizeof (BLOCK_NAME_END ) - asl->str); + } + +return asl; +} + +static GArray *load_expected_aml (test_data *data) +{ +int i; +AcpiSdtTable *sdt; +gchar *aml_file; +GError *error =NULL ; +gboolean ret; + +GArray *exp_ssdt_tables =g_array_new (false, true,sizeof (AcpiSdtTable)); +for (i =0 ; i < data->ssdt_tables->len; ++i) { +AcpiSdtTable exp_sdt; + sdt = &g_array_index (data->ssdt_tables, AcpiSdtTable, i); + +memset (&exp_sdt,0 ,sizeof (exp_sdt)); + exp_sdt.header.signature = sdt->header.signature; + + aml_file =g_strdup_printf ("%s/%s/%.4s" , data_dir, data->machine, + (gchar *)&exp_sdt.header.signature); + exp_sdt.aml_file = aml_file; +g_assert (g_file_test (aml_file,G_FILE_TEST_EXISTS )); + ret =g_file_get_contents (aml_file, &exp_sdt.aml, + &exp_sdt.aml_len, &error); +g_assert (ret); +g_assert_no_error (error); +g_assert (exp_sdt.aml); +g_assert (exp_sdt.aml_len); + +g_array_append_val (exp_ssdt_tables, exp_sdt); + } + +return exp_ssdt_tables; +} + +static void test_acpi_asl (test_data *data) +{ +int i; +AcpiSdtTable *sdt, *exp_sdt; +test_data exp_data; + +memset (&exp_data,0 ,sizeof (exp_data)); + exp_data.ssdt_tables =load_expected_aml (data); +dump_aml_files (data); +for (i =0 ; i < data->ssdt_tables->len; ++i) { +GString *asl, *exp_asl; + + sdt = &g_array_index (data->ssdt_tables, AcpiSdtTable, i); + exp_sdt = &g_array_index (exp_data.ssdt_tables, AcpiSdtTable, i); + +load_asl (data->ssdt_tables, sdt); + asl =normalize_asl (sdt->asl); + +load_asl (exp_data.ssdt_tables, exp_sdt); + exp_asl =normalize_asl (exp_sdt->asl); + +g_assert (!g_strcmp0 (asl->str, exp_asl->str)); +g_string_free (asl, true); +g_string_free (exp_asl, true); + } + +free_test_data (&exp_data); }static void test_acpi_one (const char *params,test_data *data)@@ -329,10 +530,14 @@ static void test_acpi_one(const char *params, test_data *data)uint8_t signature_high;uint16_t signature;int i; +const char *device ="" ; -memset (data,0 ,sizeof (*data)); - args =g_strdup_printf ("-net none -display none %s %s" , - params ? params :"" , disk); +if (!g_strcmp0 (data->machine,MACHINE_Q35 )) { + device =",id=hd -device ide-hd,drive=hd" ; + } + + args =g_strdup_printf ("-net none -display none %s -drive file=%s%s," , + params ? params :"" , disk, device);qtest_start (args);/* Wait at most 1 minute */ @@ -362,6 +567,10 @@ static void test_acpi_one(const char *params, test_data *data)test_acpi_dsdt_table (data);test_acpi_ssdt_tables (data); +if (iasl_installed ()) { +test_acpi_asl (data); + } +qtest_quit (global_qtest);g_free (args); }@@ -373,8 +582,14 @@ static void test_acpi_tcg(void)/* Supplying -machine accel argument overrides the default (qtest). * This is to make guest actually run. */ +memset (&data,0 ,sizeof (data)); + data.machine =MACHINE_PC ;test_acpi_one ("-machine accel=tcg" , &data); +free_test_data (&data); +memset (&data,0 ,sizeof (data)); + data.machine =MACHINE_Q35 ; +test_acpi_one ("-machine q35,accel=tcg" , &data);free_test_data (&data); }Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH v2 3/3] acpi unit-test: compare DSDT and SSDT tables against expected values
Quoted 171 lines · Marcel Apfelbaum
Quoted 162 lines · Michael S. Tsirkin
Quoted 161 lines · Marcel Apfelbaum
This test will run only if iasl is installed on the host machine. The test plan:
1. Dumps the ACPI tables as AML on the disk.
2. Runs iasl to disassembly the tables into ASL files.
3. Runs iasl to disassembly the offline AML files into ASL files.
4. Compares the ASL files.The test runs for both default machine and q35. In case the test fails, it can be easily tweaked to show the differences between the ASL files and understand the issue.
Signed-off-by Marcel Apfelbaum <[email protected]>--- tests/acpi-test.c | 257 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 236 insertions(+), 21 deletions(-)tests/acpi-test.c +59
-17@@ -18,14 +18,22 @@#include "qemu/compiler.h" #include "hw/i386/acpi-defs.h" +#define MACHINE_PC "pc" +#define MACHINE_Q35 "q35" +/* DSDT and SSDTs format */ typedef struct {AcpiTableHeader header; -uint8_t *aml; -int aml_len; -}AcpiSdtTable ; +gchar *aml;/* aml bytecode from guest */ +gsize aml_len; +gchar *aml_file; +gchar *asl;/* asl code generated from aml */ +gsize asl_len; +gchar *asl_file; +} QEMU_PACKED AcpiSdtTable; typedef struct { + const char *machine; uint32_t rsdp_addr; AcpiRsdpDescriptor rsdp_table; AcpiRsdtDescriptorRev1 rsdt_table;@@ -33,8 +41,7 @@ typedef struct {AcpiFacsDescriptorRev1 facs_table;uint32_t *rsdt_tables_addr;int rsdt_tables_nr; -AcpiSdtTable dsdt_table; -GArray *ssdt_tables; +GArray *ssdt_tables;/* first is DSDT */ } test_data;#define LOW (x) ((x) & 0xff)@@ -91,8 +98,10 @@ typedef struct {/* Boot sector code: write SIGNATURE into memory, * then halt. +* Q35 machine requires a minimum 0x7e000 bytes disk. +* (bug or feature?) */ -static uint8_t boot_sector[0x200 ] = { +static uint8_t boot_sector[0x7e000 ] = {/* 7c00: mov $0xdead,%ax */ [0x00 ] =0xb8 , [0x01 ] =LOW (SIGNATURE ),@@ -117,17 +126,40 @@ static uint8_t boot_sector[0x200] = { };static const char *disk ="tests/acpi-test-disk.raw" ; +static const char *data_dir ="tests/acpi-test-data" ;static void free_test_data (test_data *data) { +AcpiSdtTable *temp;int i; -g_free (data->rsdt_tables_addr); +if (data->rsdt_tables_addr) { +g_free (data->rsdt_tables_addr); + } +for (i =0 ; i < data->ssdt_tables->len; ++i) { -g_free (g_array_index (data->ssdt_tables, AcpiSdtTable, i).aml); + temp = &g_array_index (data->ssdt_tables, AcpiSdtTable, i); +if (temp->aml) { +g_free (temp->aml); + } +if (temp->aml_file) { +if (g_strstr_len (temp->aml_file,-1 ,"aml-" )) { +unlink (temp->aml_file); + } +g_free (temp->aml_file); + } +if (temp->asl) { +g_free (temp->asl); + } +if (temp->asl_file) { +if (g_strstr_len (temp->asl_file,-1 ,"asl-" )) { +unlink (temp->asl_file); + } +g_free (temp->asl_file); + } } +g_array_free (data->ssdt_tables, false); -g_free (data->dsdt_table.aml); }static uint8_t acpi_checksum (const uint8_t *data,int len)@@ -292,34 +324,203 @@ static void test_dst_table(AcpiSdtTable *sdt_table, uint32_t addr)ACPI_READ_ARRAY_PTR (sdt_table->aml, sdt_table->aml_len, addr); checksum =acpi_checksum ((uint8_t *)sdt_table,sizeof (AcpiTableHeader)) + -acpi_checksum (sdt_table->aml, sdt_table->aml_len); +acpi_checksum ((uint8_t *)sdt_table->aml, sdt_table->aml_len);g_assert (!checksum); }static void test_acpi_dsdt_table (test_data *data) { -AcpiSdtTable *dsdt_table = &data->dsdt_table; +AcpiSdtTable dsdt_table;uint32_t addr = data->fadt_table.dsdt; -test_dst_table (dsdt_table, addr); - g_assert_cmphex(dsdt_table->header.signature, ==, ACPI_DSDT_SIGNATURE); +memset (&dsdt_table,0 ,sizeof (dsdt_table)); + data->ssdt_tables =g_array_new (false, true,sizeof (AcpiSdtTable)); + +test_dst_table (&dsdt_table, addr); + g_assert_cmphex(dsdt_table.header.signature, ==, ACPI_DSDT_SIGNATURE); + +/* Place DSDT first */ +g_array_append_val (data->ssdt_tables, dsdt_table); }static void test_acpi_ssdt_tables (test_data *data) { -GArray *ssdt_tables;int ssdt_tables_nr = data->rsdt_tables_nr -1 ;/* fadt is first */ int i; - ssdt_tables =g_array_sized_new (false, true,sizeof (AcpiSdtTable), - ssdt_tables_nr);for (i =0 ; i < ssdt_tables_nr; i++) {AcpiSdtTable ssdt_table; + +memset (&ssdt_table,0 ,sizeof (ssdt_table));uint32_t addr = data->rsdt_tables_addr[i +1 ];/* fadt is first */ test_dst_table (&ssdt_table, addr); -g_array_append_val (ssdt_tables, ssdt_table); +g_array_append_val (data->ssdt_tables, ssdt_table); + } +} + +static bool iasl_installed (void ) +{Quoted 8 lines
tests/acpi-test.c static void test_dst_table(AcpiSdtTable *sdt_table, uint32_t addr) · line 367
Quoted 5 lines
tests/acpi-test.c +5
-0+gchar *out =NULL , *out_err =NULL ; +bool ret; + +/* pass 'out' and 'out_err' in order to be redirected */ + ret =g_spawn_command_line_sync ("iasl" , &out, &out_err,NULL ,NULL );One interesting option here is to include config-hosts.mak from
Makefile, then use IASL configured there.
Quoted 2 lines
Would be better, I agree, expect I have
no idea how to include this file.
In fact it already includes that I think
so just add -DCONFIG_IASL="${IASL}"
might do the trick.
Quoted 218 lines
I'll look
it up and send it as different patch as you
suggested.Thanks for the review!
MarcelQuoted 209 lines
Can be a patch on top though.
Quoted 206 lines
tests/acpi-test.c +172
-4+ +if (out_err) { + ret = ret && (out_err[0 ] =='\0' ); +g_free (out_err); } - data->ssdt_tables = ssdt_tables; + +if (out) { +g_free (out); + } + +return ret; +} + +static void dump_aml_files (test_data *data) +{ +AcpiSdtTable *sdt; +GError *error =NULL ; +gint fd; +int i; + +for (i =0 ; i < data->ssdt_tables->len; ++i) { + sdt = &g_array_index (data->ssdt_tables, AcpiSdtTable, i); +g_assert (sdt->aml); + + fd =g_file_open_tmp ("aml-XXXXXX" , &sdt->aml_file, &error); +g_assert_no_error (error); + +write (fd, sdt,sizeof (AcpiTableHeader)); +write (fd, sdt->aml, sdt->aml_len); +close (fd); + } +} + +static void load_asl (GArray *sdts,AcpiSdtTable *sdt) +{ +AcpiSdtTable *temp; +GError *error =NULL ; +GString *command_line =g_string_new ("'iasl' " ); +gint fd; +gchar *out, *out_err; +gboolean ret; +int i; + + fd =g_file_open_tmp ("asl-XXXXXX.dsl" , &sdt->asl_file, &error); +g_assert_no_error (error); +close (fd); + +/* build command line */ +g_string_append_printf (command_line,"-p %s " , sdt->asl_file); +for (i =0 ; i <2 ; ++i) {/* reference DSDT and SSDT */ + temp = &g_array_index (sdts, AcpiSdtTable, i); +g_string_append_printf (command_line,"-e %s " , temp->aml_file); + } +g_string_append_printf (command_line,"-d %s" , sdt->aml_file); + +/* pass 'out' and 'out_err' in order to be redirected */ +g_spawn_command_line_sync (command_line->str, &out, &out_err,NULL , &error); +g_assert_no_error (error); + + ret =g_file_get_contents (sdt->asl_file, (gchar **)&sdt->asl, + &sdt->asl_len, &error); +g_assert (ret); +g_assert_no_error (error); +g_assert (sdt->asl_len); + +g_free (out); +g_free (out_err); +g_string_free (command_line, true); +} + +#define COMMENT_END "*/" +#define DEF_BLOCK "DefinitionBlock (" +#define BLOCK_NAME_END ".aml" + +static GString *normalize_asl (gchar *asl_code) +{ +GString *asl =g_string_new (asl_code); +gchar *comment, *block_name; + +/* strip comments (different generation days) */ + comment =g_strstr_len (asl->str, asl->len,COMMENT_END ); +if (comment) { + asl =g_string_erase (asl,0 , comment +sizeof (COMMENT_END ) - asl->str); + } + +/* strip def block name (it has file path in it) */ +if (g_str_has_prefix (asl->str,DEF_BLOCK )) { + block_name =g_strstr_len (asl->str, asl->len,BLOCK_NAME_END ); +g_assert (block_name); + asl =g_string_erase (asl,0 , + block_name +sizeof (BLOCK_NAME_END ) - asl->str); + } + +return asl; +} + +static GArray *load_expected_aml (test_data *data) +{ +int i; +AcpiSdtTable *sdt; +gchar *aml_file; +GError *error =NULL ; +gboolean ret; + +GArray *exp_ssdt_tables =g_array_new (false, true,sizeof (AcpiSdtTable)); +for (i =0 ; i < data->ssdt_tables->len; ++i) { +AcpiSdtTable exp_sdt; + sdt = &g_array_index (data->ssdt_tables, AcpiSdtTable, i); + +memset (&exp_sdt,0 ,sizeof (exp_sdt)); + exp_sdt.header.signature = sdt->header.signature; + + aml_file =g_strdup_printf ("%s/%s/%.4s" , data_dir, data->machine, + (gchar *)&exp_sdt.header.signature); + exp_sdt.aml_file = aml_file; +g_assert (g_file_test (aml_file,G_FILE_TEST_EXISTS )); + ret =g_file_get_contents (aml_file, &exp_sdt.aml, + &exp_sdt.aml_len, &error); +g_assert (ret); +g_assert_no_error (error); +g_assert (exp_sdt.aml); +g_assert (exp_sdt.aml_len); + +g_array_append_val (exp_ssdt_tables, exp_sdt); + } + +return exp_ssdt_tables; +} + +static void test_acpi_asl (test_data *data) +{ +int i; +AcpiSdtTable *sdt, *exp_sdt; +test_data exp_data; + +memset (&exp_data,0 ,sizeof (exp_data)); + exp_data.ssdt_tables =load_expected_aml (data); +dump_aml_files (data); +for (i =0 ; i < data->ssdt_tables->len; ++i) { +GString *asl, *exp_asl; + + sdt = &g_array_index (data->ssdt_tables, AcpiSdtTable, i); + exp_sdt = &g_array_index (exp_data.ssdt_tables, AcpiSdtTable, i); + +load_asl (data->ssdt_tables, sdt); + asl =normalize_asl (sdt->asl); + +load_asl (exp_data.ssdt_tables, exp_sdt); + exp_asl =normalize_asl (exp_sdt->asl); + +g_assert (!g_strcmp0 (asl->str, exp_asl->str)); +g_string_free (asl, true); +g_string_free (exp_asl, true); + } + +free_test_data (&exp_data); }static void test_acpi_one (const char *params,test_data *data)@@ -329,10 +530,14 @@ static void test_acpi_one(const char *params, test_data *data)uint8_t signature_high;uint16_t signature;int i; +const char *device ="" ; -memset (data,0 ,sizeof (*data)); - args =g_strdup_printf ("-net none -display none %s %s" , - params ? params :"" , disk); +if (!g_strcmp0 (data->machine,MACHINE_Q35 )) { + device =",id=hd -device ide-hd,drive=hd" ; + } + + args =g_strdup_printf ("-net none -display none %s -drive file=%s%s," , + params ? params :"" , disk, device);qtest_start (args);/* Wait at most 1 minute */ @@ -362,6 +567,10 @@ static void test_acpi_one(const char *params, test_data *data)test_acpi_dsdt_table (data);test_acpi_ssdt_tables (data); +if (iasl_installed ()) { +test_acpi_asl (data); + } +qtest_quit (global_qtest);g_free (args); }@@ -373,8 +582,14 @@ static void test_acpi_tcg(void)/* Supplying -machine accel argument overrides the default (qtest). * This is to make guest actually run. */ +memset (&data,0 ,sizeof (data)); + data.machine =MACHINE_PC ;test_acpi_one ("-machine accel=tcg" , &data); +free_test_data (&data); +memset (&data,0 ,sizeof (data)); + data.machine =MACHINE_Q35 ; +test_acpi_one ("-machine q35,accel=tcg" , &data);free_test_data (&data); }Signature · 1 line
1.8.3.1
Quoted 8 lines · Marcel Apfelbaum
The test:
- runs only if iasl is installed on the host machine.
- the test plan:
1. Dumps the ACPI tables as AML on the disk.
2. Runs iasl to disassembly the tables into ASL files.
3. Runs iasl to disassembly the offline AML files.
3. Compares them with expected offline ASL files.
- the test runs for both default machine and q35.
Looks good to me overall.
One thing I'd like to ask is that you add a script to run after ACPI tables are updated.
It could update both pre-generated hex files and the expected files.
Quoted 3 lines
- in case the test fails, it can be easily tweaked to show the differences between the ASL files and understand the issue.
How exactly does it need to be tweaked?
Quoted 42 lines
Patches:
1/3 - expected aml files
2/3 - creates links for the expected files
if the build directory is not current
3/3 - the test
Marcel Apfelbaum (3):
acpi unit-test: add test files
configure: added acpi unit-test files
acpi unit-test: compare DSDT and SSDT tables against expected valuesconfigure | 4 + tests/acpi-test-data/pc/APIC | Bin 0 -> 120 bytes tests/acpi-test-data/pc/DSDT | Bin 0 -> 4407 bytes tests/acpi-test-data/pc/FACP | Bin 0 -> 116 bytes tests/acpi-test-data/pc/FACS | Bin 0 -> 64 bytes tests/acpi-test-data/pc/HPET | Bin 0 -> 56 bytes tests/acpi-test-data/pc/SSDT | Bin 0 -> 2104 bytes tests/acpi-test-data/q35/APIC | Bin 0 -> 120 bytes tests/acpi-test-data/q35/DSDT | Bin 0 -> 7344 bytes tests/acpi-test-data/q35/FACP | Bin 0 -> 116 bytes tests/acpi-test-data/q35/FACS | Bin 0 -> 64 bytes tests/acpi-test-data/q35/HPET | Bin 0 -> 56 bytes tests/acpi-test-data/q35/MCFG | Bin 0 -> 60 bytes tests/acpi-test-data/q35/SSDT | Bin 0 -> 2104 bytes tests/acpi-test.c | 257 ++++++++++++++++++++++++++++++++++++++---- 15 files changed, 240 insertions(+), 21 deletions(-) create mode 100644 tests/acpi-test-data/pc/APIC create mode 100644 tests/acpi-test-data/pc/DSDT create mode 100644 tests/acpi-test-data/pc/FACP create mode 100644 tests/acpi-test-data/pc/FACS create mode 100644 tests/acpi-test-data/pc/HPET create mode 100644 tests/acpi-test-data/pc/SSDT create mode 100644 tests/acpi-test-data/q35/APIC create mode 100644 tests/acpi-test-data/q35/DSDT create mode 100644 tests/acpi-test-data/q35/FACP create mode 100644 tests/acpi-test-data/q35/FACS create mode 100644 tests/acpi-test-data/q35/HPET create mode 100644 tests/acpi-test-data/q35/MCFG create mode 100644 tests/acpi-test-data/q35/SSDTSignature · 1 line
1.8.3.1
Quoted 10 lines · Michael S. Tsirkin
Quoted 8 lines · Marcel Apfelbaum
The test:
- runs only if iasl is installed on the host machine.
- the test plan:
1. Dumps the ACPI tables as AML on the disk.
2. Runs iasl to disassembly the tables into ASL files.
3. Runs iasl to disassembly the offline AML files.
3. Compares them with expected offline ASL files.
- the test runs for both default machine and q35.
Quoted 5 lines
Looks good to me overall.
One thing I'd like to ask is that you add a script to run after ACPI tables are updated.
It could update both pre-generated hex files and the expected files.
I don't think that I understand, what is the script's purpose?
Quoted 6 lines
Quoted 4 lines
- in case the test fails, it can be easily tweaked to show the differences between the ASL files and understand the issue.
How exactly does it need to be tweaked?
Instead of the assert that is failing when the asl files are not the same, one could print them to console. Another thing that can be done is to print to console the dumped asl file names and manually do the diff.
Thanks,
Marcel
Quoted 43 lines
Quoted 43 lines
Patches:
1/3 - expected aml files
2/3 - creates links for the expected files
if the build directory is not current
3/3 - the test
Marcel Apfelbaum (3):
acpi unit-test: add test files
configure: added acpi unit-test files
acpi unit-test: compare DSDT and SSDT tables against expected valuesconfigure | 4 + tests/acpi-test-data/pc/APIC | Bin 0 -> 120 bytes tests/acpi-test-data/pc/DSDT | Bin 0 -> 4407 bytes tests/acpi-test-data/pc/FACP | Bin 0 -> 116 bytes tests/acpi-test-data/pc/FACS | Bin 0 -> 64 bytes tests/acpi-test-data/pc/HPET | Bin 0 -> 56 bytes tests/acpi-test-data/pc/SSDT | Bin 0 -> 2104 bytes tests/acpi-test-data/q35/APIC | Bin 0 -> 120 bytes tests/acpi-test-data/q35/DSDT | Bin 0 -> 7344 bytes tests/acpi-test-data/q35/FACP | Bin 0 -> 116 bytes tests/acpi-test-data/q35/FACS | Bin 0 -> 64 bytes tests/acpi-test-data/q35/HPET | Bin 0 -> 56 bytes tests/acpi-test-data/q35/MCFG | Bin 0 -> 60 bytes tests/acpi-test-data/q35/SSDT | Bin 0 -> 2104 bytes tests/acpi-test.c | 257 ++++++++++++++++++++++++++++++++++++++---- 15 files changed, 240 insertions(+), 21 deletions(-) create mode 100644 tests/acpi-test-data/pc/APIC create mode 100644 tests/acpi-test-data/pc/DSDT create mode 100644 tests/acpi-test-data/pc/FACP create mode 100644 tests/acpi-test-data/pc/FACS create mode 100644 tests/acpi-test-data/pc/HPET create mode 100644 tests/acpi-test-data/pc/SSDT create mode 100644 tests/acpi-test-data/q35/APIC create mode 100644 tests/acpi-test-data/q35/DSDT create mode 100644 tests/acpi-test-data/q35/FACP create mode 100644 tests/acpi-test-data/q35/FACS create mode 100644 tests/acpi-test-data/q35/HPET create mode 100644 tests/acpi-test-data/q35/MCFG create mode 100644 tests/acpi-test-data/q35/SSDTSignature · 1 line
1.8.3.1
Quoted 11 lines · Marcel Apfelbaum
Quoted 10 lines · Michael S. Tsirkin
Quoted 8 lines · Marcel Apfelbaum
The test:
- runs only if iasl is installed on the host machine.
- the test plan:
1. Dumps the ACPI tables as AML on the disk.
2. Runs iasl to disassembly the tables into ASL files.
3. Runs iasl to disassembly the offline AML files.
3. Compares them with expected offline ASL files.
- the test runs for both default machine and q35.
Quoted 7 lines
Quoted 5 lines
Looks good to me overall.
One thing I'd like to ask is that you add a script to run after ACPI tables are updated.
It could update both pre-generated hex files and the expected files.I don't think that I understand, what is the script's purpose?
Update aml in git after we make source changes.
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
- in case the test fails, it can be easily tweaked to show the differences between the ASL files and understand the issue.
Quoted 8 lines
Quoted 1 line
How exactly does it need to be tweaked?
Instead of the assert that is failing when the asl files are not the same, one could print them to console. Another thing that can be done is to print to console the dumped asl file names and manually do the diff.
Thanks,
Marcel
Can this be done automatically e.g. before the assert? Alternatively add a comment so people know what to do and where.
Quoted 45 lines
Quoted 43 lines
Quoted 43 lines
Patches:
1/3 - expected aml files
2/3 - creates links for the expected files
if the build directory is not current
3/3 - the test
Marcel Apfelbaum (3):
acpi unit-test: add test files
configure: added acpi unit-test files
acpi unit-test: compare DSDT and SSDT tables against expected valuesconfigure | 4 + tests/acpi-test-data/pc/APIC | Bin 0 -> 120 bytes tests/acpi-test-data/pc/DSDT | Bin 0 -> 4407 bytes tests/acpi-test-data/pc/FACP | Bin 0 -> 116 bytes tests/acpi-test-data/pc/FACS | Bin 0 -> 64 bytes tests/acpi-test-data/pc/HPET | Bin 0 -> 56 bytes tests/acpi-test-data/pc/SSDT | Bin 0 -> 2104 bytes tests/acpi-test-data/q35/APIC | Bin 0 -> 120 bytes tests/acpi-test-data/q35/DSDT | Bin 0 -> 7344 bytes tests/acpi-test-data/q35/FACP | Bin 0 -> 116 bytes tests/acpi-test-data/q35/FACS | Bin 0 -> 64 bytes tests/acpi-test-data/q35/HPET | Bin 0 -> 56 bytes tests/acpi-test-data/q35/MCFG | Bin 0 -> 60 bytes tests/acpi-test-data/q35/SSDT | Bin 0 -> 2104 bytes tests/acpi-test.c | 257 ++++++++++++++++++++++++++++++++++++++---- 15 files changed, 240 insertions(+), 21 deletions(-) create mode 100644 tests/acpi-test-data/pc/APIC create mode 100644 tests/acpi-test-data/pc/DSDT create mode 100644 tests/acpi-test-data/pc/FACP create mode 100644 tests/acpi-test-data/pc/FACS create mode 100644 tests/acpi-test-data/pc/HPET create mode 100644 tests/acpi-test-data/pc/SSDT create mode 100644 tests/acpi-test-data/q35/APIC create mode 100644 tests/acpi-test-data/q35/DSDT create mode 100644 tests/acpi-test-data/q35/FACP create mode 100644 tests/acpi-test-data/q35/FACS create mode 100644 tests/acpi-test-data/q35/HPET create mode 100644 tests/acpi-test-data/q35/MCFG create mode 100644 tests/acpi-test-data/q35/SSDTSignature · 1 line
1.8.3.1