From nobody Mon Feb 9 14:16:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.52 as permitted sender) client-ip=209.85.208.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612536236; cv=none; d=zohomail.com; s=zohoarc; b=X7tA5s1Ezh7CKNRffX2Mps6bM5tQfG1BxEPl4ZBYLyTnEFtiJ4TIyBukkTDCRFnDN8Ic97/Ql1DfD3fKsYmppPTCnh/u0gbp0zu5eoBYZmhdEXpBqwbkXPiOYA26ay/mAvCIY5b7btDDGb/tGQl9HZBUQB2lqxv87D4vukK1lEE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612536236; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MuD8YH8lHXlIxKXXmwlYnLHbV+/5tH7GQop+yQUZbaM=; b=Av5Jy4UkVzIBqS8GjBYyaxtBmoUnys8qp4fX9+AZYyt5LXJzFdMJv7Yks6u8o3VqzUitvBfkZebnvKs3E71C9QzcgwHA60tQprNRjUjYH3jrLiB/UbD0WdY+usYaD9unIqOkynZ31adS9CXn3FvopXEm1NcTVCJ5jh8k0FtLQ1k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by mx.zohomail.com with SMTPS id 1612536236284751.9597378788859; Fri, 5 Feb 2021 06:43:56 -0800 (PST) Received: by mail-ed1-f52.google.com with SMTP id q2so5944407eds.11 for ; Fri, 05 Feb 2021 06:43:54 -0800 (PST) Return-Path: Return-Path: 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) 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=TB67sGJ0X63vC2qNCyg3Va4Pd3Ch42lHO3d9Rv9/dymgqtGL342XUTMobtANWs4mrL SrVZwyc1APZqeUYMChridktkvP4oHGmT4Xos7s12Kk4Ib4d4rXNjhrwKfORgAR4Y+JTT gLwoPN3LQ6JqBWJdhX0amFXHKk4+h8/oQ412mYMH3VfN1geCijmXy4lZ4F3Y7Psp2uOp g6ilnyBVS1jGQYq/kiyXOrcWVWNzbcVxPOJp2c34hN83nrdXzOraEncNfQdvzM3YbOxJ YrQ9bfDVkkZH5MsXsggWM4vcA7hLPIPKpqXk1T1LTUepLuEPwYHZdWFQEm0q4jQ8QF1T TpYA== X-Gm-Message-State: AOAM531+wDLWhTILN2B0Q2LxEwkevDZF4YFWJITuuZfzfYbOSDMW2Ypa taSY+L7P+MRxS6xC5lsukpM= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, Peter Maydell , Thomas Huth , Andrew Jones , qemu-block@nongnu.org, Laurent Vivier , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 --- 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 v= oid *data) QDict *resp; char *error; =20 - 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"); =20 /* Enabling and disabling pmu should always work. */ --=20 2.26.2 From nobody Mon Feb 9 14:16:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.41 as permitted sender) client-ip=209.85.218.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1612536241; cv=none; d=zohomail.com; s=zohoarc; b=TOMS9+LC7WUs5J0EAFjTMl82OsDUs8owyKDdxmCxMF8c7tIgmeK4Jp8Xqo9VF3/JfnCJL09HlZTg7tLCumPVe+fUaRqEqHL49NsDH+tWDujHeBl641IU+KlC94BhtEdfNi43Qxub/ndpbNDNxTlv+eKufzGZvMHzw/GhySc7BqY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612536241; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5evm7ZSskwEzcmWuSglI+6mAOCvHUIp+CaSdo/EhioA=; b=OsfBC2cuSpu/0+9iFwkcbcIF2n020LbHHqRKH1Pmd/TpBpWFU/Czx+QKZCtt0stXdfSNrwmqeTeETi+mrPRpQ/+s2cSQQlGjxQRzelos++6s6kFrSrc6LSh/NF+1ErH9R0IoHi7py9CLJPRNv7gJPqq3VmTc25c7qHT2A9WJ8Gk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by mx.zohomail.com with SMTPS id 1612536241117439.1213849005658; Fri, 5 Feb 2021 06:44:01 -0800 (PST) Received: by mail-ej1-f41.google.com with SMTP id a9so12352124ejr.2 for ; Fri, 05 Feb 2021 06:44:00 -0800 (PST) Return-Path: Return-Path: 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) 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=S3MwoedTvEZLdERhBqDeHbGxbRj25r2kVZbZvKXqaLPh6PME2JrjuCrfq7Q3mQcC6c X5hQS1PxtD1gI6ZLAIbbJ2T3wiXXR897/AbSqX4GpwZYUxxewxZm+GE7Ufd7GWnFC24d Mr+ikNYgKLD0bp5+NAKYWVykStYh3I2lg1rzpASBUsSgEsm0PDJ33xBl5sGTLSNfieLY ziYR8ueNZXaRCYMlXB6bVfwhIRY6FS9rgBW2PDlgRipHeI9uzZiVZUkeftPZI4Q52qZ1 9Nu9udOj4T69ZLtgUsUTj/xU0CKe6u4TfcYXziFDevD1B/iaNfqxHLBJPghU5r4Ov0Sg 29qg== X-Gm-Message-State: AOAM5318zNuuyui6ewA1MU+WbOgVWNDXmYvyLrT9cjY6+DMvHzSMfdaS /b39R0l1NPevK6Tbwm8yC+E= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, Peter Maydell , Thomas Huth , Andrew Jones , qemu-block@nongnu.org, Laurent Vivier , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , "Edgar E. Iglesias" , Vikram Garhwal 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 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 !=3D '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'] =20 qtests_s390x =3D \ --=20 2.26.2 From nobody Mon Feb 9 14:16:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.48 as permitted sender) client-ip=209.85.218.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612536247; cv=none; d=zohomail.com; s=zohoarc; b=Yy9gRfr77lUO3X1sUGOkQSJoBPhak/bF9NBsIF1btpOIcG2zxNIp82gox0X92uCdtBuCklYDWKQmiK1V2qPmxgmhmHAah/4cSzOUeNL4IY+7JPvj2927JH1Hm/1Az6rtzHFnBsyVKC5F2C6G/NB7oTmMoevu210sNd5M1WEbnhg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612536247; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dblZ2cMrQMLC69vQiQ7PjI15tp+Aw6tS1AsWq28yjKE=; b=gTWl9l+t3N4pnkmUA5o5yvb7dlh0XHMHScE0R3krI/HBEWaC1JU6QOD+Zvi37u0U/CpopS+uhC2re9bTvDN2jrUDd+MdrMBo3CFLUZIRIg1mRevRuwUgsV0FFiBKrMELLOJ2aVdyp85mPB+fOFbQgCbUptdMRy6Quo51bT0bEQ0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mx.zohomail.com with SMTPS id 1612536247124111.27056207790656; Fri, 5 Feb 2021 06:44:07 -0800 (PST) Received: by mail-ej1-f48.google.com with SMTP id hs11so12376843ejc.1 for ; Fri, 05 Feb 2021 06:44:06 -0800 (PST) Return-Path: Return-Path: 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) 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=E40DbSx91vl9DQ6CN/fL+VsLdJ3xZfnNrDid66jDqPmH75sOOU//fq6mmyGef1FFvW Cuz4mxTdqGgNWH+0jmRuOgnKDuCu029iONrfaZEtsUjsnSU5e1iJu2qFjcO/zOCRPx1X cVBp+fq4XeYOPmJBLo+m7Ybr8fgnstvJtf0ehp89Z/By2OBXnf4NmatYGIzexS9cNJZy j6AoWxPPocfhYI9u+HV2I0A4MGvbnCJbCG+ilxqj5V2SYl7bmwlB9mznwH6Q3/gaCYc6 rzrVgUMzCfV4zzeZK1yp0h4LHpUfmV5HhQBj5rsrLvKy9qFoC3GhChjudykh/SG0RzSG pYsQ== X-Gm-Message-State: AOAM530Q2cIrbkKRNuwSPCRPKFl5SL3r9Gt5sEpjXHXLqQMBz5fX7Neu Yf+5hWDdQBZVPKAZgwgwsbk= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, Peter Maydell , Thomas Huth , Andrew Jones , qemu-block@nongnu.org, Laurent Vivier , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 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[] =3D { { "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 }, =20 --=20 2.26.2 From nobody Mon Feb 9 14:16:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.53 as permitted sender) client-ip=209.85.218.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612536252; cv=none; d=zohomail.com; s=zohoarc; b=X/mZiAJZbs4Ijkh4+dXtF2kkO8O5aweepjw/91kfFVkffyjheeVxyf51NwWc/rE6XeTCWZ5oLfFPPrZSYqa4w/PYkY2aItMp/eTBvr25MfqmpSdp2vj7dMCglbrsJBW8DUGLXkoNUrCGh+Uj5jiSX7E8CQzMNyashaGCh19zoJE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612536252; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J1pU1ssoi/DL7VDtGz6ONx3+WvqS4tj/g3xHAkg3ZBQ=; b=lHaL1PqGC/vTHsN+l40KACPG/gUNCyAs9jNBJCsTMU6jGZsy8oJKN+iXte9L2YHuHbue/TD6h6yXDuIB4TPKY+y2vMcVrMeQd/F3BIlBb4iutxvZ74LskPvQV5lTdTXj/kjMWxb5eXlD8X7bxyY0KxQSU2RyKnyCVHfOLQkWVKY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by mx.zohomail.com with SMTPS id 161253625241856.595562569196204; Fri, 5 Feb 2021 06:44:12 -0800 (PST) Received: by mail-ej1-f53.google.com with SMTP id p20so12312183ejb.6 for ; Fri, 05 Feb 2021 06:44:11 -0800 (PST) Return-Path: Return-Path: 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) 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=d2XQy9z8RwFpLnbWHm3/F2dizFEx3hQpbn+45U62GlKwCAtr4ubYOYpVQxWrO6kcVa dT4r0IrkhgvjjzyMq4qYEzus3Aal9KzcEzx88fevXAxGzgoKP04UsRB8ShQ5MkGZNh68 cvGz1czIlSB8QY3CfZAA8/lUpakRa4J16Z4dDdMDZ8k7ZsxMjN1e/vxdQ+4b4QSDV+HM KBXz90bSnpQlDdFPqP7WzEZrMVlpH6+LCbvq3fgwTS0STp5065H4qLLzw6rOkUfVyxXc CaNSbH9KEK6KAcvIiFcw0xOfLPnpyg/WarlOL5sATi+sUDPcdXk2hCwSZgM3l7s6Lx+Y cWkQ== X-Gm-Message-State: AOAM532W+/H25noSeVS3niq8c/XV9xV0NShUgJ4oS7CIYIPMq008HRSD 32cYoGyjKJB5W2LAhrjmRv0= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, Peter Maydell , Thomas Huth , Andrew Jones , qemu-block@nongnu.org, Laurent Vivier , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Only the Virt and Versal machines are supported under KVM. Restrict the other ones to TCG. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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[] =3D { +#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 { --=20 2.26.2 From nobody Mon Feb 9 14:16:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.53 as permitted sender) client-ip=209.85.218.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612536258; cv=none; d=zohomail.com; s=zohoarc; b=JJmtq203zOmBc1i24wGevCfT9SHtSUsS3oulmIKrvum4juiie9kIuMSa8yQr7F8OpF7HTk73ufv84pBfkgIbVL1jlD8i4oQh2+aJa74DeUQVMR1cbGF5g7+zALkH1Ab5nNLErSg6qJnrPsjrghgiracsCiapVAbm4o1gCveg1ic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612536258; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Xkg/zu6AKq/Ee23oMpv0PA3XN//XoILVWe2S9GBryeE=; b=l1EVljE9WuYRQeAZxTA1ddQXbpdkfog4z2pD7+p8Yn388SEPiBtg3ggH0QMLoOOyYMa8fHBgPSvVtjK/ZyKGHROhCK79uJy5Ror3IWqtJ9SjtT9tomhdcvPzpaiTWWAdldwmyNDZ94f5rIKaI4BiXtPdCc9/4Ha8CS2Q9V4NtTw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by mx.zohomail.com with SMTPS id 1612536258062842.1084380237986; Fri, 5 Feb 2021 06:44:18 -0800 (PST) Received: by mail-ej1-f53.google.com with SMTP id w1so12246000ejf.11 for ; Fri, 05 Feb 2021 06:44:17 -0800 (PST) Return-Path: Return-Path: 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) 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=hr53QLAuI/SOBjYDohkLmc1zxxz5BYax7zuCgaTNCR8EVuP1ONL42C5Ft1/oGpZZII 9u2mLlCm4zSMN6OncBea4c9Rb5LCCx1AoCtdrqCIaZpNlRuCQkbX4VrIv4ilY5eVdZq+ DjoQW4KAp6F+dZrssITj02etJg4zzvu66VPy6Dk64iv1eiTMyaYw+iC5MNajK3Q2lVKY JEv1EoTNhKdoCN2W3zaa+3bvQ6ksTigwuWXRCzCvHmGZQf4N9NSazSZ7PXyXgJ3t+OIT rn7swJ9Bdz0siQHA+HJsREGIhLnavTirfztmv5sYe7+eqvwm9tNSC+GAqTU0dvIANBYg MMtw== X-Gm-Message-State: AOAM532TwmR2N7B+y/lfp+QhvPuLRQbcZFTWxRpattphmF4PT64sFEYZ lE5dxeAS7FNpaQNX+MthFjV0KLG1weE= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, Peter Maydell , Thomas Huth , Andrew Jones , qemu-block@nongnu.org, Laurent Vivier , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 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); =20 if (!cpu_type_valid(machine->cpu_type)) { - error_report("mach-virt: CPU type %s not supported", machine->cpu_= type); + int len =3D strlen(machine->cpu_type) - strlen(ARM_CPU_TYPE_SUFFIX= ); + + error_report("mach-virt: CPU type %.*s not supported", + len, machine->cpu_type); exit(1); } =20 --=20 2.26.2 From nobody Mon Feb 9 14:16:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.43 as permitted sender) client-ip=209.85.218.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612536263; cv=none; d=zohomail.com; s=zohoarc; b=UBbCk9LlUSyP8AvjZDUVHODM6MHQ3PmjYCQHCDxPyPyzAUHa7OyO1WtuE/yerUALwJi2pGY0RwhjxwotZClajvW6Z4hdSdMYZf+Zcsh+3Mt4Z1R/yxioaJeH1QpNwAkAx1IRsV3IQGuVK2UeknnSC14IhO8skxFRl/1HlYEUcPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612536263; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VTiobrg06Kw2JYFRS+iUWcDIkvLt8aRr1C2BOmn2HFs=; b=gx0ClSE2E4bL1FA6bIZCYKg6I3qDYonXX5UCyidd0WLW2ovgCVVrO/gywtqyHvkSqHfB/162feIJeE1hUMKvXtOpf5UKDRB0HEEQ59Kxlctll1wR6zv6ZLx9LRTNQQXrGsapYaQsii8Nnq0PlUeJb2RP3mXZ+Sg2NlQku5eJBYA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by mx.zohomail.com with SMTPS id 1612536263728957.1830030980304; Fri, 5 Feb 2021 06:44:23 -0800 (PST) Received: by mail-ej1-f43.google.com with SMTP id lg21so12340188ejb.3 for ; Fri, 05 Feb 2021 06:44:23 -0800 (PST) Return-Path: Return-Path: 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) 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=koxAYntkS8uw+EhZ2BA6Ofg+af0I2+/xaHo7qcXxwsuFtbuozDNuEY9YK2jSz9tAlP /l+TAyKZCNg+3OWcQxW2Z/l3QqT97997burxyFnWBGhzRgNRhupS0K5GJlcecSNcIYBj X0jyVrYNogfgkfKXdZsISRKePw23ES+RTuBY0p3315wpPVkVpfRlRepThq+8rNAO+8oL c4j0Gd3guNhNjZeqFdVTZ+dsH6x2sWcerS1YyD4CuUpVskYQau5cvyycusH/A7fDb9gF J0g2EOuU6RNKGTAYxIOJrgY/8zsFKDbs4VBOkpkY3tPA/03jrIzK7mV/GZ9hqGhEwji5 twPw== X-Gm-Message-State: AOAM533ML7eP0w1aFGk/E0ZlcV5s0o0W/UZAjsFO7Oj8EohKkvP8FT1v Kv2xeZLIjJqvOW2YDwpiMRE= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, Peter Maydell , Thomas Huth , Andrew Jones , qemu-block@nongnu.org, Laurent Vivier , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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 ty= pes: cortex-a7, cortex-a15, cortex-a53, cortex-a57, cortex-a72, host, max Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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) =20 if (!cpu_type_valid(machine->cpu_type)) { int len =3D strlen(machine->cpu_type) - strlen(ARM_CPU_TYPE_SUFFIX= ); + g_autoptr(GString) s =3D g_string_new(NULL); =20 error_report("mach-virt: CPU type %.*s not supported", len, machine->cpu_type); + + for (n =3D 0; n < ARRAY_SIZE(valid_cpus); n++) { + len =3D 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 ty= pes: %s", + g_string_free(s, FALSE)); exit(1); } =20 --=20 2.26.2 From nobody Mon Feb 9 14:16:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.53 as permitted sender) client-ip=209.85.208.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612536270; cv=none; d=zohomail.com; s=zohoarc; b=QhoqN1/46yjQf8aN8wk4g0NtnPg0yGBmIp60MeYzAva99zJqcYqlhl/t3Gtz2XI4VrVVLxve9QLKH9kpPYeThxrVTmfqNQLUx1KcGzcKXRfHc751ee0Z3D/O47mz2l8u40r3UuzL7dOP0x0baYBEJleABkbOH1tAnoE5p6eNN70= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612536270; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n4AsHtVAI1SCDx8GcpPjZC1lYBQeAHaYRSZgH2aSe7Y=; b=OdP1eql3fX0XrSqMVjlqZCzLc+JWn8cKr7xAZD3Orz7ovPzVJwyWDgQlZrZOGHV3djr8qbN95GkFZR3RMBT+P+EA8WEUCv+J2OQMCvB5FYFpqUm+crO/S01E8K+hUNDh+xDigzq1/RUViJ/fqORJA07hZj9hb+2HdDUe1mtWtfw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by mx.zohomail.com with SMTPS id 1612536270430379.43791396337235; Fri, 5 Feb 2021 06:44:30 -0800 (PST) Received: by mail-ed1-f53.google.com with SMTP id g10so9109206eds.2 for ; Fri, 05 Feb 2021 06:44:28 -0800 (PST) Return-Path: Return-Path: 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) 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=BZ9piLsL+cptsqAm0cYTI8vYoO0cdmmJLizO06bGIVTHO/mXZK6PhQH0iYF/sDlG6D PTvegwiCsQOxdc6F0Xmdz2x0oPWprxpSE+XLUDCThOG44bnUYaHbNMNAlSXnuVEVKWxO R6IdgU7F22WfgEPWBtYYPh9Z8x2kugoeNEV6KDpWVKOxuXseBUdhaCNLxXvqFmok2nQY SZuF04PP4mPeAaQouLg1bxEFk1Pv46cNAEkea3U2erwimCP52bW1uhd2KbEwNI5To5q6 ODyWaqUI/15IE//A8byXRWch3IPCgjg/IHb+CsafMTFlCDVx2e3+iCTupA9FWuppjzKg ZeOg== X-Gm-Message-State: AOAM533AVlUrBO8H7fNMDebFHzK++t8LJIbcsJkUzGNbCbX/Wzgp9/Ai yF8dkV0gU5RT4U4JajUy+Ko= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, Peter Maydell , Thomas Huth , Andrew Jones , qemu-block@nongnu.org, Laurent Vivier , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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 signa= l 6 (Aborted) (core dumped) ERROR qtest-arm/device-introspect-test - too few tests run (expected 6, g= ot 5) Reviewed-by: Alistair Francis Signed-off-by: Philippe Mathieu-Daud=C3=A9 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[] =3D { static const char *valid_cpus[] =3D { 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"), }; --=20 2.26.2 From nobody Mon Feb 9 14:16:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.47 as permitted sender) client-ip=209.85.208.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612536274; cv=none; d=zohomail.com; s=zohoarc; b=aU24VUT5pf2WPGueZk2or9ooo4DdHdHVMCvsBkfgKclZwWHZZXDhGErIiCBrb1epE2y4wLRDFp8uybQtewbxu+OjdJC7LJu7M8IUmx0pXqRHscmj8bCqN+st4bNvE466hdGRVRYsAmQa7QvlTfeMvjadS3Se5RFbwYWeNHm2nKs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612536274; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=i5wyr4PRXVQ5d0pNsqkILJYj5Hv2M/2Enr4o3DvA4Fg=; b=SVSam8OMvK1OBpAQi8SOLXCow1qYFsvCxqz04EPlrT3rx769WtZNvxPTV20MLytU1Y5IInSVqba67QNCO0OI7G66PH8oTQlCuLOnoXzvejPAirMGbbU3Tjaw08VcGlv4IusytcU463NuhD42ZJRW1/sTtahFfmJYHqqgK6Atvwc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by mx.zohomail.com with SMTPS id 1612536274637417.25161712614715; Fri, 5 Feb 2021 06:44:34 -0800 (PST) Received: by mail-ed1-f47.google.com with SMTP id s3so9057750edi.7 for ; Fri, 05 Feb 2021 06:44:34 -0800 (PST) Return-Path: Return-Path: 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) 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=d/eiiZVWIBUwSTan/36/EIubd8FXeLhiSrFa3nQTwyMdHfi1bQgERO0WfEPoAzsB2E FNptO3onAombEdZK/MIh9EpTKKrb4lh3saUbmazc0z0yBRTOMdYwrN+kfIpXAaSdCSiA x778i/jGurwD6VcujL0aF512uc0kz9yt8P9Z5nA+Rj8EKjvwBZwcixbhc0AuJbJrQQnG i7cyBOXrGPZDb6FsDEUvPP/e3/+Y8plJqzWYFcvdJ7E5HKPx8UDjqe2K+Fz+r7nUafgX uGVVOZqiPPV21HGJulbkanrQLp7GJHBSrpyOOOV5QHAdVIaOFuj0kkIZ7HA+rwSNS8tS 7L3Q== X-Gm-Message-State: AOAM532xTxZocWnGP7Fsk5vl98VYZn/3auqOlNWlOkAXzEDRrLcs7MIw 9Yw9hTKxoy+wcfNyASDbqB8= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, Peter Maydell , Thomas Huth , Andrew Jones , qemu-block@nongnu.org, Laurent Vivier , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 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[] =3D { }; =20 static const char *valid_cpus[] =3D { +#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"), --=20 2.26.2 From nobody Mon Feb 9 14:16:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.53 as permitted sender) client-ip=209.85.208.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1612536280; cv=none; d=zohomail.com; s=zohoarc; b=Fv45w6xs2TzXgUvdjokO9TYQb19hZi8PjisOy/cc06L6J3FOH2fYGaIi/d346qy8s2j/Oou5HokiBzSTzQUpJoSxKnGW2IFjo/E+IZywmTORvRRmp7ym+JZdO32Iv3qdF8MfDHagewI8o5zGaNiov6/nf1HnKpLxhDvD+8oj21k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612536280; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gjWjrkoo9fwMU9Sch1mUKkw5VscVbA8NCnnTZX/2IUQ=; b=djtx3YVw89qvc8zvzL/ria5BSlfGQQzVlBvRa3jBgRoqlRgCT4lII0lF56bTfvAyhMZIuQj6IRbhBhmGgjC5FjypGIIgaa2we3w13P4R9i/tLRCyqULVW6fKmUtGHLS4m2xnHTXEQ0nWRH3dWoeNsN1icoKbKnxDAeWOkaklwss= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by mx.zohomail.com with SMTPS id 1612536280319103.41068397027516; Fri, 5 Feb 2021 06:44:40 -0800 (PST) Received: by mail-ed1-f53.google.com with SMTP id g10so9109867eds.2 for ; Fri, 05 Feb 2021 06:44:39 -0800 (PST) Return-Path: Return-Path: 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) 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=BLjo/4nJQ3zVctQ4s13oiozv4hLBljUzfvScP3kB7rCdWig4k2XdQDow26B/iZVytu HF2yTPFUvBSXrdNTQ8jkMwdFAx/zahvktwEUsGkFXljA91hndQTn/ow4yUWvAtxpB/1e HcROksHFU5DSXy3Qi3py1DVaQjQfjfHsTO6caxOqOnSBwidlT97lS6ES6VHs2qWh9P6C EWDzXsH3ZvSfQmNawyrUEtiW91P7NH4VhyAC7z23xQEynxavCqSIRUgGGZ0h70swYVyr MgjyfNxuPf3xOksavTSU8rG1EPVSXzpRvJ8jhDl6oc0X7RxuyTGNQ8Ezsqiyv9VSlHmY nXEQ== X-Gm-Message-State: AOAM531EXMc/lSIfNZA5fgnF31rMjiMT7T5SLVn+wpGHWQdt7bCfU7fw fPBoT39j+lwE5Dp/mEkGnOg= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-arm@nongnu.org, Peter Maydell , Thomas Huth , Andrew Jones , qemu-block@nongnu.org, Laurent Vivier , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , Claudio Fontana 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 --- 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 =20 -#define MACHINE "-machine virt,gic-version=3Dmax -accel tcg " +#define MACHINE_TCG "-machine virt,gic-version=3Dmax -accel tcg " #define MACHINE_KVM "-machine virt,gic-version=3Dmax -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; } =20 +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; =20 - qts =3D qtest_init(MACHINE "-cpu max,sve-max-vq=3D8"); + qts =3D qtest_init(MACHINE_TCG "-cpu max,sve-max-vq=3D8"); + + if (!tcg_enabled(qts)) { + qtest_quit(qts); + return; + } =20 assert_sve_vls(qts, "max", BIT_ULL(8) - 1, NULL); =20 @@ -387,7 +402,12 @@ static void sve_tests_sve_off(const void *data) { QTestState *qts; =20 - qts =3D qtest_init(MACHINE "-cpu max,sve=3Doff"); + qts =3D qtest_init(MACHINE_TCG "-cpu max,sve=3Doff"); + + if (!tcg_enabled(qts)) { + qtest_quit(qts); + return; + } =20 /* 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; =20 - qts =3D qtest_init(MACHINE "-cpu max"); + qts =3D qtest_init(MACHINE_TCG "-cpu max"); + + if (!tcg_enabled(qts)) { + qtest_quit(qts); + return; + } =20 /* Test common query-cpu-model-expansion input validation */ assert_type_full(qts); --=20 2.26.2