From patchwork Mon Jul 15 22:26:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 259280 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 8A9E22C0172 for ; Tue, 16 Jul 2013 08:30:03 +1000 (EST) Received: from localhost ([::1]:34940 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UyrHN-0007sx-Cx for incoming@patchwork.ozlabs.org; Mon, 15 Jul 2013 18:30:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UyrEJ-0002iP-El for qemu-devel@nongnu.org; Mon, 15 Jul 2013 18:26:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UyrEI-0001zr-8Q for qemu-devel@nongnu.org; Mon, 15 Jul 2013 18:26:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35419) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UyrEH-0001zV-VE for qemu-devel@nongnu.org; Mon, 15 Jul 2013 18:26:50 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6FMQnt5026235 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 15 Jul 2013 18:26:49 -0400 Received: from thinkpad.redhat.com (vpn-229-233.phx2.redhat.com [10.3.229.233]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r6FMQL4L014418; Mon, 15 Jul 2013 18:26:46 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 16 Jul 2013 00:26:04 +0200 Message-Id: <1373927181-24247-12-git-send-email-imammedo@redhat.com> In-Reply-To: <1373927181-24247-1-git-send-email-imammedo@redhat.com> References: <1373927181-24247-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Eduardo Habkost , Vadim Rozenfeld , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 11/20] 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 v2: - afaerber: inline property definition inside of property array. --- target-i386/cpu.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 68b7694..4b8bcf1 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1231,6 +1231,12 @@ 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, +}; + static void x86_cpuid_version_get_stepping(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) @@ -1491,6 +1497,7 @@ static Property cpu_x86_properties[] = { DEFINE_PROP_UINT32("level", X86CPU, env.cpuid_level, 0), DEFINE_PROP_UINT32("xlevel", X86CPU, env.cpuid_xlevel, 0), { .name = "family", .info = &qdev_prop_family }, + { .name = "model", .info = &qdev_prop_model }, DEFINE_PROP_END_OF_LIST(), }; @@ -2451,9 +2458,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);