Message ID | 20181025144644.15464-63-cota@braap.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=braap.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=braap.org header.i=@braap.org header.b="HlSluUd5"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="ouWHFCKQ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42grFv6rXrz9sBQ for <incoming@patchwork.ozlabs.org>; Fri, 26 Oct 2018 02:12:19 +1100 (AEDT) Received: from localhost ([::1]:55088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1gFhJ3-0000wm-B5 for incoming@patchwork.ozlabs.org; Thu, 25 Oct 2018 11:12:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <cota@braap.org>) id 1gFh5J-0002yu-IH for qemu-devel@nongnu.org; Thu, 25 Oct 2018 10:58:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <cota@braap.org>) id 1gFgvO-0008O2-IK for qemu-devel@nongnu.org; Thu, 25 Oct 2018 10:47:51 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:41953) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <cota@braap.org>) id 1gFgvO-0008At-CJ for qemu-devel@nongnu.org; Thu, 25 Oct 2018 10:47:50 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 8BDBC221C1; Thu, 25 Oct 2018 10:47:05 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 25 Oct 2018 10:47:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h= from:to:cc:subject:date:message-id:in-reply-to:references; s= mesmtp; bh=OpLaguIfTbXhxWap0rPW5HrjCEGYZEIaX0tlJOnsBhs=; b=HlSlu Ud58w27xzEYOBIiz6wGA8Mo486QT1lePOlVOoC0rOQbqDgllUd/Sznp4lE+YdN1D WntpVkYRA2PFeNxUmeU87Eh1Y2pwd8fFRHkZ6kn0NbHl0Av4rFeIH8HiuQOBqCGN zifc5dQd/4Pem+MQedjy3w8aSMuWW8DGEcIB5k= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=OpLaguIfTbXhxWap0rPW5HrjCEGYZ EIaX0tlJOnsBhs=; b=ouWHFCKQt1DjlzKv6cXqu6EQXnbGdBfU+JVaK3kp+ZJon iGx28l+EUayfLGUOMvKClMVypTyZS4By+4BOHUoEBs1tGFNlUl2z7Y8nORhYXlU1 wX49UkXu9swZaCQcoOcp2NIVh1jD7H70aZffC7dzL0jB00uXKoiIG32B507PxEMv BPcObnIiF5dQDMomOjACK4T8dZy703ktXRx2Ep5YBA2Vl6618sux22fdYHa7qi8d 1+LmX7S6tJlCiRxztopyFBEFVmjk0fn/feR93jZlwXQTwaI8AD4ZpY9ZoRZCMmmj huk9K47uzFTJyFR5w4ktITSIBQeGKpdqlvHFF3qqg== X-ME-Sender: <xms:adfRWxqWXLSF7B1hkNg3BvFjK2hMT9Vsetrv4CtdiQP3gb11AIdqUA> X-ME-Proxy: <xmx:adfRW59TzgL28TIF6kq-6c4vg8QgCxupyn22SoFiXfV04QLtslTcog> <xmx:adfRW95q172SZlewLupFjIyrM8Cpuv8c6pfROduVulFZ6hgvzElObg> <xmx:adfRW409Po_7KuwIaZltnnqqVMjS9soElqcZ_L_wKZpp70Z_JyY57g> <xmx:adfRW8Bgj9YdHe0l4fuPGNn0wrPTopA4OGSD9Xh-tb-rVcHdroHxLw> <xmx:adfRWy2dkHqQu-2xAPXKfnYTQTjlmYr3we7P6KKzXtkhtU9sJST2qA> <xmx:adfRWxXZacdmuSbh8tF55KYLaACbBDa5w8oV4__x6O9DRgzaD6FMJg> Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 21C62E4897; Thu, 25 Oct 2018 10:47:05 -0400 (EDT) From: "Emilio G. Cota" <cota@braap.org> To: qemu-devel@nongnu.org Date: Thu, 25 Oct 2018 10:46:36 -0400 Message-Id: <20181025144644.15464-63-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025144644.15464-1-cota@braap.org> References: <20181025144644.15464-1-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.27 Subject: [Qemu-devel] [RFC v4 63/71] riscv: convert to cpu_has_work_with_iothread_lock X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Sagar Karandikar <sagark@eecs.berkeley.edu>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Palmer Dabbelt <palmer@sifive.com>, Richard Henderson <richard.henderson@linaro.org>, Michael Clark <mjc@sifive.com>, Paolo Bonzini <pbonzini@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[RFC,v4,01/71] cpu: convert queued work to a QSIMPLEQ
|
expand
|
On 10/25/18 3:46 PM, Emilio G. Cota wrote: > Soon we will call cpu_has_work without the BQL. > > Cc: Michael Clark <mjc@sifive.com> > Cc: Palmer Dabbelt <palmer@sifive.com> > Cc: Sagar Karandikar <sagark@eecs.berkeley.edu> > Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> > Reviewed-by: Palmer Dabbelt <palmer@sifive.com> > Signed-off-by: Emilio G. Cota <cota@braap.org> > --- > target/riscv/cpu.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index d630e8fd6c..758fbaba29 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -249,6 +249,9 @@ static bool riscv_cpu_has_work(CPUState *cs) #ifndef CONFIG_USER_ONLY RISCVCPU *cpu = RISCV_CPU(cs); CPURISCVState *env = &cpu->env; + + g_assert(qemu_mutex_iothread_locked()); + /* * Definition of the WFI instruction requires it to ignore the privilege * mode and delegation registers, but respect individual enables @@ -335,7 +338,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) cc->reset = riscv_cpu_reset; cc->class_by_name = riscv_cpu_class_by_name; - cc->has_work = riscv_cpu_has_work; + cc->has_work_with_iothread_lock = riscv_cpu_has_work; cc->do_interrupt = riscv_cpu_do_interrupt; cc->cpu_exec_interrupt = riscv_cpu_exec_interrupt; cc->dump_state = riscv_cpu_dump_state;