From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60194) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoRNF-0000lr-2B for qemu-devel@nongnu.org; Fri, 08 Apr 2016 04:02:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoRNA-0005iL-3P for qemu-devel@nongnu.org; Fri, 08 Apr 2016 04:02:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39727) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoRN9-0005i1-VB for qemu-devel@nongnu.org; Fri, 08 Apr 2016 04:02:32 -0400 Date: Fri, 8 Apr 2016 11:02:27 +0300 From: "Michael S. Tsirkin" Message-ID: <1460102154-16096-8-git-send-email-mst@redhat.com> References: <1460102154-16096-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1460102154-16096-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 07/15] tests/bios-tables-test: fix assert List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Marcel Apfelbaum , "Dr . David Alan Gilbert" , Gabriel Somlo , Wei Huang , Laszlo Ersek From: Marcel Apfelbaum Newer iasl does not add the aml file name to the Definition Block. See acpica tools commit 1ecbb3d5: "Emit the AMLFilename as a zero-length string. Allows the compiler to create the name later -- making it easier to rename the parent ASL (DSL) file." That causes an assert in acpi tests: tests/bios-tables-test.c:455:normalize_asl: assertion failed: (block_name) Fix it by striping the start of the definition block line until the first comma. The block name is always the first parameter and the grammar does not allow comma in between, so it is safe. Reported-by: Dr. David Alan Gilbert Signed-off-by: Marcel Apfelbaum Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/bios-tables-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 0a80ddf..0352814 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -432,7 +432,7 @@ static bool load_asl(GArray *sdts, AcpiSdtTable *sdt) #define COMMENT_END "*/" #define DEF_BLOCK "DefinitionBlock (" -#define BLOCK_NAME_END ".aml" +#define BLOCK_NAME_END "," static GString *normalize_asl(gchar *asl_code) { -- MST