[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/15] tests/bios-tables-test: fix assert
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 07/15] tests/bios-tables-test: fix assert |
Date: |
Fri, 8 Apr 2016 11:02:27 +0300 |
From: Marcel Apfelbaum <address@hidden>
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 <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/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
- [Qemu-devel] [PULL 00/15] pci, virtio, acpi: fixes for 2.6, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 01/15] acpi: Add missing GCC_FMT_ATTR, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 02/15] pci-testdev: fast mmio support, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 04/15] Sort the fw_cfg file list, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 03/15] xen: piix reuse pci generic class init function, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 05/15] Migration: Add i82801b11 migration data, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 06/15] virtio-balloon: reset the statistic timer to load device, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 07/15] tests/bios-tables-test: fix assert,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 08/15] virtio: make virtio_queue_notify_vq static, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 09/15] virtio-blk: fix disabled mode, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 10/15] virtio-scsi: fix disabled mode, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 11/15] virtio: add aio handler, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 13/15] virtio-scsi: use aio handler for data plane, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 15/15] hw/pci-bridge: Add missing unref in case register-bus fails, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 12/15] virtio-blk: use aio handler for data plane, Michael S. Tsirkin, 2016/04/08
- [Qemu-devel] [PULL 14/15] virtio: merge virtio_queue_aio_set_host_notifier_handler with virtio_queue_set_aio, Michael S. Tsirkin, 2016/04/08
- Re: [Qemu-devel] [PULL 00/15] pci, virtio, acpi: fixes for 2.6, Peter Maydell, 2016/04/08