diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-02-17 17:46:04 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-24 09:06:58 -0600 |
| commit | dcce6675de5a596e486e7dc341c3a7510d22aed6 (patch) | |
| tree | 219d8adabe6fd6a81b098c42c742fc2b1a31f276 | |
| parent | 38c3dc462297e2daa3a4a2c61ea9cbf50651f62a (diff) | |
| download | qemu-dcce6675de5a596e486e7dc341c3a7510d22aed6.zip qemu-dcce6675de5a596e486e7dc341c3a7510d22aed6.tar.gz qemu-dcce6675de5a596e486e7dc341c3a7510d22aed6.tar.bz2 | |
target-i386: Introduce x86_cpuid_set_model_id()
Move the logic to transform the 48-char model ID into the 12-word model
value into a helper.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | target-i386/cpuid.c | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index 38c1d22..c2edb64 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -619,6 +619,24 @@ static void x86_cpuid_version_set_stepping(CPUX86State *env, int stepping) env->cpuid_version |= stepping & 0xf; } +static void x86_cpuid_set_model_id(CPUX86State *env, const char *model_id) +{ + int c, len, i; + + if (model_id == NULL) { + model_id = ""; + } + len = strlen(model_id); + for (i = 0; i < 48; i++) { + if (i >= len) { + c = '\0'; + } else { + c = (uint8_t)model_id[i]; + } + env->cpuid_model[i >> 2] |= c << (8 * (i & 3)); + } +} + static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) { unsigned int i; @@ -929,20 +947,7 @@ int cpu_x86_register (CPUX86State *env, const char *cpu_model) env->cpuid_ext3_features &= TCG_EXT3_FEATURES; env->cpuid_svm_features &= TCG_SVM_FEATURES; } - { - const char *model_id = def->model_id; - int c, len, i; - if (!model_id) - model_id = ""; - len = strlen(model_id); - for(i = 0; i < 48; i++) { - if (i >= len) - c = '\0'; - else - c = (uint8_t)model_id[i]; - env->cpuid_model[i >> 2] |= c << (8 * (i & 3)); - } - } + x86_cpuid_set_model_id(env, def->model_id); return 0; } |