david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target-i386: Print warning when mixing [+-]foo and foo=(on|off)

Browse Source 
Print a warning when mixing [+-]foo and foo=(on|off) in the -cpu
argument in a way that will break in the future.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2016-10-24 17:53:52 -02:00
parent 2df35773cb
commit 83a00f6095
2 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
target-i386/cpu.c
View File

@ -1973,6 +1973,11 @@ static const char *x86_cpu_feature_name(FeatureWord w, int bitnr)
*/
static GList *plus_features, *minus_features;
static gint compare_string(gconstpointer a, gconstpointer b)
{
return g_strcmp0(a, b);
}
/* Parse "+feature,-feature,feature=foo" CPU feature string
*/
static void x86_cpu_parse_featurestr(const char *typename, char *features,
@ -1981,6 +1986,7 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features,
char *featurestr; /* Single 'key=value" string being parsed */
Error *local_err = NULL;
static bool cpu_globals_initialized;
bool ambiguous = false;
if (cpu_globals_initialized) {
return;
@ -2022,6 +2028,19 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features,
feat2prop(featurestr);
name = featurestr;
if (g_list_find_custom(plus_features, name, compare_string)) {
error_report("warning: Ambiguous CPU model string. "
"Don't mix both \"+%s\" and \"%s=%s\"",
name, name, val);
ambiguous = true;
}
if (g_list_find_custom(minus_features, name, compare_string)) {
error_report("warning: Ambiguous CPU model string. "
"Don't mix both \"-%s\" and \"%s=%s\"",
name, name, val);
ambiguous = true;
}
/* Special case: */
if (!strcmp(name, "tsc-freq")) {
int64_t tsc_freq;
@ -2046,6 +2065,11 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features,
qdev_prop_register_global(prop);
}
if (ambiguous) {
error_report("warning: Compatibility of ambiguous CPU model "
"strings won't be kept on future QEMU versions");
}
if (local_err) {
error_propagate(errp, local_err);
}

28
tests/test-x86-cpuid-compat.c
View File

@ -35,6 +35,7 @@ static QObject *qom_get(const char *path, const char *prop)
return ret;
}
#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS
static bool qom_get_bool(const char *path, const char *prop)
{
QBool *value = qobject_to_qbool(qom_get(path, prop));
@ -43,6 +44,7 @@ static bool qom_get_bool(const char *path, const char *prop)
QDECREF(value);
return b;
}
#endif
typedef struct CpuidTestArgs {
const char *cmdline;
@ -76,7 +78,8 @@ static void add_cpuid_test(const char *name, const char *cmdline,
qtest_add_data_func(name, args, test_cpuid_prop);
}
static void test_plus_minus(void)
#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS
static void test_plus_minus_subprocess(void)
{
char *path;
@ -86,9 +89,8 @@ static void test_plus_minus(void)
* 3) Old feature names with underscores (e.g. "sse4_2")
* should keep working
*
* Note: rules 1 and 2 are planned to be removed soon, but we
* need to keep compatibility for a while until we start
* warning users about it.
* Note: rules 1 and 2 are planned to be removed soon, and
* should generate a warning.
*/
qtest_start("-cpu pentium,-fpu,+fpu,-mce,mce=on,+cx8,cx8=off,+sse4_1,sse4_2=on");
path = get_cpu0_qom_path();
@ -108,11 +110,27 @@ static void test_plus_minus(void)
g_free(path);
}
static void test_plus_minus(void)
{
g_test_trap_subprocess("/x86/cpuid/parsing-plus-minus/subprocess", 0, 0);
g_test_trap_assert_passed();
g_test_trap_assert_stderr("*Ambiguous CPU model string. "
"Don't mix both \"-mce\" and \"mce=on\"*");
g_test_trap_assert_stderr("*Ambiguous CPU model string. "
"Don't mix both \"+cx8\" and \"cx8=off\"*");
g_test_trap_assert_stdout("");
}
#endif
int main(int argc, char **argv)
{
g_test_init(&argc, &argv, NULL);
qtest_add_func("x86/cpuid/parsing-plus-minus", test_plus_minus);
#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS
g_test_add_func("/x86/cpuid/parsing-plus-minus/subprocess",
test_plus_minus_subprocess);
g_test_add_func("/x86/cpuid/parsing-plus-minus", test_plus_minus);
#endif
/* Original level values for CPU models: */
add_cpuid_test("x86/cpuid/phenom/level",