From patchwork Wed Nov 27 22:28:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 294682 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 90B7C2C0091 for ; Thu, 28 Nov 2013 09:33:18 +1100 (EST) Received: from localhost ([::1]:38095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlnfX-0007EW-U2 for incoming@patchwork.ozlabs.org; Wed, 27 Nov 2013 17:33:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vlnbj-0002fP-Dr for qemu-devel@nongnu.org; Wed, 27 Nov 2013 17:29:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vlnbd-0007fM-7A for qemu-devel@nongnu.org; Wed, 27 Nov 2013 17:29:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43105) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vlnbc-0007eo-Vm for qemu-devel@nongnu.org; Wed, 27 Nov 2013 17:29:13 -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 rARMTBKc030015 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 27 Nov 2013 17:29:11 -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 rARMSvit027976; Wed, 27 Nov 2013 17:29:10 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 27 Nov 2013 23:28:50 +0100 Message-Id: <1385591336-2755-11-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 10/16] target-i386: cpu: convert 'tsc-frequency' 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 4389ffa..b4f616e 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1535,6 +1535,12 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Visitor *v, void *opaque, cpu->env.tsc_khz = value / 1000; } +static PropertyInfo qdev_prop_tsc_freq = { + .name = "int64", + .get = x86_cpuid_get_tsc_freq, + .set = x86_cpuid_set_tsc_freq, +}; + static void x86_cpuid_get_apic_id(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { @@ -2683,9 +2689,6 @@ static void x86_cpu_initfn(Object *obj) cs->env_ptr = env; cpu_exec_init(env); - object_property_add(obj, "tsc-frequency", "int", - x86_cpuid_get_tsc_freq, - x86_cpuid_set_tsc_freq, NULL, NULL, NULL); object_property_add(obj, "apic-id", "int", x86_cpuid_get_apic_id, x86_cpuid_set_apic_id, NULL, NULL, NULL); @@ -2752,6 +2755,7 @@ static Property x86_cpu_properties[] = { { .name = "stepping", .info = &qdev_prop_stepping }, { .name = "vendor", .info = &qdev_prop_vendor }, { .name = "model-id", .info = &qdev_prop_model_id }, + { .name = "tsc-frequency", .info = &qdev_prop_tsc_freq }, DEFINE_PROP_END_OF_LIST() };