From nobody Wed Nov 19 00:12:06 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1613503118; cv=none; d=zohomail.com; s=zohoarc; b=X9KgGZbzg5X0RlnqT1Doel8JC/NzctU7s401OCSYWua7D9l/uh5+lSWfs3I/mmVNZ2W+u6yiW2mYUbeU+3A1mZF7BfjUgs6zSa+uWTDDesLmz8ETCQENmWNtc2ufKxz77KbPPne9u6X9BEUlETDj2UrwdDxkwcRYS7Gcf6pj3EA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613503118; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bYu1HcfbRjMDOL+3Zu/RTEPh1T7xwLWjSMQEHtMFLQY=; b=aku5pebW8+ht2VSOgz5GTP2gRUPcMNoM83nGrX71X/ibzvOugOqF5agDWK4d7M3qE09meTF1O5iWr2zwRmUG+RgpKE0qC7b1ZK4oTuhJwg3baHrNOzplSe7fiaAHSjmTt+lKcIxq7LIO42+eWKO7BaefhbuudpKphioMIfDJgLU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613503118578476.8390978711594; Tue, 16 Feb 2021 11:18:38 -0800 (PST) Received: from localhost ([::1]:49816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lC5ro-0008SY-H2 for importer@patchew.org; Tue, 16 Feb 2021 14:18:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lC5kX-0002qj-V2 for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:11:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:32837) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lC5kP-0004Rv-Lx for qemu-devel@nongnu.org; Tue, 16 Feb 2021 14:11:02 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-602--KIKbPseNZWYL8JiLEQcXA-1; Tue, 16 Feb 2021 14:10:53 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A9F41842A99; Tue, 16 Feb 2021 19:10:52 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-215.ams2.redhat.com [10.36.112.215]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6C785C1B4; Tue, 16 Feb 2021 19:10:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613502655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bYu1HcfbRjMDOL+3Zu/RTEPh1T7xwLWjSMQEHtMFLQY=; b=CkM6LHzYhlqdst7dqtBfMukZDyNS0gxYt13uaGak/+KVZEEOICCZLR+awji7+j6m7aUf9Q 3o5eznpop3pN7h0jiDG36Mre+/XcVS3HDbrxWcJoaCWWWtuC/qKvxBpcm0vL342mT6PCzp nN/H2tjBeOWmRYPFGnMASnQG7RWENQo= X-MC-Unique: -KIKbPseNZWYL8JiLEQcXA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 10/10] target/i386: update to show preferred boolean syntax for -cpu Date: Tue, 16 Feb 2021 19:10:27 +0000 Message-Id: <20210216191027.595031-11-berrange@redhat.com> In-Reply-To: <20210216191027.595031-1-berrange@redhat.com> References: <20210216191027.595031-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=63.128.21.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The preferred syntax is to use "foo=3Don|off", rather than a bare "+foo" or "-foo" Signed-off-by: Daniel P. Berrang=C3=A9 --- target/i386/cpu.c | 2 +- tests/qtest/test-x86-cpuid-compat.c | 52 ++++++++++++++--------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 9c3d2d60b7..a5091cc85c 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6451,7 +6451,7 @@ static void x86_cpu_expand_features(X86CPU *cpu, Erro= r **errp) } else if (cpu->env.cpuid_min_level < 0x14) { mark_unavailable_features(cpu, FEAT_7_0_EBX, CPUID_7_0_EBX_INTEL_PT, - "Intel PT need CPUID leaf 0x14, please set by \"-cpu .= ..,+intel-pt,min-level=3D0x14\""); + "Intel PT need CPUID leaf 0x14, please set by \"-cpu .= ..,intel-pt=3Don,min-level=3D0x14\""); } } =20 diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpu= id-compat.c index 7ca1883a29..6470f0a85d 100644 --- a/tests/qtest/test-x86-cpuid-compat.c +++ b/tests/qtest/test-x86-cpuid-compat.c @@ -235,82 +235,82 @@ int main(int argc, char **argv) /* 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", "level", 6); + "-cpu 486,arat=3Don", "level", 6); /* CPUID[EAX=3D7,ECX=3D0].EBX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/fsgsbase", - "-cpu phenom,+fsgsbase", "level", 7); + "-cpu phenom,fsgsbase=3Don", "level", 7); /* CPUID[EAX=3D7,ECX=3D0].ECX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/avx512vbmi", - "-cpu phenom,+avx512vbmi", "level", 7); + "-cpu phenom,avx512vbmi=3Don", "level", 7); /* CPUID[EAX=3D0xd,ECX=3D1].EAX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/xsaveopt", - "-cpu phenom,+xsaveopt", "level", 0xd); + "-cpu phenom,xsaveopt=3Don", "level", 0xd); /* CPUID[8000_0001].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/3dnow", - "-cpu 486,+3dnow", "xlevel", 0x80000001); + "-cpu 486,3dnow=3Don", "xlevel", 0x80000001); /* CPUID[8000_0001].ECX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/sse4a", - "-cpu 486,+sse4a", "xlevel", 0x80000001); + "-cpu 486,sse4a=3Don", "xlevel", 0x80000001); /* CPUID[8000_0007].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/invtsc", - "-cpu 486,+invtsc", "xlevel", 0x80000007); + "-cpu 486,invtsc=3Don", "xlevel", 0x80000007); /* CPUID[8000_000A].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/npt", - "-cpu 486,+svm,+npt", "xlevel", 0x8000000A); + "-cpu 486,svm=3Don,npt=3Don", "xlevel", 0x8000000A); /* CPUID[C000_0001].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel2/phenom/xstore", - "-cpu phenom,+xstore", "xlevel2", 0xC0000001); + "-cpu phenom,xstore=3Don", "xlevel2", 0xC0000001); /* SVM needs CPUID[0x8000000A] */ add_cpuid_test("x86/cpuid/auto-xlevel/athlon/svm", - "-cpu athlon,+svm", "xlevel", 0x8000000A); + "-cpu athlon,svm=3Don", "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,+fsgsbase,+avx512vbmi", + "-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,+fsgsbase,+avx512vbmi,+xsav= eopt", + "-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,+fsgsbase,+avx512vbmi,+xsaveo= pt", + "-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,+fsgsbase,+avx512vbmi,+xsaveo= pt", + "-cpu 486,level=3D0,arat=3Don,fsgsbase=3Don,avx512vbmi= =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,+sse4a,+invtsc,+npt,+svm", + "-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,+sse4a,+invtsc,+np= t,+svm", + "-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,+sse4a,+invtsc,+np= t,+svm", + "-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,+sse4a,+invtsc,+npt,+svm", + "-cpu 486,xlevel=3D0,3dnow=3Don,sse4a=3Don,invtsc=3Don,= npt=3Don,svm=3Don", "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", + "-cpu 486,xlevel2=3D0xC0000002,xstore=3Don", "xlevel2", 0xC0000002); =20 /* Check compatibility of old machine-types that didn't * auto-increase level/xlevel/xlevel2: */ =20 add_cpuid_test("x86/cpuid/auto-level/pc-2.7", - "-machine pc-i440fx-2.7 -cpu 486,+arat,+avx512vbmi,+xsa= veopt", + "-machine pc-i440fx-2.7 -cpu 486,arat=3Don,avx512vbmi= =3Don,xsaveopt=3Don", "level", 1); add_cpuid_test("x86/cpuid/auto-xlevel/pc-2.7", - "-machine pc-i440fx-2.7 -cpu 486,+3dnow,+sse4a,+invtsc,= +npt,+svm", + "-machine pc-i440fx-2.7 -cpu 486,3dnow=3Don,sse4a=3Don,= invtsc=3Don,npt=3Don,svm=3Don", "xlevel", 0); add_cpuid_test("x86/cpuid/auto-xlevel2/pc-2.7", - "-machine pc-i440fx-2.7 -cpu 486,+xstore", + "-machine pc-i440fx-2.7 -cpu 486,xstore=3Don", "xlevel2", 0); /* * QEMU 1.4.0 had auto-level enabled for CPUID[7], already, @@ -321,19 +321,19 @@ int main(int argc, char **argv) "-machine pc-i440fx-1.4 -cpu Nehalem", "level", 2); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-1.5/on", - "-machine pc-i440fx-1.4 -cpu Nehalem,+smap", + "-machine pc-i440fx-1.4 -cpu Nehalem,smap=3Don", "level", 7); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.3/off", "-machine pc-i440fx-2.3 -cpu Penryn", "level", 4); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.3/on", - "-machine pc-i440fx-2.3 -cpu Penryn,+erms", + "-machine pc-i440fx-2.3 -cpu Penryn,erms=3Don", "level", 7); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/off", "-machine pc-i440fx-2.9 -cpu Conroe", "level", 10); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/on", - "-machine pc-i440fx-2.9 -cpu Conroe,+erms", + "-machine pc-i440fx-2.9 -cpu Conroe,erms=3Don", "level", 10); =20 /* @@ -348,7 +348,7 @@ int main(int argc, char **argv) "-machine pc-i440fx-2.4 -cpu SandyBridge,", "xlevel", 0x80000008); add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-on", - "-machine pc-i440fx-2.4 -cpu SandyBridge,+svm,+npt", + "-machine pc-i440fx-2.4 -cpu SandyBridge,svm=3Don,npt= =3Don", "xlevel", 0x80000008); =20 /* Test feature parsing */ --=20 2.29.2