[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [RFC 04/20] target-i386: filter out not TCG features if
From: |
Eduardo Habkost |
Subject: |
Re: [Qemu-devel] [RFC 04/20] target-i386: filter out not TCG features if running without kvm at realize time |
Date: |
Fri, 10 Aug 2012 10:48:42 -0300 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Fri, Aug 10, 2012 at 01:22:20PM +0200, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
> ---
> target-i386/cpu.c | 24 +++++++++++++-----------
> 1 file changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 17e98e1..d0dec63 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -1171,17 +1171,6 @@ int cpu_x86_register(X86CPU *cpu, const char
> *cpu_model)
> env->cpuid_xlevel2 = def->xlevel2;
> object_property_set_int(OBJECT(cpu), (int64_t)def->tsc_khz * 1000,
> "tsc-frequency", &error);
> - 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:
> @@ -1745,6 +1734,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.2
>
--
Eduardo
- [Qemu-devel] [RFC 00/20] target-i386: convert CPU features into properties, Igor Mammedov, 2012/08/10
- [Qemu-devel] [RFC 01/20] target-i386: return Error from cpu_x86_find_by_name(), Igor Mammedov, 2012/08/10
- [Qemu-devel] [RFC 02/20] target-i386: cpu_x86_register(): report error from property setter, Igor Mammedov, 2012/08/10
- [Qemu-devel] [RFC 03/20] target-i386: if x86_cpu_realize() failed report error and do cleanup, Igor Mammedov, 2012/08/10
- [Qemu-devel] [RFC 04/20] target-i386: filter out not TCG features if running without kvm at realize time, Igor Mammedov, 2012/08/10
- Re: [Qemu-devel] [RFC 04/20] target-i386: filter out not TCG features if running without kvm at realize time,
Eduardo Habkost <=
- [Qemu-devel] [RFC 05/20] target-i386: move out CPU features initialization in separate func, Igor Mammedov, 2012/08/10
- [Qemu-devel] [RFC 06/20] target-i386: xlevel should be more than 0x80000000, move fixup into setter, Igor Mammedov, 2012/08/10
- [Qemu-devel] [RFC 07/20] target-i386: convert cpuid features into properties, Igor Mammedov, 2012/08/10
- [Qemu-devel] [RFC 08/20] target-i386: convert 'hv_spinlocks' feature into property, Igor Mammedov, 2012/08/10
- [Qemu-devel] [RFC 09/20] target-i386: convert 'hv_relaxed' feature into property, Igor Mammedov, 2012/08/10
- [Qemu-devel] [RFC 11/20] target-i386: convert 'check' and 'enforce' features into properties, Igor Mammedov, 2012/08/10