From patchwork Mon Apr 10 12:55:17 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: 97115 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp1348187qgd; Mon, 10 Apr 2017 05:55:50 -0700 (PDT) X-Received: by 10.200.39.130 with SMTP id w2mr50875908qtw.260.1491828950280; Mon, 10 Apr 2017 05:55:50 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id q10si13355812qtq.77.2017.04.10.05.55.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Apr 2017 05:55:50 -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]:34323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxYrD-0002Vm-Kx for patch@linaro.org; Mon, 10 Apr 2017 08:55:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxYqr-0002UA-RC for qemu-devel@nongnu.org; Mon, 10 Apr 2017 08:55:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxYqo-00037L-Al for qemu-devel@nongnu.org; Mon, 10 Apr 2017 08:55:25 -0400 Received: from mail-wr0-x22b.google.com ([2a00:1450:400c:c0c::22b]:35891) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cxYqo-00036j-3V for qemu-devel@nongnu.org; Mon, 10 Apr 2017 08:55:22 -0400 Received: by mail-wr0-x22b.google.com with SMTP id c55so74644476wrc.3 for ; Mon, 10 Apr 2017 05:55:21 -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=Ij4huRFkTP/wFHq5UK54p4Ii6b+lHuUU8Rjsz1M1zFg=; b=RkVGJywNRUDJf+GNvlUBgXiP1j1EPzylUXKnXkk92AUaYZk3F2qeUWk7WUSn3hTeVj xnjQVH0fjMZOO6J4NAJ8V1sCfz23hKDp6cPovP22s6j3y4ADqyFjXgvJ1c6jgOA33pSA s06VXhnaJeX097wk/iDPdCZ5Mnt4SghLV+o1Q= 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=Ij4huRFkTP/wFHq5UK54p4Ii6b+lHuUU8Rjsz1M1zFg=; b=JcKqo7sFTuKY97B2GyQW6nu8sbJm0JQu1ujerauN4lPhm+MQk60nsiiW8ajOFvtrAs ouhGfu/OtjS42ALKYOx2J9p0kcVxsudEhmBLU5ppMb1KeH48i04OM14PRsr10CFhi01c I3K85FCTJaRIsHVQyW3zc3MRQWwMV5kb6fIjCwYikTTPLs1eM/fsTQjM2rdl6y+GBJ8V Mtc8Krmels+0OpHwwhmSlOYB0hnOYxP7s8rqOAxAxHEsWE6DErgvtdRu1ts07G8RcTaw mXuKl1R0PF8+q0NeYYORlwIxOfyCV41bHCJ/VH9LppzjPPe3Do4DhsEvg4km4Ee6CoS/ WiAw== X-Gm-Message-State: AFeK/H2jWw+1AyRIZvyrKmkMP7Mh1ko0RKMd7x+KhS3sM500KnhrUSMmgAGHQ2+Gouo7TQrJ X-Received: by 10.223.134.152 with SMTP id 24mr40179838wrx.30.1491828920907; Mon, 10 Apr 2017 05:55:20 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a66sm17494503wrc.58.2017.04.10.05.55.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Apr 2017 05:55:19 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 2CE843E0FC9; Mon, 10 Apr 2017 13:55:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 10 Apr 2017 13:55:17 +0100 Message-Id: <20170410125524.21008-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170410125524.21008-1-alex.bennee@linaro.org> References: <20170410125524.21008-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::22b Subject: [Qemu-devel] [PULL 04/11] 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: Paolo Bonzini , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Peter Crosthwaite 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 -- 2.11.0 diff --git a/cpus.c b/cpus.c index 58d90aa2b9..fc0ddc8793 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); }