From patchwork Wed Jun 5 13:18:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 249048 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C08ED2C009A for ; Wed, 5 Jun 2013 23:20:26 +1000 (EST) Received: from localhost ([::1]:43904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkDdW-000459-8p for incoming@patchwork.ozlabs.org; Wed, 05 Jun 2013 09:20:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkDcF-0003D6-Q4 for qemu-devel@nongnu.org; Wed, 05 Jun 2013 09:19:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UkDcD-0001CE-OK for qemu-devel@nongnu.org; Wed, 05 Jun 2013 09:19:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9746) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkDcD-0001C2-Eq for qemu-devel@nongnu.org; Wed, 05 Jun 2013 09:19:01 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r55DJ0kv012311 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 5 Jun 2013 09:19:01 -0400 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r55DIuV7017218; Wed, 5 Jun 2013 09:18:59 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 5 Jun 2013 15:18:33 +0200 Message-Id: <1370438326-27054-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1370438326-27054-1-git-send-email-imammedo@redhat.com> References: <1370438326-27054-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: ehabkost@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 02/15] target-i386: cpu: convert 'model' to static property 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: Igor Mammedov Reviewed-by: Eduardo Habkost --- target-i386/cpu.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index c87cc9f..5d379af 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1238,6 +1238,14 @@ static void x86_cpuid_version_set_model(Object *obj, Visitor *v, void *opaque, env->cpuid_version |= ((value & 0xf) << 4) | ((value >> 4) << 16); } +static PropertyInfo qdev_prop_model = { + .name = "uint32", + .get = x86_cpuid_version_get_model, + .set = x86_cpuid_version_set_model, +}; +#define DEFINE_PROP_MODEL(_n) \ + DEFINE_PROP(_n, X86CPU, env.cpuid_version, qdev_prop_model, uint32_t) + static void x86_cpuid_version_get_stepping(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) @@ -1485,6 +1493,7 @@ static void x86_cpu_get_feature_words(Object *obj, Visitor *v, void *opaque, static Property cpu_x86_properties[] = { DEFINE_PROP_FAMILY("family"), + DEFINE_PROP_MODEL("model"), DEFINE_PROP_END_OF_LIST(), }; @@ -2464,9 +2473,6 @@ static void x86_cpu_initfn(Object *obj) cs->env_ptr = env; cpu_exec_init(env); - object_property_add(obj, "model", "int", - x86_cpuid_version_get_model, - x86_cpuid_version_set_model, NULL, NULL, NULL); object_property_add(obj, "stepping", "int", x86_cpuid_version_get_stepping, x86_cpuid_version_set_stepping, NULL, NULL, NULL);