From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57769) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dcCuD-0003wo-P2 for qemu-devel@nongnu.org; Mon, 31 Jul 2017 11:46:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dcCuB-0008I9-6c for qemu-devel@nongnu.org; Mon, 31 Jul 2017 11:46:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58080) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dcCuB-0008He-0k for qemu-devel@nongnu.org; Mon, 31 Jul 2017 11:46:51 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6044F5DD9B for ; Mon, 31 Jul 2017 15:41:01 +0000 (UTC) From: Igor Mammedov Date: Mon, 31 Jul 2017 17:40:48 +0200 Message-Id: <1501515652-33372-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1501515652-33372-1-git-send-email-imammedo@redhat.com> References: <1501515652-33372-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH for-2.10 1/5] tests: acpi: move tested tables array allocation outside of test_acpi_dsdt_table() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Marcel Apfelbaum at best it's confusing that array for list of tables to be tested against reference tables is allocated within test_acpi_dsdt_table() and at worst it would just overwrite list of tables if they were added before test_acpi_dsdt_table(). Move array initialization to test_acpi_one() before we start processing tables. Signed-off-by: Igor Mammedov --- tests/bios-tables-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 63da978..b72fa80 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -229,12 +229,11 @@ static void test_acpi_dsdt_table(test_data *data) uint32_t addr = data->fadt_table.dsdt; memset(&dsdt_table, 0, sizeof(dsdt_table)); - data->tables = g_array_new(false, true, sizeof(AcpiSdtTable)); test_dst_table(&dsdt_table, addr); ACPI_ASSERT_CMP(dsdt_table.header.signature, "DSDT"); - /* Place DSDT first */ + /* Since DSDT isn't in RSDT, add DSDT to ASL test tables list manually */ g_array_append_val(data->tables, dsdt_table); } @@ -634,6 +633,7 @@ static void test_acpi_one(const char *params, test_data *data) boot_sector_test(); + data->tables = g_array_new(false, true, sizeof(AcpiSdtTable)); test_acpi_rsdp_address(data); test_acpi_rsdp_table(data); test_acpi_rsdt_table(data); -- 2.7.4