Received: by 2002:a19:6b17:0:0:0:0:0 with SMTP id d23csp2393417lfa; Tue, 13 Oct 2020 16:09:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxV8Kv9VPdaPKG8LZHY3WQ1JWCBtFqNpVDWpKWwggjNfdEgMpYUJzKjWb86yXyyaOvYarG4 X-Received: by 2002:a25:b68c:: with SMTP id s12mr2946296ybj.502.1602630568309; Tue, 13 Oct 2020 16:09:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602630568; cv=none; d=google.com; s=arc-20160816; b=Fe9hVdVK5DQ7ikhbVzk8+tMHSh+EWwMK107ctIVUEqkWActh8txH1uE6dolAbIYXMv TDkhKWRrtG1S5sINisXzJ6EkM9UnhZlJSPGG1HyYdTZ3ZztBruSolJ1qvz/tCrsCOg+T R3LFErUUK4gn9f707Vof63A4rIF0caHqYA2mQrUc3ZTGo40ql72GYKz7IkOoaFRavjQD mX97dmgRlL9Z5bZw7p/iDgd5RxOeyp5KrGC38sc1adJKfoM1ukuy8TPvd8L6N/VOi2xd g/e7Q3JDZYPqTj6QLUHQY03ZyOw9ixdpSgXB92GT6gc+qrxN3dknaMoBujlaH+qOuWiW 4QEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=nFHqLdQ1LZr/q2BKzU1o9GdIbvc7LjYhDm97t9aU/Ro=; b=ArNiBXtsbXECQMExHz5KtiH4n1c/aH0M5CH9x0hf2kTLgcf5mcW58FRKBADRVkw4KY wWk46FYzVTvG3J4IgwklfwoD3Q/9uDtPjgoO1M9Wq+2k/l4bVpiS697HAjUykeL3vFt6 dM88A+CDrBGUNjhsXe9TvhjIL+h0uVc3kl5+TE0ye7/NMpdoU+WUcggK08rjSStoqJ4A 0CGR22GAnDREMOK1a9m+TRcnuiLsUjKncShdaFzS0p0byZqS9zgWLv21dK5lMfjGK6h7 Gxc/2JcnvxB1PExgZbDwQsZftsAhWZ3oDbITvXJuP4DVAlcmuwYvQm5/GOikPMBKapEj TfVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=TLGzn0Qm; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r2si42334ybg.489.2020.10.13.16.09.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Oct 2020 16:09:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=TLGzn0Qm; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:44544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSTQ7-0002va-M7 for alex.bennee@linaro.org; Tue, 13 Oct 2020 19:09:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSTMf-0006sf-W9 for qemu-arm@nongnu.org; Tue, 13 Oct 2020 19:05:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kSTMe-0003jp-7r for qemu-arm@nongnu.org; Tue, 13 Oct 2020 19:05:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602630351; 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=nFHqLdQ1LZr/q2BKzU1o9GdIbvc7LjYhDm97t9aU/Ro=; b=TLGzn0Qm545KQRWmEExCeoWpojVdxSd9sNB7lnbIljACjXyuHPAjX1sdnH7EQScXHIg5Y4 TcNWeosZ3LftB7yibfAy7JTlSDWLU0Fy1qm6czGPJFuj2O1K+OnteAlSeHiFCi2HuSDBl8 wX+dYkpBOZcvMyIAEdjqrscjqrSiKkA= 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-263-nDWHKgk1NNGLyyIPI98Yhw-1; Tue, 13 Oct 2020 19:05:49 -0400 X-MC-Unique: nDWHKgk1NNGLyyIPI98Yhw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 83A531074659; Tue, 13 Oct 2020 23:05:47 +0000 (UTC) Received: from localhost (ovpn-66-44.rdu2.redhat.com [10.10.66.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 43F5E19C71; Tue, 13 Oct 2020 23:05:40 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH v2 6/7] i386: Don't use default_cpu_version inside x86_cpu_definition_entry() Date: Tue, 13 Oct 2020 19:04:56 -0400 Message-Id: <20201013230457.150630-7-ehabkost@redhat.com> In-Reply-To: <20201013230457.150630-1-ehabkost@redhat.com> References: <20201013230457.150630-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/13 02:06:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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-arm@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 , David Hildenbrand , Thomas Huth , Jiaxun Yang , Eric Blake , Markus Armbruster , Wainer dos Santos Moschetta , Halil Pasic , Christian Borntraeger , Aleksandar Markovic , Marcel Apfelbaum , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Eduardo Habkost , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Cleber Rosa , Jiri Denemark , David Gibson , "Daniel P. Berrange" , Cornelia Huck , qemu-ppc@nongnu.org, Paolo Bonzini , Aurelien Jarno Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: arCgoMTQDXIC We will change query-cpu-definitions to have a new `machine` parameter. Move the code that reads default_cpu_version to qmp_query_cpu_definitions() to make that easier to implement. This patch shouldn't introduce any behavior change. Results of query-cpu-definition will be exactly the same. Signed-off-by: Eduardo Habkost --- target/i386/cpu.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index bf4b4a4812..0807d12ffa 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4990,11 +4990,16 @@ void x86_cpu_list(void) } #ifndef CONFIG_USER_ONLY +typedef struct X86CPUDefinitionArgs { + CpuDefinitionInfoList *cpu_list; + X86CPUVersion default_version; +} X86CPUDefinitionArgs; + static void x86_cpu_definition_entry(gpointer data, gpointer user_data) { ObjectClass *oc = data; X86CPUClass *cc = X86_CPU_CLASS(oc); - CpuDefinitionInfoList **cpu_list = user_data; + X86CPUDefinitionArgs *args = user_data; CpuDefinitionInfoList *entry; CpuDefinitionInfo *info; @@ -5010,25 +5015,27 @@ static void x86_cpu_definition_entry(gpointer data, gpointer user_data) * Old machine types won't report aliases, so that alias translation * doesn't break compatibility with previous QEMU versions. */ - if (cc->model && default_cpu_version != CPU_VERSION_LEGACY) { + if (cc->model && args->default_version != CPU_VERSION_LEGACY) { info->alias_of = x86_cpu_model_resolve_alias(cc->model, - default_cpu_version); + args->default_version); info->has_alias_of = !!info->alias_of; } entry = g_malloc0(sizeof(*entry)); entry->value = info; - entry->next = *cpu_list; - *cpu_list = entry; + entry->next = args->cpu_list; + args->cpu_list = entry; } CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp) { - CpuDefinitionInfoList *cpu_list = NULL; + X86CPUDefinitionArgs args = { .cpu_list = NULL }; GSList *list = get_sorted_cpu_model_list(); - g_slist_foreach(list, x86_cpu_definition_entry, &cpu_list); + + args.default_version = default_cpu_version; + g_slist_foreach(list, x86_cpu_definition_entry, &args); g_slist_free(list); - return cpu_list; + return args.cpu_list; } #endif -- 2.28.0