From patchwork Fri Apr 7 15:42:14 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: 97032 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp340383qgd; Fri, 7 Apr 2017 08:44:30 -0700 (PDT) X-Received: by 10.237.36.210 with SMTP id u18mr44152091qtc.51.1491579870251; Fri, 07 Apr 2017 08:44:30 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f9si5126989qkb.156.2017.04.07.08.44.30 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 07 Apr 2017 08:44:30 -0700 (PDT) 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]:51493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwW3p-0003ZD-QH for patch@linaro.org; Fri, 07 Apr 2017 11:44:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwW1p-0002OY-AN for qemu-devel@nongnu.org; Fri, 07 Apr 2017 11:42:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cwW1o-0007VC-Fx for qemu-devel@nongnu.org; Fri, 07 Apr 2017 11:42:25 -0400 Received: from mail-wr0-x235.google.com ([2a00:1450:400c:c0c::235]:35565) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cwW1o-0007Tm-AE for qemu-devel@nongnu.org; Fri, 07 Apr 2017 11:42:24 -0400 Received: by mail-wr0-x235.google.com with SMTP id o21so83623618wrb.2 for ; Fri, 07 Apr 2017 08:42:24 -0700 (PDT) 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=24uhtL1rsRWJyGEN487kXclBTAGuCMUuaxwKASZpmQA=; b=KricS5JMkRL4X65rij67E3qO9d8u6iyp6/rYqvGwcRdxHNDkjbqjENaj6ihGP9TxLk I6kdDAqxbKMHbg0Qu5CpwyNkub6jfWl2Ea6/kZoyc7OqFrLhztwOCgMKglEOzqtZczvl uQy6C7LaZZTL5g/wzXCjPBpXPbKjytcs4Ob2Y= 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=24uhtL1rsRWJyGEN487kXclBTAGuCMUuaxwKASZpmQA=; b=L4R05jxt3W2rX8F5xUJzKnwjSVsiRRZV+8wZJOxgjVUnqCtDzSD9SQ5+YnVYbDpDP0 h7MXmE6EI3zTOrIln7pzBcDMbnxBzr6c1A2h/BUI0LjpT0MdS2jxSENsdC4XgnuxFK+S n40lfB553njaXfh0VwdDJhudbIJPoyyE8rXvtXVAEwdLW4mBX4pE59GutMsCDOO9cKb0 r8s5kwBOu/o+K/w3XbQ+3TjgGKrJmocbn8aCibMD/hHGj2Yh5hJE8GGiIlmeCoYTb7z4 b/oHUPq1aVCB36CM+vSP5wo3qlm/Se9QVUcZAnmSOMyBSFADFc24ijjzZSzU5WXKbHxe 5vpw== X-Gm-Message-State: AN3rC/7QbSVTmk4N/bsAifR4huOtFdnxsTKnE50A9quadl9zE64l/fdrSBB5bN8TQ+I9PeOU X-Received: by 10.223.151.200 with SMTP id t8mr3466343wrb.148.1491579743180; Fri, 07 Apr 2017 08:42:23 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l41sm6427230wrl.59.2017.04.07.08.42.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Apr 2017 08:42:20 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6678E3E1058; Fri, 7 Apr 2017 16:42:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: dovgaluk@ispras.ru, rth@twiddle.net, pbonzini@redhat.com Date: Fri, 7 Apr 2017 16:42:14 +0100 Message-Id: <20170407154221.26918-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170407154221.26918-1-alex.bennee@linaro.org> References: <20170407154221.26918-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::235 Subject: [Qemu-devel] [PATCH v3 05/12] cpus: remove icount handling from qemu_tcg_cpu_thread_fn 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, 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" We should never be running in multi-threaded mode with icount enabled. There is no point calling handle_icount_deadline here so remove it and assert !use_icount. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- cpus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.11.0 diff --git a/cpus.c b/cpus.c index 68fdbc40b9..4e48b9c4ad 100644 --- a/cpus.c +++ b/cpus.c @@ -1392,6 +1392,8 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) { CPUState *cpu = arg; + g_assert(!use_icount); + rcu_register_thread(); qemu_mutex_lock_iothread(); @@ -1434,8 +1436,6 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) } } - handle_icount_deadline(); - atomic_mb_set(&cpu->exit_request, 0); qemu_tcg_wait_io_event(cpu); }