From nobody Tue Feb 10 01:16:02 2026 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1575875677; cv=none; d=zohomail.com; s=zohoarc; b=dKQyNtz0Xaeq1pLe1xnEwSTjZwJI0+afF9qWSpO7bfebRi8+VyNmffuO65ufLTHk8SKk0esAwpV7DIA8O0rrwX+qQHs/NbA9J9OQI/v3Hw2skFAtAYniSfG5fFnN+jnNsMasjwfz2Bo/cDTwuSBbU2vTnlpaqQNxZLYioK03+g8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575875677; h=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=bqBdgrScBGc55+TaGV80aa2rqo71V+/g0R8ZB4Lw15Y=; b=mvuU3zlYtEPZweC4c5Mexl/hWgX/SrF31ec77m1O2WsRx2GYbJjd3f1DaW0XQIAANGnhs1G8UXfgbk01PzZJBuZxBIGICR5s8nEsbGvjIasqCJi8qtQrp1zFvDPHQ8efsxF11YbM0Lot1//lldEtJR4rpD0xf8kGnqLC1NpEKYQ= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1575875677915730.4882774870093; Sun, 8 Dec 2019 23:14:37 -0800 (PST) Received: from localhost ([::1]:36780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ieDFc-0003Ys-8p for importer@patchew.org; Mon, 09 Dec 2019 02:14:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44093) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ieDEH-0002G1-K1 for qemu-devel@nongnu.org; Mon, 09 Dec 2019 02:13:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ieDEG-0002kM-I1 for qemu-devel@nongnu.org; Mon, 09 Dec 2019 02:13:13 -0500 Received: from mga11.intel.com ([192.55.52.93]:5946) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ieDEG-0002aC-Ad for qemu-devel@nongnu.org; Mon, 09 Dec 2019 02:13:12 -0500 Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Dec 2019 23:13:11 -0800 Received: from tao-optiplex-7060.sh.intel.com ([10.239.159.36]) by orsmga007.jf.intel.com with ESMTP; 08 Dec 2019 23:13:10 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,294,1571727600"; d="scan'208";a="202738836" From: Tao Xu To: ehabkost@redhat.com, pbonzini@redhat.com, rth@twiddle.net Subject: [PATCH v2 3/4] target/i386: Add new property note to versioned CPU models Date: Mon, 9 Dec 2019 15:13:02 +0800 Message-Id: <20191209071303.24303-4-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191209071303.24303-1-tao3.xu@intel.com> References: <20191209071303.24303-1-tao3.xu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.93 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: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add additional information for -cpu help to indicate the changes in this version of CPU model. Suggested-by: Eduardo Habkost Signed-off-by: Tao Xu --- target/i386/cpu.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index b09ac38409..7b3bd6d4db 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1693,6 +1693,7 @@ typedef struct PropValue { typedef struct X86CPUVersionDefinition { X86CPUVersion version; const char *alias; + const char *note; PropValue *props; } X86CPUVersionDefinition; =20 @@ -1723,6 +1724,7 @@ struct X86CPUModel { X86CPUDefinition *cpudef; /* CPU model version */ X86CPUVersion version; + const char *note; /* * If true, this is an alias CPU model. * This matters only for "-cpu help" and query-cpu-definitions @@ -4788,6 +4790,7 @@ static void x86_cpu_list_entry(gpointer data, gpointe= r user_data) char *name =3D x86_cpu_class_get_model_name(cc); char *desc =3D g_strdup(cc->model_description); char *alias_of =3D x86_cpu_class_get_alias_of(cc); + char *model_id =3D x86_cpu_class_get_model_id(cc); =20 if (!desc && alias_of) { if (cc->model && cc->model->version =3D=3D CPU_VERSION_AUTO) { @@ -4796,14 +4799,18 @@ static void x86_cpu_list_entry(gpointer data, gpoin= ter user_data) desc =3D g_strdup_printf("(alias of %s)", alias_of); } } + if (!desc && cc->model && cc->model->note) { + desc =3D g_strdup_printf("%s [%s]", model_id, cc->model->note); + } if (!desc) { - desc =3D x86_cpu_class_get_model_id(cc); + desc =3D g_strdup_printf("%s", model_id); } =20 - qemu_printf("x86 %-20s %-48s\n", name, desc); + qemu_printf("x86 %-20s %-58s\n", name, desc); g_free(name); g_free(desc); g_free(alias_of); + g_free(model_id); } =20 /* list available CPU models and flags */ @@ -5280,6 +5287,7 @@ static void x86_register_cpudef_types(X86CPUDefinitio= n *def) X86CPUModel *m =3D g_new0(X86CPUModel, 1); m->cpudef =3D def; m->version =3D vdef->version; + m->note =3D vdef->note; name =3D x86_cpu_versioned_model_name(def, vdef->version); x86_register_cpu_model_type(name, m); g_free(name); --=20 2.20.1