From patchwork Wed Nov 27 22:28:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 294696 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 BCD972C007E for ; Thu, 28 Nov 2013 10:23:57 +1100 (EST) Received: from localhost ([::1]:38091 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlnfC-0006xn-9v for incoming@patchwork.ozlabs.org; Wed, 27 Nov 2013 17:32:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39596) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vlnbd-0002Uy-44 for qemu-devel@nongnu.org; Wed, 27 Nov 2013 17:29:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VlnbX-0007cq-4o for qemu-devel@nongnu.org; Wed, 27 Nov 2013 17:29:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27868) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlnbW-0007cf-RW for qemu-devel@nongnu.org; Wed, 27 Nov 2013 17:29:07 -0500 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 rARMT6KM003313 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 27 Nov 2013 17:29:06 -0500 Received: from thinkpad.redhat.com (vpn-228-120.phx2.redhat.com [10.3.228.120]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id rARMSvip027976; Wed, 27 Nov 2013 17:29:05 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 27 Nov 2013 23:28:46 +0100 Message-Id: <1385591336-2755-7-git-send-email-imammedo@redhat.com> In-Reply-To: <1385591336-2755-1-git-send-email-imammedo@redhat.com> References: <1385591336-2755-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: afaerber@suse.de Subject: [Qemu-devel] [PATCH 06/16] 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 --- v3: - cpu_x86_properties changed to x86_cpu_properties, upstream rebase on top of it. 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 7483f28..efbcaba 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1354,6 +1354,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) @@ -2641,9 +2647,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); @@ -2718,6 +2721,7 @@ static Property x86_cpu_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() };