From patchwork Mon Mar 4 18:18:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emilio Cota X-Patchwork-Id: 10838385 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B7A0A13B5 for ; Mon, 4 Mar 2019 19:31:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5BB32B10C for ; Mon, 4 Mar 2019 19:31:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A364F2B384; Mon, 4 Mar 2019 19:31:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2F5972B324 for ; Mon, 4 Mar 2019 19:31:57 +0000 (UTC) Received: from localhost ([127.0.0.1]:59681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tJd-0003XL-4R for patchwork-qemu-devel@patchwork.kernel.org; Mon, 04 Mar 2019 14:31:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sBe-00014I-IH for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:19:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sBX-0002e0-1D for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:19:34 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:55735) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h0sBP-0001Sq-Vc; Mon, 04 Mar 2019 13:19:25 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 752A336CB; Mon, 4 Mar 2019 13:18:30 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 04 Mar 2019 13:18:30 -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=yfMsbQpOixbG8aG0TbjcznG3DGsH+mWno6kvfcDbGeM=; b=lxjnJ bFCjf+b7jfW+tM7Fo+Kx09FvmRh2F+pBjv11JMjAsu3rdOXOxVqBjKJBaeSqxAur Ojtb6cpASZKU3HqP+yTsp0ToVXBwTrogHHZf+ojTnQzmvRlOeyKWwnllRgj2Kle0 XKdyFixAexhjgF0YnbJp98HOQ8wNDXYq1YT+bw= 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=fm2; bh=yfMsbQpOixbG8aG0TbjcznG3DGsH+ mWno6kvfcDbGeM=; b=jc5q25QFcgkmFvZPNh8gQICsuZKjgMc+guuQhLOvr1Hui GT/LafEqzBSmJHALNgL38SLvWFyMOpVbEUWNZ1SDBlswrvLn2AuHRwUm1FE/2nk9 292JVfSM70STeQ9/k76yp+psClZ+rcpQAbUxyeV+oKsKcQR9OGmeraOR2GKGf6Ri wUw0/Cmvz5AMFMkreyO/zOSwPFoADQea65IyerBCnsz4Wlhn/BiqHZIl3fsKa8U/ aCZhozr5wKQFPb85R7TvITRdoVTk00B9quo3zqNFie0cyi0V1hkqj7CR2+JJodJQ pp3dELK1KrOLZlZMBEieq9yvKBSqWejXg1S0MF2hQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrfedugdduuddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfsedttdertdertddtnecuhfhrohhmpedfgfhmihhlihho ucfirdcuvehothgrfdcuoegtohhtrgessghrrggrphdrohhrgheqnecukfhppeduvdekrd ehledrvddtrddvudeinecurfgrrhgrmhepmhgrihhlfhhrohhmpegtohhtrgessghrrggr phdrohhrghenucevlhhushhtvghrufhiiigvpeek X-ME-Proxy: Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id A33E710335; Mon, 4 Mar 2019 13:18:29 -0500 (EST) From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 13:18:05 -0500 Message-Id: <20190304181813.8075-66-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190304181813.8075-1-cota@braap.org> References: <20190304181813.8075-1-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 64.147.123.25 Subject: [Qemu-devel] [PATCH v7 65/73] s390x: convert to cpu_has_work_with_iothread_lock 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-s390x@nongnu.org, Cornelia Huck , Richard Henderson , David Hildenbrand Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Soon we will call cpu_has_work without the BQL. Cc: Cornelia Huck Cc: David Hildenbrand Cc: qemu-s390x@nongnu.org Reviewed-by: Richard Henderson Reviewed-by: Cornelia Huck Signed-off-by: Emilio G. Cota --- target/s390x/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 5169adb6a5..27b76d7d8c 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -56,6 +56,8 @@ static bool s390_cpu_has_work(CPUState *cs) { S390CPU *cpu = S390_CPU(cs); + g_assert(qemu_mutex_iothread_locked()); + /* STOPPED cpus can never wake up */ if (s390_cpu_get_state(cpu) != S390_CPU_STATE_LOAD && s390_cpu_get_state(cpu) != S390_CPU_STATE_OPERATING) { @@ -470,7 +472,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) scc->initial_cpu_reset = s390_cpu_initial_reset; cc->reset = s390_cpu_full_reset; cc->class_by_name = s390_cpu_class_by_name, - cc->has_work = s390_cpu_has_work; + cc->has_work_with_iothread_lock = s390_cpu_has_work; #ifdef CONFIG_TCG cc->do_interrupt = s390_cpu_do_interrupt; #endif