[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/17] target-i386: cpu_x86_find_by_name(): split CP
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 12/17] target-i386: cpu_x86_find_by_name(): split CPU model and feature string first |
Date: |
Mon, 12 Nov 2012 19:38:57 -0200 |
Instead of using strtok() for the whole cpu_model string, first split it
into the CPU model name and the full feature string, then parse the
feature string into pieces.
When using CPU model classes, those two pieces of information will be
used at different moments (CPU model name will be used to find CPU
class, feature string will be used after CPU object was created), so
making the split in two steps will make it easier to refactor the code
later.
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 214a292..3a85989 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1151,9 +1151,10 @@ static int cpu_x86_find_by_name(X86CPUDefinition
*x86_cpu_def,
{
unsigned int i;
X86CPUDefinition *def;
-
- char *s = g_strdup(cpu_model);
- char *featurestr, *name = strtok(s, ",");
+ char *name; /* CPU model name */
+ char *features; /* Full feature "key=value,..." string */
+ char *featurestr; /* Single 'key=value" string being parsed */
+ gchar **model_pieces; /* array after split of name,features */
/* Features to be added*/
uint32_t plus_features = 0, plus_ext_features = 0;
uint32_t plus_ext2_features = 0, plus_ext3_features = 0;
@@ -1166,6 +1167,14 @@ static int cpu_x86_find_by_name(X86CPUDefinition
*x86_cpu_def,
uint32_t minus_7_0_ebx_features = 0;
uint32_t numvalue;
+ model_pieces = g_strsplit(cpu_model, ",", 2);
+ if (!model_pieces[0]) {
+ goto error;
+ }
+
+ name = model_pieces[0];
+ features = model_pieces[1];
+
for (def = x86_defs; def; def = def->next)
if (name && !strcmp(name, def->name))
break;
@@ -1181,7 +1190,7 @@ static int cpu_x86_find_by_name(X86CPUDefinition
*x86_cpu_def,
&plus_ext_features, &plus_ext2_features, &plus_ext3_features,
&plus_kvm_features, &plus_svm_features, &plus_7_0_ebx_features);
- featurestr = strtok(NULL, ",");
+ featurestr = features ? strtok(features, ",") : NULL;
while (featurestr) {
char *val;
@@ -1315,11 +1324,11 @@ static int cpu_x86_find_by_name(X86CPUDefinition
*x86_cpu_def,
if (x86_cpu_def->cpuid_7_0_ebx_features && x86_cpu_def->level < 7) {
x86_cpu_def->level = 7;
}
- g_free(s);
+ g_strfreev(model_pieces);
return 0;
error:
- g_free(s);
+ g_strfreev(model_pieces);
if (!error_is_set(errp)) {
error_set(errp, QERR_INVALID_PARAMETER_COMBINATION);
}
--
1.7.11.7
- [Qemu-devel] [PATCH 00/17] target-i386: CPU init cleanup for CPU classes/properties, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 04/17] target-i386: x86_cpudef_setup(): cosmetic change on comment, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 01/17] target-i386/cpu.c: coding style fix, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 03/17] target-i386: cpu: rename x86_def_t to X86CPUDefinition, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 02/17] target-i386: move cpu_x86_init() to cpu.c, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 05/17] target-i386: cpu_x86_init(): move error handling to end of function, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 06/17] target-i386: cpu_x86_init(): print error message in case of error, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 09/17] target-i386: move out CPU features initialization to separate func, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 10/17] target-i386: kill cpu_x86_register(), Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 12/17] target-i386: cpu_x86_find_by_name(): split CPU model and feature string first,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 14/17] target-i386: cpu_x86_init(): rename cpu_model to cpu_string, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 08/17] target-i386: cpu_x86_register(): reorder CPU property setting, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 15/17] target-i386: cpu_x86_init(): eliminate extra 'def1' variable, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 11/17] target-i386: return Error from cpu_x86_find_by_name(), Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 07/17] target-i386: cpu_x86_register(): report errors using Error parameter, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 13/17] target-i386: cpu: create cpu_x86_find_cpudef() function, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 17/17] target-i386: cpu_x86_init(): reorder split of CPU string and creation of CPU object, Eduardo Habkost, 2012/11/12
- [Qemu-devel] [PATCH 16/17] target-i386: cpu: separate cpudef lookup from feature string parsing, Eduardo Habkost, 2012/11/12