From patchwork Fri Oct 25 02:25:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 11211219 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C8A75139A for ; Fri, 25 Oct 2019 02:29:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9438A21928 for ; Fri, 25 Oct 2019 02:29:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cTwAiM5k" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9438A21928 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:54588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNpMA-0000oK-Oc for patchwork-qemu-devel@patchwork.kernel.org; Thu, 24 Oct 2019 22:29:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39503) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNpIj-00022c-EB for qemu-devel@nongnu.org; Thu, 24 Oct 2019 22:26:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNpIi-0007Z6-9D for qemu-devel@nongnu.org; Thu, 24 Oct 2019 22:26:05 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:23169 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNpIi-0007Yu-5M for qemu-devel@nongnu.org; Thu, 24 Oct 2019 22:26:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571970363; 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=skzxznZMQb+hQ2LViMb7cCRGTVd6o+H0baPEAle9Hp0=; b=cTwAiM5kiBeINnwU5mnAouJR3YTFcQuLWLZtS78DtHHFaI8alQjqyzjieS4QSMMqTDC0t2 pUNQlqd0xtJ+z7oWEnrfUtIwIKl5i2fWDkmAuvNSy0FkinjuoE81rDJ3yBZJUSTd82r8y3 I6Xc/rxWRft6BoCNBdkyvlHOJT0+tXI= 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-378-2IYdbWHlN9aWnwFL-cGtDg-1; Thu, 24 Oct 2019 22:26:00 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 448C647B; Fri, 25 Oct 2019 02:25:59 +0000 (UTC) Received: from localhost (ovpn-116-62.gru2.redhat.com [10.97.116.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id D0C91600C6; Fri, 25 Oct 2019 02:25:58 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 2/7] i386: Add default_version parameter to CPU version functions Date: Thu, 24 Oct 2019 23:25:48 -0300 Message-Id: <20191025022553.25298-3-ehabkost@redhat.com> In-Reply-To: <20191025022553.25298-1-ehabkost@redhat.com> References: <20191025022553.25298-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 2IYdbWHlN9aWnwFL-cGtDg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: Markus Armbruster , Igor Mammedov , Paolo Bonzini , Jiri Denemark , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- 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;