From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfyF9-00007p-Tw for qemu-devel@nongnu.org; Tue, 04 Dec 2012 14:33:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TfyEx-0006BZ-EJ for qemu-devel@nongnu.org; Tue, 04 Dec 2012 14:33:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:11230) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfyEx-0006BF-3x for qemu-devel@nongnu.org; Tue, 04 Dec 2012 14:33:11 -0500 From: Eduardo Habkost Date: Tue, 4 Dec 2012 17:34:41 -0200 Message-Id: <1354649683-9078-5-git-send-email-ehabkost@redhat.com> In-Reply-To: <1354649683-9078-1-git-send-email-ehabkost@redhat.com> References: <1354649683-9078-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 4/6] target-i386: postpone cpuid_level update to realize time List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , Don Slutz , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Igor Mammedov delay capping cpuid_level to 7 to realize time so property setters for cpuid_7_0_ebx_features and "level" could be used in any order/time between x86_cpu_initfn() and x86_cpu_realize(). Signed-off-by: Igor Mammedov --- target-i386/cpu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 05ac79a..56a5646 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1381,9 +1381,6 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features) if (kvm_check_features_against_host(x86_cpu_def) && enforce_cpuid) goto error; } - if (x86_cpu_def->cpuid_7_0_ebx_features && x86_cpu_def->level < 7) { - x86_cpu_def->level = 7; - } return 0; error: @@ -2074,6 +2071,11 @@ static void x86_cpu_apic_init(X86CPU *cpu, Error **errp) void x86_cpu_realize(Object *obj, Error **errp) { X86CPU *cpu = X86_CPU(obj); + CPUX86State *env = &cpu->env; + + if (env->cpuid_7_0_ebx_features && env->cpuid_level < 7) { + env->cpuid_level = 7; + } #ifndef CONFIG_USER_ONLY qemu_register_reset(x86_cpu_machine_reset_cb, cpu); -- 1.7.11.7