From patchwork Tue Oct 10 07:49:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1845649 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=GYfFz5Kz; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S4Skq4ZKtz1yqN for ; Tue, 10 Oct 2023 18:50:59 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qq7VG-0008L2-Su; Tue, 10 Oct 2023 03:50:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qq7VF-0008KF-Sb for qemu-ppc@nongnu.org; Tue, 10 Oct 2023 03:50:05 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qq7VD-0004b1-3p for qemu-ppc@nongnu.org; Tue, 10 Oct 2023 03:50:05 -0400 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-533c8f8f91dso9350950a12.0 for ; Tue, 10 Oct 2023 00:50:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696924202; x=1697529002; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xBzDwZo1XeWt7ItIGhOXUN3QV+md3tt2cNhSMxgmiwU=; b=GYfFz5KzggGrfArSJY6N1EwatuHdkl8siUccOQeAkJ9tbk3lenbRt2fkvO2SYwWUF3 BAVcQ/AHYyIIVOzF2sSnFOT53rqYa/bEJPV0UL/AH4X/1R/ZkaBQdOmnjzTzr2wdv1Yg GrY+hdTlqFEKd9xPua/yJJqZf2Csz+KJmvonZpqyG/MqLXItbrWSVJxEMqy+VEIZ+lts 195qtfbBFHuTFyFavkxUtjsIXF3SeGrayJ0Wx7NTojcZzM+psQMcS77f9iKQUEgefIrU 0hD6Gf19yXcZPTitZCUJnxtWHq7B0CE4lneLA3I492crdA9TJrLIFRfZAwCo6Xg6DIpo 64oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696924202; x=1697529002; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xBzDwZo1XeWt7ItIGhOXUN3QV+md3tt2cNhSMxgmiwU=; b=UZGPVL7sIcZ9BXXtTqIQbeiXwYpQBrvs9CJzbzGNfo3hNXNr0YrHmAhceYm3bq+HeC mj4WFtW1eLHUII8E27p5NcV06xxySPPgbhzzCE00kJWrQ62UKEoJu/gSqGs62hgsUTIt ExYRj913muVQvvVz2xFuQMVzF/e7kQaxN51uUCUfta+EDlkzotw2TTGi7omEFNk1dVjq yK4CTJlZXChIMIuNnfSaNwcVk1g26g9S+8pdAEeRgZZpz8oUa6KTvkh4nszj5E50Wv/i 31ultKEgSovLg79KpPycFuIJWFevqranvUg7IhJYAaNKU0NEw3D5+O3g1k/1u+5mDYdJ I4Rw== X-Gm-Message-State: AOJu0Yz9wGQbW7I62auAldnffw3hTy2dYblPsrArCrLHuGzpdtYf+lMT JNQIhnEqoC2+bQFcYZ86xszZUI3v2BN+hsaKVyEuQw== X-Google-Smtp-Source: AGHT+IFQGorWt50yPZp6SZlf30MT4LJGbzbBrBk41keq9CJV1abUY1y/RVlMjL7hIVgZoMmgXiOLig== X-Received: by 2002:a17:906:8455:b0:9ae:62ec:e897 with SMTP id e21-20020a170906845500b009ae62ece897mr15259871ejy.4.1696924201747; Tue, 10 Oct 2023 00:50:01 -0700 (PDT) Received: from m1x-phil.lan (aif79-h01-176-172-113-148.dsl.sta.abo.bbox.fr. [176.172.113.148]) by smtp.gmail.com with ESMTPSA id a14-20020a17090680ce00b0099cb1a2cab0sm8012503ejx.28.2023.10.10.00.50.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Oct 2023 00:50:01 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , qemu-ppc@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-arm@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Laurent Vivier Subject: [PATCH 1/4] tests/libqtest: Introduce qtest_get_arch_bits() Date: Tue, 10 Oct 2023 09:49:49 +0200 Message-ID: <20231010074952.79165-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231010074952.79165-1-philmd@linaro.org> References: <20231010074952.79165-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=philmd@linaro.org; helo=mail-ed1-x52a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-ppc@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add a method to return the architecture bits (currently 8/32/64). Signed-off-by: Philippe Mathieu-Daudé --- tests/qtest/libqtest.h | 8 ++++++++ tests/qtest/libqtest.c | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqtest.h index e53e350e3a..1e1b42241d 100644 --- a/tests/qtest/libqtest.h +++ b/tests/qtest/libqtest.h @@ -654,6 +654,14 @@ bool qtest_big_endian(QTestState *s); */ const char *qtest_get_arch(void); +/** + * qtest_get_arch_bits: + * + * Returns: The architecture bits (a.k.a. word size) for the QEMU executable + * under test. + */ +unsigned qtest_get_arch_bits(void); + /** * qtest_has_accel: * @accel_name: Accelerator name to check for. diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index b1eba71ffe..a643a6309c 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -925,6 +925,27 @@ const char *qtest_get_arch(void) return end + 1; } +unsigned qtest_get_arch_bits(void) +{ + static const char *const arch64[] = { + "aarch64", "hppa", "x86_64", "loongarch64", "mips64", + "mips64el", "ppc64", "riscv64", "s390x", "sparc64", + }; + const char *arch = qtest_get_arch(); + + if (!strcmp(arch, "avr")) { + return 8; + } + + for (unsigned i = 0; i < ARRAY_SIZE(arch64); i++) { + if (!strcmp(arch, arch64[i])) { + return 64; + } + } + + return 32; +} + bool qtest_has_accel(const char *accel_name) { if (g_str_equal(accel_name, "tcg")) { From patchwork Tue Oct 10 07:49:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1845648 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=qEGgL0AW; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S4SkL73n5z1yqN for ; Tue, 10 Oct 2023 18:50:34 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qq7VS-0008Qp-LV; Tue, 10 Oct 2023 03:50:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qq7VO-0008Mg-RU for qemu-ppc@nongnu.org; Tue, 10 Oct 2023 03:50:15 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qq7VJ-0004nx-FA for qemu-ppc@nongnu.org; Tue, 10 Oct 2023 03:50:11 -0400 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-53808d5b774so9566043a12.3 for ; Tue, 10 Oct 2023 00:50:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696924208; x=1697529008; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FJhi36jVylnj85gu6IQc1ZcAE1kH76mXKOCIios85AY=; b=qEGgL0AWm+HeJOAXc6t6IQsPDKvgzW96BJMaZixySWL+TeAz4jfnrHcwXEBnGW0Rlu roC3a6o9qKTJqAIzmQelIJKUv71Q38Lwm79NHAGy0p3+3KAYAEQfFhZ4DD3haN6n7Tiq qwnYGiY9AxGVtV9AlNnX5FG44KBOuXanqr6MhIK2QRpU4wcJ4bofiC+o4wmMT1CG2AIO wKYx/0V2dhMWPWoVoPww/tZ6gx2+GklUc8LrwelZ4uAKGfW56KX+L6i9FfR0iVUTcCLS Rb0l3GranegmLojexc29MMuE0BunJWyW8RPCvQavch6D4e09iQYz/TugggPsh8wyEErD fPfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696924208; x=1697529008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FJhi36jVylnj85gu6IQc1ZcAE1kH76mXKOCIios85AY=; b=N2Ar9PlWwm9cvnOumsR/I4ZJqTw1V6lDPLBbMC+uk0A2+ro+EYPgCrOqNtIKG4iyid aql7WBTfLTKdigNzhy0QpVtWGJ7EW1L7bdZHd5WsJ7Gmol09/vc7brlpFBoOIRR5MysA 5NrHh6CI/Aw6j3cE4ickKKaWpJhGuK5t8t2xf2o/+aTxEfkCKLKFa0a3m56UYkQId55K dF+/nz7uUjn13sgKDJ6udJv6PBwsSQnD+k8/Deiq50WnCH43W9QyGWhxTzWOKj8xWlFt q+4PeUW0ybFSH4QY67CoA4rZ6mgGd00uZKJ1y7ADvmEKDCNxDyF6MWUiHCaSyOyNi7wU y9FQ== X-Gm-Message-State: AOJu0YyjZmC1LBEjXxkru4M6lBKvJA5noH93mI07UaL2QADtIj3g7fLo 3z/P7W4pKYB2o7ymoGtxL918DA== X-Google-Smtp-Source: AGHT+IFVgI2xqatFWscv0PnIeGYbb4LpnbM0EIlDStGkK15CLtZCb/cUWX0GZO+Wy0qHg5G387NnoQ== X-Received: by 2002:a17:907:7603:b0:9b2:b633:ada2 with SMTP id jx3-20020a170907760300b009b2b633ada2mr15704652ejc.36.1696924208060; Tue, 10 Oct 2023 00:50:08 -0700 (PDT) Received: from m1x-phil.lan (aif79-h01-176-172-113-148.dsl.sta.abo.bbox.fr. [176.172.113.148]) by smtp.gmail.com with ESMTPSA id lr5-20020a170906fb8500b009adcb6c0f0esm8004696ejb.193.2023.10.10.00.50.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Oct 2023 00:50:07 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , qemu-ppc@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-arm@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Peter Maydell , Laurent Vivier , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha Subject: [PATCH 2/4] tests/qtest: Use qtest_get_arch_bits() Date: Tue, 10 Oct 2023 09:49:50 +0200 Message-ID: <20231010074952.79165-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231010074952.79165-1-philmd@linaro.org> References: <20231010074952.79165-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=philmd@linaro.org; helo=mail-ed1-x52a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-ppc@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Ani Sinha --- tests/qtest/arm-cpu-features.c | 49 ++++++++++++++++------------------ tests/qtest/bios-tables-test.c | 16 +++++------ 2 files changed, 30 insertions(+), 35 deletions(-) diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c index a8a4c668ad..b6c1b430c1 100644 --- a/tests/qtest/arm-cpu-features.c +++ b/tests/qtest/arm-cpu-features.c @@ -462,7 +462,7 @@ static void test_query_cpu_model_expansion(const void *data) assert_has_not_feature(qts, "max", "kvm-no-adjvtime"); assert_has_not_feature(qts, "max", "kvm-steal-time"); - if (g_str_equal(qtest_get_arch(), "aarch64")) { + if (qtest_get_arch_bits() == 64) { assert_has_feature_enabled(qts, "max", "aarch64"); assert_has_feature_enabled(qts, "max", "sve"); assert_has_feature_enabled(qts, "max", "sve128"); @@ -507,7 +507,7 @@ static void test_query_cpu_model_expansion_kvm(const void *data) assert_set_feature(qts, "host", "kvm-no-adjvtime", true); assert_set_feature(qts, "host", "kvm-no-adjvtime", false); - if (g_str_equal(qtest_get_arch(), "aarch64")) { + if (qtest_get_arch_bits() == 64) { bool kvm_supports_steal_time; bool kvm_supports_sve; char max_name[8], name[8]; @@ -636,34 +636,31 @@ int main(int argc, char **argv) NULL, test_query_cpu_model_expansion); } - if (!g_str_equal(qtest_get_arch(), "aarch64")) { - goto out; - } - - /* - * For now we only run KVM specific tests with AArch64 QEMU in - * order avoid attempting to run an AArch32 QEMU with KVM on - * AArch64 hosts. That won't work and isn't easy to detect. - */ - if (qtest_has_accel("kvm")) { + if (qtest_get_arch_bits() == 64) { /* - * This tests target the 'host' CPU type, so register it only if - * KVM is available. + * For now we only run KVM specific tests with AArch64 QEMU in + * order avoid attempting to run an AArch32 QEMU with KVM on + * AArch64 hosts. That won't work and isn't easy to detect. */ - qtest_add_data_func("/arm/kvm/query-cpu-model-expansion", - NULL, test_query_cpu_model_expansion_kvm); + if (qtest_has_accel("kvm")) { + /* + * This tests target the 'host' CPU type, so register it only if + * KVM is available. + */ + qtest_add_data_func("/arm/kvm/query-cpu-model-expansion", + NULL, test_query_cpu_model_expansion_kvm); - qtest_add_data_func("/arm/kvm/query-cpu-model-expansion/sve-off", - NULL, sve_tests_sve_off_kvm); + qtest_add_data_func("/arm/kvm/query-cpu-model-expansion/sve-off", + NULL, sve_tests_sve_off_kvm); + } + + if (qtest_has_accel("tcg")) { + qtest_add_data_func("/arm/max/query-cpu-model-expansion/sve-max-vq-8", + NULL, sve_tests_sve_max_vq_8); + qtest_add_data_func("/arm/max/query-cpu-model-expansion/sve-off", + NULL, sve_tests_sve_off); + } } - if (qtest_has_accel("tcg")) { - qtest_add_data_func("/arm/max/query-cpu-model-expansion/sve-max-vq-8", - NULL, sve_tests_sve_max_vq_8); - qtest_add_data_func("/arm/max/query-cpu-model-expansion/sve-off", - NULL, sve_tests_sve_off); - } - -out: return g_test_run(); } diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index f8e03dfd46..7e708d78b3 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -2089,7 +2089,7 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/piix4/nohpet", test_acpi_piix4_tcg_nohpet); /* i386 does not support memory hotplug */ - if (strcmp(arch, "i386")) { + if (qtest_get_arch_bits() == 64) { qtest_add_func("acpi/piix4/memhp", test_acpi_piix4_tcg_memhp); qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm); @@ -2127,7 +2127,7 @@ int main(int argc, char *argv[]) test_acpi_q35_tcg_acpi_hmat_noinitiator); /* i386 does not support memory hotplug */ - if (strcmp(arch, "i386")) { + if (qtest_get_arch_bits() == 64) { qtest_add_func("acpi/q35/memhp", test_acpi_q35_tcg_memhp); qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm); qtest_add_func("acpi/q35/acpihmat", @@ -2164,15 +2164,13 @@ int main(int argc, char *argv[]) test_acpi_microvm_ioapic2_tcg); qtest_add_func("acpi/microvm/oem-fields", test_acpi_microvm_oem_fields); - if (has_tcg) { - if (strcmp(arch, "x86_64") == 0) { - qtest_add_func("acpi/microvm/pcie", - test_acpi_microvm_pcie_tcg); + if (has_tcg && qtest_get_arch_bits() == 64) { + qtest_add_func("acpi/microvm/pcie", + test_acpi_microvm_pcie_tcg); #ifdef CONFIG_POSIX - qtest_add_func("acpi/microvm/acpierst", - test_acpi_microvm_acpi_erst); + qtest_add_func("acpi/microvm/acpierst", + test_acpi_microvm_acpi_erst); #endif - } } } } else if (strcmp(arch, "aarch64") == 0) { From patchwork Tue Oct 10 07:49:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1845665 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=DcBXvfVQ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S4Slm28mvz1yqN for ; Tue, 10 Oct 2023 18:51:48 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qq7VX-0008Ry-2B; Tue, 10 Oct 2023 03:50:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qq7VU-0008RA-VA for qemu-ppc@nongnu.org; Tue, 10 Oct 2023 03:50:21 -0400 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qq7VP-0004om-2W for qemu-ppc@nongnu.org; Tue, 10 Oct 2023 03:50:20 -0400 Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-532c81b9adbso9312408a12.1 for ; Tue, 10 Oct 2023 00:50:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696924213; x=1697529013; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f2NufxNzPZ9pUF8PsDHQZGBUjEuicTHUoNMeMj86XSo=; b=DcBXvfVQsQKMYcBa7ze5LXhmP9fzdc3TRtHMyEZiz0FwptqGcQr7ro5QHSIiI/5qKZ q+4QvDDLgMk5KVqO3bkOLl/4HnvHK6kcqQP9PQm5+0iPMydINr55hb0FKWb/ze9BV4TF lLdUG7qtbgsyVRMs3lxUd1cKpsHXIbqUDRvrSKYQhPURFaoh2Ki7K/YH6aSQ86Qttfjx 20T3eafeZGG1xdqpgEvUDNOKL+MY1sSeJZMNLxRPMhQJw2PmHhzY9ji+PS1wzid6gEq1 o2UCD8mSN2nDLKH6ueB+/uZcXq9jZayTju2QN9QUiztzaF7TNjs66FQKSUlX/O1l8dBH /U9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696924213; x=1697529013; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f2NufxNzPZ9pUF8PsDHQZGBUjEuicTHUoNMeMj86XSo=; b=bohD3atUUssZeOhtwfzOinfS2MCrxgg+2ROZKfcReMmq0r7zjphiVs3rhVrLxq42G4 t7ZzUM2yFTlji6jzRXwaxF2SeDWyM4MOTTp6ZiLFFAlnyDCO4b/FmMglyEeLWmOhapQJ O5Qn9OwvCAmDl0FNzSZgOP6odWD5ljCVif0Jd2IKqSh9Lf3ozZ9DU+rjBOkwzYY8Su/X noGG9m7REblWg4iihMYFzft+1YD9zAtSmMQ44ET1UteKOMaEr6N5jiX/kdByCvEOO/GO URM6N0oiSgr8A6y7clfoV9pTrC28iaPa6OQUukGdTDkxCk5d3614uNUbsuJWV49wHx/S nv2Q== X-Gm-Message-State: AOJu0YzxunzhftBsPVZq/W8S2BpRIplD3bvPKBIE3LGuxfI/XYlquvRB KdcjtE+wuP+0KXo5Gt36jiq/Mw== X-Google-Smtp-Source: AGHT+IEg81lyQK+4P+iuRE5K/osIKaqgw2DTDRSNh7brZNSNguuQuf7Lsy24vNsO4ZymjcfJ2Qlqtg== X-Received: by 2002:aa7:c746:0:b0:52a:38c3:1b49 with SMTP id c6-20020aa7c746000000b0052a38c31b49mr13446577eds.40.1696924213730; Tue, 10 Oct 2023 00:50:13 -0700 (PDT) Received: from m1x-phil.lan (aif79-h01-176-172-113-148.dsl.sta.abo.bbox.fr. [176.172.113.148]) by smtp.gmail.com with ESMTPSA id ee48-20020a056402293000b0053120f313cbsm449545edb.39.2023.10.10.00.50.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Oct 2023 00:50:13 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , qemu-ppc@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-arm@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Laurent Vivier Subject: [PATCH 3/4] tests/libqtest: Introduce qtest_get_base_arch() Date: Tue, 10 Oct 2023 09:49:51 +0200 Message-ID: <20231010074952.79165-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231010074952.79165-1-philmd@linaro.org> References: <20231010074952.79165-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=philmd@linaro.org; helo=mail-ed1-x531.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-ppc@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org While qtest_get_arch() returns the target architecture name, such "i386" or "x86_64", qtest_get_base_arch() return the "base" (or real underlying) architecture, in this example that is "x86". Signed-off-by: Philippe Mathieu-Daudé --- tests/qtest/libqtest.h | 7 +++++++ tests/qtest/libqtest.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqtest.h index 1e1b42241d..54071e74ec 100644 --- a/tests/qtest/libqtest.h +++ b/tests/qtest/libqtest.h @@ -654,6 +654,13 @@ bool qtest_big_endian(QTestState *s); */ const char *qtest_get_arch(void); +/** + * qtest_get_base_arch: + * + * Returns: The base architecture for the QEMU executable under test. + */ +const char *qtest_get_base_arch(void); + /** * qtest_get_arch_bits: * diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index a643a6309c..51cc92af21 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -925,6 +925,34 @@ const char *qtest_get_arch(void) return end + 1; } +const char *qtest_get_base_arch(void) +{ + static const struct { + const char *const arch; + const char *const base; + } basearch[] = { + { "aarch64", "arm" }, + { "i386", "x86" }, + { "loongarch64", "loongarch" }, + { "mipsel", "mips" }, + { "mips64", "mips" }, + { "mips64el", "mips" }, + { "ppc64", "ppc" }, + { "riscv32", "riscv" }, + { "riscv64", "riscv" }, + { "sparc64", "sparc" }, + { "x86_64", "x86" }, + }; + const char *arch = qtest_get_arch(); + + for (unsigned i = 0; i < ARRAY_SIZE(basearch); i++) { + if (!strcmp(arch, basearch[i].arch)) { + return basearch[i].base; + } + } + g_assert_not_reached(); +} + unsigned qtest_get_arch_bits(void) { static const char *const arch64[] = { From patchwork Tue Oct 10 07:49:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1845667 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=cceNoSFK; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S4Sm336xcz1yqN for ; Tue, 10 Oct 2023 18:52:03 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qq7Ve-00007R-Im; Tue, 10 Oct 2023 03:50:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qq7VZ-0008Vf-I8 for qemu-ppc@nongnu.org; Tue, 10 Oct 2023 03:50:26 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qq7VW-0004rG-J6 for qemu-ppc@nongnu.org; Tue, 10 Oct 2023 03:50:24 -0400 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9adb9fa7200so1167168866b.0 for ; Tue, 10 Oct 2023 00:50:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696924221; x=1697529021; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zHkTGqBrVdowOzimiYZAy4nhJnGIbEuU9/oLP4xBoO4=; b=cceNoSFKiRjBVgQ279UCMOnks+WRv/wqAcmWADRh64kZSNpX6uMDlRc0uG+PjWMgyZ 5121OX6zCRUjwV2y1XcX0FIoSlwF+qSoe3isapsr/Mgvvm36AkgXQPrG2jgJaYGe6LxG HHHDOWY3nSKwiYpHSMFxrd/N27CsAhvsXOFOnt6rjktn+bikjA7yJxIw14rFrpc8r0bW ZX00EmWXS8/P+deo6HDXagLLhkgch6xTLSc06WeUilQiJAORMffRgGf69z/qIG3MbYBI wNK1FSxZ2TRv/wwPP489GZSINTPSR1XtG78LBcQFQcvK3rxYQJyO8rkuEGPW/lX+xu2m 4k3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696924221; x=1697529021; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zHkTGqBrVdowOzimiYZAy4nhJnGIbEuU9/oLP4xBoO4=; b=khpA24e+vHx6nxLBv0ZtOA3ygpymUNP0AK13HrhBjdB1/UVLa2dxPgvIz72bQqMptA Y2P/aa1ll4vwgeeWLiE25dmXrGbArcFhRZQdoj7LhJ7Kthevk8Bd74kTH9+WX97XB4/L DogDdUCCGmjLDFAFeidsyjtHOJZVHGgIOEOjS2cB4j+uPqC8ONTqgmoo0UwguULPGHm/ Vpo0mJ7Z46IHIdQ22iLkbptD62z+XZ5YbhpHdwKnoS9Z60jwO3SmIqB1vVPHm3Re6PO1 Sz+BJLSTTERZUNiFzv7e3dFoBBGkmed8rZlJfuQnqedi3v0FNmLEITwrkMIPNZccZcz8 e+4Q== X-Gm-Message-State: AOJu0YzUWZz2P1MOw47EkfPVy+XSPwhoiQauToXDfSA05tLzcdFolrhu gI8SnFfSFoZCGNtjg4QOomwzaA== X-Google-Smtp-Source: AGHT+IGBV1xu7EXLCmP/AvjFlZUZuctWNT4QEk1nU81sUkGz8CnHvzlSPbs42O5EOxrkS7eP2gLANw== X-Received: by 2002:a17:907:1c1e:b0:9a5:7dec:fab9 with SMTP id nc30-20020a1709071c1e00b009a57decfab9mr12453124ejc.9.1696924220956; Tue, 10 Oct 2023 00:50:20 -0700 (PDT) Received: from m1x-phil.lan (aif79-h01-176-172-113-148.dsl.sta.abo.bbox.fr. [176.172.113.148]) by smtp.gmail.com with ESMTPSA id lf8-20020a170906ae4800b00992e14af9c3sm8091519ejb.143.2023.10.10.00.50.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Oct 2023 00:50:20 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , qemu-ppc@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-arm@nongnu.org, qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , John Snow , Laurent Vivier , Fam Zheng , "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , Alexander Bulekov , Bandan Das , Stefan Hajnoczi , Darren Kenny , Qiuhao Li , Dmitry Fleytman , Akihiko Odaki , Nicholas Piggin , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , David Gibson , Harsh Prateek Bora , Jeuk Kim , Gerd Hoffmann , Jason Wang , Amit Shah Subject: [PATCH 4/4] tests/qtest: Use qtest_get_base_arch() Date: Tue, 10 Oct 2023 09:49:52 +0200 Message-ID: <20231010074952.79165-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231010074952.79165-1-philmd@linaro.org> References: <20231010074952.79165-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=philmd@linaro.org; helo=mail-ej1-x629.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-ppc@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Additionally use qtest_get_arch_bits() when relevant. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Akihiko Odaki --- tests/qtest/ahci-test.c | 5 ++--- tests/qtest/am53c974-test.c | 4 +--- tests/qtest/bios-tables-test.c | 6 +++--- tests/qtest/boot-sector.c | 6 +++--- tests/qtest/device-plug-test.c | 6 ++---- tests/qtest/drive_del-test.c | 16 ++++++---------- tests/qtest/erst-test.c | 4 +--- tests/qtest/fuzz-e1000e-test.c | 4 +--- tests/qtest/ivshmem-test.c | 6 +++--- tests/qtest/libqos/qos_external.c | 6 ++++-- tests/qtest/lpc-ich9-test.c | 4 +--- tests/qtest/m48t59-test.c | 6 ++---- tests/qtest/pxe-test.c | 6 +++--- tests/qtest/qos-test.c | 6 ++++-- tests/qtest/readconfig-test.c | 6 +----- tests/qtest/rtas-test.c | 4 +--- tests/qtest/ufs-test.c | 4 +--- tests/qtest/usb-hcd-uhci-test.c | 6 +++--- tests/qtest/virtio-net-test.c | 3 +-- tests/qtest/virtio-rng-test.c | 4 +--- 20 files changed, 44 insertions(+), 68 deletions(-) diff --git a/tests/qtest/ahci-test.c b/tests/qtest/ahci-test.c index eea8b5f77b..93d1e14896 100644 --- a/tests/qtest/ahci-test.c +++ b/tests/qtest/ahci-test.c @@ -1835,7 +1835,7 @@ static void create_ahci_io_test(enum IOMode type, enum AddrMode addr, int main(int argc, char **argv) { - const char *arch, *base; + const char *base; int ret; int fd; int c; @@ -1867,8 +1867,7 @@ int main(int argc, char **argv) } /* Check architecture */ - arch = qtest_get_arch(); - if (strcmp(arch, "i386") && strcmp(arch, "x86_64")) { + if (strcmp(qtest_get_base_arch(), "x86")) { g_test_message("Skipping test for non-x86"); return 0; } diff --git a/tests/qtest/am53c974-test.c b/tests/qtest/am53c974-test.c index ed3ac7db20..dc41182a38 100644 --- a/tests/qtest/am53c974-test.c +++ b/tests/qtest/am53c974-test.c @@ -253,11 +253,9 @@ static void test_reset_before_transfer_ok(void) int main(int argc, char **argv) { - const char *arch = qtest_get_arch(); - g_test_init(&argc, &argv, NULL); - if (strcmp(arch, "i386") == 0) { + if (!strcmp(qtest_get_base_arch(), "x86") && qtest_get_arch_bits() == 32) { qtest_add_func("am53c974/test_cmdfifo_underflow_ok", test_cmdfifo_underflow_ok); qtest_add_func("am53c974/test_cmdfifo_underflow2_ok", diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 7e708d78b3..573e7dfcd9 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -2044,7 +2044,7 @@ static void test_acpi_virt_oem_fields(void) int main(int argc, char *argv[]) { - const char *arch = qtest_get_arch(); + const char *arch = qtest_get_base_arch(); bool has_kvm, has_tcg; char *v_env = getenv("V"); int ret; @@ -2063,7 +2063,7 @@ int main(int argc, char *argv[]) return 0; } - if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + if (strcmp(arch, "x86") == 0) { ret = boot_sector_init(disk); if (ret) { return ret; @@ -2173,7 +2173,7 @@ int main(int argc, char *argv[]) #endif } } - } else if (strcmp(arch, "aarch64") == 0) { + } else if (strcmp(arch, "arm") == 0 && qtest_get_arch_bits() == 64) { if (has_tcg && qtest_has_device("virtio-blk-pci")) { qtest_add_func("acpi/virt", test_acpi_virt_tcg); qtest_add_func("acpi/virt/acpihmatvirt", diff --git a/tests/qtest/boot-sector.c b/tests/qtest/boot-sector.c index 679ee17e2a..f13e9a12ff 100644 --- a/tests/qtest/boot-sector.c +++ b/tests/qtest/boot-sector.c @@ -90,7 +90,7 @@ int boot_sector_init(char *fname) int fd, ret; size_t len; char *boot_code; - const char *arch = qtest_get_arch(); + const char *arch = qtest_get_base_arch(); fd = mkstemp(fname); if (fd < 0) { @@ -98,12 +98,12 @@ int boot_sector_init(char *fname) return 1; } - if (g_str_equal(arch, "i386") || g_str_equal(arch, "x86_64")) { + if (g_str_equal(arch, "x86")) { /* Q35 requires a minimum 0x7e000 bytes disk (bug or feature?) */ len = MAX(0x7e000, sizeof(x86_boot_sector)); boot_code = g_malloc0(len); memcpy(boot_code, x86_boot_sector, sizeof(x86_boot_sector)); - } else if (g_str_equal(arch, "ppc64")) { + } else if (g_str_equal(arch, "ppc") && qtest_get_arch_bits() == 64) { /* For Open Firmware based system, use a Forth script */ boot_code = g_strdup_printf("\\ Bootscript\n%x %x c! %x %x c!\n", LOW(SIGNATURE), SIGNATURE_ADDR, diff --git a/tests/qtest/device-plug-test.c b/tests/qtest/device-plug-test.c index c6f33153eb..59153e3493 100644 --- a/tests/qtest/device-plug-test.c +++ b/tests/qtest/device-plug-test.c @@ -65,7 +65,6 @@ static void process_device_remove(QTestState *qtest, const char *id) static void test_pci_unplug_request(void) { QTestState *qtest; - const char *arch = qtest_get_arch(); const char *machine_addition = ""; if (!qtest_has_device("virtio-mouse-pci")) { @@ -73,7 +72,7 @@ static void test_pci_unplug_request(void) return; } - if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + if (strcmp(qtest_get_base_arch(), "x86") == 0) { machine_addition = "-machine pc"; } @@ -107,7 +106,6 @@ static void test_q35_pci_unplug_request(void) static void test_pci_unplug_json_request(void) { QTestState *qtest; - const char *arch = qtest_get_arch(); const char *machine_addition = ""; if (!qtest_has_device("virtio-mouse-pci")) { @@ -115,7 +113,7 @@ static void test_pci_unplug_json_request(void) return; } - if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + if (strcmp(qtest_get_base_arch(), "x86") == 0) { machine_addition = "-machine pc"; } diff --git a/tests/qtest/drive_del-test.c b/tests/qtest/drive_del-test.c index 8a6f3ac963..ccc42acce9 100644 --- a/tests/qtest/drive_del-test.c +++ b/tests/qtest/drive_del-test.c @@ -125,9 +125,9 @@ static void drive_del(QTestState *qts) */ static const char *qvirtio_get_dev_type(void) { - const char *arch = qtest_get_arch(); + const char *arch = qtest_get_base_arch(); - if (g_str_equal(arch, "arm") || g_str_equal(arch, "aarch64")) { + if (g_str_equal(arch, "arm")) { return "device"; /* for virtio-mmio */ } else if (g_str_equal(arch, "s390x")) { return "ccw"; @@ -249,7 +249,6 @@ static void test_drive_del_device_del(void) static void test_cli_device_del(void) { QTestState *qts; - const char *arch = qtest_get_arch(); const char *machine_addition = ""; if (!has_device_builtin("virtio-blk")) { @@ -257,7 +256,7 @@ static void test_cli_device_del(void) return; } - if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + if (strcmp(qtest_get_base_arch(), "x86") == 0) { machine_addition = "-machine pc"; } @@ -323,7 +322,6 @@ static void test_empty_device_del(void) static void test_device_add_and_del(void) { QTestState *qts; - const char *arch = qtest_get_arch(); const char *machine_addition = ""; if (!has_device_builtin("virtio-blk")) { @@ -331,7 +329,7 @@ static void test_device_add_and_del(void) return; } - if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + if (strcmp(qtest_get_base_arch(), "x86") == 0) { machine_addition = "-machine pc"; } @@ -394,7 +392,6 @@ static void test_device_add_and_del_q35(void) static void test_drive_add_device_add_and_del(void) { QTestState *qts; - const char *arch = qtest_get_arch(); const char *machine_addition = ""; if (!has_device_builtin("virtio-blk")) { @@ -402,7 +399,7 @@ static void test_drive_add_device_add_and_del(void) return; } - if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + if (strcmp(qtest_get_base_arch(), "x86") == 0) { machine_addition = "-machine pc"; } @@ -447,7 +444,6 @@ static void test_drive_add_device_add_and_del_q35(void) static void test_blockdev_add_device_add_and_del(void) { QTestState *qts; - const char *arch = qtest_get_arch(); const char *machine_addition = ""; if (!has_device_builtin("virtio-blk")) { @@ -455,7 +451,7 @@ static void test_blockdev_add_device_add_and_del(void) return; } - if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + if (strcmp(qtest_get_base_arch(), "x86") == 0) { machine_addition = "-machine pc"; } diff --git a/tests/qtest/erst-test.c b/tests/qtest/erst-test.c index c45bee7f05..8d3665b82c 100644 --- a/tests/qtest/erst-test.c +++ b/tests/qtest/erst-test.c @@ -95,9 +95,7 @@ static void cleanup_vm(ERSTState *s) static void setup_vm_cmd(ERSTState *s, const char *cmd) { - const char *arch = qtest_get_arch(); - - if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + if (strcmp(qtest_get_base_arch(), "x86") == 0) { s->qs = qtest_pc_boot("%s", cmd); } else { g_printerr("erst-test tests are only available on x86\n"); diff --git a/tests/qtest/fuzz-e1000e-test.c b/tests/qtest/fuzz-e1000e-test.c index 5052883fb6..a8d3596f2c 100644 --- a/tests/qtest/fuzz-e1000e-test.c +++ b/tests/qtest/fuzz-e1000e-test.c @@ -40,11 +40,9 @@ static void test_lp1879531_eth_get_rss_ex_dst_addr(void) int main(int argc, char **argv) { - const char *arch = qtest_get_arch(); - g_test_init(&argc, &argv, NULL); - if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + if (strcmp(qtest_get_base_arch(), "x86") == 0) { qtest_add_func("fuzz/test_lp1879531_eth_get_rss_ex_dst_addr", test_lp1879531_eth_get_rss_ex_dst_addr); } diff --git a/tests/qtest/ivshmem-test.c b/tests/qtest/ivshmem-test.c index 9bf8e78df6..32024d9243 100644 --- a/tests/qtest/ivshmem-test.c +++ b/tests/qtest/ivshmem-test.c @@ -397,9 +397,9 @@ static void test_ivshmem_hotplug_q35(void) static void test_ivshmem_hotplug(void) { QTestState *qts; - const char *arch = qtest_get_arch(); + const char *arch = qtest_get_base_arch(); - if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + if (strcmp(arch, "x86") == 0) { qts = qtest_init("-object memory-backend-ram,size=1M,id=mb1" " -machine pc"); } else { @@ -409,7 +409,7 @@ static void test_ivshmem_hotplug(void) qtest_qmp_device_add(qts, "ivshmem-plain", "iv1", "{'addr': %s, 'memdev': 'mb1'}", stringify(PCI_SLOT_HP)); - if (strcmp(arch, "ppc64") != 0) { + if (strcmp(arch, "ppc") != 0 && qtest_get_arch_bits() == 64) { qpci_unplug_acpi_device_test(qts, "iv1", PCI_SLOT_HP); } diff --git a/tests/qtest/libqos/qos_external.c b/tests/qtest/libqos/qos_external.c index c6bb8bff09..f01bb17628 100644 --- a/tests/qtest/libqos/qos_external.c +++ b/tests/qtest/libqos/qos_external.c @@ -31,10 +31,12 @@ static void machine_apply_to_node(const char *name) { - char *machine_name = g_strconcat(qtest_get_arch(), "/", name, NULL); + g_autofree char *machine_name = g_strdup_printf("%s/%u/%s", + qtest_get_base_arch(), + qtest_get_arch_bits(), + name); qos_graph_node_set_availability(machine_name, true); - g_free(machine_name); } void machines_apply_to_node(MachineInfoList *mach_info) diff --git a/tests/qtest/lpc-ich9-test.c b/tests/qtest/lpc-ich9-test.c index 8ac95b89f7..9f27591b74 100644 --- a/tests/qtest/lpc-ich9-test.c +++ b/tests/qtest/lpc-ich9-test.c @@ -28,11 +28,9 @@ static void test_lp1878642_pci_bus_get_irq_level_assert(void) int main(int argc, char **argv) { - const char *arch = qtest_get_arch(); - g_test_init(&argc, &argv, NULL); - if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + if (strcmp(qtest_get_base_arch(), "x86") == 0) { qtest_add_func("ich9/test_lp1878642_pci_bus_get_irq_level_assert", test_lp1878642_pci_bus_get_irq_level_assert); } diff --git a/tests/qtest/m48t59-test.c b/tests/qtest/m48t59-test.c index b9cd209165..3579effdf4 100644 --- a/tests/qtest/m48t59-test.c +++ b/tests/qtest/m48t59-test.c @@ -239,15 +239,13 @@ static void fuzz_registers(void) static void base_setup(void) { - const char *arch = qtest_get_arch(); - - if (g_str_equal(arch, "sparc")) { + if (g_str_equal(qtest_get_arch(), "sparc")) { /* Note: For sparc64, we'd need to map-in the PCI bridge memory first */ base = 0x71200000; base_year = 1968; base_machine = "SS-5"; use_mmio = true; - } else if (g_str_equal(arch, "ppc") || g_str_equal(arch, "ppc64")) { + } else if (g_str_equal(qtest_get_base_arch(), "ppc")) { base = 0xF0000000; base_year = 1968; base_machine = "ref405ep"; diff --git a/tests/qtest/pxe-test.c b/tests/qtest/pxe-test.c index e4b48225a5..5112bceb76 100644 --- a/tests/qtest/pxe-test.c +++ b/tests/qtest/pxe-test.c @@ -129,7 +129,7 @@ static void test_batch(const testdef_t *tests, bool ipv6) int main(int argc, char *argv[]) { int ret; - const char *arch = qtest_get_arch(); + const char *arch = qtest_get_base_arch(); g_test_init(&argc, &argv, NULL); @@ -143,12 +143,12 @@ int main(int argc, char *argv[]) return ret; - if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + if (strcmp(arch, "x86") == 0) { test_batch(x86_tests, false); if (g_test_slow()) { test_batch(x86_tests_slow, false); } - } else if (strcmp(arch, "ppc64") == 0) { + } else if (strcmp(arch, "ppc") == 0 && qtest_get_arch_bits() == 64) { test_batch(ppc64_tests, g_test_slow()); if (g_test_slow()) { test_batch(ppc64_tests_slow, true); diff --git a/tests/qtest/qos-test.c b/tests/qtest/qos-test.c index 5da4091ec3..5271582f6a 100644 --- a/tests/qtest/qos-test.c +++ b/tests/qtest/qos-test.c @@ -293,8 +293,10 @@ static void walk_path(QOSGraphNode *orig_path, int len) path_vec[0] = g_string_free(cmd_line, false); if (path->u.test.subprocess) { - gchar *subprocess_path = g_strdup_printf("/%s/%s/subprocess", - qtest_get_arch(), path_str); + gchar *subprocess_path = g_strdup_printf("/%s/%u/%s/subprocess", + qtest_get_base_arch(), + qtest_get_arch_bits(), + path_str); qtest_add_data_func(path_str, subprocess_path, subprocess_run_one_test); g_test_add_data_func(subprocess_path, path_vec, run_one_test); } else { diff --git a/tests/qtest/readconfig-test.c b/tests/qtest/readconfig-test.c index 760f974e63..7837997c6f 100644 --- a/tests/qtest/readconfig-test.c +++ b/tests/qtest/readconfig-test.c @@ -382,13 +382,9 @@ static void test_docs_q35_virtio_serial(void) int main(int argc, char *argv[]) { - const char *arch; g_test_init(&argc, &argv, NULL); - arch = qtest_get_arch(); - - if (g_str_equal(arch, "i386") || - g_str_equal(arch, "x86_64")) { + if (g_str_equal(qtest_get_base_arch(), "x86")) { qtest_add_func("readconfig/x86/memdev", test_x86_memdev); if (qtest_has_device("ich9-usb-ehci1") && qtest_has_device("ich9-usb-uhci1")) { diff --git a/tests/qtest/rtas-test.c b/tests/qtest/rtas-test.c index 1ba42b37d2..26c8e8e926 100644 --- a/tests/qtest/rtas-test.c +++ b/tests/qtest/rtas-test.c @@ -36,11 +36,9 @@ static void test_rtas_get_time_of_day_vof(void) int main(int argc, char *argv[]) { - const char *arch = qtest_get_arch(); - g_test_init(&argc, &argv, NULL); - if (strcmp(arch, "ppc64")) { + if (strcmp(qtest_get_base_arch(), "ppc") && qtest_get_arch_bits() != 64) { g_printerr("RTAS requires qemu-system-ppc64\n"); exit(EXIT_FAILURE); } diff --git a/tests/qtest/ufs-test.c b/tests/qtest/ufs-test.c index ed3dbca154..5a5b10b520 100644 --- a/tests/qtest/ufs-test.c +++ b/tests/qtest/ufs-test.c @@ -552,7 +552,6 @@ static void *ufs_blk_test_setup(GString *cmd_line, void *arg) static void ufs_register_nodes(void) { - const char *arch; QOSGraphEdgeOptions edge_opts = { .before_cmd_line = "-blockdev null-co,node-name=drv0,read-zeroes=on", .after_cmd_line = "-device ufs-lu,bus=ufs0,drive=drv0,lun=0", @@ -575,8 +574,7 @@ static void ufs_register_nodes(void) * Check architecture * TODO: Enable ufs io tests for ppc64 */ - arch = qtest_get_arch(); - if (!strcmp(arch, "ppc64")) { + if (!strcmp(qtest_get_base_arch(), "ppc") && qtest_get_arch_bits() == 64) { g_test_message("Skipping ufs io tests for ppc64"); return; } diff --git a/tests/qtest/usb-hcd-uhci-test.c b/tests/qtest/usb-hcd-uhci-test.c index 4446555f08..144a5541f0 100644 --- a/tests/qtest/usb-hcd-uhci-test.c +++ b/tests/qtest/usb-hcd-uhci-test.c @@ -53,7 +53,7 @@ static void test_usb_storage_hotplug(void) int main(int argc, char **argv) { - const char *arch = qtest_get_arch(); + const char *arch = qtest_get_base_arch(); const char *cmd = "-device piix3-usb-uhci,id=uhci,addr=1d.0" " -drive id=drive0,if=none,file=null-co://," "file.read-zeroes=on,format=raw" @@ -73,9 +73,9 @@ int main(int argc, char **argv) qtest_add_func("/uhci/pci/hotplug/usb-storage", test_usb_storage_hotplug); } - if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + if (strcmp(arch, "x86") == 0) { qs = qtest_pc_boot("%s", cmd); - } else if (strcmp(arch, "ppc64") == 0) { + } else if (strcmp(arch, "ppc") == 0 && qtest_get_arch_bits() == 64) { qs = qtest_spapr_boot("%s", cmd); } else { g_printerr("usb-hcd-uhci-test tests are only " diff --git a/tests/qtest/virtio-net-test.c b/tests/qtest/virtio-net-test.c index fab5dd8b05..c37fe36af6 100644 --- a/tests/qtest/virtio-net-test.c +++ b/tests/qtest/virtio-net-test.c @@ -169,7 +169,6 @@ static void hotplug(void *obj, void *data, QGuestAllocator *t_alloc) { QVirtioPCIDevice *dev = obj; QTestState *qts = dev->pdev->bus->qts; - const char *arch = qtest_get_arch(); if (dev->pdev->bus->not_hotpluggable) { g_test_skip("pci bus does not support hotplug"); @@ -179,7 +178,7 @@ static void hotplug(void *obj, void *data, QGuestAllocator *t_alloc) qtest_qmp_device_add(qts, "virtio-net-pci", "net1", "{'addr': %s}", stringify(PCI_SLOT_HP)); - if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + if (strcmp(qtest_get_base_arch(), "x86") == 0) { qpci_unplug_acpi_device_test(qts, "net1", PCI_SLOT_HP); } } diff --git a/tests/qtest/virtio-rng-test.c b/tests/qtest/virtio-rng-test.c index 64e131cd8c..173f42ff7b 100644 --- a/tests/qtest/virtio-rng-test.c +++ b/tests/qtest/virtio-rng-test.c @@ -25,12 +25,10 @@ static void rng_hotplug(void *obj, void *data, QGuestAllocator *alloc) return; } - const char *arch = qtest_get_arch(); - qtest_qmp_device_add(qts, "virtio-rng-pci", "rng1", "{'addr': %s}", stringify(PCI_SLOT_HP)); - if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { + if (strcmp(qtest_get_base_arch(), "x86") == 0) { qpci_unplug_acpi_device_test(qts, "rng1", PCI_SLOT_HP); } }