[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 1/6] target-i386: filter out not TCG features if
From: |
Eduardo Habkost |
Subject: |
Re: [Qemu-devel] [PATCH 1/6] target-i386: filter out not TCG features if running without kvm at realize time |
Date: |
Tue, 11 Dec 2012 11:26:09 -0200 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Tue, Dec 11, 2012 at 11:11:01AM +0100, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <address@hidden>
> Reviewed-by: Eduardo Habkost <address@hidden>
> Signed-off-by: Eduardo Habkost <address@hidden>
Just to confirm that this submission still looks good to me:
Reviewed-by: Eduardo Habkost <address@hidden>
> ---
> target-i386/cpu.c | 31 ++++++++++++++++---------------
> 1 files changed, 16 insertions(+), 15 deletions(-)
>
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 7be3ad8..63aae86 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -1549,21 +1549,6 @@ 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;
> - } else {
> -#ifdef CONFIG_KVM
> - filter_features_for_kvm(cpu);
> -#endif
> - }
> object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error);
> if (error) {
> fprintf(stderr, "%s\n", error_get_pretty(error));
> @@ -2077,6 +2062,22 @@ void x86_cpu_realize(Object *obj, Error **errp)
> env->cpuid_level = 7;
> }
>
> + 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;
> + } else {
> +#ifdef CONFIG_KVM
> + filter_features_for_kvm(cpu);
> +#endif
> + }
> +
> #ifndef CONFIG_USER_ONLY
> qemu_register_reset(x86_cpu_machine_reset_cb, cpu);
>
> --
> 1.7.1
>
--
Eduardo
- [Qemu-devel] [PATCH 0/6] x86 CPU cleanup (wave 2), Igor Mammedov, 2012/12/11
- [Qemu-devel] [PATCH 3/6] target-i386: explicitly set vendor for each built-in cpudef, Igor Mammedov, 2012/12/11
- [Qemu-devel] [PATCH 1/6] target-i386: filter out not TCG features if running without kvm at realize time, Igor Mammedov, 2012/12/11
- Re: [Qemu-devel] [PATCH 1/6] target-i386: filter out not TCG features if running without kvm at realize time,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 4/6] target-i386: setting default 'vendor' is obsolete, remove it, Igor Mammedov, 2012/12/11
- [Qemu-devel] [PATCH 6/6] target-i386: move out CPU features initialization in separate func, Igor Mammedov, 2012/12/11
- [Qemu-devel] [PATCH 5/6] target-i386: move setting defaults out of cpu_x86_parse_featurestr(), Igor Mammedov, 2012/12/11
- [Qemu-devel] [PATCH 2/6] target-i386: sanitize AMD's ext2_features at realize time, Igor Mammedov, 2012/12/11