From patchwork Mon Nov 12 21:39:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [15/17] target-i386: cpu_x86_init(): eliminate extra 'def1' variable Date: Mon, 12 Nov 2012 11:39:00 -0000 From: Eduardo Habkost X-Patchwork-Id: 198483 Message-Id: <1352756342-13716-16-git-send-email-ehabkost@redhat.com> To: qemu-devel@nongnu.org, Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Cc: Don Slutz Just use '&def' where a pointer to the under-construction X86CPUDefinition struct is being used. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 57acf3a..9b8e480 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1526,19 +1526,19 @@ X86CPU *cpu_x86_init(const char *cpu_string) X86CPU *cpu; CPUX86State *env; Error *error = NULL; - X86CPUDefinition def1, *def = &def1; + X86CPUDefinition def; cpu = X86_CPU(object_new(TYPE_X86_CPU)); env = &cpu->env; env->cpu_model_str = cpu_string; - memset(def, 0, sizeof(*def)); + memset(&def, 0, sizeof(def)); - if (cpu_x86_find_by_name(def, cpu_string, &error) < 0) { + if (cpu_x86_find_by_name(&def, cpu_string, &error) < 0) { goto error; } - if (cpudef_2_x86_cpu(cpu, def, &error) < 0) { + if (cpudef_2_x86_cpu(cpu, &def, &error) < 0) { goto error; }