From patchwork Wed Apr 25 09:23:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 154869 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1AF43B6FBD for ; Wed, 25 Apr 2012 20:28:19 +1000 (EST) Received: from localhost ([::1]:43474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMyTo-0000VI-Lb for incoming@patchwork.ozlabs.org; Wed, 25 Apr 2012 05:25:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMyS0-0005BC-36 for qemu-devel@nongnu.org; Wed, 25 Apr 2012 05:23:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMyRs-0005Nw-9H for qemu-devel@nongnu.org; Wed, 25 Apr 2012 05:23:51 -0400 Received: from cantor2.suse.de ([195.135.220.15]:38155 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMyRs-0005NL-0T for qemu-devel@nongnu.org; Wed, 25 Apr 2012 05:23:44 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id BAC09A39A0; Wed, 25 Apr 2012 11:23:42 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Wed, 25 Apr 2012 11:23:26 +0200 Message-Id: <1335345816-22452-6-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1335345816-22452-1-git-send-email-afaerber@suse.de> References: <1335345816-22452-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori Subject: [Qemu-devel] [PATCH v3 05/15] target-i386: Add "model" property to X86CPU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Andreas Färber Reviewed-by: Eduardo Habkost Reviewed-by: Igor Mammedov --- target-i386/cpu.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 9eb5738..ebee991 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -626,10 +626,27 @@ static void x86_cpuid_version_set_family(Object *obj, Visitor *v, void *opaque, } } -static void x86_cpuid_version_set_model(CPUX86State *env, int model) +static void x86_cpuid_version_set_model(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) { + X86CPU *cpu = X86_CPU(obj); + CPUX86State *env = &cpu->env; + const int64_t min = 0; + const int64_t max = 0xff; + int64_t value; + + visit_type_int(v, &value, name, errp); + if (error_is_set(errp)) { + return; + } + if (value < min || value > max) { + error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "", + name ? name : "null", value, min, max); + return; + } + env->cpuid_version &= ~0xf00f0; - env->cpuid_version |= ((model & 0xf) << 4) | ((model >> 4) << 16); + env->cpuid_version |= ((value & 0xf) << 4) | ((value >> 4) << 16); } static void x86_cpuid_version_set_stepping(CPUX86State *env, int stepping) @@ -946,7 +963,7 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) env->cpuid_vendor_override = def->vendor_override; env->cpuid_level = def->level; object_property_set_int(OBJECT(cpu), def->family, "family", &error); - x86_cpuid_version_set_model(env, def->model); + object_property_set_int(OBJECT(cpu), def->model, "model", &error); x86_cpuid_version_set_stepping(env, def->stepping); env->cpuid_features = def->features; env->cpuid_ext_features = def->ext_features; @@ -1502,6 +1519,9 @@ static void x86_cpu_initfn(Object *obj) object_property_add(obj, "family", "int", NULL, x86_cpuid_version_set_family, NULL, NULL, NULL); + object_property_add(obj, "model", "int", + NULL, + x86_cpuid_version_set_model, NULL, NULL, NULL); env->cpuid_apic_id = env->cpu_index; mce_init(cpu);