[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 24/29] i386: make 'hv-spinlocks' a regular uint32 pro
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 24/29] i386: make 'hv-spinlocks' a regular uint32 property |
Date: |
Thu, 27 Jun 2019 22:56:01 -0300 |
From: Roman Kagan <address@hidden>
X86CPU.hv-spinlocks is a uint32 property that has a special setter
validating the value to be no less than 0xFFF and no bigger than
UINT_MAX. The latter check is redundant; as for the former, there
appears to be no reason to prohibit the user from setting it to a lower
value.
So nuke the dedicated getter/setter pair and convert 'hv-spinlocks' to a
regular uint32 property.
Signed-off-by: Roman Kagan <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
target/i386/cpu.c | 45 ++-------------------------------------------
1 file changed, 2 insertions(+), 43 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 390f47adc5..8d5d34849c 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -3518,46 +3518,6 @@ static void x86_cpu_get_feature_words(Object *obj,
Visitor *v,
visit_type_X86CPUFeatureWordInfoList(v, "feature-words", &list, errp);
}
-static void x86_get_hv_spinlocks(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
-{
- X86CPU *cpu = X86_CPU(obj);
- int64_t value = cpu->hyperv_spinlock_attempts;
-
- visit_type_int(v, name, &value, errp);
-}
-
-static void x86_set_hv_spinlocks(Object *obj, Visitor *v, const char *name,
- void *opaque, Error **errp)
-{
- const int64_t min = 0xFFF;
- const int64_t max = UINT_MAX;
- X86CPU *cpu = X86_CPU(obj);
- Error *err = NULL;
- int64_t value;
-
- visit_type_int(v, name, &value, &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 = value;
-}
-
-static const PropertyInfo qdev_prop_spinlocks = {
- .name = "int",
- .get = x86_get_hv_spinlocks,
- .set = x86_set_hv_spinlocks,
-};
-
/* Convert all '_' in a feature string option name to '-', to make feature
* name conform to QOM property naming rule, which uses '-' instead of '_'.
*/
@@ -5682,8 +5642,6 @@ static void x86_cpu_initfn(Object *obj)
object_property_add(obj, "crash-information", "GuestPanicInformation",
x86_cpu_get_crash_info_qom, NULL, NULL, NULL, NULL);
- cpu->hyperv_spinlock_attempts = HYPERV_SPINLOCK_NEVER_RETRY;
-
for (w = 0; w < FEATURE_WORDS; w++) {
int bitnr;
@@ -5880,7 +5838,8 @@ static Property x86_cpu_properties[] = {
DEFINE_PROP_INT32("node-id", X86CPU, node_id, CPU_UNSET_NUMA_NODE_ID),
DEFINE_PROP_BOOL("pmu", X86CPU, enable_pmu, false),
- { .name = "hv-spinlocks", .info = &qdev_prop_spinlocks },
+ DEFINE_PROP_UINT32("hv-spinlocks", X86CPU, hyperv_spinlock_attempts,
+ HYPERV_SPINLOCK_NEVER_RETRY),
DEFINE_PROP_BIT64("hv-relaxed", X86CPU, hyperv_features,
HYPERV_FEAT_RELAXED, 0),
DEFINE_PROP_BIT64("hv-vapic", X86CPU, hyperv_features,
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-devel] [PULL 18/29] numa: deprecate implict memory distribution between nodes, (continued)
- [Qemu-devel] [PULL 18/29] numa: deprecate implict memory distribution between nodes, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 21/29] deprecate -mem-path fallback to anonymous RAM, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 19/29] hppa: Delete unused hppa_cpu_list() function, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 20/29] target/i386: fix feature check in hyperv-stub.c, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 22/29] i386: Don't print warning if phys-bits was set automatically, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 26/29] i386: Remove unused host_cpudef variable, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 25/29] x86/cpu: use FeatureWordArray to define filtered_features, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 23/29] i386: Fix signedness of hyperv_spinlock_attempts, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 29/29] vl.c: Add -smp, dies=* command line support and update doc, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 27/29] target/i386: Add CPUID.1F generation support for multi-dies PCMachine, Eduardo Habkost, 2019/06/27
- [Qemu-devel] [PULL 24/29] i386: make 'hv-spinlocks' a regular uint32 property,
Eduardo Habkost <=
- [Qemu-devel] [PULL 28/29] machine: Refactor smp_parse() in vl.c as MachineClass::smp_parse(), Eduardo Habkost, 2019/06/27
- Re: [Qemu-devel] [PULL 00/29] Machine next patches, no-reply, 2019/06/28