From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TrDLu-0000HH-Vd for qemu-devel@nongnu.org; Fri, 04 Jan 2013 14:54:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TrDLr-00088c-TG for qemu-devel@nongnu.org; Fri, 04 Jan 2013 14:54:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:24440) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TrDLr-00088D-Kt for qemu-devel@nongnu.org; Fri, 04 Jan 2013 14:54:47 -0500 From: Eduardo Habkost Date: Fri, 4 Jan 2013 17:56:20 -0200 Message-Id: <1357329382-20944-5-git-send-email-ehabkost@redhat.com> In-Reply-To: <1357329382-20944-1-git-send-email-ehabkost@redhat.com> References: <1357329382-20944-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 4/6] target-i386: Set feature string parsing results directly on CPU object List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Note that this is temporary: just like we would eventually kill usage of x86_def_t inside cpu_x86_parse_featurestr(), we will eventually kill usage of X86CPU inside that function as well. This will help us keep the x86_def_t usage restricted to the CPU object creation code. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index a2ac3c3..54be18c 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1303,7 +1303,7 @@ static void cpu_x86_set_props(X86CPU *cpu, QDict *features, Error **errp) /* Parse "+feature,-feature,feature=foo" CPU feature string */ -static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features, +static int cpu_x86_parse_featurestr(X86CPU *cpu, char *features, QDict **props) { char *featurestr; /* Single 'key=value" string being parsed */ @@ -1374,7 +1374,7 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features, fprintf(stderr, "bad numerical value %s\n", val); goto error; } - x86_cpu_def->tsc_khz = tsc_freq / 1000; + cpu->env.tsc_khz = tsc_freq / 1000; } else if (!strcmp(featurestr, "hv_spinlocks")) { char *err; numvalue = strtoul(val, &err, 0); @@ -1400,20 +1400,20 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features, goto error; } } - x86_cpu_def->features |= plus_features; - x86_cpu_def->ext_features |= plus_ext_features; - x86_cpu_def->ext2_features |= plus_ext2_features; - x86_cpu_def->ext3_features |= plus_ext3_features; - x86_cpu_def->kvm_features |= plus_kvm_features; - x86_cpu_def->svm_features |= plus_svm_features; - x86_cpu_def->cpuid_7_0_ebx_features |= plus_7_0_ebx_features; - x86_cpu_def->features &= ~minus_features; - x86_cpu_def->ext_features &= ~minus_ext_features; - x86_cpu_def->ext2_features &= ~minus_ext2_features; - x86_cpu_def->ext3_features &= ~minus_ext3_features; - x86_cpu_def->kvm_features &= ~minus_kvm_features; - x86_cpu_def->svm_features &= ~minus_svm_features; - x86_cpu_def->cpuid_7_0_ebx_features &= ~minus_7_0_ebx_features; + cpu->env.cpuid_features |= plus_features; + cpu->env.cpuid_ext_features |= plus_ext_features; + cpu->env.cpuid_ext2_features |= plus_ext2_features; + cpu->env.cpuid_ext3_features |= plus_ext3_features; + cpu->env.cpuid_kvm_features |= plus_kvm_features; + cpu->env.cpuid_svm_features |= plus_svm_features; + cpu->env.cpuid_7_0_ebx_features |= plus_7_0_ebx_features; + cpu->env.cpuid_features &= ~minus_features; + cpu->env.cpuid_ext_features &= ~minus_ext_features; + cpu->env.cpuid_ext2_features &= ~minus_ext2_features; + cpu->env.cpuid_ext3_features &= ~minus_ext3_features; + cpu->env.cpuid_kvm_features &= ~minus_kvm_features; + cpu->env.cpuid_svm_features &= ~minus_svm_features; + cpu->env.cpuid_7_0_ebx_features &= ~minus_7_0_ebx_features; g_strfreev(feat_array); return 0; @@ -1561,12 +1561,13 @@ X86CPU *cpu_x86_create(const char *cpu_model, Error **errp) &def->ext3_features, &def->kvm_features, &def->svm_features, &def->cpuid_7_0_ebx_features); - if (cpu_x86_parse_featurestr(def, features, &props) < 0) { + cpudef_2_x86_cpu(cpu, def, &error); + + if (cpu_x86_parse_featurestr(cpu, features, &props) < 0) { error_setg(&error, "Invalid cpu_model string format: %s", cpu_model); goto out; } - cpudef_2_x86_cpu(cpu, def, &error); cpu_x86_set_props(cpu, props, &error); out: -- 1.7.11.7