From nobody Mon Nov 25 03:06:49 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1717572359; cv=none; d=zohomail.com; s=zohoarc; b=MyPMbReEAlPthF098ZM8YVY9pU9lobDbgbLbnOQKCgOM3K8BCovMa1XhUb/+QWJQzILM0uTQR7iupHkqkz+jn8Pfi3LMx7q1WtgI4Jrz4qqq2r84BfR5kDNmNZHtAcuAoQjSVZos99VM7ThPduNFe3ktvUZ8iaIyHdOw05nGszE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717572359; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=suuFTwrFjHJhcoeTNEoS5N1Dv16DjnF0P5AMW2D9V90=; b=bKeVT1qt0lBve49sfMAIU51IWqkhVPFWXX0gsxt2Hwg7nzoRNsCQu1WN3PrwBvr+yGHma4A3bIxAxpmBWWs3fmtYy6sOKTIhUK8sI4Li2eBuo63W6Cx3cJoji18D9WCWLTxyosjisxw/2e5pGcXGUZxvJh03+idnRdQRMX734V0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1717572359556253.35064003595687; Wed, 5 Jun 2024 00:25:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEl1j-0007GW-Fn; Wed, 05 Jun 2024 03:25:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEl1h-0007FN-P2 for qemu-devel@nongnu.org; Wed, 05 Jun 2024 03:25:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEl1g-0004a1-BR for qemu-devel@nongnu.org; Wed, 05 Jun 2024 03:25:41 -0400 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-650-7_mzDBzVP5Gz9N8EoUHq5Q-1; Wed, 05 Jun 2024 03:25:38 -0400 Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-1f63b8ab0b8so16867675ad.0 for ; Wed, 05 Jun 2024 00:25:38 -0700 (PDT) Received: from localhost.localdomain ([203.163.232.78]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1f6703f7673sm56329335ad.210.2024.06.05.00.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 00:25:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717572339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=suuFTwrFjHJhcoeTNEoS5N1Dv16DjnF0P5AMW2D9V90=; b=RfmD4C9p0FXSUstT8kwTpY+Cyunpr0d7QKsXX5PtzA5JLYjLr/9ggZ6Y+BQ8AfrPt74G2z iVRl552Az1yxrZ6YBXwlkDAusj0tacZ0MmoAGuWIwtvID2AFirTjnvCHyOw0d62rC8gQKH 8/Jritr2QE7d6v7MieGzXeSzp9Xs+hY= X-MC-Unique: 7_mzDBzVP5Gz9N8EoUHq5Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717572336; x=1718177136; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=suuFTwrFjHJhcoeTNEoS5N1Dv16DjnF0P5AMW2D9V90=; b=WeoEZapKFa0H1TCwCoeCUqOljYuGPIg1/VouXVlK4yaC0XpjRR7k5eG9iZ7hKguV2k ZJ2Kyi1JbMcxOPDI78nOTeW/e7G0fMPMO9auCH4P9RBot6O/8NEUKQPVK2nCcP/Jz09x djnz5V3cd+UeQhG5oWvLyCCvU+v6tWMixcTtyTR6SZ0H46BHs0aAOZv1hTYIymETuojB NS8rQ2IPDBBKITdwqbNpbuZefBi8lLs60d9wTxvPSOzJTRrfQeI+kmHHZKD+9qpRZI8Q p8fPBduEF7y2jNSayoorLjnuKAFrmIM8bPkKxGOVfgn3UZXyw2E6m0PMFAYUY/glfglm FaeA== X-Forwarded-Encrypted: i=1; AJvYcCXo4KFJeqdBlGm6EzhXYMTahnAP6PHz/+cbgl2odXr2iVuk5k0jQ54f/zwr7MnzE9gjVCys2t6h7AksNJwrGJv1ndUjRKg= X-Gm-Message-State: AOJu0YxQZz1zznQFhd6ufktYZ7fnWx7u3SmkL/NH1K0SEegqf89FqFrN kN2MweK1Moqa0XYMPErh8q/iuBsaspvTEVaY/iMs2ZErcG/bhbNNniDS6y/4MxgpAgy6fs1RUI6 iEeHQgEOaZLSF/5gblwgn7KVAnK7PL7wPaniHkZWFqZw4qkeBGjXyaVZqxHg3 X-Received: by 2002:a17:902:e847:b0:1f6:77e3:774a with SMTP id d9443c01a7336-1f6a5a6aee4mr21912565ad.52.1717572336102; Wed, 05 Jun 2024 00:25:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFZuAWoehzvOGN0612mi6DwBU0RCtaBt8ymPEA/pAtA63V0DYhEy1xVztWV1PQe27B/RaaRgA== X-Received: by 2002:a17:902:e847:b0:1f6:77e3:774a with SMTP id d9443c01a7336-1f6a5a6aee4mr21912425ad.52.1717572335662; Wed, 05 Jun 2024 00:25:35 -0700 (PDT) From: Ani Sinha To: Thomas Huth , Laurent Vivier , Paolo Bonzini Cc: Ani Sinha , qemu-devel@nongnu.org Subject: [PATCH v2 1/3] qtest/x86/numa-test: do not use the obsolete 'pentium' cpu Date: Wed, 5 Jun 2024 12:55:09 +0530 Message-ID: <20240605072512.67692-2-anisinha@redhat.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240605072512.67692-1-anisinha@redhat.com> References: <20240605072512.67692-1-anisinha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=anisinha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1717572360033100008 Content-Type: text/plain; charset="utf-8" 'pentium' cpu is old and obsolete and should be avoided for running tests if its not strictly needed. Use 'max' cpu instead for generic non-cpu specific numa test. CC: thuth@redhat.com Reviewed-by: Thomas Huth Signed-off-by: Ani Sinha --- tests/qtest/numa-test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) changelog: review tag added. No other changes. diff --git a/tests/qtest/numa-test.c b/tests/qtest/numa-test.c index 7aa262dbb9..f01f19592d 100644 --- a/tests/qtest/numa-test.c +++ b/tests/qtest/numa-test.c @@ -125,7 +125,8 @@ static void pc_numa_cpu(const void *data) QTestState *qts; g_autofree char *cli =3D NULL; =20 - cli =3D make_cli(data, "-cpu pentium -machine smp.cpus=3D8,smp.sockets= =3D2,smp.cores=3D2,smp.threads=3D2 " + cli =3D make_cli(data, + "-cpu max -machine smp.cpus=3D8,smp.sockets=3D2,smp.cores=3D2,smp.= threads=3D2 " "-numa node,nodeid=3D0,memdev=3Dram -numa node,nodeid=3D1 " "-numa cpu,node-id=3D1,socket-id=3D0 " "-numa cpu,node-id=3D0,socket-id=3D1,core-id=3D0 " --=20 2.42.0 From nobody Mon Nov 25 03:06:49 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1717572359; cv=none; d=zohomail.com; s=zohoarc; b=SnnI5uivL7o17q6O2TX39Diu9DOa+iMnSWKvE1Fm0uGpEOHH3jmJoHazqd5TffqejMAiZjTwoExy3pZXRjGI8E++CRHzM+ehKkNiteAdpcJa9me96l7drk35ImKVma6IaLb8Jdjp7nQ7jIZ6a0+Km9NRNWmDTdR+IghkciGlYe4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717572359; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=1uH3JVfpOHt4cmUIhQ0XYf7hQEI1P3L3/uwvE5MbOQ0=; b=fUjM1ZOmGNHrmlJciE7tJ4ECeu62CdZ988lQsye9cVLWMadKhQnZ28Kd/y5DDWIYgT4P8O5iISW8kI7I4E2rEMpwqhazpvduXh65ChH/oAH5yS+PsA4NDRNP2NndEnCE7DNBFmSF+peTlE5PTmFwo9R1o90sNX9HmKyaz/cMBDY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1717572359092246.33487553772466; Wed, 5 Jun 2024 00:25:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEl1l-0007LT-Uu; Wed, 05 Jun 2024 03:25:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEl1l-0007Im-4K for qemu-devel@nongnu.org; Wed, 05 Jun 2024 03:25:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEl1j-0004aT-Gv for qemu-devel@nongnu.org; Wed, 05 Jun 2024 03:25:44 -0400 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-647-NrJ3xxp_P-2be3jX1GhN2w-1; Wed, 05 Jun 2024 03:25:41 -0400 Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-1f682e7079bso24541005ad.0 for ; Wed, 05 Jun 2024 00:25:41 -0700 (PDT) Received: from localhost.localdomain ([203.163.232.78]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1f6703f7673sm56329335ad.210.2024.06.05.00.25.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 00:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717572342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1uH3JVfpOHt4cmUIhQ0XYf7hQEI1P3L3/uwvE5MbOQ0=; b=MJNeNQvn6Gb5WsfZddY7lpZyftljc5jXUu1wmg6+Am0aGGEI6ZDpD2PsJw+jAstXBpN203 RYD4VOKS1GpYP8yP/EUhzy0gy0TkNkiyiYDSHChObckmekvYOktTl92C2/xTrujGbHzgRf 7r8NJ7I0YYS+S8hu38MxpGJ+8pCgqPI= X-MC-Unique: NrJ3xxp_P-2be3jX1GhN2w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717572340; x=1718177140; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1uH3JVfpOHt4cmUIhQ0XYf7hQEI1P3L3/uwvE5MbOQ0=; b=PP/0J9AnchimCgw6OYiQiPYIzaMGC34EA8Sdu+pn/GN88zIfMo28qCYzccmDbUb+VW ukdyUPkPTEfgPs83RpH3R7bfJgyWg0lJXUXW/p7HVV5byHT9xSiwnhS963Q9hF/3kZGv OkC+s48gwYNrTPyKdW8RF1UZepDIp/97BrdBgO8QjRJq1l3f81kOyZCRbwxMJ9I+8qHa 2NH15R5YuzN0cPVx/1WyzUul/JCsSDiPh0NUFiUrd8UfJm9RirT7SjGUhrb9PCFomW09 FgeMHCfNct7yJ6wLDPYwBhXahnAlcKUknU46EkoIRjPt0/jwuMGEz9Bz49HVsXE084Dg J4yA== X-Forwarded-Encrypted: i=1; AJvYcCUtu5lBh9uy5WeS7uskC6uYpS/ABWw+pkA6jsIeyD8QXR3wQ4dVvAHTBs80MudeYo+FDdyY+w03vv3KSybigGegDMT744A= X-Gm-Message-State: AOJu0Ywq/Lqh0goVWy0fLpSaxGudtGlks9o8JUotnWyKvjKi8ZtpmApu tCWxSAktze0GnIFDQuEpU4Fh4KQqBE/lr3TWPap2Fri01c0KaTy2Qq+ovHZJ+CuVHR05veMLD0e f0WiQtm7cZziLC4P8BlfVyIOHc1Roj6dvaEcn1zlISLG9FBI23GeS X-Received: by 2002:a17:902:fa86:b0:1f6:1a91:e744 with SMTP id d9443c01a7336-1f6a5a11c60mr15807425ad.21.1717572340365; Wed, 05 Jun 2024 00:25:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH2pXxei2mOz5vemilMrrAdP0lTynzCw1RMTI4JTiecXktHkDYoptMQ0rL187vDTNo66IRbxw== X-Received: by 2002:a17:902:fa86:b0:1f6:1a91:e744 with SMTP id d9443c01a7336-1f6a5a11c60mr15807265ad.21.1717572339869; Wed, 05 Jun 2024 00:25:39 -0700 (PDT) From: Ani Sinha To: Thomas Huth , Laurent Vivier , Paolo Bonzini Cc: Ani Sinha , qemu-devel@nongnu.org Subject: [PATCH 2/3] tests/qtest/libqtest: add qtest_has_cpu() api Date: Wed, 5 Jun 2024 12:55:10 +0530 Message-ID: <20240605072512.67692-3-anisinha@redhat.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240605072512.67692-1-anisinha@redhat.com> References: <20240605072512.67692-1-anisinha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=anisinha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SORBS_WEB=1.5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1717572360042100009 Content-Type: text/plain; charset="utf-8" Added a new test api qtest_has_cpu() in order to check availability of some cpu models in the current QEMU binary. The specific architecture of the QEMU binary is selected using the QTEST_QEMU_BINARY environment variable. This a= pi would be useful to run tests against some older cpu models after checking if QEMU actually supported these models. CC: thuth@redhat.com Signed-off-by: Ani Sinha --- tests/qtest/libqtest.c | 84 ++++++++++++++++++++++++++++++++++++++++++ tests/qtest/libqtest.h | 8 ++++ 2 files changed, 92 insertions(+) diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index d8f80d335e..135a607728 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -37,6 +37,7 @@ #include "qapi/qmp/qjson.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" +#include "qapi/qmp/qbool.h" =20 #define MAX_IRQ 256 =20 @@ -1471,6 +1472,12 @@ struct MachInfo { char *alias; }; =20 +struct CpuInfo { + char *name; + char *alias_of; + bool deprecated; +}; + static void qtest_free_machine_list(struct MachInfo *machines) { if (machines) { @@ -1550,6 +1557,83 @@ static struct MachInfo *qtest_get_machines(const cha= r *var) return machines; } =20 +static struct CpuInfo *qtest_get_cpus(void) +{ + static struct CpuInfo *cpus; + QDict *response, *minfo; + QList *list; + const QListEntry *p; + QObject *qobj; + QString *qstr; + QBool *qbool; + QTestState *qts; + int idx; + + if (cpus) { + return cpus; + } + + silence_spawn_log =3D !g_test_verbose(); + + qts =3D qtest_init_with_env(NULL, "-machine none"); + response =3D qtest_qmp(qts, "{ 'execute': 'query-cpu-definitions' }"); + g_assert(response); + list =3D qdict_get_qlist(response, "return"); + g_assert(list); + + cpus =3D g_new(struct CpuInfo, qlist_size(list) + 1); + + for (p =3D qlist_first(list), idx =3D 0; p; p =3D qlist_next(p), idx++= ) { + minfo =3D qobject_to(QDict, qlist_entry_obj(p)); + g_assert(minfo); + + qobj =3D qdict_get(minfo, "name"); + g_assert(qobj); + qstr =3D qobject_to(QString, qobj); + g_assert(qstr); + cpus[idx].name =3D g_strdup(qstring_get_str(qstr)); + + qobj =3D qdict_get(minfo, "alias_of"); + if (qobj) { /* old machines do not report aliases */ + qstr =3D qobject_to(QString, qobj); + g_assert(qstr); + cpus[idx].alias_of =3D g_strdup(qstring_get_str(qstr)); + } else { + cpus[idx].alias_of =3D NULL; + } + + qobj =3D qdict_get(minfo, "deprecated"); + qbool =3D qobject_to(QBool, qobj); + g_assert(qbool); + cpus[idx].deprecated =3D qbool_get_bool(qbool); + } + + qtest_quit(qts); + qobject_unref(response); + + silence_spawn_log =3D false; + + memset(&cpus[idx], 0, sizeof(struct CpuInfo)); /* Terminating entry */ + return cpus; +} + +bool qtest_has_cpu(const char *cpu) +{ + struct CpuInfo *cpus; + int i; + + cpus =3D qtest_get_cpus(); + + for (i =3D 0; cpus[i].name !=3D NULL; i++) { + if (g_str_equal(cpu, cpus[i].name) || + (cpus[i].alias_of && g_str_equal(cpu, cpus[i].alias_of))) { + return true; + } + } + + return false; +} + void qtest_cb_for_every_machine(void (*cb)(const char *machine), bool skip_old_versioned) { diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqtest.h index 6e3d3525bf..c94b64f960 100644 --- a/tests/qtest/libqtest.h +++ b/tests/qtest/libqtest.h @@ -949,6 +949,14 @@ bool qtest_has_machine(const char *machine); */ bool qtest_has_machine_with_env(const char *var, const char *machine); =20 +/** + * qtest_has_cpu: + * @cpu: The cpu to look for + * + * Returns: true if the cpu is available in the target binary. + */ +bool qtest_has_cpu(const char *cpu); + /** * qtest_has_device: * @device: The device to look for --=20 2.42.0 From nobody Mon Nov 25 03:06:49 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1717572394; cv=none; d=zohomail.com; s=zohoarc; b=NHwE292ehQXnKqyRSqkuDkqjnR/b81+xSGX4vmKG4pDQ/8ykaXLIrvAVyuvhLtQoYtguPGwdjNXXVIqgvtgyncjgHlPx2VngZm0vK8E+zVsAjRMuXNSeFfRYlC8ulYCSZ/FAqja21LMDGnmPkxQVpcxCNOSLUH2+/oWBmrWEKUU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717572394; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fiVJUtIQgCNlR10lRRAGnZcdMQyFwt7Yf0bpSkUpQr8=; b=cxPO3N6vmXFuQqtAcWUA7nWeYS4YjC2VUTqGsG2h5DYT8H5Z1Dfl76Fyx2osAGy4xmHSIfipUF9i9JBoocyBbI9mgDZ8InMECqt+UrAPbZKwnXR6vF6Ubu7dO3ddLqbsRE6Adc8vKJ9Z9WjpVrUoLTPdlCCMdXjH5WIPCREpqBE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1717572394967236.87898489441466; Wed, 5 Jun 2024 00:26:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEl1t-0007Rp-LM; Wed, 05 Jun 2024 03:25:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEl1s-0007RI-2T for qemu-devel@nongnu.org; Wed, 05 Jun 2024 03:25:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEl1q-0004ai-00 for qemu-devel@nongnu.org; Wed, 05 Jun 2024 03:25:51 -0400 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-335-nAyHQEnmP7KoxuEhqxBG_w-1; Wed, 05 Jun 2024 03:25:46 -0400 Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-1f61b9823cbso65402585ad.1 for ; Wed, 05 Jun 2024 00:25:46 -0700 (PDT) Received: from localhost.localdomain ([203.163.232.78]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1f6703f7673sm56329335ad.210.2024.06.05.00.25.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 00:25:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717572348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fiVJUtIQgCNlR10lRRAGnZcdMQyFwt7Yf0bpSkUpQr8=; b=LgYQihj9gJ9Wfx4iPfa20JYLAYuyPoAS9ckY1eH49WkXZZR0Oy8V8tMJmDKHryl1vakbGU P9Ea2GydmhZrW8Vsb1BdhmUqvihWsPWgCPnBeq124AW8KkPc4IhqmTncWpJF6oEhmgkqD0 iPmR1R4v0aH5ok4rxenXxjgp7ITJFYM= X-MC-Unique: nAyHQEnmP7KoxuEhqxBG_w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717572345; x=1718177145; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fiVJUtIQgCNlR10lRRAGnZcdMQyFwt7Yf0bpSkUpQr8=; b=CszTP6zR7jCf9BbicR7WUVibxFYu3OZ1JDtRZ1J+m5hwyd78rSAiPM7oJUpLkdgLbd 1Npqde9WREcRPf5kXt7wFwLrPpJf5wZQCjFcHhfi+8SJw2eUBeGLI7NI/jAbVNZDHOoM 0wSUVsDRlJWtHPxvTs+erO8sj8+G00w8IngtOQBw1wFDkb8lGlRPnLafPwgYq+ShX5IQ VmGDrh70dDD7Xajsx9ZcHB+BAlj57ePkCioqWWX7GUS+JXPSlVL5ul3Psh6CvlGWVD03 UKPyrEdO5/kAdvKSlhvXaq6BzHIoqeauCG6coSuxeE9sPBzl0Pd8o1D+I616uHVxhYzq 7pow== X-Forwarded-Encrypted: i=1; AJvYcCUw8//Q2NsqCmqzvHWXxxMH65PA0NQvc+bYr+sj6K73iZQy1qUrYXRAuAvAeKn7v5YtgG94jD5M26LajhheZzqwhRrf53g= X-Gm-Message-State: AOJu0Yx6RieLG3vzD0VNXXG/HJwhC+ZS/56eqQOaC4SOfSiCr+e/te23 JR79k3QF4JRpnf/TBnCWBc8fwkB3dcvWpUglOvm6LakQQmpKq4jFQUf6Spv6vhT4Nj74gDiOkYE LPfyauCJr5fCIgYWC0HV1bWslzLBqDlarJuHadNe3NZcAhg7U20r6 X-Received: by 2002:a17:902:ceca:b0:1f6:850c:3c5f with SMTP id d9443c01a7336-1f6a5a879c2mr23912375ad.69.1717572345043; Wed, 05 Jun 2024 00:25:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEhPvemlzt2pvD8gLlIaI4OsKiYczgRWOj2BAoUCErNcn96Drl9ZFAr4LTIVoRDJOIXriRszg== X-Received: by 2002:a17:902:ceca:b0:1f6:850c:3c5f with SMTP id d9443c01a7336-1f6a5a879c2mr23912195ad.69.1717572344616; Wed, 05 Jun 2024 00:25:44 -0700 (PDT) From: Ani Sinha To: "Michael S. Tsirkin" , Marcel Apfelbaum , Thomas Huth , Laurent Vivier , Paolo Bonzini Cc: Ani Sinha , imammedo@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 3/3] tests/qtest/x86: check for availability of older cpu models before running tests Date: Wed, 5 Jun 2024 12:55:11 +0530 Message-ID: <20240605072512.67692-4-anisinha@redhat.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240605072512.67692-1-anisinha@redhat.com> References: <20240605072512.67692-1-anisinha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=anisinha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SORBS_WEB=1.5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1717572396348100006 Content-Type: text/plain; charset="utf-8" Some older cpu models like 486, athlon, pentium, penryn, phenom, core2duo e= tc may not be available in all builds. Check for their availability in qemu be= fore running the corresponding tests. The order of the tests has been altered so that all tests for similar checks under a specific cpu is placed together. One minor correction. Replaced 'phenom' with '486' in the test 'x86/cpuid/auto-level/phenom/arat' matching the cpu used. CC: thuth@redhat.com CC: imammedo@redhat.com Signed-off-by: Ani Sinha --- tests/qtest/test-x86-cpuid-compat.c | 214 +++++++++++++++++----------- 1 file changed, 127 insertions(+), 87 deletions(-) diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpu= id-compat.c index 6a39454fce..054f9eae47 100644 --- a/tests/qtest/test-x86-cpuid-compat.c +++ b/tests/qtest/test-x86-cpuid-compat.c @@ -209,99 +209,135 @@ static void test_plus_minus(void) =20 int main(int argc, char **argv) { + bool has_486, has_athlon, has_conroe; + bool has_core2duo, has_penryn, has_pentium, has_phenom; + g_test_init(&argc, &argv, NULL); =20 - g_test_add_func("/x86/cpuid/parsing-plus-minus/subprocess", - test_plus_minus_subprocess); - g_test_add_func("/x86/cpuid/parsing-plus-minus", test_plus_minus); + has_486 =3D qtest_has_cpu("486"); + has_athlon =3D qtest_has_cpu("athlon"); + has_conroe =3D qtest_has_cpu("Conroe"); + has_core2duo =3D qtest_has_cpu("core2duo"); + has_penryn =3D qtest_has_cpu("Penryn"); + has_pentium =3D qtest_has_cpu("pentium"); + has_phenom =3D qtest_has_cpu("phenom"); + + if (has_pentium) { + g_test_add_func("/x86/cpuid/parsing-plus-minus/subprocess", + test_plus_minus_subprocess); + g_test_add_func("/x86/cpuid/parsing-plus-minus", test_plus_minus); + } =20 /* Original level values for CPU models: */ - add_cpuid_test("x86/cpuid/phenom/level", - "-cpu phenom", "level", 5); - add_cpuid_test("x86/cpuid/Conroe/level", - "-cpu Conroe", "level", 10); + if (has_486) { + add_cpuid_test("x86/cpuid/486/xlevel", + "-cpu 486", "xlevel", 0); + } + if (has_phenom) { + add_cpuid_test("x86/cpuid/phenom/level", + "-cpu phenom", "level", 5); + add_cpuid_test("x86/cpuid/phenom/xlevel", + "-cpu phenom", "xlevel", 0x8000001A); + } + if (has_athlon) { + add_cpuid_test("x86/cpuid/athlon/xlevel", + "-cpu athlon", "xlevel", 0x80000008); + } + if (has_core2duo) { + add_cpuid_test("x86/cpuid/core2duo/xlevel", + "-cpu core2duo", "xlevel", 0x80000008); + } + if (has_conroe) { + add_cpuid_test("x86/cpuid/Conroe/level", + "-cpu Conroe", "level", 10); + } add_cpuid_test("x86/cpuid/SandyBridge/level", "-cpu SandyBridge", "level", 0xd); - add_cpuid_test("x86/cpuid/486/xlevel", - "-cpu 486", "xlevel", 0); - add_cpuid_test("x86/cpuid/core2duo/xlevel", - "-cpu core2duo", "xlevel", 0x80000008); - add_cpuid_test("x86/cpuid/phenom/xlevel", - "-cpu phenom", "xlevel", 0x8000001A); - add_cpuid_test("x86/cpuid/athlon/xlevel", - "-cpu athlon", "xlevel", 0x80000008); =20 /* If level is not large enough, it should increase automatically: */ - /* CPUID[6].EAX: */ - add_cpuid_test("x86/cpuid/auto-level/phenom/arat", - "-cpu 486,arat=3Don", "level", 6); - /* CPUID[EAX=3D7,ECX=3D0].EBX: */ - add_cpuid_test("x86/cpuid/auto-level/phenom/fsgsbase", - "-cpu phenom,fsgsbase=3Don", "level", 7); - /* CPUID[EAX=3D7,ECX=3D0].ECX: */ - add_cpuid_test("x86/cpuid/auto-level/phenom/avx512vbmi", - "-cpu phenom,avx512vbmi=3Don", "level", 7); - /* CPUID[EAX=3D0xd,ECX=3D1].EAX: */ - add_cpuid_test("x86/cpuid/auto-level/phenom/xsaveopt", - "-cpu phenom,xsaveopt=3Don", "level", 0xd); - /* CPUID[8000_0001].EDX: */ - add_cpuid_test("x86/cpuid/auto-xlevel/486/3dnow", - "-cpu 486,3dnow=3Don", "xlevel", 0x80000001); - /* CPUID[8000_0001].ECX: */ - add_cpuid_test("x86/cpuid/auto-xlevel/486/sse4a", - "-cpu 486,sse4a=3Don", "xlevel", 0x80000001); - /* CPUID[8000_0007].EDX: */ - add_cpuid_test("x86/cpuid/auto-xlevel/486/invtsc", - "-cpu 486,invtsc=3Don", "xlevel", 0x80000007); - /* CPUID[8000_000A].EDX: */ - add_cpuid_test("x86/cpuid/auto-xlevel/486/npt", - "-cpu 486,svm=3Don,npt=3Don", "xlevel", 0x8000000A); - /* CPUID[C000_0001].EDX: */ - add_cpuid_test("x86/cpuid/auto-xlevel2/phenom/xstore", - "-cpu phenom,xstore=3Don", "xlevel2", 0xC0000001); - /* SVM needs CPUID[0x8000000A] */ - add_cpuid_test("x86/cpuid/auto-xlevel/athlon/svm", - "-cpu athlon,svm=3Don", "xlevel", 0x8000000A); - + if (has_486) { + /* CPUID[6].EAX: */ + add_cpuid_test("x86/cpuid/auto-level/486/arat", + "-cpu 486,arat=3Don", "level", 6); + /* CPUID[8000_0001].EDX: */ + add_cpuid_test("x86/cpuid/auto-xlevel/486/3dnow", + "-cpu 486,3dnow=3Don", "xlevel", 0x80000001); + /* CPUID[8000_0001].ECX: */ + add_cpuid_test("x86/cpuid/auto-xlevel/486/sse4a", + "-cpu 486,sse4a=3Don", "xlevel", 0x80000001); + /* CPUID[8000_0007].EDX: */ + add_cpuid_test("x86/cpuid/auto-xlevel/486/invtsc", + "-cpu 486,invtsc=3Don", "xlevel", 0x80000007); + /* CPUID[8000_000A].EDX: */ + add_cpuid_test("x86/cpuid/auto-xlevel/486/npt", + "-cpu 486,svm=3Don,npt=3Don", "xlevel", 0x8000000A); + } + if (has_phenom) { + /* CPUID[EAX=3D7,ECX=3D0].EBX: */ + add_cpuid_test("x86/cpuid/auto-level/phenom/fsgsbase", + "-cpu phenom,fsgsbase=3Don", "level", 7); + /* CPUID[EAX=3D7,ECX=3D0].ECX: */ + add_cpuid_test("x86/cpuid/auto-level/phenom/avx512vbmi", + "-cpu phenom,avx512vbmi=3Don", "level", 7); + /* CPUID[EAX=3D0xd,ECX=3D1].EAX: */ + add_cpuid_test("x86/cpuid/auto-level/phenom/xsaveopt", + "-cpu phenom,xsaveopt=3Don", "level", 0xd); + /* CPUID[C000_0001].EDX: */ + add_cpuid_test("x86/cpuid/auto-xlevel2/phenom/xstore", + "-cpu phenom,xstore=3Don", "xlevel2", 0xC0000001); + } + if (has_athlon) { + /* SVM needs CPUID[0x8000000A] */ + add_cpuid_test("x86/cpuid/auto-xlevel/athlon/svm", + "-cpu athlon,svm=3Don", "xlevel", 0x8000000A); + } =20 /* If level is already large enough, it shouldn't change: */ add_cpuid_test("x86/cpuid/auto-level/SandyBridge/multiple", "-cpu SandyBridge,arat=3Don,fsgsbase=3Don,avx512vbmi=3D= on", "level", 0xd); /* If level is explicitly set, it shouldn't change: */ - add_cpuid_test("x86/cpuid/auto-level/486/fixed/0xF", - "-cpu 486,level=3D0xF,arat=3Don,fsgsbase=3Don,avx512vbm= i=3Don,xsaveopt=3Don", - "level", 0xF); - add_cpuid_test("x86/cpuid/auto-level/486/fixed/2", - "-cpu 486,level=3D2,arat=3Don,fsgsbase=3Don,avx512vbmi= =3Don,xsaveopt=3Don", - "level", 2); - add_cpuid_test("x86/cpuid/auto-level/486/fixed/0", - "-cpu 486,level=3D0,arat=3Don,fsgsbase=3Don,avx512vbmi= =3Don,xsaveopt=3Don", - "level", 0); + if (has_486) { + add_cpuid_test("x86/cpuid/auto-level/486/fixed/0xF", + "-cpu 486,level=3D0xF,arat=3Don,fsgsbase=3Don,avx51= 2vbmi=3Don,xsaveopt=3Don", + "level", 0xF); + add_cpuid_test("x86/cpuid/auto-level/486/fixed/2", + "-cpu 486,level=3D2,arat=3Don,fsgsbase=3Don,avx512v= bmi=3Don,xsaveopt=3Don", + "level", 2); + add_cpuid_test("x86/cpuid/auto-level/486/fixed/0", + "-cpu 486,level=3D0,arat=3Don,fsgsbase=3Don,avx512v= bmi=3Don,xsaveopt=3Don", + "level", 0); + } =20 /* if xlevel is already large enough, it shouldn't change: */ - add_cpuid_test("x86/cpuid/auto-xlevel/phenom/3dnow", - "-cpu phenom,3dnow=3Don,sse4a=3Don,invtsc=3Don,npt=3Don= ,svm=3Don", - "xlevel", 0x8000001A); + if (has_phenom) { + add_cpuid_test("x86/cpuid/auto-xlevel/phenom/3dnow", + "-cpu phenom,3dnow=3Don,sse4a=3Don,invtsc=3Don,npt= =3Don,svm=3Don", + "xlevel", 0x8000001A); + } + /* If xlevel is explicitly set, it shouldn't change: */ - add_cpuid_test("x86/cpuid/auto-xlevel/486/fixed/80000002", - "-cpu 486,xlevel=3D0x80000002,3dnow=3Don,sse4a=3Don,inv= tsc=3Don,npt=3Don,svm=3Don", - "xlevel", 0x80000002); - add_cpuid_test("x86/cpuid/auto-xlevel/486/fixed/8000001A", - "-cpu 486,xlevel=3D0x8000001A,3dnow=3Don,sse4a=3Don,inv= tsc=3Don,npt=3Don,svm=3Don", - "xlevel", 0x8000001A); - add_cpuid_test("x86/cpuid/auto-xlevel/phenom/fixed/0", - "-cpu 486,xlevel=3D0,3dnow=3Don,sse4a=3Don,invtsc=3Don,= npt=3Don,svm=3Don", - "xlevel", 0); - - /* if xlevel2 is already large enough, it shouldn't change: */ - add_cpuid_test("x86/cpuid/auto-xlevel2/486/fixed", - "-cpu 486,xlevel2=3D0xC0000002,xstore=3Don", - "xlevel2", 0xC0000002); + if (has_486) { + add_cpuid_test("x86/cpuid/auto-xlevel/486/fixed/80000002", + "-cpu 486,xlevel=3D0x80000002,3dnow=3Don,sse4a=3Don= ,invtsc=3Don,npt=3Don,svm=3Don", + "xlevel", 0x80000002); + add_cpuid_test("x86/cpuid/auto-xlevel/486/fixed/8000001A", + "-cpu 486,xlevel=3D0x8000001A,3dnow=3Don,sse4a=3Don= ,invtsc=3Don,npt=3Don,svm=3Don", + "xlevel", 0x8000001A); + add_cpuid_test("x86/cpuid/auto-xlevel/phenom/fixed/0", + "-cpu 486,xlevel=3D0,3dnow=3Don,sse4a=3Don,invtsc= =3Don,npt=3Don,svm=3Don", + "xlevel", 0); + + /* if xlevel2 is already large enough, it shouldn't change: */ + add_cpuid_test("x86/cpuid/auto-xlevel2/486/fixed", + "-cpu 486,xlevel2=3D0xC0000002,xstore=3Don", + "xlevel2", 0xC0000002); + } + =20 /* Check compatibility of old machine-types that didn't * auto-increase level/xlevel/xlevel2: */ - if (qtest_has_machine("pc-i440fx-2.7")) { + if (qtest_has_machine("pc-i440fx-2.7") && has_486) { add_cpuid_test("x86/cpuid/auto-level/pc-2.7", "-machine pc-i440fx-2.7 -cpu 486,arat=3Don,avx512vb= mi=3Don,xsaveopt=3Don", "level", 1); @@ -317,7 +353,7 @@ int main(int argc, char **argv) * and the compat code that sets default level shouldn't * disable the auto-level=3D7 code: */ - if (qtest_has_machine("pc-i440fx-2.3")) { + if (qtest_has_machine("pc-i440fx-2.3") && has_penryn) { add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.3/off", "-machine pc-i440fx-2.3 -cpu Penryn", "level", 4); @@ -325,7 +361,7 @@ int main(int argc, char **argv) "-machine pc-i440fx-2.3 -cpu Penryn,erms=3Don", "level", 7); } - if (qtest_has_machine("pc-i440fx-2.9")) { + if (qtest_has_machine("pc-i440fx-2.9") && has_conroe) { add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/off", "-machine pc-i440fx-2.9 -cpu Conroe", "level", 10); @@ -354,18 +390,22 @@ int main(int argc, char **argv) } =20 /* Test feature parsing */ - add_feature_test("x86/cpuid/features/plus", - "-cpu 486,+arat", - 6, 0, "EAX", 2, true); - add_feature_test("x86/cpuid/features/minus", - "-cpu pentium,-mmx", - 1, 0, "EDX", 23, false); - add_feature_test("x86/cpuid/features/on", - "-cpu 486,arat=3Don", - 6, 0, "EAX", 2, true); - add_feature_test("x86/cpuid/features/off", - "-cpu pentium,mmx=3Doff", - 1, 0, "EDX", 23, false); + if (has_486) { + add_feature_test("x86/cpuid/features/plus", + "-cpu 486,+arat", + 6, 0, "EAX", 2, true); + add_feature_test("x86/cpuid/features/on", + "-cpu 486,arat=3Don", + 6, 0, "EAX", 2, true); + } + if (has_pentium) { + add_feature_test("x86/cpuid/features/minus", + "-cpu pentium,-mmx", + 1, 0, "EDX", 23, false); + add_feature_test("x86/cpuid/features/off", + "-cpu pentium,mmx=3Doff", + 1, 0, "EDX", 23, false); + } add_feature_test("x86/cpuid/features/max-plus-invtsc", "-cpu max,+invtsc", 0x80000007, 0, "EDX", 8, true); --=20 2.42.0