From nobody Thu Nov 6 19:45:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488213611335100.15867730368961; Mon, 27 Feb 2017 08:40:11 -0800 (PST) Received: from localhost ([::1]:54191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciOLI-0003Y0-3w for importer@patchew.org; Mon, 27 Feb 2017 11:40:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciO6p-0007rI-Jr for qemu-devel@nongnu.org; Mon, 27 Feb 2017 11:25:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ciO6o-0005BS-JP for qemu-devel@nongnu.org; Mon, 27 Feb 2017 11:25:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51744) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ciO6o-0005Al-E6 for qemu-devel@nongnu.org; Mon, 27 Feb 2017 11:25:10 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 982D24A549; Mon, 27 Feb 2017 16:25:10 +0000 (UTC) Received: from localhost (ovpn-116-24.gru2.redhat.com [10.97.116.24]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1RGP9nb012508; Mon, 27 Feb 2017 11:25:10 -0500 From: Eduardo Habkost To: Peter Maydell Date: Mon, 27 Feb 2017 13:24:52 -0300 Message-Id: <20170227162501.29280-3-ehabkost@redhat.com> In-Reply-To: <20170227162501.29280-1-ehabkost@redhat.com> References: <20170227162501.29280-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 27 Feb 2017 16:25:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 02/11] i386: Add ordering field to CPUClass X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , qemu-devel@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead of using kvm_enabled to order the "-cpu help" list, use a new "ordering" field for that. Message-Id: <20170119210449.11991-3-ehabkost@redhat.com> Tested-by: Jiri Denemark Signed-off-by: Eduardo Habkost --- target/i386/cpu-qom.h | 2 ++ target/i386/cpu.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/target/i386/cpu-qom.h b/target/i386/cpu-qom.h index 8cd607e9a2..14abd0a8c1 100644 --- a/target/i386/cpu-qom.h +++ b/target/i386/cpu-qom.h @@ -48,6 +48,7 @@ typedef struct X86CPUDefinition X86CPUDefinition; * X86CPUClass: * @cpu_def: CPU model definition * @kvm_required: Whether CPU model requires KVM to be enabled. + * @ordering: Ordering on the "-cpu help" CPU model list. * @migration_safe: See CpuDefinitionInfo::migration_safe * @parent_realize: The parent class' realize handler. * @parent_reset: The parent class' reset handler. @@ -63,6 +64,7 @@ typedef struct X86CPUClass { X86CPUDefinition *cpu_def; =20 bool kvm_required; + int ordering; bool migration_safe; =20 /* Optional description of CPU model. diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 2adee42035..8efe4de89e 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1550,6 +1550,7 @@ static void host_x86_cpu_class_init(ObjectClass *oc, = void *data) uint32_t eax =3D 0, ebx =3D 0, ecx =3D 0, edx =3D 0; =20 xcc->kvm_required =3D true; + xcc->ordering =3D 9; =20 host_cpuid(0x0, 0, &eax, &ebx, &ecx, &edx); x86_cpu_vendor_words2str(host_cpudef.vendor, ebx, edx, ecx); @@ -2126,7 +2127,7 @@ static void listflags(FILE *f, fprintf_function print= , const char **featureset) } } =20 -/* Sort alphabetically by type name, listing kvm_required models last. */ +/* Sort alphabetically by type name, respecting X86CPUClass::ordering. */ static gint x86_cpu_list_compare(gconstpointer a, gconstpointer b) { ObjectClass *class_a =3D (ObjectClass *)a; @@ -2135,9 +2136,8 @@ static gint x86_cpu_list_compare(gconstpointer a, gco= nstpointer b) X86CPUClass *cc_b =3D X86_CPU_CLASS(class_b); const char *name_a, *name_b; =20 - if (cc_a->kvm_required !=3D cc_b->kvm_required) { - /* kvm_required items go last */ - return cc_a->kvm_required ? 1 : -1; + if (cc_a->ordering !=3D cc_b->ordering) { + return cc_a->ordering - cc_b->ordering; } else { name_a =3D object_class_get_name(class_a); name_b =3D object_class_get_name(class_b); --=20 2.11.0.259.g40922b1