[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/29] acpi unit-test: resolved iasl crash
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 14/29] acpi unit-test: resolved iasl crash |
Date: |
Mon, 20 Jan 2014 16:10:08 +0200 |
From: Marcel Apfelbaum <address@hidden>
It seems that iasl has an issue when disassembles
some ACPI tables using the command line:
iasl -e DSDT -e SSDT -d HPET
Modified the iasl command line to "iasl -d HPET"
until the problem is solved. The command line
remained the same for DSDT and SSDT tables.
Reported-by: Michael S. Tsirkin <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/acpi-test.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/tests/acpi-test.c b/tests/acpi-test.c
index a3d2b34..6095d07 100644
--- a/tests/acpi-test.c
+++ b/tests/acpi-test.c
@@ -23,6 +23,7 @@
#define MACHINE_Q35 "q35"
#define ACPI_REBUILD_EXPECTED_AML "TEST_ACPI_REBUILD_AML"
+#define ACPI_SSDT_SIGNATURE 0x54445353 /* SSDT */
/* DSDT and SSDTs format */
typedef struct {
@@ -403,6 +404,11 @@ static void dump_aml_files(test_data *data, bool rebuild)
}
}
+static bool compare_signature(AcpiSdtTable *sdt, uint32_t signature)
+{
+ return sdt->header.signature == signature;
+}
+
static void load_asl(GArray *sdts, AcpiSdtTable *sdt)
{
AcpiSdtTable *temp;
@@ -419,9 +425,15 @@ static void load_asl(GArray *sdts, AcpiSdtTable *sdt)
/* 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);
+ if (compare_signature(sdt, ACPI_DSDT_SIGNATURE) ||
+ compare_signature(sdt, ACPI_SSDT_SIGNATURE)) {
+ for (i = 0; i < sdts->len; ++i) {
+ temp = &g_array_index(sdts, AcpiSdtTable, i);
+ if (compare_signature(temp, ACPI_DSDT_SIGNATURE) ||
+ compare_signature(temp, ACPI_SSDT_SIGNATURE)) {
+ g_string_append_printf(command_line, "-e %s ", temp->aml_file);
+ }
+ }
}
g_string_append_printf(command_line, "-d %s", sdt->aml_file);
--
MST
- [Qemu-devel] [PULL 03/29] ACPI: Fix AppleSMC _STA size, (continued)
- [Qemu-devel] [PULL 03/29] ACPI: Fix AppleSMC _STA size, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 05/29] acpi unit-test: add test files, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 06/29] configure: added acpi unit-test files, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 07/29] acpi unit-test: compare DSDT and SSDT tables against expected values, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 08/29] configure: add CONFIG_IASL to config-host.h, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 09/29] acpi unit-test: extract iasl executable from configuration, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 10/29] acpi unit-test: added script to rebuild the expected aml files, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 11/29] acpi unit-test: hook to rebuild expected aml files, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 12/29] tests: fix acpi to work on bigendian host, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 13/29] acpi unit-test: renamed ssdt_tables to tables, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 14/29] acpi unit-test: resolved iasl crash,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 15/29] acpi unit-test: do not fail on asl mismatch, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 16/29] pc: make: fix dependencies: rebuild when included file is changed, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 17/29] pci: add pci_for_each_bus_depth_first, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 18/29] pcihp: generalization of piix4 acpi, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 20/29] acpi-build: enable hotplug for PCI bridges, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 24/29] pc: PIIX DSDT: exclude CPU/PCI hotplug & GPE0 IO range from PCI bus resources, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 23/29] pc: set PRST base in DSDT depending on chipset, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 25/29] pc: Q35 DSDT: exclude CPU hotplug IO range from PCI bus resources, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 26/29] pc: ACPI: expose PRST IO range via _CRS, Michael S. Tsirkin, 2014/01/20
- [Qemu-devel] [PULL 27/29] pc: ACPI: unify source of CPU hotplug IO base/len, Michael S. Tsirkin, 2014/01/20