From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1lCZ-0002Xa-Vj for qemu-devel@nongnu.org; Wed, 15 Aug 2012 17:32:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1lCY-0004ME-8M for qemu-devel@nongnu.org; Wed, 15 Aug 2012 17:32:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41673) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1lCX-0004Li-UZ for qemu-devel@nongnu.org; Wed, 15 Aug 2012 17:32:30 -0400 Date: Wed, 15 Aug 2012 23:32:16 +0200 From: Igor Mammedov Message-ID: <20120815233216.26310dea@thinkpad.mammed.net> In-Reply-To: <6AA2E547-774E-4251-B6E6-4FBFB233E059@redhat.com> References: <1345047221-26898-1-git-send-email-imammedo@redhat.com> <1345047221-26898-9-git-send-email-imammedo@redhat.com> <6AA2E547-774E-4251-B6E6-4FBFB233E059@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 08/21] target-i386: convert 'hv_spinlocks' feature into property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, gleb@redhat.com, vijaymohan.pandarathil@hp.com, jan.kiszka@siemens.com, mtosatti@redhat.com, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, blauwirbel@gmail.com, avi@redhat.com, pbonzini@redhat.com, akong@redhat.com, lersek@redhat.com, afaerber@suse.de On Wed, 15 Aug 2012 17:43:31 -0300 Eduardo Habkost wrote: > > On 15/08/2012, at 13:13, Igor Mammedov wrote: > > > Signed-off-by: Igor Mammedov > > --- > > target-i386/cpu.c | 31 +++++++++++++++++++++++++++++++ > > 1 file changed, 31 insertions(+) > > > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > > index 440e724..777b8ce 100644 > > --- a/target-i386/cpu.c > > +++ b/target-i386/cpu.c > > @@ -963,6 +963,32 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Visitor *v, void *opaque, > > cpu->env.tsc_khz = value / 1000; > > } > > > > +#if !defined(CONFIG_USER_ONLY) > > +static void x86_get_hv_spinlocks(Object *obj, Visitor *v, void *opaque, > > + const char *name, Error **errp) > > +{ > > + int64_t value = hyperv_get_spinlock_retries(); > > This breaks build if compiling without KVM support, as hyperv_get_spinlock_retries() is available only if CONFIG_KVM is set (hyperv_set_spinlock_retries(), on the other hand, is defined as an empty function if CONFIG_KVM is not set). Fixed by https://github.com/imammedo/qemu/commit/3172153a73c6912bd90a7226a0343c6601ed1d04 on x86-cpu-properties.WIP branch. Thanks, Igor > > > + > > + 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; > > + } > > + if (!value) { > > + error_set(errp, QERR_PROPERTY_VALUE_BAD, "", name, "0"); > > + return; > > + } > > + hyperv_set_spinlock_retries(value); > > +} > > +#endif > > + > > static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t *def, Error **errp) > > { > > CPUX86State *env = &cpu->env; > > @@ -1919,6 +1945,11 @@ static void x86_cpu_initfn(Object *obj) > > object_property_add(obj, "tsc-frequency", "int", > > x86_cpuid_get_tsc_freq, > > x86_cpuid_set_tsc_freq, NULL, NULL, NULL); > > +#if !defined(CONFIG_USER_ONLY) > > + object_property_add(obj, "hv_spinlocks", "int", > > + x86_get_hv_spinlocks, > > + x86_set_hv_spinlocks, NULL, NULL, NULL); > > +#endif > > x86_register_cpuid_properties(obj, feature_name); > > x86_register_cpuid_properties(obj, ext_feature_name); > > x86_register_cpuid_properties(obj, ext2_feature_name); > > -- > > 1.7.11.2 > > > > -- > Eduardo > >