From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54029) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VvRZt-0005K5-AV for qemu-devel@nongnu.org; Tue, 24 Dec 2013 07:59:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VvRZi-00041K-Bw for qemu-devel@nongnu.org; Tue, 24 Dec 2013 07:59:17 -0500 Received: from cantor2.suse.de ([195.135.220.15]:52000 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VvRZi-000419-0j for qemu-devel@nongnu.org; Tue, 24 Dec 2013 07:59:06 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 24 Dec 2013 13:58:58 +0100 Message-Id: <1387889941-9896-8-git-send-email-afaerber@suse.de> In-Reply-To: <1387889941-9896-1-git-send-email-afaerber@suse.de> References: <1387889941-9896-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 07/10] target-i386: Convert 'hv_spinlocks' to static property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Igor Mammedov Signed-off-by: Igor Mammedov Signed-off-by: Andreas F=C3=A4rber --- target-i386/cpu.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 7d5b58c..39c57f8 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1596,6 +1596,46 @@ static void x86_cpu_get_feature_words(Object *obj,= Visitor *v, void *opaque, error_propagate(errp, err); } =20 +static void x86_get_hv_spinlocks(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu =3D X86_CPU(obj); + int64_t value =3D cpu->hyperv_spinlock_attempts; + + visit_type_int(v, &value, name, errp); +} + +static void x86_set_hv_spinlocks(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + const int64_t min =3D 0xFFF; + const int64_t max =3D UINT_MAX; + X86CPU *cpu =3D X86_CPU(obj); + Error *err =3D NULL; + int64_t value; + + visit_type_int(v, &value, name, &err); + if (err) { + error_propagate(errp, err); + return; + } + + if (value < min || value > max) { + error_setg(errp, "Property %s.%s doesn't take value %" PRId64 + " (minimum: %" PRId64 ", maximum: %" PRId64 ")", + object_get_typename(obj), name ? name : "null", + value, min, max); + return; + } + cpu->hyperv_spinlock_attempts =3D value; +} + +static PropertyInfo qdev_prop_spinlocks =3D { + .name =3D "int", + .get =3D x86_get_hv_spinlocks, + .set =3D x86_set_hv_spinlocks, +}; + static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def, const char *name) { @@ -1713,6 +1753,7 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, c= har *features, Error **errp) } else if (!strcmp(featurestr, "hv-spinlocks")) { char *err; const int min =3D 0xFFF; + char num[32]; numvalue =3D strtoul(val, &err, 0); if (!*val || *err) { error_setg(errp, "bad numerical value %s", val); @@ -1724,7 +1765,8 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, c= har *features, Error **errp) min); numvalue =3D min; } - cpu->hyperv_spinlock_attempts =3D numvalue; + snprintf(num, sizeof(num), "%" PRId32, numvalue); + object_property_parse(OBJECT(cpu), num, featurestr, errp= ); } else { error_setg(errp, "unrecognized feature %s", featurestr); goto out; @@ -2726,6 +2768,7 @@ static void x86_cpu_synchronize_from_tb(CPUState *c= s, TranslationBlock *tb) =20 static Property x86_cpu_properties[] =3D { DEFINE_PROP_BOOL("pmu", X86CPU, enable_pmu, false), + { .name =3D "hv-spinlocks", .info =3D &qdev_prop_spinlocks }, DEFINE_PROP_BOOL("hv-relaxed", X86CPU, hyperv_relaxed_timing, false)= , DEFINE_PROP_BOOL("hv-vapic", X86CPU, hyperv_vapic, false), DEFINE_PROP_END_OF_LIST() --=20 1.8.4