Message ID | 20181213050453.9677-66-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="OLe0EDc8"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="iGT/OsPB"; 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 43Fjmd1SNYz9s5c for <incoming@patchwork.ozlabs.org>; Thu, 13 Dec 2018 17:04:01 +1100 (AEDT) Received: from localhost ([::1]:50755 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 1gXK6I-0008Vn-Pq for incoming@patchwork.ozlabs.org; Thu, 13 Dec 2018 01:03:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <cota@braap.org>) id 1gXJDA-0008FE-Ps for qemu-devel@nongnu.org; Thu, 13 Dec 2018 00:07:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <cota@braap.org>) id 1gXJD8-0002KI-Fc for qemu-devel@nongnu.org; Thu, 13 Dec 2018 00:07:00 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:39005) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <cota@braap.org>) id 1gXJD7-0001qB-D7; Thu, 13 Dec 2018 00:06:57 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id D0C592229C; Thu, 13 Dec 2018 00:05:51 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 13 Dec 2018 00:05:51 -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=S5JzzIwGm9LNJIKMXCnvgZXl1GXRwHgt8AMaCEMJdrQ=; b=OLe0E Dc8npU1rmN/TK/FJoFlIt5UneImP2CnOtzi1VjKT/JyAhp08nQMsx0fm3tbEb3BV FGqvy7/UEsvTmN1ukemJz5pK5Ja5mOBfQaOvFjvNy1Cfq6hZr6vvuApBpjcrPI1k jGtXjj5MSJm2lKTiAE59+O+B1iia9n5lYOEhfA= 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=S5JzzIwGm9LNJIKMXCnvgZXl1GXRw Hgt8AMaCEMJdrQ=; b=iGT/OsPB76sGDmjvsCJ3aiHYYTRrMeLhqC36Z7c4b+jeG RcGv+9ZMW/rvWJGjMHSCAVK+7bNCP6Q+cB8CXwPrv7eHks2zunfCkIeqe+fTt7FJ y/Dxj0u7as4libo2mkQHlCpqYUku7E2N4LEfDqEh69c/2SNdIK1VSz8CYx9lgKDT LX1gUxBIlnZkwjUyP7GrbLpamsMo48faCAAyCNiYEL3qxlhss+oJ5Hpy0q2tw+vF DvlQ/a3GdMUkjBzWgRsnQqy1exeevaMrxG1eNRdDSbIn0JcmGfYCFGUL8f+Imdk1 snVq8tGlrdVysI2B6SBLN/6Q4YyDTc60HMv6j3xsg== X-ME-Sender: <xms:r-gRXC7sN0JP8_7NdeTzMPAkxI50oeX2x38gIh894RYiWp90KaNL6A> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtkedrudehuddgkedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfquhhtnecuuegrihhlohhuthemucef tddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffufffkof gjfhestddtredtredttdenucfhrhhomhepfdfgmhhilhhiohcuifdrucevohhtrgdfuceo tghothgrsegsrhgrrghprdhorhhgqeenucfkphepuddvkedrheelrddvtddrvdduieenuc frrghrrghmpehmrghilhhfrhhomheptghothgrsegsrhgrrghprdhorhhgnecuvehluhhs thgvrhfuihiivgepudel X-ME-Proxy: <xmx:r-gRXHHXg55pJql-GKbXRiVfUo9ZKjVkhE9Sct7YMSHFDme35cVmCw> <xmx:r-gRXAmc9J_DGD8plw3T30cz9ailWqbVSd4nX48xCDLftewoK4-EsQ> <xmx:r-gRXPZDOlMNjuEZAa7R_Q8A3PbTVgOwuGAIQxWs9VFfqlGAHuQxsQ> <xmx:r-gRXIDxdgkvst3Xyw8cpAlhzfw7oapR6hRhkmBHqvvbVmFKH1c2xA> Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 794D710086; 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:45 -0500 Message-Id: <20181213050453.9677-66-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 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: <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: David Hildenbrand <david@redhat.com>, Cornelia Huck <cohuck@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Alexander Graf <agraf@suse.de>, qemu-s390x@nongnu.org, 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/s390x/cpu.c b/target/s390x/cpu.c index d1594c90d9..5c38abaa49 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -59,6 +59,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) { @@ -473,7 +475,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