OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vl/cpus: be smarter with icount and MTTCG

Browse Source 
The sense of the test was inverted. Make it simple, if icount is
enabled then we disabled MTTCG by default. If the user tries to force
MTTCG upon us then we tell them "no".

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Alex Bennée 2017-02-27 17:09:01 +00:00
parent b64842dee4
commit 83fd9629a3
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cpus.c
View File

@ -181,10 +181,7 @@ static bool check_tcg_memory_orders_compatible(void)
static bool default_mttcg_enabled(void) static bool default_mttcg_enabled(void)
{ {
QemuOpts *icount_opts = qemu_find_opts_singleton("icount"); if (use_icount || TCG_OVERSIZED_GUEST) {
const char *rr = qemu_opt_get(icount_opts, "rr");
if (rr || TCG_OVERSIZED_GUEST) {
return false; return false;
} else { } else {
#ifdef TARGET_SUPPORTS_MTTCG #ifdef TARGET_SUPPORTS_MTTCG
@ -202,6 +199,8 @@ void qemu_tcg_configure(QemuOpts *opts, Error **errp)
if (strcmp(t, "multi") == 0) { if (strcmp(t, "multi") == 0) {
if (TCG_OVERSIZED_GUEST) { if (TCG_OVERSIZED_GUEST) {
error_setg(errp, "No MTTCG when guest word size > hosts"); error_setg(errp, "No MTTCG when guest word size > hosts");
} else if (use_icount) {
error_setg(errp, "No MTTCG when icount is enabled");
} else { } else {
if (!check_tcg_memory_orders_compatible()) { if (!check_tcg_memory_orders_compatible()) {
error_report("Guest expects a stronger memory ordering " error_report("Guest expects a stronger memory ordering "

7
vl.c
View File

@ -4055,8 +4055,6 @@ int main(int argc, char **argv, char **envp)
replay_configure(icount_opts); replay_configure(icount_opts);
qemu_tcg_configure(accel_opts, &error_fatal);
machine_class = select_machine(); machine_class = select_machine();
set_memory_options(&ram_slots, &maxram_size, machine_class); set_memory_options(&ram_slots, &maxram_size, machine_class);
@ -4423,14 +4421,13 @@ int main(int argc, char **argv, char **envp)
if (!tcg_enabled()) { if (!tcg_enabled()) {
error_report("-icount is not allowed with hardware virtualization"); error_report("-icount is not allowed with hardware virtualization");
exit(1); exit(1);
} else if (qemu_tcg_mttcg_enabled()) {
error_report("-icount does not currently work with MTTCG");
exit(1);
} }
configure_icount(icount_opts, &error_abort); configure_icount(icount_opts, &error_abort);
qemu_opts_del(icount_opts); qemu_opts_del(icount_opts);
} }
qemu_tcg_configure(accel_opts, &error_fatal);
if (default_net) { if (default_net) {
QemuOptsList *net = qemu_find_opts("net"); QemuOptsList *net = qemu_find_opts("net");
qemu_opts_set(net, NULL, "type", "nic", &error_abort); qemu_opts_set(net, NULL, "type", "nic", &error_abort);