From patchwork Sun Dec 9 19:45:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 204781 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 07D8A2C01FB for ; Mon, 10 Dec 2012 06:59:32 +1100 (EST) Received: from localhost ([::1]:49989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Thmpx-0005iz-Mt for incoming@patchwork.ozlabs.org; Sun, 09 Dec 2012 14:46:53 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ThmpG-0003gN-Fq for qemu-devel@nongnu.org; Sun, 09 Dec 2012 14:46:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ThmpE-00053H-4X for qemu-devel@nongnu.org; Sun, 09 Dec 2012 14:46:10 -0500 Received: from cantor2.suse.de ([195.135.220.15]:49236 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ThmpD-000539-Rp for qemu-devel@nongnu.org; Sun, 09 Dec 2012 14:46:08 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 55590A41E0; Sun, 9 Dec 2012 20:46:07 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 9 Dec 2012 20:45:51 +0100 Message-Id: <1355082353-322-3-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355082353-322-1-git-send-email-afaerber@suse.de> References: <1354645978-17362-1-git-send-email-ehabkost@redhat.com> <1355082353-322-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: blauwirbel@gmail.com, imammedo@redhat.com, ehabkost@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH qom-cpu 2/4] target-i386: Drop redundant list of CPU definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Since we are no longer parsing cpudefs from config files, only the array of built-in definitions remains. Signed-off-by: Andreas Färber Reviewed-by: Eduardo Habkost --- target-i386/cpu.c | 37 ++++++++++++++----------------------- 1 Datei geändert, 14 Zeilen hinzugefügt(+), 23 Zeilen entfernt(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index a46faa2..e265317 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -330,11 +330,7 @@ typedef struct x86_def_t { #define TCG_SVM_FEATURES 0 #define TCG_7_0_EBX_FEATURES (CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_SMAP) -/* maintains list of cpu model definitions - */ -static x86_def_t *x86_defs = {NULL}; - -/* built-in cpu model definitions (deprecated) +/* built-in cpu model definitions */ static x86_def_t builtin_x86_defs[] = { { @@ -1210,20 +1206,17 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Visitor *v, void *opaque, static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *name) { - x86_def_t *def; + int i; - for (def = x86_defs; def; def = def->next) { - if (name && !strcmp(name, def->name)) { - break; + for (i = 0; i < ARRAY_SIZE(builtin_x86_defs); i++) { + x86_def_t *def = &builtin_x86_defs[i]; + if (strcmp(name, def->name) == 0) { + memcpy(x86_cpu_def, def, sizeof(*def)); + return 0; } } - if (!def) { - return -1; - } else { - memcpy(x86_cpu_def, def, sizeof(*def)); - } - return 0; + return -1; } /* Parse "+feature,-feature,feature=foo" CPU feature string @@ -1418,10 +1411,11 @@ static void listflags(char *buf, int bufsize, uint32_t fbits, /* generate CPU information. */ void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf) { - x86_def_t *def; + int i; char buf[256]; - for (def = x86_defs; def; def = def->next) { + for (i = 0; i < ARRAY_SIZE(builtin_x86_defs); i++) { + x86_def_t *def = &builtin_x86_defs[i]; snprintf(buf, sizeof(buf), "%s", def->name); (*cpu_fprintf)(f, "x86 %16s %-48s\n", buf, def->model_id); } @@ -1442,14 +1436,14 @@ void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf) CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp) { CpuDefinitionInfoList *cpu_list = NULL; - x86_def_t *def; + int i; - for (def = x86_defs; def; def = def->next) { + for (i = 0; i < ARRAY_SIZE(builtin_x86_defs); i++) { CpuDefinitionInfoList *entry; CpuDefinitionInfo *info; info = g_malloc0(sizeof(*info)); - info->name = g_strdup(def->name); + info->name = g_strdup(builtin_x86_defs[i].name); entry = g_malloc0(sizeof(*entry)); entry->value = info; @@ -1598,7 +1592,6 @@ void x86_cpudef_setup(void) for (i = 0; i < ARRAY_SIZE(builtin_x86_defs); ++i) { x86_def_t *def = &builtin_x86_defs[i]; - def->next = x86_defs; /* Look for specific "cpudef" models that */ /* have the QEMU version in .model_id */ @@ -1611,8 +1604,6 @@ void x86_cpudef_setup(void) break; } } - - x86_defs = def; } }