Patchwork [08/21] target-i386: convert 'hv_spinlocks' feature into property

login
register
mail settings
Submitter Igor Mammedov
Date Aug. 15, 2012, 4:13 p.m.
Message ID <1345047221-26898-9-git-send-email-imammedo@redhat.com>
Download mbox | patch
Permalink /patch/177736/
State New
Headers show

Comments

Igor Mammedov - Aug. 15, 2012, 4:13 p.m.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 target-i386/cpu.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
Eduardo Habkost - Aug. 15, 2012, 8:43 p.m.
On 15/08/2012, at 13:13, Igor Mammedov <imammedo@redhat.com> wrote:

> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> 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).


> +
> +    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
>
Igor Mammedov - Aug. 15, 2012, 9:32 p.m.
On Wed, 15 Aug 2012 17:43:31 -0300
Eduardo Habkost <ehabkost@redhat.com> wrote:

> 
> On 15/08/2012, at 13:13, Igor Mammedov <imammedo@redhat.com> wrote:
> 
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > 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	
> 
>

Patch

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();
+
+    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);