[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] target-i386: Remove assert(kvm_enabled()) from
From: |
Igor Mammedov |
Subject: |
Re: [Qemu-devel] [PATCH] target-i386: Remove assert(kvm_enabled()) from host_x86_cpu_initfn() |
Date: |
Fri, 10 Jun 2016 14:40:18 +0200 |
On Fri, 10 Jun 2016 08:48:33 -0300
Eduardo Habkost <address@hidden> wrote:
> The code will be changed to allow creation of the CPU object and
> report kvm_required errors only at realizefn, so we need to make
> the instance_init function more flexible.
>
> Signed-off-by: Eduardo Habkost <address@hidden>
> ---
> I am applying this before "Move xcc->kvm_required check to
> realize time" to avoid triggering the assert().
Reviewed-by: Igor Mammedov <address@hidden>
> ---
> target-i386/cpu.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 647cd30..c91902f 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -1547,16 +1547,17 @@ static void host_x86_cpu_initfn(Object *obj)
> CPUX86State *env = &cpu->env;
> KVMState *s = kvm_state;
>
> - assert(kvm_enabled());
> -
> /* We can't fill the features array here because we don't know yet if
> * "migratable" is true or false.
> */
> cpu->host_features = true;
>
> - env->cpuid_level = kvm_arch_get_supported_cpuid(s, 0x0, 0, R_EAX);
> - env->cpuid_xlevel = kvm_arch_get_supported_cpuid(s, 0x80000000, 0,
> R_EAX);
> - env->cpuid_xlevel2 = kvm_arch_get_supported_cpuid(s, 0xC0000000, 0,
> R_EAX);
> + /* If KVM is disabled, cpu_x86_create() will already report an error */
> + if (kvm_enabled()) {
> + env->cpuid_level = kvm_arch_get_supported_cpuid(s, 0x0, 0, R_EAX);
> + env->cpuid_xlevel = kvm_arch_get_supported_cpuid(s, 0x80000000, 0,
> R_EAX);
> + env->cpuid_xlevel2 = kvm_arch_get_supported_cpuid(s, 0xC0000000, 0,
> R_EAX);
> + }
>
> object_property_set_bool(OBJECT(cpu), true, "pmu", &error_abort);
> }
- Re: [Qemu-devel] [PATCH 02/10] target-i386: cpu: move features logic that requires CPUState to realize time, (continued)
[Qemu-devel] [PATCH 03/10] target-i386: cpu: move xcc->kvm_required check to realize time, Igor Mammedov, 2016/06/06
[Qemu-devel] [PATCH 01/10] target-i386: Remove xlevel & hv-spinlocks option fixups, Igor Mammedov, 2016/06/06
[Qemu-devel] [PATCH 06/10] target-i386: print obsolete warnings if +-features are used, Igor Mammedov, 2016/06/06
- Re: [Qemu-devel] [PATCH 06/10] target-i386: print obsolete warnings if +-features are used, Paolo Bonzini, 2016/06/07
- Re: [Qemu-devel] [PATCH 06/10] target-i386: print obsolete warnings if +-features are used, Igor Mammedov, 2016/06/07
- Re: [Qemu-devel] [PATCH 06/10] target-i386: print obsolete warnings if +-features are used, Paolo Bonzini, 2016/06/07
- Re: [Qemu-devel] [PATCH 06/10] target-i386: print obsolete warnings if +-features are used, Igor Mammedov, 2016/06/07
- Re: [Qemu-devel] [PATCH 06/10] target-i386: print obsolete warnings if +-features are used, Paolo Bonzini, 2016/06/07
- Re: [Qemu-devel] [PATCH 06/10] target-i386: print obsolete warnings if +-features are used, Igor Mammedov, 2016/06/07
- Re: [Qemu-devel] [PATCH 06/10] target-i386: print obsolete warnings if +-features are used, Eduardo Habkost, 2016/06/07
[Qemu-devel] [PATCH 04/10] target-i386: cpu: use cpu_generic_init() in cpu_x86_init(), Igor Mammedov, 2016/06/06