From patchwork Tue Mar 7 15:50:44 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: 95001 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1947330qgd; Tue, 7 Mar 2017 07:57:13 -0800 (PST) X-Received: by 10.55.148.71 with SMTP id w68mr1208090qkd.268.1488902233854; Tue, 07 Mar 2017 07:57:13 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p11si353642qtg.227.2017.03.07.07.57.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 07 Mar 2017 07:57:13 -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]:51342 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clHU7-0006oF-DQ for patch@linaro.org; Tue, 07 Mar 2017 10:57:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clHO0-0002PG-0S for qemu-devel@nongnu.org; Tue, 07 Mar 2017 10:50:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clHNy-0005jE-7F for qemu-devel@nongnu.org; Tue, 07 Mar 2017 10:50:52 -0500 Received: from mail-wr0-x22d.google.com ([2a00:1450:400c:c0c::22d]:36455) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1clHNy-0005iu-13 for qemu-devel@nongnu.org; Tue, 07 Mar 2017 10:50:50 -0500 Received: by mail-wr0-x22d.google.com with SMTP id u108so4318147wrb.3 for ; Tue, 07 Mar 2017 07:50:49 -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=+KBKsm5ulTq4WhNhuLpB3JQrD5tBOzJfyHdp8ImIHcI=; b=IPujn25QOHDxiiznwfx7cubT7UtyvHsRHawnvesJ22PWxCBXTJvsqYNymf45Lh2C7X lbWy197scw5tV7AYURaFH+bjMQvBlDYtABTAROgwFixR8iisAlbziylga1pglpWFAuUc KvZuhfgbfsn83HpnYXB926bO/4kb9KXPiaCw4= 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=+KBKsm5ulTq4WhNhuLpB3JQrD5tBOzJfyHdp8ImIHcI=; b=Nzebwyv38fxKMETA4YbZdkvZar5ugv6Ig4Hg79VPK35AGmcNOHuBdBJ4xszigvqJe1 9uumysCAi/VoJS6yqovhDMHS5KlcZHCiosf4LF9qsdWZEeYOOlVYqVR5dY2GJScLUh2/ nHM9jOuHchhiqZBGDI6nNnPAlTLnj/l/COp0LpmyDs0IoL0Tt/jBSFEBkPH+X73SA7rG BqaA5LnzFToKChux3pqyAn8HFN0ECR6BThOnfdZmkizxycEUYjD+Hj/Nz67jicBfFzai 8bxB//QApOG+OLhqj6JTzlkXuc9xXGd6nbnwS4TVYNGFQXlXkEshVK2tQYqPiUtmzeWL SDHg== X-Gm-Message-State: AMke39kha1SgIoqnTkqSFvQa163yhVTjBRIDmhOb5GeUpRuMv82/g9cEekc2GZsOrjv8I6Cw X-Received: by 10.223.133.6 with SMTP id 6mr903057wrh.57.1488901848820; Tue, 07 Mar 2017 07:50:48 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t194sm19546260wmd.13.2017.03.07.07.50.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Mar 2017 07:50:45 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 81FE33E3002; Tue, 7 Mar 2017 15:50:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, rth@twiddle.net, pbonzini@redhat.com Date: Tue, 7 Mar 2017 15:50:44 +0000 Message-Id: <20170307155054.5833-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170307155054.5833-1-alex.bennee@linaro.org> References: <20170307155054.5833-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22d Subject: [Qemu-devel] [PATCH v3 01/11] 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, nikunj@linux.vnet.ibm.com, Peter Crosthwaite , a.rigo@virtualopensystems.com, qemu-devel@nongnu.org, cota@braap.org, bobby.prani@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , 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 Reviewed-by: Richard Henderson --- 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 c857ad2957..6a817fec13 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 " diff --git a/vl.c b/vl.c index 71b75ef8a0..7aea62d0a5 100644 --- a/vl.c +++ b/vl.c @@ -4026,8 +4026,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); @@ -4394,14 +4392,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);