From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCvQq-00085p-2V for qemu-devel@nongnu.org; Tue, 14 Jun 2016 16:59:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCvQo-0007hi-2u for qemu-devel@nongnu.org; Tue, 14 Jun 2016 16:59:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48829) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCvQn-0007hc-QT for qemu-devel@nongnu.org; Tue, 14 Jun 2016 16:59:29 -0400 From: Eduardo Habkost Date: Tue, 14 Jun 2016 17:59:05 -0300 Message-Id: <1465937948-548-8-git-send-email-ehabkost@redhat.com> In-Reply-To: <1465937948-548-1-git-send-email-ehabkost@redhat.com> References: <1465937948-548-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PULL 07/10] target-i386: Move xcc->kvm_required check to realize time List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-devel@nongnu.org, Richard Henderson , Paolo Bonzini , Igor Mammedov From: Igor Mammedov It will allow to drop custom cpu_x86_init() and use cpu_generic_init() instead, reducing cpu_x86_create() to a simple 3-liner. Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index c91902f..7db632b 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -678,6 +678,14 @@ static ObjectClass *x86_cpu_class_by_name(const char *cpu_model) return oc; } +static char *x86_cpu_class_get_model_name(X86CPUClass *cc) +{ + const char *class_name = object_class_get_name(OBJECT_CLASS(cc)); + assert(g_str_has_suffix(class_name, X86_CPU_TYPE_SUFFIX)); + return g_strndup(class_name, + strlen(class_name) - strlen(X86_CPU_TYPE_SUFFIX)); +} + struct X86CPUDefinition { const char *name; uint32_t level; @@ -1552,7 +1560,7 @@ static void host_x86_cpu_initfn(Object *obj) */ cpu->host_features = true; - /* If KVM is disabled, cpu_x86_create() will already report an error */ + /* If KVM is disabled, x86_cpu_realizefn() will report an error later */ 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); @@ -2178,7 +2186,6 @@ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefinition *def, Error **errp) X86CPU *cpu_x86_create(const char *cpu_model, Error **errp) { X86CPU *cpu = NULL; - X86CPUClass *xcc; ObjectClass *oc; gchar **model_pieces; char *name, *features; @@ -2197,12 +2204,6 @@ X86CPU *cpu_x86_create(const char *cpu_model, Error **errp) error_setg(&error, "Unable to find CPU definition: %s", name); goto out; } - xcc = X86_CPU_CLASS(oc); - - if (xcc->kvm_required && !kvm_enabled()) { - error_setg(&error, "CPU model '%s' requires KVM", name); - goto out; - } cpu = X86_CPU(object_new(object_class_get_name(oc))); @@ -2909,6 +2910,13 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) static bool ht_warned; FeatureWord w; + if (xcc->kvm_required && !kvm_enabled()) { + char *name = x86_cpu_class_get_model_name(xcc); + error_setg(&local_err, "CPU model '%s' requires KVM", name); + g_free(name); + goto out; + } + if (cpu->apic_id < 0) { error_setg(errp, "apic-id property was not initialized properly"); return; -- 2.5.5