From patchwork Wed Jul 5 07:14:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 784454 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x2Xjb6JCwz9sBR for ; Wed, 5 Jul 2017 17:36:03 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sCyhZn1M"; dkim-atps=neutral Received: from localhost ([::1]:44581 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSeqt-0007F4-S5 for incoming@patchwork.ozlabs.org; Wed, 05 Jul 2017 03:35:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSeX4-0004yR-Sx for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:15:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSeX4-0007r3-0e for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:15:30 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:32808) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dSeX3-0007qa-QM for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:15:29 -0400 Received: by mail-wr0-x241.google.com with SMTP id x23so49173673wrb.0 for ; Wed, 05 Jul 2017 00:15:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=Ex2DPmJmRoBpcEzb8KdU3KCNwWWorF93AR6SYasqLsw=; b=sCyhZn1McEcDHlM0USSSOJbaaVrXTgpxf2YM3xb8cYKWCDEuaXYxFXm1hFcF4OeuZ2 C4/+ibqZJHdurKwSWWAepxQ2dvYxf0hDt8okuWIm1UwSLejZU7wPsnQ2gK1XSVdmk6gP 3P8We+zvnRPbeJc7lIIHC5xpEQQbv7Ic9XYDsICzw0JsqNZa7hatW8KeB6cJoCb7VV3X oi/83fiFE1VQv5xezHCmeiySTYKfJAsgg7nnEoVxObw0RXx1pdjLLXE+XMSgnxHa1XIO xQeFJ7DiikjK2TCdfTbiJmM4/ATJHCzezabCaFKgI4pUVA7TzksqDZnJAJQzKUoEKuRq Y48w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=Ex2DPmJmRoBpcEzb8KdU3KCNwWWorF93AR6SYasqLsw=; b=jarjf2g9v4y1H/ScwTKZrQZB0TOKEIp4tNlr7UmoQU7WK1e91LdCy8Hu5D1jFo658j tGmiM9rP0RnSRv1ewEe6ws+9f6ghSIDDFxvnaztqDqNLXjtE3yYIuQpA3zwNc+KVJo+C eMzFqz7fFjrgf60RM7NXsGl2eBgvdJyo9O+34qO6JnhBhwCeNFrYbLxaCE19KT6fpkzr Hjqolrwhuk1n8iqJvDvz1RsNaBIPZlr5ofQkI/eUDSGYksz7RfLbcfgHDAgeG/cLImnM Hj45j5nBPnQ4xURSa8oAgoVFysgjV9CV0MtnxMfdCBrDRt1S0xt2IwwEhlSjrb5IXDEA vh/Q== X-Gm-Message-State: AKS2vOwkvJFIKZZXwogiPk6CR2OaciB+5m2DnYqwgTBl22YHANsGU5s3 CgXm9axHsMy1RENeIoo= X-Received: by 10.223.161.219 with SMTP id v27mr38095936wrv.135.1499238928593; Wed, 05 Jul 2017 00:15:28 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id y35sm22202793wrc.51.2017.07.05.00.15.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 00:15:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 5 Jul 2017 09:14:36 +0200 Message-Id: <1499238885-26161-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1499238885-26161-1-git-send-email-pbonzini@redhat.com> References: <1499238885-26161-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PULL 33/42] tcg: move tb_lock out of translate-all.h 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Paolo Bonzini --- bsd-user/main.c | 1 - include/exec/exec-all.h | 4 ++++ tcg/tcg.h | 4 ---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 04f95dd..fa9c012 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -25,7 +25,6 @@ #include "qemu/config-file.h" #include "qemu/path.h" #include "qemu/help_option.h" -/* For tb_lock */ #include "cpu.h" #include "exec/exec-all.h" #include "tcg.h" diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 724ec73..0b56432 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -467,6 +467,10 @@ extern uintptr_t tci_tb_ptr; smaller than 4 bytes, so we don't worry about special-casing this. */ #define GETPC_ADJ 2 +void tb_lock(void); +void tb_unlock(void); +void tb_lock_reset(void); + #if !defined(CONFIG_USER_ONLY) struct MemoryRegion *iotlb_to_region(CPUState *cpu, diff --git a/tcg/tcg.h b/tcg/tcg.h index 9e37722..da78721 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -757,10 +757,6 @@ void *tcg_malloc_internal(TCGContext *s, int size); void tcg_pool_reset(TCGContext *s); TranslationBlock *tcg_tb_alloc(TCGContext *s); -void tb_lock(void); -void tb_unlock(void); -void tb_lock_reset(void); - /* Called with tb_lock held. */ static inline void *tcg_malloc(int size) {