From patchwork Thu Oct 25 14:46:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Emilio Cota X-Patchwork-Id: 10655945 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 B76271751 for ; Thu, 25 Oct 2018 15:04:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A740928492 for ; Thu, 25 Oct 2018 15:04:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B6652BBDF; Thu, 25 Oct 2018 15:04:32 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3D41E2BB95 for ; Thu, 25 Oct 2018 15:04:32 +0000 (UTC) Received: from localhost ([::1]:55051 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFhBX-0003A3-FO for patchwork-qemu-devel@patchwork.kernel.org; Thu, 25 Oct 2018 11:04:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFh5J-0003lE-Aj 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 ) id 1gFgvP-0008QP-PB for qemu-devel@nongnu.org; Thu, 25 Oct 2018 10:47:52 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:44599) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gFgvP-0008By-FQ for qemu-devel@nongnu.org; Thu, 25 Oct 2018 10:47:51 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 51341221A3; Thu, 25 Oct 2018 10:47:07 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 25 Oct 2018 10:47:07 -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=ggwSpfLpW5mnB1jlMsKGEFLNv2YYxEsXChsQCXXgmqw=; b=tQ64H y+JED9UUzXJm3eLoe8G6wjxmyKtfICY0MxC91vyG2LqPbB2SdzxivooxTXS1xaNf khagV0dUZobMw/a9AgA1MHh0QSzHt0nDfIvKUboP76oqNOyid5NXNTLK2Iqh1LfO CeJSiXFaBxu7r9hXt7gC8jzn+9Aveai4Vi+8+8= 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=ggwSpfLpW5mnB1jlMsKGEFLNv2YYx EsXChsQCXXgmqw=; b=ywHDvP1QiAlAtvA+8YI2Kgt5MCRsNwi3kXe8CcOg4M1Cn ve2syaiwkXP7qhoe+0xVg+zw1oxherHJz/67mlrtSuDlAMAlbNDO+HoYqdiJ+3JI avLBlsTAUFudoLLTXQ+VGlZvbNZoH7MA3y5s/GmybvI9ZWKGO61Mfg4YeTShgEWG /pZwYhNVwlqodcsmz6o1KLYaPgPTLVjaxdvwXXc5wN7+VUeJecljgsuFa3h+6Tmh c5oeFeG+bQ3VphkazaFmQahdfnMyw6r1rhfSfGPrmPA4q1sGq7HgnsVW+OWd+uEJ B0Jp4d85pVVuNkW9Wk0zRzPio54qeMgUUVIXF4/Zw== X-ME-Sender: X-ME-Proxy: Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 05F2BE421C; Thu, 25 Oct 2018 10:47:07 -0400 (EDT) From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Thu, 25 Oct 2018 10:46:43 -0400 Message-Id: <20181025144644.15464-70-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 70/71] cpus-common: move exclusive_idle higher in the file 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 Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This will simplify the following commit's diff. Signed-off-by: Emilio G. Cota Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée --- cpus-common.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cpus-common.c b/cpus-common.c index 232cb12c46..ad8a8ef535 100644 --- a/cpus-common.c +++ b/cpus-common.c @@ -73,6 +73,15 @@ static void finish_safe_work(CPUState *cpu) cpu_exec_end(cpu); } +/* Wait for pending exclusive operations to complete. The CPU list lock + must be held. */ +static inline void exclusive_idle(void) +{ + while (pending_cpus) { + qemu_cond_wait(&exclusive_resume, &qemu_cpu_list_lock); + } +} + void cpu_list_add(CPUState *cpu) { qemu_mutex_lock(&qemu_cpu_list_lock); @@ -200,15 +209,6 @@ void async_run_on_cpu_no_bql(CPUState *cpu, run_on_cpu_func func, queue_work_on_cpu(cpu, wi); } -/* Wait for pending exclusive operations to complete. The CPU list lock - must be held. */ -static inline void exclusive_idle(void) -{ - while (pending_cpus) { - qemu_cond_wait(&exclusive_resume, &qemu_cpu_list_lock); - } -} - /* Start an exclusive operation. Must only be called from outside cpu_exec. */ void start_exclusive(void)