From patchwork Thu Oct 25 14:45:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Emilio Cota X-Patchwork-Id: 10656109 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 1FDA714BB for ; Thu, 25 Oct 2018 15:48:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E4132BD81 for ; Thu, 25 Oct 2018 15:48:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 008612BDC7; Thu, 25 Oct 2018 15:48:41 +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 A47702BD81 for ; Thu, 25 Oct 2018 15:48:41 +0000 (UTC) Received: from localhost ([::1]:55284 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFhsG-0003LE-UL for patchwork-qemu-devel@patchwork.kernel.org; Thu, 25 Oct 2018 11:48:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFh5V-0002yu-5y for qemu-devel@nongnu.org; Thu, 25 Oct 2018 10:58:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFgus-0007si-C8 for qemu-devel@nongnu.org; Thu, 25 Oct 2018 10:47:20 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:58077) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gFgur-0007gL-PH for qemu-devel@nongnu.org; Thu, 25 Oct 2018 10:47:18 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 0E45321FE8; Thu, 25 Oct 2018 10:46:49 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 25 Oct 2018 10:46:49 -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=yFvrCTNwIBOlNSFQ32Flcq+Rf4vT/MuluMSgD1C61YU=; b=ELFHn HlxdLbhvMJ9xyRlcDeZrA369SPO+AnAO88k2BUcYaHpUahW384zVGFUJZTubL/Nk CSAdxQC95vcxtYPbiHfpVfpm1Lx5CUyaajBdQ9gz3Nn99zSKTqcQuj0mIw6+qNC8 L0xwX7YoKy8zXB9Oi2SoSXqDf+YqpK5+embOhI= 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=yFvrCTNwIBOlNSFQ32Flcq+Rf4vT/ MuluMSgD1C61YU=; b=zAuFORNkdqnw5pajy5lfi/B3YNu+XaZlTeUuqty02D6MY X57zv2A57l+DOB2kYVWsmG+CPiVQRyCRSBfnn2nUTZ2hAaIdQLVnJY0GVxKTfyLi ydN7xq2v2ARdDuT01GpV2nEWLJZTXEYOB2J8TvG9+VUXlO7H8lKOO1TUopSECd7r EX+IQpIaFGc2+tNsY3Urm8CP0Cnc9eBVCNPD/fsGtX+DVM1OUOzWI/iDeGTlacmz 2NQlfjJSig8oqRMvT5ZOCep0snBIAgHnvD1apMkq9NROucnhKVp2xsbkqa+vQPxw uJ9V8wG8/hJ5Whyqns0t7JxaKA5g57xmeTCMvCssg== 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 9427BE4A47; Thu, 25 Oct 2018 10:46:48 -0400 (EDT) From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Thu, 25 Oct 2018 10:45:47 -0400 Message-Id: <20181025144644.15464-14-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 14/71] cpu: define cpu_halted helpers 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 cpu->halted will soon be protected by cpu->lock. We will use these helpers to ease the transition, since right now cpu->halted has many direct callers. Reviewed-by: Richard Henderson Signed-off-by: Emilio G. Cota Reviewed-by: Alex Bennée --- include/qom/cpu.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 11cbf21f00..aeed63a705 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -487,6 +487,30 @@ bool cpu_mutex_locked(const CPUState *cpu); */ bool no_cpu_mutex_locked(void); +static inline uint32_t cpu_halted(CPUState *cpu) +{ + uint32_t ret; + + if (cpu_mutex_locked(cpu)) { + return cpu->halted; + } + cpu_mutex_lock(cpu); + ret = cpu->halted; + cpu_mutex_unlock(cpu); + return ret; +} + +static inline void cpu_halted_set(CPUState *cpu, uint32_t val) +{ + if (cpu_mutex_locked(cpu)) { + cpu->halted = val; + return; + } + cpu_mutex_lock(cpu); + cpu->halted = val; + cpu_mutex_unlock(cpu); +} + static inline void cpu_tb_jmp_cache_clear(CPUState *cpu) { unsigned int i;