[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH] target-i386: Remove assert(kvm_enabled()) from host_x
From: |
Eduardo Habkost |
Subject: |
[Qemu-arm] [PATCH] target-i386: Remove assert(kvm_enabled()) from host_x86_cpu_initfn() |
Date: |
Fri, 10 Jun 2016 08:48:33 -0300 |
User-agent: |
Mutt/1.6.1 (2016-04-27) |
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().
---
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);
}
--
2.5.5
- Re: [Qemu-arm] [PATCH 06/10] target-i386: print obsolete warnings if +-features are used, (continued)
[Qemu-arm] [PATCH 03/10] target-i386: cpu: move xcc->kvm_required check to realize time, Igor Mammedov, 2016/06/06
[Qemu-arm] [PATCH 10/10] pc: parse cpu features only once, Igor Mammedov, 2016/06/06
[Qemu-arm] [PATCH 08/10] cpu: use CPUClass->parse_features() as convertor to global properties, Igor Mammedov, 2016/06/06