From patchwork Fri Feb 5 14:43:37 2021 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: 1436693 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=UVtaku4p; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DXJ9b51wjz9sRR for ; Sat, 6 Feb 2021 01:45:07 +1100 (AEDT) Received: from localhost ([::1]:51888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l82M5-0002Vs-K0 for incoming@patchwork.ozlabs.org; Fri, 05 Feb 2021 09:45:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42518) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l82Kz-0002Dg-G5; Fri, 05 Feb 2021 09:43:57 -0500 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]:37790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l82Kx-0002F8-VE; Fri, 05 Feb 2021 09:43:57 -0500 Received: by mail-ed1-x536.google.com with SMTP id q2so9092338edi.4; Fri, 05 Feb 2021 06:43:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MuD8YH8lHXlIxKXXmwlYnLHbV+/5tH7GQop+yQUZbaM=; b=UVtaku4poOccipZPXArt8FJrAo0tP+JQ+UJCfKk9EcrQXamQ3Y8rwUPGExq3yo/0ri su5oboHhT+O4yIzBrmO7iRLiaYkOGi2Re5XCuHqs453irTe0g9FKQR/8T81KZhbeDT8O nik5djKfjs5Qs25uDwg3OlrmtjXHbtN1YhTOGk4qsjLhwr7hxsJ/70PndDEltiWaTobi Q+7xSMkWEZ9kPxwxT1se+7UbmN5txuYmSto9eM4UV9DheD4hyIguExwI+uMpqF2caK+H qr2G5SPpBRTHhTol24SGT1opEWK9jCO8aPmaPDpx5+KkG+r+4c21V8X15tF8SYzLB6zb RvYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=MuD8YH8lHXlIxKXXmwlYnLHbV+/5tH7GQop+yQUZbaM=; b=q0M6W8tCOZbRYYlnlbqZ+0FYwGHpgosYAnt85tvWXK/JYgpJd8z97FEoQp1QmB7+Dy ZdILRteSsoYwRJUTC8GQXlHp8cjNwrvvEGW1/pYr2TmevxsLHvNyVvyUFIz8uylyyjva tVZJG8fufvJ3tIFMy0/aEU8KQWQeMpP/fVXy7hVC+TUqUIoAsMdvsBELpu+KmaBFc/dL uynI+nrTTqTbfqzs8rBgYrR8mo36QdrXwIFX9DMFZVOLLBW35ZaJUfZKel0J/h3P4Ehy MPH/M13KPU1A6O0VwSNLVcoTVH8STE3jtAxvThY+nJu/5vCDvHRJ+3zFKiv5NmdBJuKY eCxg== X-Gm-Message-State: AOAM531+0M5psoVpIZt2exBtAJEeSpXnfFmp4YbJRKLoX2NnclAJu3+Z oVrV/TNJkchrxTxL3JBu5qfeBmQR7Xk= X-Google-Smtp-Source: ABdhPJy2Tz/Vu+jSec0Y9r7HLzwWZw8Eah5pSbB0YNpLaExd3y3LunZpElvmz7HFVGcWuJcqczuHtA== X-Received: by 2002:a05:6402:40c4:: with SMTP id z4mr3807226edb.233.1612536233607; Fri, 05 Feb 2021 06:43:53 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id q9sm4009547ejd.113.2021.02.05.06.43.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 06:43:52 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/9] tests/qtest/arm-cpu-features: Remove Cortex-A15 check Date: Fri, 5 Feb 2021 15:43:37 +0100 Message-Id: <20210205144345.2068758-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205144345.2068758-1-f4bug@amsat.org> References: <20210205144345.2068758-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x536.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Laurent Vivier , Peter Maydell , Thomas Huth , qemu-block@nongnu.org, Andrew Jones , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Support for ARMv7 has been dropped in commit 82bf7ae84ce ("target/arm: Remove KVM support for 32-bit Arm hosts"), no need to check for Cortex A15 host cpu anymore. Signed-off-by: Philippe Mathieu-Daudé --- tests/qtest/arm-cpu-features.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c index 8252b85bb85..c59c3cb002b 100644 --- a/tests/qtest/arm-cpu-features.c +++ b/tests/qtest/arm-cpu-features.c @@ -515,10 +515,6 @@ static void test_query_cpu_model_expansion_kvm(const void *data) QDict *resp; char *error; - assert_error(qts, "cortex-a15", - "We cannot guarantee the CPU type 'cortex-a15' works " - "with KVM on this host", NULL); - assert_has_feature_enabled(qts, "host", "aarch64"); /* Enabling and disabling pmu should always work. */ From patchwork Fri Feb 5 14:43:38 2021 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: 1436694 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=knA0/DNE; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DXJ9j0BD3z9sRR for ; Sat, 6 Feb 2021 01:45:13 +1100 (AEDT) Received: from localhost ([::1]:52450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l82MA-0002mU-Rq for incoming@patchwork.ozlabs.org; Fri, 05 Feb 2021 09:45:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l82L5-0002Tb-BQ; Fri, 05 Feb 2021 09:44:03 -0500 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:46623) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l82L3-0002IJ-Q9; Fri, 05 Feb 2021 09:44:03 -0500 Received: by mail-ej1-x629.google.com with SMTP id w2so12228234ejk.13; Fri, 05 Feb 2021 06:44:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5evm7ZSskwEzcmWuSglI+6mAOCvHUIp+CaSdo/EhioA=; b=knA0/DNEN+J6r5N0LMxv/4w0HzFCCbw/cP0NtYeKLDwZxuCNQtfk9ug4cZAJvgBycC qr4E8XMPAtAYioZA6UvPPHGCTJJi+ZKY7iHQqycdUC6nbgpFtjHA+YXkNKdbAzbmK8BD 5eDgGkdw/7hg/6iDftkL3KaRMmHrZOdP0VEuJ5Jjlae6fmSsOI2XeWaSNdJiH440oc/h 9f6jeP/RRO2XuCdfpHhIh7G6YdVr3OnfQgOA2YqDc3AaOT+UDGfXULePeDVFmrkFRhI6 lxAehMWzw4GA3zjaAacZzz4JMSY4ExiP3LQmHWz8DsBxmB6Ff/MpnP2qOPCvH2nRGX0m UmSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=5evm7ZSskwEzcmWuSglI+6mAOCvHUIp+CaSdo/EhioA=; b=cbAB7lcrCExZ9alxeBf6GF0eufg8ViXUTFKjLFARXKKkav7wqvTzjTF1ys/X89Wff6 3PmHhIJcf6AfpOcBvghslZ1rZtZx2RzvxjwJmZgnEG6Y6ZJh1IKrYQIM4LoI/tB8xrnU z7OkJoENUL41pm9Ht9JgwpEQ/ID/czMiN5fXG2uQxrbhumrlQ0P1vISCP/4mLdIfiTE7 1yBqhhG7MxBEI8H0HPzvh1hlsH2ri/MMXdaA/ZXUzgg802H35mBIUup2JM6hf0Bm9rc3 pmBjzJg/ptxzqTmq65RAmJqXTjMZB3OyzyiQld9G3yba5li7xFLCYC97wY6Gqv7og6Qj ZY/g== X-Gm-Message-State: AOAM532GvXvIQTcvRP1rnzxdI2FyuB/Ok3WNTyvmvqIcIQqiNBJpsJTd bJ7FxFav553sWAIpYLRc/oQ3u71VhR8= X-Google-Smtp-Source: ABdhPJyZ+1oifxJWzXIBLvDe3Eqlb4kZypcVFevwEUY5rXxJD4fEtVvJfiQpIKfJpLBJnh+O4BfV+A== X-Received: by 2002:a17:906:a082:: with SMTP id q2mr4286120ejy.483.1612536239401; Fri, 05 Feb 2021 06:43:59 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id a25sm936260edt.16.2021.02.05.06.43.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 06:43:58 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/9] tests/qtest: Restrict xlnx-can-test to TCG builds Date: Fri, 5 Feb 2021 15:43:38 +0100 Message-Id: <20210205144345.2068758-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205144345.2068758-1-f4bug@amsat.org> References: <20210205144345.2068758-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x629.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Laurent Vivier , Peter Maydell , Thomas Huth , Vikram Garhwal , qemu-block@nongnu.org, Alistair Francis , Andrew Jones , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, "Edgar E. Iglesias" , Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The Xilinx CAN controller test is uses the ZCU102 board which is based on a ZynqMP SoC. In the default configuration - used by this test - this SoC creates 2 Cortex R5F cores. Such cores are not v8A archicture, thus can not be run under KVM. Therefore restrict this test to TCG. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- Cc: Alistair Francis Cc: "Edgar E. Iglesias" Cc: Vikram Garhwal --- tests/qtest/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index c83bc211b6a..d8ebd5bf98e 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -159,10 +159,10 @@ (cpu != 'arm' ? ['bios-tables-test'] : []) + \ (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-test'] : []) + \ (config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-swtpm-test'] : []) + \ + (config_all.has_key('CONFIG_TCG') ? ['xlnx-can-test'] : []) + \ ['arm-cpu-features', 'numa-test', 'boot-serial-test', - 'xlnx-can-test', 'migration-test'] qtests_s390x = \ From patchwork Fri Feb 5 14:43:39 2021 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: 1436695 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=bGc1ZUgV; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DXJ9l2rxSz9sRR for ; Sat, 6 Feb 2021 01:45:15 +1100 (AEDT) Received: from localhost ([::1]:52694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l82MD-0002tk-AH for incoming@patchwork.ozlabs.org; Fri, 05 Feb 2021 09:45:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l82LC-0002gY-TR; Fri, 05 Feb 2021 09:44:12 -0500 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]:33704) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l82L9-0002Ls-I4; Fri, 05 Feb 2021 09:44:08 -0500 Received: by mail-ej1-x62a.google.com with SMTP id sa23so12380597ejb.0; Fri, 05 Feb 2021 06:44:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dblZ2cMrQMLC69vQiQ7PjI15tp+Aw6tS1AsWq28yjKE=; b=bGc1ZUgV/Nx9pGAJJXViDeubeLJ3KSyyySwPiOg1BcmYgeuNDgULMpXA2lFqCQOS+2 dVofPa6szRxLCBGdumWJ2Hq0PqqT0FN1q4vuwoscidrgEsV2f/FbsPay+3W+PPTrN7mE QF7hjGJYJ+gas9Oh2k3oL2yzoysFyU6zXuRI5SlXwHkiVTNXo76aE+wjbEFkMyAeKuE/ qLGRuoOtLaezzyOnrjmdja+hhb1yqoZpyA2VDbjU1m3oO1yugGKvDCwklLjPJhZSW0KC khv8YP2S1gLUff666R+h2xBYDBqJ0yi0u2VsrJMzHdEn3Us5Bfwm/T8zthZ0NHxXvZJp iwdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dblZ2cMrQMLC69vQiQ7PjI15tp+Aw6tS1AsWq28yjKE=; b=YuLNj53hXxMRtWDuJ/LjihVOifVIzdeoXDA2gTI+7AVqA9HwhukOv/83a+luQxU+GW WemaLNbhDDTgZuoI4wZ5pRAMDBeYPecZOGJdT+24eMJz1+MLhvjlYduzTsrD1F89yCov MByy2NC34WwoSAnNI+WdfuSaykITd+xYCMNXxRUsrjJ7nPOW6srz2jULJ4OkMrQqQulG GlYHQrDPa4BsYlW5BL4zjdcOJ1Z3zTSP7CqeMry1gdtLnsIY9NaxWfSbinZ410rBgPrU XEZ/VwtYq+GiKk9ENvvAnvXFSOwPJulEjNhiQuaG1YTHGaiDgo0QMCfpIP6uWtS4yJeX OkXQ== X-Gm-Message-State: AOAM533rbIlyBYBKR3t8AOxpC7jBtr9a3t6ickkN5qcn+/7xJ14gJaiH HI0APqMhtU/yYlP8hAAc9QY3wzibc3A= X-Google-Smtp-Source: ABdhPJwaFQ8BXAkJNPUM74PRENPBWmQSvgr5KlhqbctAGJ1lOmTFgL2AY/oZPSRVFnuTXrImQzzyeg== X-Received: by 2002:a17:906:87c3:: with SMTP id zb3mr4373739ejb.244.1612536245246; Fri, 05 Feb 2021 06:44:05 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id g16sm3980102ejo.107.2021.02.05.06.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 06:44:04 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/9] tests/qtest/boot-serial-test: Test Virt machine with 'max' Date: Fri, 5 Feb 2021 15:43:39 +0100 Message-Id: <20210205144345.2068758-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205144345.2068758-1-f4bug@amsat.org> References: <20210205144345.2068758-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x62a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Laurent Vivier , Peter Maydell , Thomas Huth , qemu-block@nongnu.org, Andrew Jones , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When using KVM, using a specific cpu type will only work if the host CPU really is that exact CPU type. During testing we can simply use the 'max' CPU which will select all the features available from the host. This allow running this test on a Cavium CN8890 (ThunderX cores). Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Andrew Jones --- tests/qtest/boot-serial-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c index b6b1c23cd01..d74509b1c57 100644 --- a/tests/qtest/boot-serial-test.c +++ b/tests/qtest/boot-serial-test.c @@ -149,7 +149,7 @@ static testdef_t tests[] = { { "arm", "raspi2", "", "TT", sizeof(bios_raspi2), 0, bios_raspi2 }, /* For hppa, force bios to output to serial by disabling graphics. */ { "hppa", "hppa", "-vga none", "SeaBIOS wants SYSTEM HALT" }, - { "aarch64", "virt", "-cpu cortex-a57", "TT", sizeof(kernel_aarch64), + { "aarch64", "virt", "-cpu max", "TT", sizeof(kernel_aarch64), kernel_aarch64 }, { "arm", "microbit", "", "T", sizeof(kernel_nrf51), kernel_nrf51 }, From patchwork Fri Feb 5 14:43:40 2021 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: 1436696 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=D1xw66rt; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DXJFQ3ZGFz9sWV for ; Sat, 6 Feb 2021 01:48:24 +1100 (AEDT) Received: from localhost ([::1]:32920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l82PF-0006V3-GU for incoming@patchwork.ozlabs.org; Fri, 05 Feb 2021 09:48:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l82LN-0002iM-To; Fri, 05 Feb 2021 09:44:23 -0500 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:46629) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l82LE-0002Od-TN; Fri, 05 Feb 2021 09:44:14 -0500 Received: by mail-ej1-x62c.google.com with SMTP id w2so12229161ejk.13; Fri, 05 Feb 2021 06:44:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J1pU1ssoi/DL7VDtGz6ONx3+WvqS4tj/g3xHAkg3ZBQ=; b=D1xw66rtNR0SWJkqUGEwEab54BWMTjVSeIAbEXtcvqBUuQcFvkXFhjK/XKX4vMte99 bTohPpXVDAjVboUqoXuXuQ8rhR32EfzjZKoPfgVSKwFoRjQAVcNMxf4og7v4irYgkBBP CYnGBsF/NDFoFLJuc1lkcsnBH1cpG7YaMpFjRIuKpl8r6Oq7pft0eVVo4HAAwwwpsiQA Pukz59fotWp/SGSh9hetGDXUBscTYodbx1aqgAnTJ7nMzdD8/DOW+AB9apyuYopeTtMV pGHWQACn4zjRB1Pv1RretfM+mky7Ljpw10hugSpXm+fJ6vO8FTYKh+yikEso4aG2xxHE m+JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=J1pU1ssoi/DL7VDtGz6ONx3+WvqS4tj/g3xHAkg3ZBQ=; b=tO/x/owb+WfCYPVRhEaUca0GSldxHwmHC05212/3FEVWtNpD+DoFdSJ6gAx4vH42qB oTNFWir3umiApTTrvQCSAihbmYq6VG3eu1zLBBEjYBFKhyI/1xTow92+oyxI4TgUxvl1 VQgzIYssTHCF2C9OA4CJQ6NJLr0+JzC4Hs8kOtZwiacQTajjdXkRvwZSi+I3J+as6+7S Fk8e8ejNKSlEQ9NMPX5NPRCLHjU/BGEpMHSoTZ24Lxg8r9K2MCrWWzlFBqqgAmM0M9kn Nl4A4mC3uISlVH0kd9MkKfvGVVMi/XZyR+y+zij+ahik/UxjYUwOcE+lJuQ3A5vT9e/H oVgw== X-Gm-Message-State: AOAM531J/4QneOePghq6SH6l8x/JnCtNC+kPNjbmSIIsEGMe3toASekH NCjGflsTnxu9oT6UgIynWcfC3LxR0e8= X-Google-Smtp-Source: ABdhPJw7OYWzgx0HnsRoje7yX5BHhHsO7USy6vPSLilXjKMAU+KnVjxfV2oJzuqY9tCZ+d2VzR4nkA== X-Received: by 2002:a17:906:2697:: with SMTP id t23mr4363534ejc.357.1612536250581; Fri, 05 Feb 2021 06:44:10 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id qx8sm3971665ejb.48.2021.02.05.06.44.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 06:44:10 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/9] tests/qtest/cdrom-test: Only allow the Virt machine under KVM Date: Fri, 5 Feb 2021 15:43:40 +0100 Message-Id: <20210205144345.2068758-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205144345.2068758-1-f4bug@amsat.org> References: <20210205144345.2068758-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x62c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Laurent Vivier , Peter Maydell , Thomas Huth , qemu-block@nongnu.org, Andrew Jones , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Only the Virt and Versal machines are supported under KVM. Restrict the other ones to TCG. Signed-off-by: Philippe Mathieu-Daudé --- tests/qtest/cdrom-test.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c index 5af944a5fb7..ac02f2bb4f1 100644 --- a/tests/qtest/cdrom-test.c +++ b/tests/qtest/cdrom-test.c @@ -222,9 +222,12 @@ int main(int argc, char **argv) add_cdrom_param_tests(mips64machines); } else if (g_str_equal(arch, "arm") || g_str_equal(arch, "aarch64")) { const char *armmachines[] = { +#ifdef CONFIG_TCG "realview-eb", "realview-eb-mpcore", "realview-pb-a8", "realview-pbx-a9", "versatileab", "versatilepb", "vexpress-a15", - "vexpress-a9", "virt", NULL + "vexpress-a9", +#endif /* CONFIG_TCG */ + "virt", NULL }; add_cdrom_param_tests(armmachines); } else { From patchwork Fri Feb 5 14:43:41 2021 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: 1436699 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=DUzbQda1; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DXJJg70Bpz9sWY for ; Sat, 6 Feb 2021 01:51:15 +1100 (AEDT) Received: from localhost ([::1]:40920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l82S1-0001OI-Rm for incoming@patchwork.ozlabs.org; Fri, 05 Feb 2021 09:51:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l82LR-0002j0-IX; Fri, 05 Feb 2021 09:44:26 -0500 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]:33718) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l82LN-0002Qy-Ab; Fri, 05 Feb 2021 09:44:22 -0500 Received: by mail-ej1-x636.google.com with SMTP id sa23so12381565ejb.0; Fri, 05 Feb 2021 06:44:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xkg/zu6AKq/Ee23oMpv0PA3XN//XoILVWe2S9GBryeE=; b=DUzbQda1m4bnqAFLyLB6eIM8vYj/X4I0dEM5/Ae7NndZhZNO++wYpb/GsrkM9G2fdb ZdeE4zBDjXvdz2m8akGj5Yn4O3blQpeegw8s7cKFkwW2dxZCe1yEEF0ZHFmFNwE4WiTh FYRsGfxNqFIjlDK7mJH5yPmKclBvvtlGUbMpmjW7jJ95L0i50SUz6FPktQzwc5M2QUwW hRlosIUrdwj5wu8eRpSOBgh1/Zvhvt94LHhBxDhkbdaCRuPF9vE6OcJmZAocZpM0Q2Cb LQqFcH1zXbw2ipZoLIq+thGyDXa/6A2DHUSbkSQC73XfLGutXgdH6fl1jwQ0QMczt3Ow LQhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Xkg/zu6AKq/Ee23oMpv0PA3XN//XoILVWe2S9GBryeE=; b=JM/4Kz7U18FXQDRjYPALPYTQx4aLMtvtTNbEqx9cwBhg2pQUJErPEKoYGLwCf8I5XK 5e1iO6ThNedoJvYn49S/Mz42otvfBfwUBJj9RTHXxqRc54/KqTb8t3L7gu2JzqN5IuX7 EEfri/7kxDEu6FilAA0btwkLepKE991OVkNGSwOZwdAzK7CwBWRgaUrSHsgQSpP1KQr2 XGC6DuYw7KZpWcIA0/CFS+E81KCeS8zJMCWrmS9x5dOl4U9wyrLLn5jyRM9OWXqiWf4u 4IIRyajvl89Hz3mFGu1UHWjsBN1WgjNZOluzC+JP15We0KfcvnAsZ6qfmU9NwYPFXAOB rkYg== X-Gm-Message-State: AOAM533EVEL/vprCDyLsDyQ9+qV8klrpfFULEoqMZgezA62fBnp0I3el Kpqn5x1eCgq1s3x/m3oQwwPi9xiNA3U= X-Google-Smtp-Source: ABdhPJyPOvLRzMbqEXMiNye6S+y3gEcu3PM5eYVrEVRsGsPslWOGaP7SGofKpbBnhs2bGt5IvYs4LQ== X-Received: by 2002:a17:907:3f13:: with SMTP id hq19mr4391142ejc.142.1612536256133; Fri, 05 Feb 2021 06:44:16 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id u2sm3982732ejb.65.2021.02.05.06.44.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 06:44:15 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 5/9] hw/arm/virt: Improve CPU name in help message Date: Fri, 5 Feb 2021 15:43:41 +0100 Message-Id: <20210205144345.2068758-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205144345.2068758-1-f4bug@amsat.org> References: <20210205144345.2068758-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x636.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Laurent Vivier , Peter Maydell , Thomas Huth , qemu-block@nongnu.org, Andrew Jones , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When selecting an incorrect CPU, there is a mismatch between the CPU name provided and the one displayed (which is some QEMU internal name): $ qemu-system-aarch64 -M virt -cpu cortex-a8 qemu-system-aarch64: mach-virt: CPU type cortex-a8-arm-cpu not supported Strip the suffix to display the correct CPU name: $ qemu-system-aarch64 -M virt -cpu cortex-a8 qemu-system-aarch64: mach-virt: CPU type cortex-a8-arm Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Andrew Jones --- hw/arm/virt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 399da734548..7802d3a66e8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1829,7 +1829,10 @@ static void machvirt_init(MachineState *machine) finalize_gic_version(vms); if (!cpu_type_valid(machine->cpu_type)) { - error_report("mach-virt: CPU type %s not supported", machine->cpu_type); + int len = strlen(machine->cpu_type) - strlen(ARM_CPU_TYPE_SUFFIX); + + error_report("mach-virt: CPU type %.*s not supported", + len, machine->cpu_type); exit(1); } From patchwork Fri Feb 5 14:43:42 2021 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: 1436700 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=LZS7OU9P; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DXJLW4lhhz9sWW for ; Sat, 6 Feb 2021 01:52:51 +1100 (AEDT) Received: from localhost ([::1]:46256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l82TZ-0003hD-Jj for incoming@patchwork.ozlabs.org; Fri, 05 Feb 2021 09:52:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l82LT-0002jS-CF; Fri, 05 Feb 2021 09:44:30 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:44960) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l82LR-0002SX-Ve; Fri, 05 Feb 2021 09:44:27 -0500 Received: by mail-ej1-x62d.google.com with SMTP id w1so12246510ejf.11; Fri, 05 Feb 2021 06:44:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VTiobrg06Kw2JYFRS+iUWcDIkvLt8aRr1C2BOmn2HFs=; b=LZS7OU9PLEL3wnLwvFERNy6JvAKSIiCAdy+xNn+oF4+zVnf+xyjHltt8vFbke76Bd7 Hh2wGfPBvfMLbRZoPyYG87PSF4n69n8IiAws794SslNKP11Kf8+rJHniSyPk3W5vIAXf n0O9Qmm+iS594IcAe7pDzP9i1Yjl99VFiPFRJVypPPl6tVhWMpWokoYvV7K6h9Iaq0KX iRrEqDnc+lQFW27DItlBjk7BalObRKTV+6BLL/IOdHd5OX+nx8rNkKRH2bAXZJ5bA3RS dQ/elnXFBOFnc5TIg2eT2oTHI8iEUh+bZnyYL/4N3XFYfDcacnP3YUShwnUfXxY8GjeA 2EIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=VTiobrg06Kw2JYFRS+iUWcDIkvLt8aRr1C2BOmn2HFs=; b=giZz8AL75TqzTFKdwCpb60DhPlVzAt9gG/wrtw/gZ1WFjOPcYh0/DSkOh92s4ReYE1 zYf8LhKDOPmWM5vMOl/fHqo7vNtnFc7mUr1jzQ3EyilyZO1i+R4otjAgxwT4A6pTJSMz hvRk+bcnqnqwcieeeYe0VnZq3+QxKPOQfXXZAVacKq6jA58OsRlnxpUyYvbZUAX4HRYG XIrjyewwFZCro+QVRFwO1ZZjkgkTJq4jidqbBrlzYgmemJGM30KcRn4LS+QEgvN2Iajm c089s4c/iRjOt9vt5kTCFGRjtuv4ChY8Z4WdEL0YpvK8Hs5tk0F7xpXAcDjIa/XsTSob rYHg== X-Gm-Message-State: AOAM5308ILT950ssgK9Ixpc2flD/t7Eefj0dl0Wr35+kYs36a2wdxT+O l0/Oc37BNqev3B6TAaOcoyMzbSv+m4E= X-Google-Smtp-Source: ABdhPJzn7J0hDyTG5vX14Z/KHbNZg/Y+xN5SlwHgCMQaOTWc9v4REwqZidp/bCdhLwHqEP3drffJMw== X-Received: by 2002:a17:906:46ce:: with SMTP id k14mr4448504ejs.480.1612536262018; Fri, 05 Feb 2021 06:44:22 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id x21sm3963731eje.118.2021.02.05.06.44.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 06:44:21 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 6/9] hw/arm/virt: Display list of valid CPUs for the Virt machine Date: Fri, 5 Feb 2021 15:43:42 +0100 Message-Id: <20210205144345.2068758-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205144345.2068758-1-f4bug@amsat.org> References: <20210205144345.2068758-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x62d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Laurent Vivier , Peter Maydell , Thomas Huth , qemu-block@nongnu.org, Andrew Jones , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The Virt machine is restricted to a subset of the CPU provided by QEMU. Instead of having the user run '--cpu help' and try each CPUs until finding a match, display the list from start: $ qemu-system-aarch64 -M virt -cpu cortex-a8 qemu-system-aarch64: mach-virt: CPU type cortex-a8 not supported qemu-system-aarch64: mach-virt: Please select one of the following CPU types: cortex-a7, cortex-a15, cortex-a53, cortex-a57, cortex-a72, host, max Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/virt.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 7802d3a66e8..6ffe091804f 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1830,9 +1830,20 @@ static void machvirt_init(MachineState *machine) if (!cpu_type_valid(machine->cpu_type)) { int len = strlen(machine->cpu_type) - strlen(ARM_CPU_TYPE_SUFFIX); + g_autoptr(GString) s = g_string_new(NULL); error_report("mach-virt: CPU type %.*s not supported", len, machine->cpu_type); + + for (n = 0; n < ARRAY_SIZE(valid_cpus); n++) { + len = strlen(valid_cpus[n]) - strlen(ARM_CPU_TYPE_SUFFIX); + g_string_append_printf(s, " %.*s", len, valid_cpus[n]); + if (n + 1 < ARRAY_SIZE(valid_cpus)) { + g_string_append_c(s, ','); + } + } + error_report("mach-virt: Please select one of the following CPU types: %s", + g_string_free(s, FALSE)); exit(1); } From patchwork Fri Feb 5 14:43:43 2021 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: 1436698 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=uosYDztW; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DXJFp3wlrz9sWV for ; Sat, 6 Feb 2021 01:48:46 +1100 (AEDT) Received: from localhost ([::1]:34674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l82Pc-0007FF-EQ for incoming@patchwork.ozlabs.org; Fri, 05 Feb 2021 09:48:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l82LW-0002jc-Tl; Fri, 05 Feb 2021 09:44:30 -0500 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:40455) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l82LV-0002VU-Hx; Fri, 05 Feb 2021 09:44:30 -0500 Received: by mail-ed1-x52c.google.com with SMTP id s3so9057508edi.7; Fri, 05 Feb 2021 06:44:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n4AsHtVAI1SCDx8GcpPjZC1lYBQeAHaYRSZgH2aSe7Y=; b=uosYDztWZMrtk/y00Iyq/Hxlks93zFumpoGxWBYAzBEM6/WkyftCLoxUXRCue3eHJa a1pOFbjZMZ0M5bd2kLjDmy1i6nBkMNY8EimwUxS39SgwWeI06MCC0hNILDu32Y8D/Lcl md+ZrfxIvEJDHY98mm8vfpL2brtQihDM5ZKzAP6Cnl6NUtUPQF2tmDWClCtJjoAoHZIr jRF4UM8kLXY9WhfB04eLFUdOtlOzJuAd6s4YmgNm7f52R0GGjcYWun48+ooY+f13RU5X S8ZgMfdh/rvLe8uj8NFgB/OGE9n9gPRQY/7JlapUd9VUxbzWvoGk5QEgUC4TDXzUTpwl CZOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=n4AsHtVAI1SCDx8GcpPjZC1lYBQeAHaYRSZgH2aSe7Y=; b=mWz3iKgtoHc1Qg6TW45enaG/FyXcFA/p2afhzF9kiI+CriLQEPlbTYzo5lFiqJqY5d GEun3azsecmUlvSvB7lxHsgVaSGku1xId6wa3eJn3tpt8IvmR5CRUoZwkaXRwIKU+QDm SPbAw1f51khI8RbrCa9p8Dz831lOkc32lSDVQPp+FMtBM/75rsQU1OXv5hxHvn5QK0P9 zSJ5IPQj7vjbHbcjtg3ZJIQ69CAMQerVJ8yfEwuPGGdPJgFAKQuetZuwb/ApqPNIm5XQ hCVKB6HSH4GrKSN4HysyYfsHx857w6Pp1KU86Ps190TSzEU011eXtDvZwfGRmgm39ZvE 78mQ== X-Gm-Message-State: AOAM5320yj+AQ2x14AX6+6Sm2tqAmWKfVhSnbCbhvZtdh3yK5/bJwHVI GirerJP+FcUpldbuXeyYUmVzWoJ4Bmw= X-Google-Smtp-Source: ABdhPJxoQi9GuNc9ks/ouu8D6jbKy+jXEPi5W1k1nhQXMRf1J8wwToZsbPH47j0Dozf7isAIglZI+Q== X-Received: by 2002:aa7:dbd4:: with SMTP id v20mr3969931edt.330.1612536267480; Fri, 05 Feb 2021 06:44:27 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id a15sm4069257edy.86.2021.02.05.06.44.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 06:44:26 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 7/9] hw/arm/virt: Do not include 64-bit CPUs in 32-bit build Date: Fri, 5 Feb 2021 15:43:43 +0100 Message-Id: <20210205144345.2068758-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205144345.2068758-1-f4bug@amsat.org> References: <20210205144345.2068758-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x52c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Laurent Vivier , Peter Maydell , Thomas Huth , qemu-block@nongnu.org, Andrew Jones , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Alistair Francis , Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Similarly to commit 210f47840dd, remove 64-bit CPUs (which have never been available on 32-bit build, see commit d14d42f19bf), to fix: $ make check-qtest-arm ... Running test qtest-arm/device-introspect-test missing object type 'cortex-a53-arm-cpu' Broken pipe ../tests/qtest/libqtest.c:181: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped) ERROR qtest-arm/device-introspect-test - too few tests run (expected 6, got 5) Reviewed-by: Alistair Francis Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Andrew Jones --- hw/arm/virt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 6ffe091804f..f5e4a6ec914 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -199,9 +199,11 @@ static const int a15irqmap[] = { static const char *valid_cpus[] = { ARM_CPU_TYPE_NAME("cortex-a7"), ARM_CPU_TYPE_NAME("cortex-a15"), +#ifdef TARGET_AARCH64 ARM_CPU_TYPE_NAME("cortex-a53"), ARM_CPU_TYPE_NAME("cortex-a57"), ARM_CPU_TYPE_NAME("cortex-a72"), +#endif /* TARGET_AARCH64 */ ARM_CPU_TYPE_NAME("host"), ARM_CPU_TYPE_NAME("max"), }; From patchwork Fri Feb 5 14:43:44 2021 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: 1436701 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=bZKD6AwF; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DXJNm1Q0Gz9sWW for ; Sat, 6 Feb 2021 01:54:48 +1100 (AEDT) Received: from localhost ([::1]:50732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l82VS-0005bK-5A for incoming@patchwork.ozlabs.org; Fri, 05 Feb 2021 09:54:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l82Ld-000321-25; Fri, 05 Feb 2021 09:44:37 -0500 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]:32947) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l82Lb-0002Xl-C1; Fri, 05 Feb 2021 09:44:36 -0500 Received: by mail-ed1-x535.google.com with SMTP id c6so9109132ede.0; Fri, 05 Feb 2021 06:44:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i5wyr4PRXVQ5d0pNsqkILJYj5Hv2M/2Enr4o3DvA4Fg=; b=bZKD6AwFbpEQGiOLznFufh3bCqr65lgZtxvTNUB7g4ljTIZ1JYjCLk8e14W1uVV+bA 58MjocnpBUdyfg3IRf53wvmw4VTdwVxnV8xXxRxYt5SPD4FXCd7IAz7JKIj7Sm9hhPYU PwIJsN+g7nd9TBw/JgOKeifVM3dLUCZrSPNFqxJ8GL0iu4hAa3KWMlCEcHs7kXzHzyhl gvQaL2MQGxux8zI3JknpcGQzA8cwli27uS5DUIyyyOogzNKvJSxqKvoawFIaYpA85TVK U7ash/zjWwTsPI/70jgbrQvdYOmUxwWd1gweBFLftRSSJr1+HL+w91dSW3usEYkVP9r0 ffEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=i5wyr4PRXVQ5d0pNsqkILJYj5Hv2M/2Enr4o3DvA4Fg=; b=Ppb0GSF3kQRC+lCccqn8HnCFONbfl/jxgaYdoAHa40Sc/q9gHFJhwlzKd1USzhe4eK vnaMycDLdJIWLQH+Jo4gTq7dEb66lpWc2eGS+ctIi+MdjX169agPKVUAxUCQTj6S8n1v f4UPWdlduAV+2/lSB/hUCp7Ql6J9Vnlr23FF3SHEn6V/seeYbcRUrIk2jh+NEcUtE0Gm 6aDjfnQ90gKTGtMce3feQGGspklOUyfaIiJH2MGRTHcwGLL9a71Q54lbYdJdZVaSrmU7 AjQJomg3neK3A9R7AdFaGE4/uvZN/r3XzoAe9l/6rmw+z41O549LnZ5zKAr3kURaJWll MucA== X-Gm-Message-State: AOAM530eDZSo2wOWjSCszNpOpOafaHFWRbIk6ChILLWLjs/neGxDgPo2 W4jl1oBZc9YmAKpQl01SV3D/fi3s918= X-Google-Smtp-Source: ABdhPJye5KJ20GFuxtd8ET/2AAuofbRosb8AVqSHILvFF1z2hno/xpz67vXbf57XS+J7FPgIm8w+1w== X-Received: by 2002:aa7:de82:: with SMTP id j2mr3811845edv.313.1612536272904; Fri, 05 Feb 2021 06:44:32 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id q9sm4010233ejd.113.2021.02.05.06.44.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 06:44:32 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 8/9] hw/arm/virt: Restrict 32-bit CPUs to TCG Date: Fri, 5 Feb 2021 15:43:44 +0100 Message-Id: <20210205144345.2068758-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205144345.2068758-1-f4bug@amsat.org> References: <20210205144345.2068758-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x535.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Laurent Vivier , Peter Maydell , Thomas Huth , qemu-block@nongnu.org, Andrew Jones , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Support for ARMv7 has been dropped in commit 82bf7ae84ce ("target/arm: Remove KVM support for 32-bit Arm hosts"). Restrict the 32-bit CPUs to --enable-tcg builds. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Andrew Jones --- hw/arm/virt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index f5e4a6ec914..ab6300650f9 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -197,8 +197,10 @@ static const int a15irqmap[] = { }; static const char *valid_cpus[] = { +#ifdef CONFIG_TCG ARM_CPU_TYPE_NAME("cortex-a7"), ARM_CPU_TYPE_NAME("cortex-a15"), +#endif /* CONFIG_TCG */ #ifdef TARGET_AARCH64 ARM_CPU_TYPE_NAME("cortex-a53"), ARM_CPU_TYPE_NAME("cortex-a57"), From patchwork Fri Feb 5 14:43:45 2021 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: 1436697 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=YfbL3wd7; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DXJFg0kb5z9sWV for ; Sat, 6 Feb 2021 01:48:39 +1100 (AEDT) Received: from localhost ([::1]:34402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l82PV-00077p-0y for incoming@patchwork.ozlabs.org; Fri, 05 Feb 2021 09:48:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l82Lj-0003Ia-Cs; Fri, 05 Feb 2021 09:44:43 -0500 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]:32938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l82Lg-0002bB-NP; Fri, 05 Feb 2021 09:44:43 -0500 Received: by mail-ed1-x52a.google.com with SMTP id c6so9109472ede.0; Fri, 05 Feb 2021 06:44:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gjWjrkoo9fwMU9Sch1mUKkw5VscVbA8NCnnTZX/2IUQ=; b=YfbL3wd7WIFvDX66J6x/emlBwMT1vunccIADjGH5sA4zJ/cFFH+CrHhF7uOUJBg664 JZMOaMoGEKYIXEX6q6Dv3gnJCQwTdw98g/8Uh4Zf9GdgGTPkDZz0KPypUwra1LHb2608 nvejPdqhCSGmvdDxA2ZSwlOtqiuorJgOM1Ia2etQUCTLYQIU+vUKfGCTXAsTHKm80/62 X1mrFC7nqOdzl1YEpve4azx4vA/4JKMHno6PCGoUzxFl2KK8n7lJwAPqG3QNOmgm5fl6 2Hxls14icc2CsOCssTn0V1furNTPQIOa0nVvbO+prPo9EQudmofNp9WJXUAV246yKH9c iEEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=gjWjrkoo9fwMU9Sch1mUKkw5VscVbA8NCnnTZX/2IUQ=; b=l78Ovalr6my6hWGs/Vq2PlRdZVnkvfpz0BaVmJZsJiU4IVSu/LjoHklNtj83i2+HLA QV2f41cpc1d2DQ5FHR10zznSJgJcAzYEO8jVrP3+dyJ2lteFw1RXIWZAhJTh3rbO8E5G Wn2VZG//QYIfv2vYeS81pdndOnpbh7VH74hDpkdXY3nzeq5YBE3DouP5eRSBZBWpMtVy qMpfj9/vEuJtBB3nlg41Ya9SSNGmM48ABwbvAqgoNBHuNQ4UAoNuv4QewBiQwpGQj3WJ 9aLrRWP8GOmTS3w++lY+reT7eajBmQRhzekDATGjtZogMclI6kIRoAfCc9eMQISVeHXf kFcg== X-Gm-Message-State: AOAM530Zjhk1S7HO/x7aGod11k3ayAu912sEsvau9r+7KeFtT3rbrESy okJgzbtewejGyODOfwngNqw5vcmF8Vw= X-Google-Smtp-Source: ABdhPJxA0vKoza0E4rwkL255gG4NozbcAGeH9pTZfgqUu89/kfQHAHe/SMFvyoE4XELbfzLsNPM86A== X-Received: by 2002:a05:6402:524f:: with SMTP id t15mr3755462edd.158.1612536278411; Fri, 05 Feb 2021 06:44:38 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id hr3sm3883275ejc.41.2021.02.05.06.44.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 06:44:37 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 9/9] tests/qtest/arm-cpu-features: Restrict TCG-only tests Date: Fri, 5 Feb 2021 15:43:45 +0100 Message-Id: <20210205144345.2068758-10-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205144345.2068758-1-f4bug@amsat.org> References: <20210205144345.2068758-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Laurent Vivier , Peter Maydell , Thomas Huth , qemu-block@nongnu.org, Andrew Jones , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , Roman Bolshakov , qemu-arm@nongnu.org, Claudio Fontana , Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Some tests explicitly request the TCG accelerator. As these tests will obviously fails if TCG is not present, disable them in such case. Signed-off-by: Philippe Mathieu-Daudé --- Cc: Roman Bolshakov Cc: Claudio Fontana RFC because of the TODO. Roman posted a series to have a QMP command to query enabled accelerators. --- tests/qtest/arm-cpu-features.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c index c59c3cb002b..c6e86282b66 100644 --- a/tests/qtest/arm-cpu-features.c +++ b/tests/qtest/arm-cpu-features.c @@ -20,7 +20,7 @@ */ #define SVE_MAX_VQ 16 -#define MACHINE "-machine virt,gic-version=max -accel tcg " +#define MACHINE_TCG "-machine virt,gic-version=max -accel tcg " #define MACHINE_KVM "-machine virt,gic-version=max -accel kvm -accel tcg " #define QUERY_HEAD "{ 'execute': 'query-cpu-model-expansion', " \ " 'arguments': { 'type': 'full', " @@ -41,6 +41,16 @@ static bool kvm_enabled(QTestState *qts) return enabled; } +static bool tcg_enabled(QTestState *qts) +{ + /* TODO: Implement QMP query-accel? */ +#ifdef CONFIG_TCG + return true; +#else + return false; +#endif /* CONFIG_TCG */ +} + static QDict *do_query_no_props(QTestState *qts, const char *cpu_type) { return qtest_qmp(qts, QUERY_HEAD "'model': { 'name': %s }" @@ -352,7 +362,12 @@ static void sve_tests_sve_max_vq_8(const void *data) { QTestState *qts; - qts = qtest_init(MACHINE "-cpu max,sve-max-vq=8"); + qts = qtest_init(MACHINE_TCG "-cpu max,sve-max-vq=8"); + + if (!tcg_enabled(qts)) { + qtest_quit(qts); + return; + } assert_sve_vls(qts, "max", BIT_ULL(8) - 1, NULL); @@ -387,7 +402,12 @@ static void sve_tests_sve_off(const void *data) { QTestState *qts; - qts = qtest_init(MACHINE "-cpu max,sve=off"); + qts = qtest_init(MACHINE_TCG "-cpu max,sve=off"); + + if (!tcg_enabled(qts)) { + qtest_quit(qts); + return; + } /* SVE is off, so the map should be empty. */ assert_sve_vls(qts, "max", 0, NULL); @@ -443,7 +463,12 @@ static void test_query_cpu_model_expansion(const void *data) { QTestState *qts; - qts = qtest_init(MACHINE "-cpu max"); + qts = qtest_init(MACHINE_TCG "-cpu max"); + + if (!tcg_enabled(qts)) { + qtest_quit(qts); + return; + } /* Test common query-cpu-model-expansion input validation */ assert_type_full(qts);