mirror of
https://github.com/Motorhead1991/qemu.git
synced 2026-03-04 09:04:39 -07:00
accel/tcg: Move mttcg warning to tcg_init_machine
Delay the warning to tcg_init_machine, because we will have resolved the CPUClass at that point. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
d1aa577228
commit
84cde4af08
1 changed files with 14 additions and 7 deletions
|
|
@ -93,7 +93,8 @@ static int tcg_init_machine(MachineState *ms)
|
|||
# else
|
||||
bool mttcg_supported = false;
|
||||
# endif
|
||||
if (s->mttcg_enabled == ON_OFF_AUTO_AUTO) {
|
||||
switch (s->mttcg_enabled) {
|
||||
case ON_OFF_AUTO_AUTO:
|
||||
/*
|
||||
* We default to false if we know other options have been enabled
|
||||
* which are currently incompatible with MTTCG. Otherwise when each
|
||||
|
|
@ -108,12 +109,22 @@ static int tcg_init_machine(MachineState *ms)
|
|||
*/
|
||||
if (mttcg_supported && !icount_enabled()) {
|
||||
s->mttcg_enabled = ON_OFF_AUTO_ON;
|
||||
max_threads = ms->smp.max_cpus;
|
||||
} else {
|
||||
s->mttcg_enabled = ON_OFF_AUTO_OFF;
|
||||
}
|
||||
}
|
||||
if (s->mttcg_enabled == ON_OFF_AUTO_ON) {
|
||||
break;
|
||||
case ON_OFF_AUTO_ON:
|
||||
if (!mttcg_supported) {
|
||||
warn_report("Guest not yet converted to MTTCG - "
|
||||
"you may get unexpected results");
|
||||
}
|
||||
max_threads = ms->smp.max_cpus;
|
||||
break;
|
||||
case ON_OFF_AUTO_OFF:
|
||||
break;
|
||||
default:
|
||||
g_assert_not_reached();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -153,10 +164,6 @@ static void tcg_set_thread(Object *obj, const char *value, Error **errp)
|
|||
if (icount_enabled()) {
|
||||
error_setg(errp, "No MTTCG when icount is enabled");
|
||||
} else {
|
||||
#ifndef TARGET_SUPPORTS_MTTCG
|
||||
warn_report("Guest not yet converted to MTTCG - "
|
||||
"you may get unexpected results");
|
||||
#endif
|
||||
s->mttcg_enabled = ON_OFF_AUTO_ON;
|
||||
}
|
||||
} else if (strcmp(value, "single") == 0) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue