Skip to contentSkip to conversation

acpi unit-test: extract iasl executable from configuration

PATCH Superseded Marcel Apfelbaum 3 participants 5 messages Dec 25, 2013

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover acpi unit-test: extract iasl executable from configuration

The test checked if iasl is installed by running "iasl" and checking the error output.
It is better to use the iasl executable as appears in configuration.

patch 1: exports IASL configuration option to config-host.h patch 2: acpi unit-test uses the exported CONFIG_IASL define

Marcel Apfelbaum (2):
configure: add CONFIG_IASL to config-host.h
acpi unit-test: extract iasl executable from configuration

 scripts/create_config |  4 ++++
 tests/acpi-test.c     | 31 ++++++++-----------------------
 2 files changed, 12 insertions(+), 23 deletions(-)
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/2 configure: add CONFIG_IASL to config-host.h

Acpi unit-tests will extract the iasl executable
from CONFIG_IASL define.

---
 scripts/create_config | 4 ++++
 1 file changed, 4 insertions(+)
scripts/create_config +4 -0
index b1adbf5..0478315 100755
@@ -26,6 +26,10 @@ case $line in
     # save for the next definitions
     prefix=${line#*=}
     ;;
+ IASL=*) # iasl executable
+    value=${line#*=}
+    echo "#define CONFIG_IASL \"$value\""
+    ;;
  CONFIG_AUDIO_DRIVERS=*)
     drivers=${line#*=}
     echo "#define CONFIG_AUDIO_DRIVERS \\"
Signature · 1 line
1.8.3.1
#2 lore raw

Re: [Qemu-devel] [PATCH 1/2] configure: add CONFIG_IASL to config-host.h

Quoted 4 lines · Marcel Apfelbaum

Acpi unit-tests will extract the iasl executable
from CONFIG_IASL define.

Added the maintainers of scripts/create_config,
sorry for not doing it in the first place.

Thanks,
Marcel

Quoted 19 lines
---
 scripts/create_config | 4 ++++
 1 file changed, 4 insertions(+)
scripts/create_config +4 -0
index b1adbf5..0478315 100755
@@ -26,6 +26,10 @@ case $line in
     # save for the next definitions
     prefix=${line#*=}
     ;;
+ IASL=*) # iasl executable
+    value=${line#*=}
+    echo "#define CONFIG_IASL \"$value\""
+    ;;
  CONFIG_AUDIO_DRIVERS=*)
     drivers=${line#*=}
     echo "#define CONFIG_AUDIO_DRIVERS \\"
#3 lore raw

Re: [Qemu-devel] [PATCH 1/2] configure: add CONFIG_IASL to config-host.h

In reply to Marcel Apfelbaum
Quoted 13 lines · Marcel Apfelbaum

Acpi unit-tests will extract the iasl executable
from CONFIG_IASL define.

---
 scripts/create_config | 4 ++++
 1 file changed, 4 insertions(+)
scripts/create_config +0 -0
index b1adbf5..0478315 100755

scripts/create_config case $line in · line 32

Quoted 7 lines
scripts/create_config +4 -0
@@ -26,6 +26,10 @@ case $line in
     # save for the next definitions
     prefix=${line#*=}
     ;;
+ IASL=*) # iasl executable
+    value=${line#*=}
+    echo "#define CONFIG_IASL \"$value\""
+    ;;

This won't work correctly if IASL includes any
special characters like \ or '.
It's a good idea to use preprocessor's # operator,
that escapes them properly.
We have a bunch of macros like this all over the place, short term you can introduce
#define CONFIG_STRINGIFY(x) #x
longer term we really want QEMU_STRINGIFY.

Quoted 5 lines
scripts/create_config +0 -0
  CONFIG_AUDIO_DRIVERS=*)
     drivers=${line#*=}
     echo "#define CONFIG_AUDIO_DRIVERS \\"
Signature · 1 line
1.8.3.1
#4 lore raw

PATCH 2/2 acpi unit-test: extract iasl executable from configuration

In reply to Marcel Apfelbaum

The test checked if iasl is installed by running "iasl" and checking the error output.
It is better to use the iasl executable as appears in configuration.

---
 tests/acpi-test.c | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)
tests/acpi-test.c +8 -23
index 4f0cca6..d9374f2 100644
@@ -127,6 +127,11 @@ static uint8_t boot_sector[0x7e000] = {
 
 static const char *disk = "tests/acpi-test-disk.raw";
 static const char *data_dir = "tests/acpi-test-data";
+#ifdef CONFIG_IASL
+static const char *iasl = CONFIG_IASL;
+#else
+static const char *iasl;
+#endif
 
 static void free_test_data(test_data *data)
 {
@@ -358,26 +363,6 @@ static void test_acpi_ssdt_tables(test_data *data)
     }
 }
 
-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);
-    }
-
-    if (out) {
-        g_free(out);
-    }
-
-    return ret;
-}
-
 static void dump_aml_files(test_data *data)
 {
     AcpiSdtTable *sdt;
@@ -402,7 +387,7 @@ static void load_asl(GArray *sdts, AcpiSdtTable *sdt)
 {
     AcpiSdtTable *temp;
     GError *error = NULL;
-    GString *command_line = g_string_new("'iasl' ");
+    GString *command_line = g_string_new(iasl);
     gint fd;
     gchar *out, *out_err;
     gboolean ret;
@@ -413,7 +398,7 @@ static void load_asl(GArray *sdts, AcpiSdtTable *sdt)
     close(fd);
 
     /* build command line */
-    g_string_append_printf(command_line, "-p %s ", sdt->asl_file);
+    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);
@@ -567,7 +552,7 @@ static void test_acpi_one(const char *params, test_data *data)
     test_acpi_dsdt_table(data);
     test_acpi_ssdt_tables(data);
 
-    if (iasl_installed()) {
+    if (iasl) {
         test_acpi_asl(data);
     }
 
Signature · 1 line
1.8.3.1