From nobody Tue May 21 16:07:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562229110; cv=none; d=zoho.com; s=zohoarc; b=WD1biuZSwzzy0EQYEtXuCpXXHcorQAd+npHlg537MxDxF6AFRCg5gW7GMhi3e3e9SSYtYwWeTD/fNhBDOK+DbjaN2x0TI0HTvmXzlG/RCFKFFPilmE8ChkP/N2EqcHvaEa16LRa49urA3yslRBRqT6HKcB911m+ZU3qWHugl/RA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562229110; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=FnLEq05xCYHoUKDWdvfjrwIct7PSNe3TjTNUf8JwDwo=; b=SvK8bW1C5UjYYJEls23vlwB9aKCefDSeQyMd+DgsaixnLwH5Td54mTsK4GWHD3Ulx01ijMfHoAngbG3GHrnv1AiY7jw2w10355hO3pASSMtIQcwD9gLVW/MaKSiVUHNvwTSEOTnYPhdiPHm8lvKwzMj/eZruS4nat1F3/KW3adU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562229110255658.5026407965347; Thu, 4 Jul 2019 01:31:50 -0700 (PDT) Received: from localhost ([::1]:43526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hix9h-0005e3-BN for importer@patchew.org; Thu, 04 Jul 2019 04:31:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54105) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hix6B-0002vp-Iu for qemu-devel@nongnu.org; Thu, 04 Jul 2019 04:28:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hix69-0001mb-CM for qemu-devel@nongnu.org; Thu, 04 Jul 2019 04:28:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7394) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hix61-0001eU-Cb for qemu-devel@nongnu.org; Thu, 04 Jul 2019 04:28:04 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A100A37F43 for ; Thu, 4 Jul 2019 08:27:52 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0874259441; Thu, 4 Jul 2019 08:27:47 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 4 Jul 2019 04:27:35 -0400 Message-Id: <20190704082736.25258-2-imammedo@redhat.com> In-Reply-To: <20190704082736.25258-1-imammedo@redhat.com> References: <20190704082736.25258-1-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 04 Jul 2019 08:27:52 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] tests: acpi: do not require IASL for dumping AML blobs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" IASL isn't needed when dumping ACPI tables from guest for rebuild purposes. So move this part out from IASL branch. Makes rebuild-expected-aml.sh work without IASL installed on host. Signed-off-by: Igor Mammedov Reviewed-by: Eric Auger Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/bios-tables-test.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index d863233fe9..13bd166b81 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -597,12 +597,10 @@ static void test_acpi_one(const char *params, test_da= ta *data) test_acpi_rxsdt_table(data); test_acpi_fadt_table(data); =20 - if (iasl) { - if (getenv(ACPI_REBUILD_EXPECTED_AML)) { - dump_aml_files(data, true); - } else { - test_acpi_asl(data); - } + if (getenv(ACPI_REBUILD_EXPECTED_AML)) { + dump_aml_files(data, true); + } else if (iasl) { + test_acpi_asl(data); } =20 /* --=20 2.18.1 From nobody Tue May 21 16:07:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562228992; cv=none; d=zoho.com; s=zohoarc; b=bo5r0tElpfpy5Ty/h5Ozz2zImsQy47VpjraAea3wAQ+Qk4vFNpKilErpNGrs4NPgMjfZZuGt7U1bLVNjgGCi7c3xXe3BrYcrb06p0VtGUtf/9iUwvuDz97WvpdrcXJKWDNIHzu47+j1DvcvL6RMaweJqgxKVWCr0EN9LvGXcYz4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562228992; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=PLrhPna3lbWX2cMkcXJYh7GLwKiIOBKcnG6d9gCqzw8=; b=Ug3KsasuDIgWP0AKZNkYm5hlPhrDsPOwCAonoz2cc1GiOdfZHvdQGhxcPGb6GurzQp8XjI3JDqsBKowhnovPpnr/alG5DBpJM+USXTdPxXglZ18YxmaqoCB/WsLLq8gCz1p9Q4D4M14gT9mp3+4fMV+gj9J73YoFpOjWnrIQRb0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562228992838422.2559389973113; Thu, 4 Jul 2019 01:29:52 -0700 (PDT) Received: from localhost ([::1]:43510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hix7k-0003qy-HO for importer@patchew.org; Thu, 04 Jul 2019 04:29:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54106) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hix6B-0002vq-Iy for qemu-devel@nongnu.org; Thu, 04 Jul 2019 04:28:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hix69-0001mj-Dk for qemu-devel@nongnu.org; Thu, 04 Jul 2019 04:28:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52722) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hix64-0001ec-WA for qemu-devel@nongnu.org; Thu, 04 Jul 2019 04:28:07 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 91DB6308216C for ; Thu, 4 Jul 2019 08:27:53 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id E47215944E; Thu, 4 Jul 2019 08:27:52 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 4 Jul 2019 04:27:36 -0400 Message-Id: <20190704082736.25258-3-imammedo@redhat.com> In-Reply-To: <20190704082736.25258-1-imammedo@redhat.com> References: <20190704082736.25258-1-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 04 Jul 2019 08:27:53 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] tests: acpi: do not skip tests when IASL is not installed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" tests do binary comparition so we can check tables without IASL. Move IASL condition right before decompilation step and skip it if IASL is not installed. Signed-off-by: Igor Mammedov Reviewed-by: Eric Auger Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/bios-tables-test.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 13bd166b81..a356ac3489 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -389,6 +389,14 @@ static void test_acpi_asl(test_data *data) all_tables_match =3D all_tables_match && test_acpi_find_diff_allowed(exp_sdt); =20 + /* + * don't try to decompile if IASL isn't present, in this case user + * will just 'get binary file mismatch' warnings and test failure + */ + if (!iasl) { + continue; + } + err =3D load_asl(data->tables, sdt); asl =3D normalize_asl(sdt->asl); =20 @@ -431,6 +439,11 @@ static void test_acpi_asl(test_data *data) g_string_free(asl, true); g_string_free(exp_asl, true); } + if (!iasl && !all_tables_match) { + fprintf(stderr, "to see ASL diff between mismatched files install = IASL," + " rebuild QEMU from scratch and re-run tests with V=3D1" + " environment variable set"); + } g_assert(all_tables_match); =20 free_test_data(&exp_data); @@ -599,7 +612,7 @@ static void test_acpi_one(const char *params, test_data= *data) =20 if (getenv(ACPI_REBUILD_EXPECTED_AML)) { dump_aml_files(data, true); - } else if (iasl) { + } else { test_acpi_asl(data); } =20 --=20 2.18.1