From nobody Mon Nov 25 03:45:36 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=1717596870; cv=none; d=zohomail.com; s=zohoarc; b=W0B4pxG6m1WIBz2qCLRguCLJnpyA8Wjw6HHiSKQG5M4S3UQqTLlJBBEGjjxj/8YNHrenV+pbqcSgT6e4xVDu7AxmMol6ALGE+fn0N3VE8Fwydjuv6hYwI+Mxyk4BeUymjNd1UU6esOgVSDN7Ne2LcGR421H6YR84/Um3kDC8ODg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717596870; 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=CXFOuCjO7G5UCkIFsgitrynWMfaFo4WfMng6DJRMxN4=; b=btCcFkmwEUjf/ihwgS87iyPtTcl4j3hCtQMkq2SjRPQqZi5t9opv3RMuEzqQxvV69wZdGgh9LtU3OV44ety2EuGW0eoXj8wORV81I7Z7gl04BtLUZ4PKfTnCy1FdkiaTa7qz3bZXDivQvchI9D5NlIgBFdWXDWcVLb+jKTthyFs= 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 171759687037885.10771819097647; Wed, 5 Jun 2024 07:14:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sErOk-0001Yo-AO; Wed, 05 Jun 2024 10:13:54 -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 1sErOh-0001Xw-Ic for qemu-devel@nongnu.org; Wed, 05 Jun 2024 10:13:51 -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 1sErOg-0004jZ-6R for qemu-devel@nongnu.org; Wed, 05 Jun 2024 10:13:51 -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-533-Pa9c_Y61MZ6zNJ4nTJ3ChA-1; Wed, 05 Jun 2024 10:13:47 -0400 Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-1f682664703so23081545ad.1 for ; Wed, 05 Jun 2024 07:13:47 -0700 (PDT) Received: from localhost.localdomain ([203.163.232.78]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1f6323ddac9sm105225665ad.173.2024.06.05.07.13.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 07:13:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717596829; 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=CXFOuCjO7G5UCkIFsgitrynWMfaFo4WfMng6DJRMxN4=; b=SPSyVF5RsiRlCPanxlLLiSEvGajF6kYya7bqmBvGF+Zv0zb8SBnSd2wNOfphFE8o4v8Wjy 1Vsp9D2UBQsuHoxJhxj2s8FTG8fAugSCfCn7RQDSZVLoopC5AAzV7yCf6ktICnwFGjBXM7 iHZow8J2KSUGgDwPUqzyYA9bfkqnjr4= X-MC-Unique: Pa9c_Y61MZ6zNJ4nTJ3ChA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717596826; x=1718201626; 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=CXFOuCjO7G5UCkIFsgitrynWMfaFo4WfMng6DJRMxN4=; b=POCCzvaXMPpmGB1S3+WFNrdQjCy3OINYXhEsfJHns6QQ/hd2RxfS5v/mUQgZUzkfad llIcl+fVf1/mljHk0UHAPOxCUzPyjM7+Vpzy/7IH3exb7ws+4O0zc2AmexTjE9rjslU4 iUUdmjd2j2j9yJ3xRRYr0t5Ail96tRqViGRJGX8dqaAkdsOqkdg3Js9gY05G5wyjAAYb GWd3goXjJfa5ozjj6l6+aKfqGV0giVuU9wgIRcAbDRwIn9aaW4rXyd39qztZGyH33BPh UWJwPIi5f3ML4WSyE5DqiFPojbKKX+lKMOrWUUZQce0PYVbGwDZFNbRoqm3v3lCR/JOR 1xVg== X-Forwarded-Encrypted: i=1; AJvYcCXtEw4aPytHt2tspxEiu0A+gcX1DavDd8PaTqKRSnFFZYNBeCah3iYtelrnU7NTXKn82s7A7WFyHSDoPSHyqPMywWwdWX8= X-Gm-Message-State: AOJu0YwzSQ11NhzqOsFshIrBbo4B8NNf4yF6syu342Dt9TRc3oHvZI2L Cm7/ufa/ofsRlPtpIebtkqKre39siVm7TucAEhChvS2UTaeG1BnLYSdGAtQI2UFQsjM1H7DC7Qw tlr/IpBYcCZ6UOh1AdGZao4Yv2xN8IXuiFnjKLsHMbJJYD6Ry4vTV X-Received: by 2002:a17:902:e810:b0:1e3:dfdc:6972 with SMTP id d9443c01a7336-1f6a5a042damr30849465ad.9.1717596826529; Wed, 05 Jun 2024 07:13:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH8efO6sn1nPpF1bJYIAFV/UHO4uMlYwW9ExMwEK0Wbou/RrKGGr+d9gyYKWPGYebOoJw5emQ== X-Received: by 2002:a17:902:e810:b0:1e3:dfdc:6972 with SMTP id d9443c01a7336-1f6a5a042damr30849165ad.9.1717596826092; Wed, 05 Jun 2024 07:13:46 -0700 (PDT) From: Ani Sinha To: Thomas Huth , Laurent Vivier , Paolo Bonzini Cc: Ani Sinha , Igor Mammedov , qemu-devel@nongnu.org Subject: [PATCH v3 1/3] qtest/x86/numa-test: do not use the obsolete 'pentium' cpu Date: Wed, 5 Jun 2024 19:43:14 +0530 Message-ID: <20240605141316.91955-2-anisinha@redhat.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240605141316.91955-1-anisinha@redhat.com> References: <20240605141316.91955-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: -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: 1717596872447100003 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 Reviewed-by: Igor Mammedov Signed-off-by: Ani Sinha --- tests/qtest/numa-test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) changelog: v2: added reviewed tag v3: added reviewed tag 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:45:36 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=1717596865; cv=none; d=zohomail.com; s=zohoarc; b=MFD/5lbCmuo+MU5YwpE25gUaNmg9l6QymVksPp2VJjHOmh0nZC0NG6uE7YSwqwa58xBQFAHk52tTSjrXJWa8E6+eZxEA8jRoz7ObE0OZXuAIhH4OqB7P1uP4iq5UDKfYQ5nhBSIDsHP4Ff/3Qqn9ER94TOYkTFYObmK41F2roNs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717596865; 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=Pihwqy/YzeEm4VX36K7UghQI36VbDkmh1JUSIJjPN2cgs+oq443IkK5IF+hO86fpnPrRYtsaXdtu2wSrpvVS80pk4TuJQHygGKj0Qa9RtkhzxGph0icRuqwloNuVEjmntApWVjCLvGxHRr4O4LUUJ1E3QLvQDm1b84eCp6fjocA= 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 1717596865390729.0376738371798; Wed, 5 Jun 2024 07:14:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sErOv-0001l3-UY; Wed, 05 Jun 2024 10:14:05 -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 1sErOu-0001k1-OX for qemu-devel@nongnu.org; Wed, 05 Jun 2024 10:14:04 -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 1sErOs-0004l3-WA for qemu-devel@nongnu.org; Wed, 05 Jun 2024 10:14:04 -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-624-J-b8rVa8O-apwUxvQ28hyg-1; Wed, 05 Jun 2024 10:13:57 -0400 Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-1f6828e8823so28315865ad.2 for ; Wed, 05 Jun 2024 07:13:57 -0700 (PDT) Received: from localhost.localdomain ([203.163.232.78]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1f6323ddac9sm105225665ad.173.2024.06.05.07.13.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 07:13:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717596842; 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=ffys+Q8h38L/A1Y4VcI5QiafvyN0/uZvJ9dBCiYkuyIrNYNHNdc9M8JyZuwjV/LDqGoEQY y4WbXtYJKSBQ8fjKeg6z2IljpkJb9YoT6EtEP3JVG7XIFChPkAwqq4xYmVPl2U7Fciw7ia wwP6fCdjteOMWgosBKVi7U/B33piqwk= X-MC-Unique: J-b8rVa8O-apwUxvQ28hyg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717596837; x=1718201637; 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=QrTDWzw0KlNWBwZ4WEHAJhkCqoM3QdSx0u/WOP1Txna3NQbBR/cRkMUgcRrfwNe34z utBtwSH2IzgCJZHhr8PRFYewBlkyByJTA3Gqp3Kx8pKPEcV0JHyp0gjKKzVJoaiMKLgy rwH/hvT5E+m+Q1sY10MSzG+tSwfIwEnJqIRcAhD5u26ZbTbACu6uz6K31RzvIQhScpKj zcFckcBdjdgEvTdU1Pd4WPtW0vA0AOhY2mjLhuQCCNNZ5kTwlq8WiJeLDYWZ3AaXnhmV vGS5uYGuOgZeuvytnSlUSd11TN6dy+I5HEe2ye9G99rqIs9a1bMK6MEBskqjyy2LGEQR uLOA== X-Forwarded-Encrypted: i=1; AJvYcCWYr2qhViYP9SQXZfShiKsd6eyQ1sIJGtAEnpNb7u5K2egcrGTkv6ysio+tdIwFJGbWnbRxYoqzY15M04M5giSHNMbulDc= X-Gm-Message-State: AOJu0Yy/oN17HTOSnXc8T54/Fy4JJbkZ2qdz55Mul+YMeLpRdLK1t6Dj nJj+JEacYyQPlX4yVSC2oO3i/PE6yDo/u1iscTp+ESHRpgmx1nJsa3cBvh88tdAx4zrm7jpwsDH 0ReGUBbBHVYuvK/aoj0HsvbnIlGU7vDoPWKYW6D7MsuwN+gGzHvCJ X-Received: by 2002:a17:902:db02:b0:1f4:808e:9f6d with SMTP id d9443c01a7336-1f6a59ffc2cmr31995105ad.6.1717596836645; Wed, 05 Jun 2024 07:13:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGYHm+FLSc+zDi9DgcE0uEGl1KOPqx/zQBS0lr3fZOdztQydYwNn6usGExXPjtXAH50x6yQwQ== X-Received: by 2002:a17:902:db02:b0:1f4:808e:9f6d with SMTP id d9443c01a7336-1f6a59ffc2cmr31994735ad.6.1717596836140; Wed, 05 Jun 2024 07:13:56 -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 19:43:15 +0530 Message-ID: <20240605141316.91955-3-anisinha@redhat.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240605141316.91955-1-anisinha@redhat.com> References: <20240605141316.91955-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: -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: 1717596866408100001 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:45:36 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=1717596880; cv=none; d=zohomail.com; s=zohoarc; b=lHASO1/utXB0eeJztEPeYuX2PbVmrLsaqe9NIRO52NkF5wNRp+at1X3e/HJMj2Px16W4fWaAFi0QpJKN8Sv9BhJwKBt0KY9Vf4J22rpQlTmbUXGRtXu+FunfrZ/N+ZJDHQ70hIcfnpv3zQiDsnA1eTXI9CaMizz5P3PQySY17KM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717596880; 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=Tcl0qZl4zU184pZcQrM7oLNyygIhSEBwyRI8ZNXhceI=; b=SSJy3gdQK/dg9QCPIF7v0t/GGfBi9AnUTqirzzRtD0cZPovnG3rzx+Xd/LYr2OIrj3CmRgsKgPXX56jheRcXDtlc9cEPwoQ5ofIzXLhe+hTANLdZftSaPxG/e02L865OLgC5FheYkjbdxhwLx9pLA1aJ+ggGX/ExuzihjfjE4EM= 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 1717596880339227.40948724848124; Wed, 5 Jun 2024 07:14:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sErOy-0001mb-96; Wed, 05 Jun 2024 10:14:08 -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 1sErOx-0001lz-3P for qemu-devel@nongnu.org; Wed, 05 Jun 2024 10:14:07 -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 1sErOu-0004nB-TB for qemu-devel@nongnu.org; Wed, 05 Jun 2024 10:14:06 -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-507--eul_6I2PdKIl65r-AsyqA-1; Wed, 05 Jun 2024 10:14:02 -0400 Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-1f6768af0b3so33499955ad.0 for ; Wed, 05 Jun 2024 07:14:02 -0700 (PDT) Received: from localhost.localdomain ([203.163.232.78]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1f6323ddac9sm105225665ad.173.2024.06.05.07.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 07:14:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717596844; 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=Tcl0qZl4zU184pZcQrM7oLNyygIhSEBwyRI8ZNXhceI=; b=UTzj0cI6+3IHaCyYKKwF7MPeXzhlu+T6wsbTql5HLElXts4bZbYdQ0Q4Wu2qGyRIlxg2/7 3ZLGPhsIHfTjOknV+FnQWqUR5wtaPP7nqkFMMgdWi6t08uI4H05NWNZX0fyn9HcSqvc0xV JjYxRmztKmpV+kq8c4m+fS/PxEgjpRM= X-MC-Unique: -eul_6I2PdKIl65r-AsyqA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717596842; x=1718201642; 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=Tcl0qZl4zU184pZcQrM7oLNyygIhSEBwyRI8ZNXhceI=; b=iIFW05GnkstiXcS+ah/ktEm40h5M7S3AXeAHvQqgvZGI3xSjzTswNFy2DeEVxHudK1 inbONLGmjGuPNCuBQxwl6yn3YiiOsmDGkbBOCCcgqvHXrofYQo/wf4SMqJgOXGelRsAM zfPz/QEPYv3JO/dW0erFKRPUU2sQZ6NLNRIj8y7ynkqPkjn58n3RJxRexq80yPNMme45 8Iqdtsp5GfxWn2hZCIL6Y406vCKrJZozEqsK+ilKGCXP6mIr3oRcrbCoThQcXPDod+2v Xh65LQ2wEZpUcca2lkSt+qnFnmJXrKU0CwgDI/RJpS/aRVE44hhZV1V5xdB/ZKSl3Zr3 jJzA== X-Forwarded-Encrypted: i=1; AJvYcCUZ6at41VSA2eED2dpp3beOzo26R2C03NmhTa8rNSIEQAPJESUbm9KtiYl03oPMtdbMyv9WY9LYp5L1x7DaQOGiRlE4/5o= X-Gm-Message-State: AOJu0YzARbdtm+ePsIHaj3kxbeZlV5GP/li6SZGh4pOmYVJpO9ooAO4k XVdgpR7DtuEn78qguSxkiwVH35sj0zq6ZVQNcESP03gqFczRmrqEX7fs8FSiKp3bbKIW/e70VTI cz2sZ9ZEMpjg6SI5YK3+kG5nO6vMC/SZH7l+YLO5qEeW5XwhLwEvh X-Received: by 2002:a17:902:e84e:b0:1f6:77e3:774c with SMTP id d9443c01a7336-1f6a5a1931amr33910605ad.38.1717596841573; Wed, 05 Jun 2024 07:14:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGGjfLKS6H939LaQ3XHWouVVDyK939lU/Ow5aqQ35/OAVpORyjytjLF7BXWYYyuow42OSjNXw== X-Received: by 2002:a17:902:e84e:b0:1f6:77e3:774c with SMTP id d9443c01a7336-1f6a5a1931amr33910355ad.38.1717596841120; Wed, 05 Jun 2024 07:14:01 -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 v2 3/3] tests/qtest/x86: check for availability of older cpu models before running tests Date: Wed, 5 Jun 2024 19:43:16 +0530 Message-ID: <20240605141316.91955-4-anisinha@redhat.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240605141316.91955-1-anisinha@redhat.com> References: <20240605141316.91955-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: 1717596882794100003 Content-Type: text/plain; charset="utf-8" It is better to check if some older cpu models like 486, athlon, pentium, penryn, phenom, core2duo etc are available before running their correspondi= ng tests. Some downstream distributions may no longer support these older cpu models. 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 | 159 +++++++++++++++++----------- 1 file changed, 98 insertions(+), 61 deletions(-) changelog: v2: reworked as per suggestion from danpb. diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpu= id-compat.c index 6a39454fce..3b384d2e06 100644 --- a/tests/qtest/test-x86-cpuid-compat.c +++ b/tests/qtest/test-x86-cpuid-compat.c @@ -67,10 +67,29 @@ static void test_cpuid_prop(const void *data) g_free(path); } =20 -static void add_cpuid_test(const char *name, const char *cmdline, +static void add_cpuid_test(const char *name, const char *cpu, + const char *cpufeat, const char *machine, const char *property, int64_t expected_value) { CpuidTestArgs *args =3D g_new0(CpuidTestArgs, 1); + char *cmdline; + char *save; + + if (!qtest_has_cpu(cpu)) { + return; + } + cmdline =3D g_strdup_printf("-cpu %s", cpu); + + if (cpufeat) { + save =3D cmdline; + cmdline =3D g_strdup_printf("%s,%s", cmdline, cpufeat); + g_free(save); + } + if (machine) { + save =3D cmdline; + cmdline =3D g_strdup_printf("-machine %s %s", machine, cmdline); + g_free(save); + } args->cmdline =3D cmdline; args->property =3D property; args->expected_value =3D expected_value; @@ -169,6 +188,10 @@ static void test_plus_minus_subprocess(void) { char *path; =20 + if (!qtest_has_cpu("pentium")) { + return; + } + /* Rules: * 1)"-foo" overrides "+foo" * 2) "[+-]foo" overrides "foo=3D..." @@ -198,6 +221,10 @@ static void test_plus_minus_subprocess(void) =20 static void test_plus_minus(void) { + if (!qtest_has_cpu("pentium")) { + return; + } + g_test_trap_subprocess("/x86/cpuid/parsing-plus-minus/subprocess", 0, = 0); g_test_trap_assert_passed(); g_test_trap_assert_stderr("*Ambiguous CPU model string. " @@ -217,99 +244,105 @@ int main(int argc, char **argv) =20 /* Original level values for CPU models: */ add_cpuid_test("x86/cpuid/phenom/level", - "-cpu phenom", "level", 5); + "phenom", NULL, NULL, "level", 5); add_cpuid_test("x86/cpuid/Conroe/level", - "-cpu Conroe", "level", 10); + "Conroe", NULL, NULL, "level", 10); add_cpuid_test("x86/cpuid/SandyBridge/level", - "-cpu SandyBridge", "level", 0xd); + "SandyBridge", NULL, NULL, "level", 0xd); add_cpuid_test("x86/cpuid/486/xlevel", - "-cpu 486", "xlevel", 0); + "486", NULL, NULL, "xlevel", 0); add_cpuid_test("x86/cpuid/core2duo/xlevel", - "-cpu core2duo", "xlevel", 0x80000008); + "core2duo", NULL, NULL, "xlevel", 0x80000008); add_cpuid_test("x86/cpuid/phenom/xlevel", - "-cpu phenom", "xlevel", 0x8000001A); + "phenom", NULL, NULL, "xlevel", 0x8000001A); add_cpuid_test("x86/cpuid/athlon/xlevel", - "-cpu athlon", "xlevel", 0x80000008); + "athlon", NULL, NULL, "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); + add_cpuid_test("x86/cpuid/auto-level/486/arat", + "486", "arat=3Don", NULL, "level", 6); /* CPUID[EAX=3D7,ECX=3D0].EBX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/fsgsbase", - "-cpu phenom,fsgsbase=3Don", "level", 7); + "phenom", "fsgsbase=3Don", NULL, "level", 7); /* CPUID[EAX=3D7,ECX=3D0].ECX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/avx512vbmi", - "-cpu phenom,avx512vbmi=3Don", "level", 7); + "phenom", "avx512vbmi=3Don", NULL, "level", 7); /* CPUID[EAX=3D0xd,ECX=3D1].EAX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/xsaveopt", - "-cpu phenom,xsaveopt=3Don", "level", 0xd); + "phenom", "xsaveopt=3Don", NULL, "level", 0xd); /* CPUID[8000_0001].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/3dnow", - "-cpu 486,3dnow=3Don", "xlevel", 0x80000001); + "486", "3dnow=3Don", NULL, "xlevel", 0x80000001); /* CPUID[8000_0001].ECX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/sse4a", - "-cpu 486,sse4a=3Don", "xlevel", 0x80000001); + "486", "sse4a=3Don", NULL, "xlevel", 0x80000001); /* CPUID[8000_0007].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/invtsc", - "-cpu 486,invtsc=3Don", "xlevel", 0x80000007); + "486", "invtsc=3Don", NULL, "xlevel", 0x80000007); /* CPUID[8000_000A].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/npt", - "-cpu 486,svm=3Don,npt=3Don", "xlevel", 0x8000000A); + "486", "svm=3Don,npt=3Don", NULL, "xlevel", 0x8000000A); /* CPUID[C000_0001].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel2/phenom/xstore", - "-cpu phenom,xstore=3Don", "xlevel2", 0xC0000001); + "phenom", "xstore=3Don", NULL, "xlevel2", 0xC0000001); /* SVM needs CPUID[0x8000000A] */ add_cpuid_test("x86/cpuid/auto-xlevel/athlon/svm", - "-cpu athlon,svm=3Don", "xlevel", 0x8000000A); + "athlon", "svm=3Don", NULL, "xlevel", 0x8000000A); =20 =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); + "SandyBridge", "arat=3Don,fsgsbase=3Don,avx512vbmi=3Don= ", + NULL, "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); + "486", + "level=3D0xF,arat=3Don,fsgsbase=3Don,avx512vbmi=3Don,xs= aveopt=3Don", + NULL, "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); + "486", + "level=3D2,arat=3Don,fsgsbase=3Don,avx512vbmi=3Don,xsav= eopt=3Don", + NULL, "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); + "486", + "level=3D0,arat=3Don,fsgsbase=3Don,avx512vbmi=3Don,xsav= eopt=3Don", + NULL, "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); + "phenom", "3dnow=3Don,sse4a=3Don,invtsc=3Don,npt=3Don,s= vm=3Don", + NULL, "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); + "486", + "xlevel=3D0x80000002,3dnow=3Don,sse4a=3Don,invtsc=3Don,= npt=3Don,svm=3Don", + NULL, "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); + "486", + "xlevel=3D0x8000001A,3dnow=3Don,sse4a=3Don,invtsc=3Don,= npt=3Don,svm=3Don", + NULL, "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); + "486", + "xlevel=3D0,3dnow=3Don,sse4a=3Don,invtsc=3Don,npt=3Don,= svm=3Don", + NULL, "xlevel", 0); =20 /* 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); + "486", "xlevel2=3D0xC0000002,xstore=3Don", + NULL, "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")) { 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); + "486", "arat=3Don,avx512vbmi=3Don,xsaveopt=3Don", + "pc-i440fx-2.7", "level", 1); add_cpuid_test("x86/cpuid/auto-xlevel/pc-2.7", - "-machine pc-i440fx-2.7 -cpu 486,3dnow=3Don,sse4a= =3Don,invtsc=3Don,npt=3Don,svm=3Don", - "xlevel", 0); + "486", "3dnow=3Don,sse4a=3Don,invtsc=3Don,npt=3Don,= svm=3Don", + "pc-i440fx-2.7", "xlevel", 0); add_cpuid_test("x86/cpuid/auto-xlevel2/pc-2.7", - "-machine pc-i440fx-2.7 -cpu 486,xstore=3Don", + "486", "xstore=3Don", "pc-i440fx-2.7", "xlevel2", 0); } /* @@ -319,18 +352,18 @@ int main(int argc, char **argv) */ if (qtest_has_machine("pc-i440fx-2.3")) { add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.3/off", - "-machine pc-i440fx-2.3 -cpu Penryn", + "Penryn", NULL, "pc-i440fx-2.3", "level", 4); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.3/on", - "-machine pc-i440fx-2.3 -cpu Penryn,erms=3Don", + "Penryn", "erms=3Don", "pc-i440fx-2.3", "level", 7); } if (qtest_has_machine("pc-i440fx-2.9")) { add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/off", - "-machine pc-i440fx-2.9 -cpu Conroe", + "Conroe", NULL, "pc-i440fx-2.9", "level", 10); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/on", - "-machine pc-i440fx-2.9 -cpu Conroe,erms=3Don", + "Conroe", "erms=3Don", "pc-i440fx-2.9", "level", 10); } =20 @@ -341,31 +374,35 @@ int main(int argc, char **argv) */ if (qtest_has_machine("pc-i440fx-2.3")) { add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.3", - "-machine pc-i440fx-2.3 -cpu SandyBridge", + "SandyBridge", NULL, "pc-i440fx-2.3", "xlevel", 0x8000000a); } if (qtest_has_machine("pc-i440fx-2.4")) { add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-off", - "-machine pc-i440fx-2.4 -cpu SandyBridge,", + "SandyBridge", NULL, "pc-i440fx-2.4", "xlevel", 0x80000008); add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-on", - "-machine pc-i440fx-2.4 -cpu SandyBridge,svm=3Don,n= pt=3Don", + "SandyBridge", "svm=3Don,npt=3Don", "pc-i440fx-2.4", "xlevel", 0x80000008); } =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 (qtest_has_cpu("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 (qtest_has_cpu("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