From nobody Mon Nov 25 02:42:59 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=1717649138; cv=none; d=zohomail.com; s=zohoarc; b=cdyBMrgh0KmlZNI3F2x1dxIHgZtEVEmjBabSFSx5er28dfMy58bP9VLs4ZbBKA/vWak9eKiiABwWBVKuPxslp+3Juo9q3JyXncfstaMm3NXRHVfnjmB9NjhNRTpB/z87KLMiNWT0ORqpuZmmMkGcnSWY4V1B+l36KZQGZIDkW8w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717649138; 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=mOOlv7L2avyyL4xO82xIG7tzsc7nx9TcVszICCX3FgE=; b=nirBDYdkeIicvmacqLHDuNyJ3T7lyErGqTwl+WYtYSgIdJs/xoV4YogWRYgBMPAMZuyOi1p0+GewW0tHA/v/kcPdFFRONwQW4MuHKcKUxFawbWdCvbbtqgSUsq4fUlVBEwH6dpdo0g2LY1r70UH1Y9UAJvM6lcKRr45YXNasXo0= 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 1717649138659228.90455979100136; Wed, 5 Jun 2024 21:45:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sF4zS-0008Bq-EH; Thu, 06 Jun 2024 00:44:42 -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 1sF4zR-0008BW-7Y for qemu-devel@nongnu.org; Thu, 06 Jun 2024 00:44:41 -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 1sF4zP-0008Iz-PQ for qemu-devel@nongnu.org; Thu, 06 Jun 2024 00:44:40 -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-691-W4345nmYNx-UN7kzpjH2zw-1; Thu, 06 Jun 2024 00:44:37 -0400 Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-1f68862abbaso5769035ad.3 for ; Wed, 05 Jun 2024 21:44:37 -0700 (PDT) Received: from localhost.localdomain ([203.163.239.242]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1f6bd81b9e2sm4057165ad.295.2024.06.05.21.44.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 21:44:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717649078; 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=mOOlv7L2avyyL4xO82xIG7tzsc7nx9TcVszICCX3FgE=; b=K3Yl523lZ4i7+SByJz3I5aNEFUj8weHE9g6Ow3eVoeg3bu/qLeG+CEdqytjchhUE/6mIda BIFG5wMoO0UQDLZ+lKxHKk2weLarhh0Ze6RezZAhx6nFfkBLJWuwyfdPBYe1w/3OwDha0N TJzGpIEWf2XRMjhy5O3Bud5DW5GRQ3c= X-MC-Unique: W4345nmYNx-UN7kzpjH2zw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717649076; x=1718253876; 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=mOOlv7L2avyyL4xO82xIG7tzsc7nx9TcVszICCX3FgE=; b=H8ileE8InRsV5XtJHZKr6EaTwNE+RnM9ao/jbB38dX5KbOMcCxWNFPZ5HiiQYCL9DL lgsJrxYFEcxgQQwftMZTO3ajRrnck0tgyVwWiQ8zzY9Sa8cqu0MQ6lxGLBdXShNxKc2o nKBzeFG7nEhom6hKmNuOQ87J78GD0kdyCTaL7XvU+uG02iEJIyjUDlpKvA5OxqdVG48+ X1YHKmflXEK+u48q5dlNuiWcBL6MJGFB/jJQbYHZaiunmbKcMsg1EESW4UgNeFJdQChu TQs9TbOD/iTEOooMJqZ1kAq22nUIWF306M79iQmx7A9/MbMdnNNtJ06e2/owYiTU5y5t sPmg== X-Forwarded-Encrypted: i=1; AJvYcCX84+SVEzpIEzP/UdpZ99pm1JaHaRMU8YrsK4t1U3p9BzoCIg8ifJhnqZlpJYM9Tg+dWCeNzuntBMwfjgw2fsxwSv8XOA4= X-Gm-Message-State: AOJu0YyobFWvBgHMVUZRFIQV9dK/w2bj00HCFkQij8Of0hSeq4ko+hSe JbGdb6wW/WJkK3Vwz7yuzcj+glPhXdvqxkgSa/XeSGVQw5cOhUOEh7kCQT0e6Ig+mZ/4jooxPyB q8eaUr4tfESMGZL/tcRjWvFdRcPapdp+cVYmBu4eG/gx2hZO7igp+ X-Received: by 2002:a17:902:d48a:b0:1f6:a602:fb05 with SMTP id d9443c01a7336-1f6a6030d76mr51208965ad.45.1717649076251; Wed, 05 Jun 2024 21:44:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHOvrxSkhpVJR+TkTvEuYU9CA0VdQLX6LCYS1npecrX38Ge+JAigLdjZTjS0PqB9ELJ3DLCLQ== X-Received: by 2002:a17:902:d48a:b0:1f6:a602:fb05 with SMTP id d9443c01a7336-1f6a6030d76mr51208815ad.45.1717649075840; Wed, 05 Jun 2024 21:44:35 -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: Thu, 6 Jun 2024 10:14:17 +0530 Message-ID: <20240606044419.8806-2-anisinha@redhat.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240606044419.8806-1-anisinha@redhat.com> References: <20240606044419.8806-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: 1717649139962100001 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 (thuth) v3: added reviewed tag (imammeodo) 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 02:42:59 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=1717649140; cv=none; d=zohomail.com; s=zohoarc; b=fN1Bs0nP2OntoU44/uV3hQgkcW0bJmpqFhjGUmp5zlkzG43blw92rD1zn0mG7DckbK5v9S2JMAvxRkU8ELCeuNZCkQThz61CW2OyRtNjyUJ5Odh/mdO6iF95tNF7hXoFnhSzTkFppUIW1CVKluI7/WO0WLLgJ9AQUo4QSqUcsg4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717649140; 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=DD2UPZgG3XFaYqostWgC1etd2AUbGv9lCsOVzkIbH/B59rKzDeIAKiUg32zkbbDQr4hQgdxSIuqRhVJEt/J4xK8nPhZbqd1Yqg5LXRv9k0odHVFbuhCn9wYmDQUx0oI7vs31/A/VKSwr7PaTVcQIbtl6UB08wIMDQPJwj8bepxI= 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 1717649140257652.9607367282536; Wed, 5 Jun 2024 21:45:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sF4zX-0008C8-BX; Thu, 06 Jun 2024 00:44:47 -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 1sF4zV-0008C0-Gz for qemu-devel@nongnu.org; Thu, 06 Jun 2024 00:44:45 -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 1sF4zT-0008JC-Ud for qemu-devel@nongnu.org; Thu, 06 Jun 2024 00:44:45 -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-618-CTCIYIYIO7qHipT9AUY6uQ-1; Thu, 06 Jun 2024 00:44:40 -0400 Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-1f62e7432c7so5391725ad.0 for ; Wed, 05 Jun 2024 21:44:40 -0700 (PDT) Received: from localhost.localdomain ([203.163.239.242]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1f6bd81b9e2sm4057165ad.295.2024.06.05.21.44.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 21:44:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717649082; 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=iiPing+Buezh9bNjLS2Bb2pZ9OGhrnusB53Dd1KOjwB7/OvBH4zookGR3jghrl0Np/JP8L qob4AMDGwgLz38dX06DUKTkWpeQwkVVW8OMW/1XbpQabIPCjJe/wqYQKGRav8CuEwGGWqs h3oNZ30MCMjK9ZxGBcsOj1Z3HTY2dpc= X-MC-Unique: CTCIYIYIO7qHipT9AUY6uQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717649079; x=1718253879; 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=dlp8t/s6afSOYpw0cYt6NiW6+oV8bJBz8pCSJGFIXS7DD7sfGCYoDQ3SJR2ljc4k5+ xnMZ+fGd+MVM2xT1swATJiBZ5xm4S9G9CBLoUNNV7fV/MB18eYLEFC0RGO8TcMtgN4Vn xcQ+0mZiKZ6f7wKGrKPPerikHEXLeJ7dLNTGGlzPNNrfSidndzJaud2EhVX9Ozo9JtjK Sdqkb2u9+bnrHgS7mILVScw25vOfiHaHBD0T9LP/YJxdsHHRhhgdhsxfo6TLjM13ZmMt lmtQM2xFRUotaZXzas/JuEdtDcMt8ZWZPMWPWSeBp7oCGrAhU/eC7xvR21e4V45X+QYY 4YxA== X-Forwarded-Encrypted: i=1; AJvYcCUReb0dnw/MhkVb47cG7e5VkovWRkfyPXnmQzXWODGAydoyW4hmAre4BzoclRvA5UPDYzVwsKpYLp0zZCX2QS71KITesRc= X-Gm-Message-State: AOJu0Yx2lap/EXmSploG4nfibQiz5M8HzcGhs/nj0JqdVWxJbPgcqtOJ unO7pTrzRkQI/g99josoc94kzWHvcos/y51IO2b+fbavJiicviJl32Leahxe85Y9b+gduxqPiKU 0cQvDBIqvaHShOyzDiee9qvy7HFkSo3k2EF6qqa4VOTJTRMmZWk4M X-Received: by 2002:a17:902:ced1:b0:1f6:8235:dbbc with SMTP id d9443c01a7336-1f6a5a23fdfmr53203135ad.29.1717649079440; Wed, 05 Jun 2024 21:44:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGxUT+6IJaKT/HJHkjna57ygcsZOUPHiyrKlwAGybgL4gONW3GDCjXVMt4svHfybH54oIkJAQ== X-Received: by 2002:a17:902:ced1:b0:1f6:8235:dbbc with SMTP id d9443c01a7336-1f6a5a23fdfmr53203005ad.29.1717649079004; Wed, 05 Jun 2024 21:44: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: Thu, 6 Jun 2024 10:14:18 +0530 Message-ID: <20240606044419.8806-3-anisinha@redhat.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240606044419.8806-1-anisinha@redhat.com> References: <20240606044419.8806-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: 1717649141452100005 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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 02:42:59 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=1717649159; cv=none; d=zohomail.com; s=zohoarc; b=hXmwt+52DKPhKOMHlHyCclf4hvSQm3lrSnqB91YYWU5qfnYzHgEtA0IDlP+3R1yM2h0QQeLsLUChqwbcOllRpp0RrNZssyKWrW+yNTbV/a4dHCDOnEtRwBp109a6kC7i6TEPOyqqDs/y1BApAdzsNnrhGWM8EvlEtTjci/xaMXk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717649159; 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=vmaAdKQzAZzsiULoP3TeJY9GmDnRELKZLCeesie7Gxw=; b=bmI2UKu//pJezwyi6vs2RgzJOz+2vjHWn2/iHqMTxveF7XkhChl+301unBewTChq7czoCri6/Yciou8vS1DR1CK2sMNTjTuzeTpUXn5SMc5yU6PVrngsSUYvdVBKC2sOUc5hRPNmCRGRJP+4vaJB72IXOtlo4Qt1+d4IcVIB77o= 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 1717649159427368.5299026654819; Wed, 5 Jun 2024 21:45:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sF4zf-0008D5-Vp; Thu, 06 Jun 2024 00:44:56 -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 1sF4ze-0008Cq-94 for qemu-devel@nongnu.org; Thu, 06 Jun 2024 00:44:54 -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 1sF4za-0008JY-Ng for qemu-devel@nongnu.org; Thu, 06 Jun 2024 00:44:52 -0400 Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-250-uGRC6_2BO6ixMfuQm5GE1A-1; Thu, 06 Jun 2024 00:44:47 -0400 Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-6507e2f0615so456761a12.1 for ; Wed, 05 Jun 2024 21:44:44 -0700 (PDT) Received: from localhost.localdomain ([203.163.239.242]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1f6bd81b9e2sm4057165ad.295.2024.06.05.21.44.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 21:44:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717649089; 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=vmaAdKQzAZzsiULoP3TeJY9GmDnRELKZLCeesie7Gxw=; b=TcwD+UtqH3vYOEpslNM4oYBn5pbDcVrM0OCFyK+lkhp8s+Qv89nofy0//qZE8BUAth+MmL xDA2enC9wNiCp6hn8wd9COqkW0yNkSm4xtFAXt8eQPhiCB5OKGbtcZ7wElwjl7+kzYi1W+ EnCpNjO07/F3yys5RD/NrK0PICgCNQM= X-MC-Unique: uGRC6_2BO6ixMfuQm5GE1A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717649083; x=1718253883; 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=vmaAdKQzAZzsiULoP3TeJY9GmDnRELKZLCeesie7Gxw=; b=SWDuhTc/2tzNoOaP/MGdXQi8dcSDCLLgygSGYRxTMoT1BysnnR0CnNQ3FNGMmDBFOG npkNn3E3MytWEZ531milF4z08sFJ+YXoajJeeVUYhrIYkNcHyeUNr9iJa2gl6bQ4kb+x mjz6tzlMiP+zUQilHROffjidI64iO5QUzmVWAfOF2lmMRyFgOsaufBplep//TdCtfuvN QVRaUMt/vnGannGiTohHrRcnldwADG3w3Vo1kWKflzWKneIgYpCPFEtKoukvUEuEK37I whlZZ+fpwmgvlNNDUNFmtz6hGOAa/8leTxfQc3M1ATC1uCIN4SzlnaRuRXd0YBXGnyIy evrw== X-Forwarded-Encrypted: i=1; AJvYcCWEk/MkoNtxmp07qg6I0ZmLkAlmaFU//92OnxINElPMjNG/gcE0NlJdfmDAUH2koQMx9hfzqaaM0LUdWbKdwvcGLyZ2p/8= X-Gm-Message-State: AOJu0YzOnfvFzY3Onr2rg121auPAHHKY2NpxT6VjARtyiT47E5fK67c1 04lnKkG6w7xXJ2PC/lY1yceFOv7UvgxmbQ8is0E4unvG55xJrkT8I7TevcxwVwrBwkXltzqRV4B TincTjuyNPEJ+vlGk4a3d4m6/fZbp8bTHfZepXcM6e75NNjeG8udt X-Received: by 2002:a05:6a21:614:b0:1b2:a78c:f5d0 with SMTP id adf61e73a8af0-1b2b71930bbmr4171694637.61.1717649083517; Wed, 05 Jun 2024 21:44:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGareBrygFuhTAjPhnm0BTbkTwoRdx9MyJXsKYuufqY+ggORjvGdQp/5N1KxI80VrM1YLARQA== X-Received: by 2002:a05:6a21:614:b0:1b2:a78c:f5d0 with SMTP id adf61e73a8af0-1b2b71930bbmr4171679637.61.1717649083021; Wed, 05 Jun 2024 21:44:43 -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 v3 3/3] tests/qtest/x86: check for availability of older cpu models before running tests Date: Thu, 6 Jun 2024 10:14:19 +0530 Message-ID: <20240606044419.8806-4-anisinha@redhat.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240606044419.8806-1-anisinha@redhat.com> References: <20240606044419.8806-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: 1717649161457100007 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. Signature of add_feature_test() has been modified to return void as FeatureTestArgs* was not used by the caller. 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 Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/qtest/test-x86-cpuid-compat.c | 170 ++++++++++++++++++---------- 1 file changed, 108 insertions(+), 62 deletions(-) changelog: v2: reworked as per suggestion from danpb. v3: reworked as_feature_test() same way as add_cpuid_test() diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpu= id-compat.c index 6a39454fce..d5307f39e7 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; @@ -149,12 +168,24 @@ static void test_feature_flag(const void *data) * either "feature-words" or "filtered-features", when running QEMU * using cmdline */ -static FeatureTestArgs *add_feature_test(const char *name, const char *cmd= line, - uint32_t eax, uint32_t ecx, - const char *reg, int bitnr, - bool expected_value) +static void add_feature_test(const char *name, const char *cpu, + const char *cpufeat, uint32_t eax, + uint32_t ecx, const char *reg, + int bitnr, bool expected_value) { FeatureTestArgs *args =3D g_new0(FeatureTestArgs, 1); + char *cmdline; + + if (!qtest_has_cpu(cpu)) { + return; + } + + if (cpufeat) { + cmdline =3D g_strdup_printf("-cpu %s,%s", cpu, cpufeat); + } else { + cmdline =3D g_strdup_printf("-cpu %s", cpu); + } + args->cmdline =3D cmdline; args->in_eax =3D eax; args->in_ecx =3D ecx; @@ -162,13 +193,17 @@ static FeatureTestArgs *add_feature_test(const char *= name, const char *cmdline, args->bitnr =3D bitnr; args->expected_value =3D expected_value; qtest_add_data_func(name, args, test_feature_flag); - return args; + return; } =20 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 +233,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 +256,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 +364,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,42 +386,43 @@ 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", + "486", "+arat", 6, 0, "EAX", 2, true); add_feature_test("x86/cpuid/features/minus", - "-cpu pentium,-mmx", + "pentium", "-mmx", 1, 0, "EDX", 23, false); add_feature_test("x86/cpuid/features/on", - "-cpu 486,arat=3Don", + "486", "arat=3Don", 6, 0, "EAX", 2, true); add_feature_test("x86/cpuid/features/off", - "-cpu pentium,mmx=3Doff", + "pentium", "mmx=3Doff", 1, 0, "EDX", 23, false); + add_feature_test("x86/cpuid/features/max-plus-invtsc", - "-cpu max,+invtsc", + "max" , "+invtsc", 0x80000007, 0, "EDX", 8, true); add_feature_test("x86/cpuid/features/max-invtsc-on", - "-cpu max,invtsc=3Don", + "max", "invtsc=3Don", 0x80000007, 0, "EDX", 8, true); add_feature_test("x86/cpuid/features/max-minus-mmx", - "-cpu max,-mmx", + "max", "-mmx", 1, 0, "EDX", 23, false); add_feature_test("x86/cpuid/features/max-invtsc-on,mmx=3Doff", - "-cpu max,mmx=3Doff", + "max", "mmx=3Doff", 1, 0, "EDX", 23, false); =20 return g_test_run(); --=20 2.42.0