aboutsummaryrefslogtreecommitdiff
path: root/cpus.c
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2017-02-27 17:09:01 +0000
committerAlex Bennée <alex.bennee@linaro.org>2017-03-09 10:38:02 +0000
commit83fd9629a39ee8a58f1f772a2ca3a7745a4c5743 (patch)
treeb56dcc5a0ecc26f6ba5361da74d4d62992b262c0 /cpus.c
parentb64842dee42d6b24d51283e4722140b73be1e222 (diff)
downloadqemu-83fd9629a39ee8a58f1f772a2ca3a7745a4c5743.zip
qemu-83fd9629a39ee8a58f1f772a2ca3a7745a4c5743.tar.gz
qemu-83fd9629a39ee8a58f1f772a2ca3a7745a4c5743.tar.bz2
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>
Diffstat (limited to 'cpus.c')
-rw-r--r--cpus.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/cpus.c b/cpus.c
index c857ad2..6a817fe 100644
--- a/cpus.c
+++ b/cpus.c
@@ -181,10 +181,7 @@ static bool check_tcg_memory_orders_compatible(void)
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 @@ void qemu_tcg_configure(QemuOpts *opts, Error **errp)
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 "