From patchwork Wed Oct 26 02:10:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 618799 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp117638pvb; Tue, 25 Oct 2022 19:30:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4MKscF8uq9i+tZgTt0YY7HaeoWjUZZT6K23yBb+FBEkImwRQuHhLjpekWihr4CSAX7rNXj X-Received: by 2002:a05:6214:c2a:b0:4ba:170c:1929 with SMTP id a10-20020a0562140c2a00b004ba170c1929mr23472662qvd.21.1666751427625; Tue, 25 Oct 2022 19:30:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666751427; cv=none; d=google.com; s=arc-20160816; b=KqSxOhGeoHd9nJbjv1T71lvI6NMRYuMD9dDzDD5EgVPz+NQ+YpUTEb/j9hLfshC9um ecaZOGbWmB3ZSX8dOl8PT7sk7c5LabcctfYVMmhhczahyF+la34e9JE+k0r6xZvelwKV ns7iHqKRfUTj7uozTLEm5IN9g820n38eoTQPOSdUJG0n1kkM+EMe0znvZsEOmxtgB5pc M5G4laPOE3cWwLd+rKt2SqKCy/CNLUWwwWkYWk9/IkqdoCdDdmQrtbWyIleuTqmLtwNJ k6RcqA3htgOHDFrDkrzHfngxHqS6ZkSI5Sc5DoiGeoBl6phpljmSQiRNouQbA9AzafoQ dxsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ckxXpvB+UzHhX2Kt++OpD5XHQD1pSGLuWje3pRHkgZA=; b=fufwcKPfB23OapbP7r0TGq+5lueQfkXVCEiPUrOl+tp1QWN/8wk2sgWrlFSmy8dAH9 nZbhpWNvAd/YBJAPVmfIpMUxOVlTyHP7hlS4L09DpSxggFR/O2armRau4JWkx52ryOha SgPZqVY+A+nHm8c2uNrSLn1S4QTNy+GF5HtLcY02FY+oTheHw0S1kuHaxLIk5/a6EpWE wNYB2lD4gNrReFyeFqUFlJQ4e5xNSMaN5jf7+HZXlHl4FrI36ONYKlVGyLB56OrfCpki C9xj4wtakX7omQ0oIqFB4nmhgLyeMW7h/7Kt2pwSL1etdBHKXACNFcRmTiaEoZ4P139M rEYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qyrLQh+N; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y13-20020a05620a25cd00b006ee91933251si3317573qko.708.2022.10.25.19.30.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Oct 2022 19:30:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qyrLQh+N; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1onVtj-0004to-E8; Tue, 25 Oct 2022 22:12:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1onVth-0004t8-Cn for qemu-devel@nongnu.org; Tue, 25 Oct 2022 22:12:01 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1onVtf-0001AU-VG for qemu-devel@nongnu.org; Tue, 25 Oct 2022 22:12:01 -0400 Received: by mail-pj1-x1033.google.com with SMTP id m2so8713346pjr.3 for ; Tue, 25 Oct 2022 19:11:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ckxXpvB+UzHhX2Kt++OpD5XHQD1pSGLuWje3pRHkgZA=; b=qyrLQh+Nxn9yseRBns42h+0Ji78k5h9kGM4iS8JoX2wzZOBXVpuShnwy3yUhNdHx3j NYhYiL8p/b+UkgTmE7bm/KI2w6QQ6BsQN4GJA4q0grV8kjg9dBAXLk7LShr02CVGnPIY /V58v/E/3mxe+XBOjbUFxwVD9zTcLRttXJOXb87sKTPG8JEuTIvEZVNP1qkD4NkV6mUS nJVViW03hzo9BpAsgLs+F3BIDY4CkdQerm6VZ5Pmmwp6s39kOqzZ+UALAD58s01fP/15 y66JAixHDdL6GXZpOBTFeFVTnAgTKIEPqMYHH7QLPOzoVf7JT3v4lHEopR0Ior/y1iFF aONg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ckxXpvB+UzHhX2Kt++OpD5XHQD1pSGLuWje3pRHkgZA=; b=4YLpwoTrlmsmWg86yzDUpQYJezPYL239SzuQNopJgZWLWA8pVlYFaYydxk8Sv9mfNB /mb2JE5Ww+UnJDZYop5cdbHwbCKRnvtenglwQVHJtZWUU4OEngw+fRO6ABu0KLdLM8Gn kcFTQTxl3E3BTaoxjD91hPMyRzrz5ro3PmvvK31qLCzPwot1boaTpqDoYZhc5HGLRng1 /pme31cMpyXo7JoKmwTkcXDSzaSRUIUKL7HkmXUrhJfA6hYPLuETPMmYQck6lFq/Mrqx voWTsLTiFgk/syL64SnJ2VRn8gKafOC9rAnzBwrwbTVVFJU0eLXcPg0z2ImrJANtI/VP I1LQ== X-Gm-Message-State: ACrzQf1ewtlse3FFv2m4hEGEfaVnXtAFZsjt7ua6OECrl07iz+448Pts UV5xCmdPcXwQr1HaTnk/rXFPMWMoWPxjKDKy X-Received: by 2002:a17:902:d2cf:b0:17f:7b65:862f with SMTP id n15-20020a170902d2cf00b0017f7b65862fmr41353203plc.168.1666750318621; Tue, 25 Oct 2022 19:11:58 -0700 (PDT) Received: from stoup.hotspotlogin.services ([103.100.225.182]) by smtp.gmail.com with ESMTPSA id o29-20020a635d5d000000b0043c9da02729sm1897833pgm.6.2022.10.25.19.11.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 19:11:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 12/47] accel/tcg: Move assert_no_pages_locked to internal.h Date: Wed, 26 Oct 2022 12:10:41 +1000 Message-Id: <20221026021116.1988449-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221026021116.1988449-1-richard.henderson@linaro.org> References: <20221026021116.1988449-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1033.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org There are no users outside of accel/tcg; this function does not need to be defined in exec-all.h. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- accel/tcg/internal.h | 5 +++++ include/exec/exec-all.h | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/accel/tcg/internal.h b/accel/tcg/internal.h index a77b110b78..1a704ee14f 100644 --- a/accel/tcg/internal.h +++ b/accel/tcg/internal.h @@ -90,6 +90,11 @@ void do_assert_page_locked(const PageDesc *pd, const char *file, int line); void page_lock(PageDesc *pd); void page_unlock(PageDesc *pd); #endif +#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_DEBUG_TCG) +void assert_no_pages_locked(void); +#else +static inline void assert_no_pages_locked(void) { } +#endif TranslationBlock *tb_gen_code(CPUState *cpu, target_ulong pc, target_ulong cs_base, uint32_t flags, diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index e5f8b224a5..b5bde1b56a 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -642,14 +642,6 @@ extern __thread uintptr_t tci_tb_ptr; smaller than 4 bytes, so we don't worry about special-casing this. */ #define GETPC_ADJ 2 -#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_DEBUG_TCG) -void assert_no_pages_locked(void); -#else -static inline void assert_no_pages_locked(void) -{ -} -#endif - #if !defined(CONFIG_USER_ONLY) /**