From patchwork Tue Feb 28 15:07:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 94641 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1373154qgi; Tue, 28 Feb 2017 07:33:36 -0800 (PST) X-Received: by 10.159.38.78 with SMTP id 72mr1339575uag.109.1488296016695; Tue, 28 Feb 2017 07:33:36 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v30si769229uag.132.2017.02.28.07.33.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 28 Feb 2017 07:33:36 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cijmQ-0000f9-DQ for patch@linaro.org; Tue, 28 Feb 2017 10:33:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cijMy-0003e9-2j for qemu-devel@nongnu.org; Tue, 28 Feb 2017 10:07:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cijMv-0002mj-9j for qemu-devel@nongnu.org; Tue, 28 Feb 2017 10:07:16 -0500 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:32983) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cijMv-0002mM-3b for qemu-devel@nongnu.org; Tue, 28 Feb 2017 10:07:13 -0500 Received: by mail-wm0-x22d.google.com with SMTP id i17so3363544wmf.0 for ; Tue, 28 Feb 2017 07:07:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f6HLJVeLVrAiIcmM79bHFqbHiBLrVBiHzZVtZ+KgaKw=; b=T3sP5oFnkFMD1KME6VYsOC2YZE+DthCXa7NaSfM0NPzu5IpekHhrTg/szq4liS2t4a l1E085CrtK17ObTCXSDe0hKTA+ZTDQ7gvUDANSXz1aWgIvutx8ZZizZSx2DknKyvs0s4 D79F1Tmmzd/qdcon7IdHSsH21t/3ykGK38q+0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f6HLJVeLVrAiIcmM79bHFqbHiBLrVBiHzZVtZ+KgaKw=; b=CQU67VQM8fpDm/cYFD8aw0OilXvHkt4GYQ1BfzjkF5CNfMdUUb6RNRM5kqps6PGB8c wDsT8P9Nh/SgCvhwYcGSXoOeFu++PrcSQQbY5UhzwX1fAGS7snGR075g5IJnOIPr7sV4 /6WNyZ9XL+AxzkmM9R7srrnru+uyZw71tp8+lUU89uaDrNNvhAwHVzEMy4THK1dHA3/v T5oniomutiLPVz8uNQ/T8QiHKQTK8kzsqZHya0K34Sgr6BWX6d7Vz83FMYw3linhQLLE Mb2X0Fb/kYtf4Ans90tPahpZBOjyu3CAwooAtkZWBUEVMA0CjjiGUixXacKN60d3hRUG FF6w== X-Gm-Message-State: AMke39nGMKD09DW/z7GTdulZrcb2r2NMPoS4X3U3qGTeZiRcg1gxQuB4D4Yr20gNdkBuhoeG X-Received: by 10.28.70.2 with SMTP id t2mr2868392wma.34.1488294431996; Tue, 28 Feb 2017 07:07:11 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a35sm2710706wra.21.2017.02.28.07.07.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Feb 2017 07:07:10 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 943883E0422; Tue, 28 Feb 2017 15:07:09 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: rth@twiddle.net Date: Tue, 28 Feb 2017 15:07:07 +0000 Message-Id: <20170228150709.27453-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170228150709.27453-1-alex.bennee@linaro.org> References: <20170228150709.27453-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22d Subject: [Qemu-devel] [PATCH v1 1/3] vl/cpus: be smarter with icount and MTTCG X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mttcg@listserver.greensocs.com, peter.maydell@linaro.org, nikunj@linux.vnet.ibm.com, Peter Crosthwaite , a.rigo@virtualopensystems.com, qemu-devel@nongnu.org, cota@braap.org, Paolo Bonzini , bobby.prani@gmail.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- cpus.c | 7 +++---- vl.c | 7 ++----- 2 files changed, 5 insertions(+), 9 deletions(-) -- 2.11.0 diff --git a/cpus.c b/cpus.c index 8200ac6b75..e9aab9f70f 100644 --- a/cpus.c +++ b/cpus.c @@ -185,10 +185,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 @@ -206,6 +203,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 " diff --git a/vl.c b/vl.c index e10a27bdd6..bbbf1baadf 100644 --- a/vl.c +++ b/vl.c @@ -4025,8 +4025,6 @@ int main(int argc, char **argv, char **envp) replay_configure(icount_opts); - qemu_tcg_configure(accel_opts, &error_fatal); - machine_class = select_machine(); set_memory_options(&ram_slots, &maxram_size, machine_class); @@ -4393,14 +4391,13 @@ int main(int argc, char **argv, char **envp) if (!tcg_enabled()) { error_report("-icount is not allowed with hardware virtualization"); 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); qemu_opts_del(icount_opts); } + qemu_tcg_configure(accel_opts, &error_fatal); + if (default_net) { QemuOptsList *net = qemu_find_opts("net"); qemu_opts_set(net, NULL, "type", "nic", &error_abort);