yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-23 06:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-i386: Remove xlevel & hv-spinlocks option fixups

Browse source 
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.

Backports commit c19b85216b5d47d922ac010931d4c7b2d79b2f68 from qemu
This commit is contained in:
Eduardo Habkost 2018-02-24 18:32:16 -05:00 committed by Lioncash
parent 610a52e9c7
commit b9ca5c4d33
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 1 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
qemu/target-i386/cpu.c
View file

@ -1991,7 +1991,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;
@ -2006,21 +2005,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) {
numvalue += 0x80000000;
}
snprintf(num, sizeof(num), "%" PRIu32, numvalue);
object_property_parse(cs->uc, 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];
@ -2034,22 +2019,6 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features,
snprintf(num, sizeof(num), "%" PRId64, tsc_freq);
object_property_parse(cs->uc, 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 < (uint32_t)min) {
numvalue = min;
}
snprintf(num, sizeof(num), "%" PRId32, numvalue);
object_property_parse(cs->uc, OBJECT(cpu), num, featurestr, &local_err);
} else {
object_property_parse(cs->uc, OBJECT(cpu), val, featurestr, &local_err);
}
} else {
feat2prop(featurestr);