From: Eduardo Habkost <ehabkost@redhat.com>
To: qemu-devel@nongnu.org
Cc: Markus Armbruster <armbru@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Jiri Denemark <jdenemar@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: [PATCH 2/7] i386: Add default_version parameter to CPU version functions
Date: Thu, 24 Oct 2019 23:25:48 -0300 [thread overview]
Message-ID: <20191025022553.25298-3-ehabkost@redhat.com> (raw)
In-Reply-To: <20191025022553.25298-1-ehabkost@redhat.com>
Not all CPU version lookup code will use default_cpu_version:
we'll change query-cpu-definitions to optionally get a machine
type argument. Make CPU version resolving functions get an
explicit default_version argument.
All callers are being changed to use default_cpu_version as
argument, so no behavior is being changed yet.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/i386/cpu.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 5b7c5b1177..843f8c4b68 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -3187,11 +3187,12 @@ static X86CPUVersion x86_cpu_model_last_version(const X86CPUModel *model)
}
/* Return the actual version being used for a specific CPU model */
-static X86CPUVersion x86_cpu_model_resolve_version(const X86CPUModel *model)
+static X86CPUVersion x86_cpu_model_resolve_version(const X86CPUModel *model,
+ X86CPUVersion default_version)
{
X86CPUVersion v = model->version;
if (v == CPU_VERSION_AUTO) {
- v = default_cpu_version;
+ v = default_version;
}
if (v == CPU_VERSION_LATEST) {
return x86_cpu_model_last_version(model);
@@ -3958,14 +3959,15 @@ static char *x86_cpu_class_get_model_id(X86CPUClass *xc)
return r;
}
-static char *x86_cpu_class_get_alias_of(X86CPUClass *cc)
+static char *x86_cpu_class_get_alias_of(X86CPUClass *cc,
+ X86CPUVersion default_version)
{
X86CPUVersion version;
if (!cc->model || !cc->model->is_alias) {
return NULL;
}
- version = x86_cpu_model_resolve_version(cc->model);
+ version = x86_cpu_model_resolve_version(cc->model, default_version);
if (version <= 0) {
return NULL;
}
@@ -3978,7 +3980,7 @@ static void x86_cpu_list_entry(gpointer data, gpointer user_data)
X86CPUClass *cc = X86_CPU_CLASS(oc);
g_autofree char *name = x86_cpu_class_get_model_name(cc);
g_autofree char *desc = g_strdup(cc->model_description);
- g_autofree char *alias_of = x86_cpu_class_get_alias_of(cc);
+ g_autofree char *alias_of = x86_cpu_class_get_alias_of(cc, default_cpu_version);
if (!desc && alias_of) {
if (cc->model && cc->model->version == CPU_VERSION_AUTO) {
@@ -4045,7 +4047,7 @@ static void x86_cpu_definition_entry(gpointer data, gpointer user_data)
* doesn't break compatibility with previous QEMU versions.
*/
if (default_cpu_version != CPU_VERSION_LEGACY) {
- info->alias_of = x86_cpu_class_get_alias_of(cc);
+ info->alias_of = x86_cpu_class_get_alias_of(cc, default_cpu_version);
info->has_alias_of = !!info->alias_of;
}
@@ -4116,7 +4118,7 @@ static void x86_cpu_apply_props(X86CPU *cpu, PropValue *props)
static void x86_cpu_apply_version_props(X86CPU *cpu, X86CPUModel *model)
{
const X86CPUVersionDefinition *vdef;
- X86CPUVersion version = x86_cpu_model_resolve_version(model);
+ X86CPUVersion version = x86_cpu_model_resolve_version(model, default_cpu_version);
if (version == CPU_VERSION_LEGACY) {
return;
--
2.21.0
next prev parent reply other threads:[~2019-10-25 2:29 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 2:25 [PATCH 0/7] i386: Add `machine` parameter to query-cpu-definitions Eduardo Habkost
2019-10-25 2:25 ` [PATCH 1/7] i386: Use g_autofree at x86_cpu_list_entry() Eduardo Habkost
2019-10-25 2:25 ` Eduardo Habkost [this message]
2019-10-25 2:25 ` [PATCH 3/7] i386: Don't use default_cpu_version at "-cpu help" Eduardo Habkost
2019-10-25 2:25 ` [PATCH 4/7] machine: machine_find_class() function Eduardo Habkost
2019-10-25 2:25 ` [PATCH 5/7] i386: Remove x86_cpu_set_default_version() function Eduardo Habkost
2019-10-25 2:25 ` [PATCH 6/7] i386: Don't use default_cpu_version() inside query-cpu-definitions Eduardo Habkost
2019-10-25 2:25 ` [PATCH 7/7] cpu: Add `machine` parameter to query-cpu-definitions Eduardo Habkost
2019-10-25 6:36 ` Markus Armbruster
2019-10-25 13:22 ` Eduardo Habkost
2019-10-25 7:17 ` [PATCH 0/7] i386: " David Hildenbrand
2019-10-25 7:55 ` Christian Borntraeger
2019-10-25 8:02 ` David Hildenbrand
2019-10-25 13:49 ` Eduardo Habkost
2019-10-25 14:03 ` Daniel P. Berrangé
2019-10-25 14:23 ` David Hildenbrand
2019-10-25 15:00 ` Daniel P. Berrangé
2019-10-25 17:19 ` David Hildenbrand
2019-10-25 13:38 ` Eduardo Habkost
2019-10-25 14:10 ` David Hildenbrand
2019-10-25 19:02 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191025022553.25298-3-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=armbru@redhat.com \
--cc=imammedo@redhat.com \
--cc=jdenemar@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).