[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/10] target-i386: Remove xlevel & hv-spinlocks opti
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 04/10] target-i386: Remove xlevel & hv-spinlocks option fixups |
Date: |
Tue, 14 Jun 2016 17:59:02 -0300 |
The "fixup will be removed in future versions" warnings are
present since QEMU 1.7.0, at least, so users should have fixed
their scripts and configurations, already.
In the case of libvirt users, libvirt doesn't use the "xlevel"
option, and already rejects HyperV spinlock retry count < 0xFFF.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 36 +-----------------------------------
1 file changed, 1 insertion(+), 35 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index f3f95cd..a62d731 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1952,7 +1952,6 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char
*features,
FeatureWordArray plus_features = { 0 };
/* Features to be removed */
FeatureWordArray minus_features = { 0 };
- uint32_t numvalue;
CPUX86State *env = &cpu->env;
Error *local_err = NULL;
@@ -1967,23 +1966,7 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char
*features,
} else if ((val = strchr(featurestr, '='))) {
*val = 0; val++;
feat2prop(featurestr);
- if (!strcmp(featurestr, "xlevel")) {
- char *err;
- char num[32];
-
- numvalue = strtoul(val, &err, 0);
- if (!*val || *err) {
- error_setg(errp, "bad numerical value %s", val);
- return;
- }
- if (numvalue < 0x80000000) {
- error_report("xlevel value shall always be >= 0x80000000"
- ", fixup will be removed in future versions");
- numvalue += 0x80000000;
- }
- snprintf(num, sizeof(num), "%" PRIu32, numvalue);
- object_property_parse(OBJECT(cpu), num, featurestr,
&local_err);
- } else if (!strcmp(featurestr, "tsc-freq")) {
+ if (!strcmp(featurestr, "tsc-freq")) {
int64_t tsc_freq;
char *err;
char num[32];
@@ -1997,23 +1980,6 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char
*features,
snprintf(num, sizeof(num), "%" PRId64, tsc_freq);
object_property_parse(OBJECT(cpu), num, "tsc-frequency",
&local_err);
- } else if (!strcmp(featurestr, "hv-spinlocks")) {
- char *err;
- const int min = 0xFFF;
- char num[32];
- numvalue = strtoul(val, &err, 0);
- if (!*val || *err) {
- error_setg(errp, "bad numerical value %s", val);
- return;
- }
- if (numvalue < min) {
- error_report("hv-spinlocks value shall always be >= 0x%x"
- ", fixup will be removed in future versions",
- min);
- numvalue = min;
- }
- snprintf(num, sizeof(num), "%" PRId32, numvalue);
- object_property_parse(OBJECT(cpu), num, featurestr,
&local_err);
} else {
object_property_parse(OBJECT(cpu), val, featurestr,
&local_err);
}
--
2.5.5
- [Qemu-devel] [PULL 00/10] X86 queue, 2016-06-14, Eduardo Habkost, 2016/06/14
- [Qemu-devel] [PULL 02/10] pc: Add 2.7 machine, Eduardo Habkost, 2016/06/14
- [Qemu-devel] [PULL 03/10] target-i386: Implement CPUID[0xB] (Extended Topology Enumeration), Eduardo Habkost, 2016/06/14
- [Qemu-devel] [PULL 01/10] target-i386: add Skylake-Client cpu model, Eduardo Habkost, 2016/06/14
- [Qemu-devel] [PULL 05/10] target-i386: Move features logic that requires CPUState to realize time, Eduardo Habkost, 2016/06/14
- [Qemu-devel] [PULL 07/10] target-i386: Move xcc->kvm_required check to realize time, Eduardo Habkost, 2016/06/14
- [Qemu-devel] [PULL 04/10] target-i386: Remove xlevel & hv-spinlocks option fixups,
Eduardo Habkost <=
- [Qemu-devel] [PULL 08/10] target-i386: Use cpu_generic_init() in cpu_x86_init(), Eduardo Habkost, 2016/06/14
- [Qemu-devel] [PULL 06/10] target-i386: Remove assert(kvm_enabled()) from host_x86_cpu_initfn(), Eduardo Habkost, 2016/06/14
- [Qemu-devel] [PULL 09/10] target-i386: Consolidate calls of object_property_parse() in x86_cpu_parse_featurestr, Eduardo Habkost, 2016/06/14
- [Qemu-devel] [PULL 10/10] target-i386: Print obsolete warnings if +-features are used, Eduardo Habkost, 2016/06/14
Re: [Qemu-devel] [PULL 00/10] X86 queue, 2016-06-14, Eduardo Habkost, 2016/06/14