From patchwork Mon Feb 11 16:35:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 219647 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 6EEC32C02BC for ; Tue, 12 Feb 2013 04:14:50 +1100 (EST) Received: from localhost ([::1]:49287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4wPf-0004us-FK for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2013 11:39:27 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4wPR-0004Re-E6 for qemu-devel@nongnu.org; Mon, 11 Feb 2013 11:39:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U4wPH-0005Nc-Em for qemu-devel@nongnu.org; Mon, 11 Feb 2013 11:39:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:2592) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4wPH-0005NF-69 for qemu-devel@nongnu.org; Mon, 11 Feb 2013 11:39:03 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1BGd1SD011357 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 11 Feb 2013 11:39:01 -0500 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r1BGctsq028773; Mon, 11 Feb 2013 11:39:00 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 11 Feb 2013 17:35:05 +0100 Message-Id: <1360600511-25133-4-git-send-email-imammedo@redhat.com> In-Reply-To: <1360600511-25133-1-git-send-email-imammedo@redhat.com> References: <1360600511-25133-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Don@cloudswitch.com, afaerber@suse.de, ehabkost@redhat.com Subject: [Qemu-devel] [PATCH 3/9] target-i386: convert 'hv_spinlocks' 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 --- target-i386/cpu.c | 41 ++++++++++++++++++++++++++++++++++------- 1 files changed, 34 insertions(+), 7 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index a062337..1f14b65 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -496,6 +496,38 @@ PropertyInfo qdev_prop_tsc_freq = { #define DEFINE_PROP_TSC_FREQ(_n) \ DEFINE_PROP(_n, X86CPU, env.tsc_khz, qdev_prop_tsc_freq, int32_t) +static void x86_get_hv_spinlocks(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + int64_t value = hyperv_get_spinlock_retries(); + + visit_type_int(v, &value, name, errp); +} + +static void x86_set_hv_spinlocks(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + int64_t value; + + visit_type_int(v, &value, name, errp); + if (error_is_set(errp)) { + return; + } + hyperv_set_spinlock_retries(value); +} + +PropertyInfo qdev_prop_spinlocks = { + .name = "int", + .get = x86_get_hv_spinlocks, + .set = x86_set_hv_spinlocks, +}; +#define DEFINE_PROP_HV_SPINLOCKS(_n, _defval) { \ + .name = _n, \ + .info = &qdev_prop_spinlocks, \ + .qtype = QTYPE_QINT, \ + .defval = _defval \ +} + static Property cpu_x86_properties[] = { DEFINE_PROP_FAMILY("family"), DEFINE_PROP_MODEL("model"), @@ -505,6 +537,7 @@ static Property cpu_x86_properties[] = { DEFINE_PROP_VENDOR("vendor"), DEFINE_PROP_MODEL_ID("model-id"), DEFINE_PROP_TSC_FREQ("tsc-frequency"), + DEFINE_PROP_HV_SPINLOCKS("hv-spinlocks", HYPERV_SPINLOCK_NEVER_RETRY), DEFINE_PROP_END_OF_LIST(), }; @@ -1425,13 +1458,7 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char *features, Error **errp) snprintf(num, sizeof(num), "%" PRId64, tsc_freq); object_property_parse(OBJECT(cpu), num, "tsc-frequency", errp); } else if (!strcmp(featurestr, "hv-spinlocks")) { - char *err; - numvalue = strtoul(val, &err, 0); - if (!*val || *err) { - error_setg(errp, "bad numerical value %s\n", val); - goto out; - } - hyperv_set_spinlock_retries(numvalue); + object_property_parse(OBJECT(cpu), val, featurestr, errp); } else { error_setg(errp, "unrecognized feature %s\n", featurestr); goto out;