From nobody Tue May 7 03:24:48 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=1562577938; cv=none; d=zoho.com; s=zohoarc; b=Q6rZJg925wjoPHT9nbEYsNFKhP+3z0yOULi5rO4lCkT6ZyrCkmCWXiIhDbPrI32OBna+UXqwwNs/Tdkd3C85d0whkI2vOTqHUrBgKcVPt7oKoDgjt0Z9UKo93V5w69YUkAvE6kAxPPRqZ9reecWOPraEEMjEok21+cNILsMyi2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562577938; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=hFpy0qLmscn5yXQ94btf6Vy6bTwvzEpOexygatJoI/I=; b=bf53ibDKcMiWHhILzz10vcxYZua5i2+tosunNu68pK0Vzk9eY6OdNU4LSlMNf9J2P7uacsZ8fMaWh5Qhorxgmjvn/sxMn0odMeLVKLp6nMXMDAtC7Tb7cWBmJIzhbc0IurYYrTF1ak+ablLsDgasAjfLIP9NeZPAgfEhZEh1LNY= 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 1562577938095281.2662478366576; Mon, 8 Jul 2019 02:25:38 -0700 (PDT) Received: from localhost ([::1]:39720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkPtw-0005un-2l for importer@patchew.org; Mon, 08 Jul 2019 05:25:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45727) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkPsk-0004sT-Ru for qemu-devel@nongnu.org; Mon, 08 Jul 2019 05:24:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkPsk-0000rq-0U for qemu-devel@nongnu.org; Mon, 08 Jul 2019 05:24:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45690) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hkPsj-0000rT-Ry for qemu-devel@nongnu.org; Mon, 08 Jul 2019 05:24:21 -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 920A781E0D for ; Mon, 8 Jul 2019 09:24:18 +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 E468D4FF26; Mon, 8 Jul 2019 09:24:16 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 8 Jul 2019 05:24:09 -0400 Message-Id: <20190708092410.11167-2-imammedo@redhat.com> In-Reply-To: <20190708092410.11167-1-imammedo@redhat.com> References: <20190708092410.11167-1-imammedo@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 08 Jul 2019 09:24:18 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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 v3 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-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: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Eric Auger --- 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 7 03:24:48 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=1562577966; cv=none; d=zoho.com; s=zohoarc; b=UqWaRYCnbHOuqFQ4x0t3ttLgxuMOifo2l+t3FKkbpc9nc40t8HxrVWEgrcX5pZ26FKK8zJXgGOMvkQpFIPWXRTHaH3bKY3FtH0/bqKeMtywVRhXC1VSOQYEhlAMMBNm4+AWuDE6WyR5gfCEDq895vxbw5KQ7vRUOtPEYbcLmQX4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562577966; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=t5hW9rBCfp6hbZ9NAE92NvoKN/fixcXsVKt5hNsFbpg=; b=f0iwCfXJqGTpivJ+1txHuzHa0YEVUlD1N9WZECzN1Tmenq0xBrRI9m8r4RXr5+cwEuPFvCnH2xbAANhNo9N2QqH1IgaSXBtsfEbIP91QuxkPWIjlD3a58kbS8PFkYRLPLJFefF8d0UGyM5s9s1pxCtmUr7nKLEPeVKYnHoceLN4= 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 1562577966409372.966811600101; Mon, 8 Jul 2019 02:26:06 -0700 (PDT) Received: from localhost ([::1]:39724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkPuN-0006Pz-8q for importer@patchew.org; Mon, 08 Jul 2019 05:26:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45754) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkPss-0004yo-9d for qemu-devel@nongnu.org; Mon, 08 Jul 2019 05:24:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkPsq-0000uW-AX for qemu-devel@nongnu.org; Mon, 08 Jul 2019 05:24:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45734) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hkPsq-0000tl-5H for qemu-devel@nongnu.org; Mon, 08 Jul 2019 05:24:28 -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 A99B081E0E for ; Mon, 8 Jul 2019 09:24:21 +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 D7EAB2B1BB; Mon, 8 Jul 2019 09:24:18 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 8 Jul 2019 05:24:10 -0400 Message-Id: <20190708092410.11167-3-imammedo@redhat.com> In-Reply-To: <20190708092410.11167-1-imammedo@redhat.com> References: <20190708092410.11167-1-imammedo@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 08 Jul 2019 09:24:21 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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 v3 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-Type: text/plain; charset="utf-8" tests do binary comparision 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 --- v2: - fix typo in commit message Eric Auger 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