Message ID | 20181213050453.9677-67-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="PUgUdrlH"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="dTRsUHrn"; 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 43FjdY2SWNz9s47 for <incoming@patchwork.ozlabs.org>; Thu, 13 Dec 2018 16:57:53 +1100 (AEDT) Received: from localhost ([::1]:50717 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 1gXK0M-0003Ps-T4 for incoming@patchwork.ozlabs.org; Thu, 13 Dec 2018 00:57:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <cota@braap.org>) id 1gXJD0-00083O-Sf for qemu-devel@nongnu.org; Thu, 13 Dec 2018 00:06:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <cota@braap.org>) id 1gXJCx-0002B1-JU for qemu-devel@nongnu.org; Thu, 13 Dec 2018 00:06:50 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:33697) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <cota@braap.org>) id 1gXJCx-0001qC-9M for qemu-devel@nongnu.org; Thu, 13 Dec 2018 00:06:47 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 19A86222A3; Thu, 13 Dec 2018 00:05:52 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 13 Dec 2018 00:05:52 -0500 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=yFhG8Kkdn4/2HeNyrpEOnyluPn41yNkdEq/EtYifhVo=; b=PUgUd rlH7bltRZVxP2nsC6TWUjWMMBJzbu7McRIKk13dBQVdUaP3Au3KHAjqCHvHkz1xp kTlI/OAqh4cfb5C0v5s24sVH5KGJ1RgrFQZ3KY6foAs6uxiWIqZUXaSE8pOKwyj5 TLAYcuEo+d1/iFwPILcyKajeOkU9T/5aJ6jtbk= 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=yFhG8Kkdn4/2HeNyrpEOnyluPn41y NkdEq/EtYifhVo=; b=dTRsUHrnYpQ2wT3ODkmjea3Ge4w6+iCIodNtKJhoKVuJR lDB7pr++cYPpxu5p9JErOUJdhtVT6TKjMNtI+XpnQFQwVRCQpFqMTzMr7hPbHeCQ bsTh3ToHTqguyLnwJ4BmhaNAGB5/MClWnerHAHPbJ0QRMMm3l3Tf+/xhfiW7slwW KXE1Ce3eu2nlT+CPcd2oP2WjEvz9xG2cISA4uRXXHYKiZJz70RLDaYkHeMQsEwA3 PeDfARxxb6W92gI42ZIIbzB8tGtUP0nLJXwfwguWcizW+7eZLgRlHGpSA7fwQ8Um Ojot7EDSD6MJUocV5VF0HIyL9abnVuO0iG60qxObQ== X-ME-Sender: <xms:r-gRXDXcjPMNBlQ4XYnidWPj2SeBU8YVD3hTp_w0KUcW912ZInRluQ> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtkedrudehuddgkedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfquhhtnecuuegrihhlohhuthemucef tddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffufffkof gjfhestddtredtredttdenucfhrhhomhepfdfgmhhilhhiohcuifdrucevohhtrgdfuceo tghothgrsegsrhgrrghprdhorhhgqeenucfkphepuddvkedrheelrddvtddrvdduieenuc frrghrrghmpehmrghilhhfrhhomheptghothgrsegsrhgrrghprdhorhhgnecuvehluhhs thgvrhfuihiivgepudel X-ME-Proxy: <xmx:r-gRXDWjfxK5o5HNdKkjqSdXiuV3bjMAted20Q9woTnV9EKeHPXkCA> <xmx:r-gRXEaL6U46S3Rp20uzgJph0VcqsJxJ6gLGSp__O6CNWcSMQPtMqg> <xmx:r-gRXGXr7YaDB_GtSBvNlW0IZ-ZkDTNFo3nRV6bnyAm85t80jBBQ5Q> <xmx:sOgRXMEE3nNOtaf1Mg-tZf7TBrRkLUxp3yOpbZR9O01jAUmF-TUWEQ> Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id B2C9210084; Thu, 13 Dec 2018 00:05:51 -0500 (EST) From: "Emilio G. Cota" <cota@braap.org> To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 00:04:46 -0500 Message-Id: <20181213050453.9677-67-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181213050453.9677-1-cota@braap.org> References: <20181213050453.9677-1-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.25 Subject: [Qemu-devel] [PATCH v5 66/73] 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>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
per-CPU locks
|
expand
|
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index a025a0a3ba..9de76be471 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -251,6 +251,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 @@ -337,7 +340,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;