commit 83fd9629a39ee8a58f1f772a2ca3a7745a4c5743
author Alex Bennée <alex.bennee@linaro.org> Mon Feb 27 17:09:01 2017 +0000
committer Alex Bennée <alex.bennee@linaro.org> Thu Mar 09 10:38:02 2017 +0000
tree b56dcc5a0ecc26f6ba5361da74d4d62992b262c0
parent b64842dee42d6b24d51283e4722140b73be1e222

vl/cpus: be smarter with icount and MTTCG

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>

cpus.c

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