From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W08W8-0000C2-Jt for qemu-devel@nongnu.org; Mon, 06 Jan 2014 06:38:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W08W3-0006qQ-73 for qemu-devel@nongnu.org; Mon, 06 Jan 2014 06:38:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:11284) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W08W2-0006q5-Sn for qemu-devel@nongnu.org; Mon, 06 Jan 2014 06:38:43 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s06BcfHF007126 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 6 Jan 2014 06:38:41 -0500 Date: Mon, 6 Jan 2014 13:43:09 +0200 From: "Michael S. Tsirkin" Message-ID: <20140106114309.GA29689@redhat.com> References: <1388320370-28732-1-git-send-email-marcel.a@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1388320370-28732-1-git-send-email-marcel.a@redhat.com> Subject: Re: [Qemu-devel] [PATCH] acpi unit-test: resolved iasl crash List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcel Apfelbaum Cc: qemu-devel@nongnu.org On Sun, Dec 29, 2013 at 02:32:50PM +0200, Marcel Apfelbaum wrote: > It seems that iasl has an issue when disassembles > some ACPI tables using the command line: > iasl -e DSDT -e SSDT -d HPET > I opened a bug on iasl project: > https://github.com/acpica/acpica/issues/20 > > 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 space needed after : > Signed-off-by: Marcel Apfelbaum > --- > tests/acpi-test.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/tests/acpi-test.c b/tests/acpi-test.c > index 2d32b69..26d2e26 100644 > --- a/tests/acpi-test.c > +++ b/tests/acpi-test.c > @@ -403,7 +403,7 @@ static void dump_aml_files(test_data *data, bool rebuild) > } > } > > -static void load_asl(GArray *sdts, AcpiSdtTable *sdt) > +static void load_asl(GArray *sdts, AcpiSdtTable *sdt, bool referenceDsdt) > { > AcpiSdtTable *temp; > GError *error = NULL; > @@ -419,9 +419,11 @@ 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 (referenceDsdt) { > + 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); > > @@ -510,14 +512,14 @@ static void test_acpi_asl(test_data *data) > dump_aml_files(data, false); > for (i = 0; i < data->ssdt_tables->len; ++i) { > GString *asl, *exp_asl; > - > + bool referenceDsdt = (i < 2); /* only for DSDT and SSDT */ Please don't use camelCase for variables. Can we check the table signature instead of looking at the index? > 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); > + load_asl(data->ssdt_tables, sdt, referenceDsdt); > asl = normalize_asl(sdt->asl); > > - load_asl(exp_data.ssdt_tables, exp_sdt); > + load_asl(exp_data.ssdt_tables, exp_sdt, referenceDsdt); > exp_asl = normalize_asl(exp_sdt->asl); > > g_assert(!g_strcmp0(asl->str, exp_asl->str)); > -- > 1.8.3.1