Commit ed5e1ec3 authored by Andreas Färber's avatar Andreas Färber Committed by Anthony Liguori
Browse files

target-i386: Introduce x86_cpuid_version_set_family()



Move the logic for setting the family and extended family into a
helper function.

To make the helper self-contained and in preparation of future
unordered/multiple uses, mask out any previous family values first.
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 8811e1e1
......@@ -597,6 +597,16 @@ static int check_features_against_host(x86_def_t *guest_def)
return rv;
}
static void x86_cpuid_version_set_family(CPUX86State *env, int family)
{
env->cpuid_version &= ~0xff00f00;
if (family > 0x0f) {
env->cpuid_version |= 0xf00 | ((family - 0x0f) << 20);
} else {
env->cpuid_version |= family << 8;
}
}
static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model)
{
unsigned int i;
......@@ -883,10 +893,7 @@ int cpu_x86_register (CPUX86State *env, const char *cpu_model)
}
env->cpuid_vendor_override = def->vendor_override;
env->cpuid_level = def->level;
if (def->family > 0x0f)
env->cpuid_version = 0xf00 | ((def->family - 0x0f) << 20);
else
env->cpuid_version = def->family << 8;
x86_cpuid_version_set_family(env, def->family);
env->cpuid_version |= ((def->model & 0xf) << 4) | ((def->model >> 4) << 16);
env->cpuid_version |= def->stepping;
env->cpuid_features = def->features;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment