From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sx8DH-0004os-28 for qemu-devel@nongnu.org; Thu, 02 Aug 2012 23:06:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sx8DB-00067X-25 for qemu-devel@nongnu.org; Thu, 02 Aug 2012 23:06:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26141) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sx8DA-000677-QZ for qemu-devel@nongnu.org; Thu, 02 Aug 2012 23:06:00 -0400 From: Eduardo Habkost Date: Thu, 2 Aug 2012 23:59:14 -0300 Message-Id: <1343962766-22024-8-git-send-email-ehabkost@redhat.com> In-Reply-To: <1343962766-22024-1-git-send-email-ehabkost@redhat.com> References: <1343962766-22024-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 07/19] i386: cpu: extract parsing of feature strings to separate function 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?= Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 62 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 7af80a0..dd2dc45 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1077,17 +1077,14 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Visitor *v, void *opaque, cpu->env.tsc_khz = value / 1000; } -static int cpu_x86_build_from_name(x86_def_t *x86_cpu_def, - const char *cpu_model) +/* Extend a x86_def_t struct based on a +feature,-feature,feature=xyz string + * + * Returns 0 on success, -1 on error. + */ +static int cpu_x86_extend_features(x86_def_t *x86_cpu_def, char *featlist) { unsigned int i; - x86_def_t *def; - - char *last; - char *s = g_strdup(cpu_model); - char *featurestr, *name = strtok_r(s, ",", &last); - char *featlist = strtok_r(NULL, "", &last); - + char *last, *featurestr; /* Features to be added*/ uint32_t plus_features = 0, plus_ext_features = 0; uint32_t plus_ext2_features = 0, plus_ext3_features = 0; @@ -1098,20 +1095,6 @@ static int cpu_x86_build_from_name(x86_def_t *x86_cpu_def, uint32_t minus_kvm_features = 0, minus_svm_features = 0; uint32_t numvalue; - for (def = x86_defs; def; def = def->next) { - if (name && !strcmp(name, def->name)) { - break; - } - } - - if (kvm_enabled() && name && strcmp(name, "host") == 0) { - cpu_x86_fill_host(x86_cpu_def); - } else if (!def) { - goto error; - } else { - memcpy(x86_cpu_def, def, sizeof(*def)); - } - plus_kvm_features = ~0; /* not supported bits will be filtered out later */ add_flagname_to_bitmaps("hypervisor", &plus_features, @@ -1243,6 +1226,39 @@ static int cpu_x86_build_from_name(x86_def_t *x86_cpu_def, x86_cpu_def->ext3_features &= ~minus_ext3_features; x86_cpu_def->kvm_features &= ~minus_kvm_features; x86_cpu_def->svm_features &= ~minus_svm_features; + return 0; +error: + return -1; +} + +static int cpu_x86_build_from_name(x86_def_t *x86_cpu_def, + const char *cpu_model) +{ + x86_def_t *def; + + char *last; + char *s = g_strdup(cpu_model); + char *name = strtok_r(s, ",", &last); + char *featlist = strtok_r(NULL, "", &last); + + for (def = x86_defs; def; def = def->next) { + if (name && !strcmp(name, def->name)) { + break; + } + } + + if (kvm_enabled() && name && strcmp(name, "host") == 0) { + cpu_x86_fill_host(x86_cpu_def); + } else if (!def) { + goto error; + } else { + memcpy(x86_cpu_def, def, sizeof(*def)); + } + + if (cpu_x86_extend_features(x86_cpu_def, featlist) < 0) { + goto error; + } + if (check_cpuid) { if (check_features_against_host(x86_cpu_def) && enforce_cpuid) { goto error; -- 1.7.11.2