On Fri, Sep 07, 2012 at 10:54:53PM +0200, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <imamm...@redhat.com>
> Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
(The Reviewed-by line is present above already, but I am just confirming
that this refresh looks OK to me)
> ---
> target-i386/cpu.c | 25 ++++++++++++++-----------
> 1 file changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 3f80069..567ad69 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -1400,17 +1400,7 @@ int cpu_x86_register(X86CPU *cpu, const char
> *cpu_model)
> env->cpuid_ext2_features |= (def->features & CPUID_EXT2_AMD_ALIASES);
> }
>
> - if (!kvm_enabled()) {
> - env->cpuid_features &= TCG_FEATURES;
> - env->cpuid_ext_features &= TCG_EXT_FEATURES;
> - env->cpuid_ext2_features &= (TCG_EXT2_FEATURES
> -#ifdef TARGET_X86_64
> - | CPUID_EXT2_SYSCALL | CPUID_EXT2_LM
> -#endif
> - );
> - env->cpuid_ext3_features &= TCG_EXT3_FEATURES;
> - env->cpuid_svm_features &= TCG_SVM_FEATURES;
> - }
> +
> object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error);
>
> out:
> @@ -1881,6 +1871,19 @@ static void mce_init(X86CPU *cpu)
> void x86_cpu_realize(Object *obj, Error **errp)
> {
> X86CPU *cpu = X86_CPU(obj);
> + CPUX86State *env = &cpu->env;
> +
> + if (!kvm_enabled()) {
> + env->cpuid_features &= TCG_FEATURES;
> + env->cpuid_ext_features &= TCG_EXT_FEATURES;
> + env->cpuid_ext2_features &= (TCG_EXT2_FEATURES
> +#ifdef TARGET_X86_64
> + | CPUID_EXT2_SYSCALL | CPUID_EXT2_LM
> +#endif
> + );
> + env->cpuid_ext3_features &= TCG_EXT3_FEATURES;
> + env->cpuid_svm_features &= TCG_SVM_FEATURES;
> + }
>
> #ifndef CONFIG_USER_ONLY
> qemu_register_reset(x86_cpu_machine_reset_cb, cpu);
> --
> 1.7.11.4
>
>
--
Eduardo
