From nobody Thu Apr 2 00:08:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1775036959; cv=none; d=zohomail.com; s=zohoarc; b=mhC8DU4DbCFIhVdMUNZjJnpEIH5RMsl/IVH9MPV8KosRSBEiFJredGeYuFQ76y0xRU0VLt6CtF+lSinlojFH2mVhy7eCbvwkcQm519UFH445Xe3KG21cd4OQg3uKgcR8L77RS638kRJnJyipjAXIEodbo/6ZFpHukhLJePG8YIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775036959; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=Ul3pTRZ9ii612LV0EoDdvHEyXRX21gyOxJ37kH6REiI=; b=miT9ZCluAlJ7U/ZAbae+9gLVE+rdrKzKq0Qk+UDuIbgWC0ClCjbfi0RjYmUV1XWaDvAXgZXQFXLNUroyhNO9WG00yHmmWv6Ec9k2pXvafUORelR2mgmZWGe4tADxn+kyV2zpkkwiueAfJh755/SUcsaDvnULcmhuKnl144jg/jQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775036959660951.0946462168514; Wed, 1 Apr 2026 02:49:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w7sBy-0008BX-WC; Wed, 01 Apr 2026 05:48:55 -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 1w7sBx-0008B8-TK for qemu-devel@nongnu.org; Wed, 01 Apr 2026 05:48:53 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w7sBw-0000LM-FE for qemu-devel@nongnu.org; Wed, 01 Apr 2026 05:48:53 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-486507134e4so75420805e9.0 for ; Wed, 01 Apr 2026 02:48:51 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4887eb5aff3sm146945685e9.15.2026.04.01.02.48.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 02:48:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775036931; x=1775641731; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Ul3pTRZ9ii612LV0EoDdvHEyXRX21gyOxJ37kH6REiI=; b=qdhKjR6fJ5MBf1H2lMiH70QZUVNhN2Ck7gvhNz0szeJLEj3QBPEEakloGF4O7VTr8m T4Np8dKMGs1qwvGrxTm3XCXl3Y4ivcRSIopkBOzuWCYdm4ZdmOLDwaCX0Bi64hLE7Pi1 wMAmhUxADUnkz7Nz1d2GKH7SocKe/ulETlRUPTy+g0UoYaqj8oWct4WNHh/QGZ2gX39W xCFdwXLb/USLOiPDBWy1LZ/BiV0pZ2a9rqEL4Up/+q6/PxEiJrNptgzdZ6/ixX671psZ A3U9uTqUGyho7GLWjsyzXOdanxGgqUwXatPEwdkF9F3+zU6Y2+w43XtxIKZDERfXnK2w UNsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775036931; x=1775641731; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Ul3pTRZ9ii612LV0EoDdvHEyXRX21gyOxJ37kH6REiI=; b=Iu7ccLiRwupoO+4b6U1CC7JOKooFYEvOggGy32iOVzfbaeoz75qcKoP62HZw5PKOTW XwUXidQLN1caOfM8PIG/An5fI2MNAmp4iAp+3mmrXMCaqCJyGR7OkbS8flvUCqdA7Wss CsQR60LCKd33T9KIxOl/ROOxisMMzaS0lgHf90fBguqMzWjmqqg0NiJqXxlKVhfKYPiG gRY3hNzY4e9iXtp3jaNwv8gLrni9XNiqyqjb1I7s9XcZ9FlAl7U1Bn5t8RSj0li7vuEV j0DoEZqNQOCKwFOhv0cyu9cE7zqHQSJB4LlioObxEmOpBNs8ZTLDDvHFhcyD1wp+XLRU rLhw== X-Gm-Message-State: AOJu0YywEah4scacOlghqE5NctPdZiuAcydERq6fIRCyga3h9UTq4YIx iChGx2dmcRfVTsO8V5w+rfUTrQlLIzr5nK6H6DV289SukoRz/CnQFb5zL6BHvRcIRfvYN5OrMv8 tqTQpqAg= X-Gm-Gg: ATEYQzxjze73j5MoANc3rfxlYC7rxm1N5qwMddGlJw91VLkZaWAjJCKPDvzMxzDPK1k A9Wt8S/XB1DQaZ3UF3UvhEqG92r+x1VqYjTKloQSfzohY0+csA1mckeAlkYeqTSPnm+E/CLt9lB wNClgH5uxaHtx29eT/WY+BIy6nM9Ii38zvpapV40ieEBu3nUqkpNPF8SSGehX1VgN+OappbVcWR 99DH4r0wWpzkbw7UC2fdL5lFzL7rbpRRjBaVwRp8oZotWu0Sr5SEVdrkNBKTC23do9fmW4diM/7 KRi5zRzSXw3Nusu/Ndr5qZq1pG9mCfW9XU90X07SFAgQLPW8L0AofdBXbMb29TCsH4z3+/Ty4q1 3oWzWxzINIqinCIBJTLqK7NIJE1z44U3aAhhbyyOFw1nuIAaI3x2yQxLdgtON7HP2lqDmGOHN3m jKasBTg9Tx52T560tTA50GYPjY4ppsNksB4NttyHAU+atktX8tKHwvkB0A/P8eryUS9oCoM6j5P OvPEqt90vO56m91x8sif/WmnwXWo6E= X-Received: by 2002:a05:600c:3515:b0:477:76bf:e1fb with SMTP id 5b1f17b1804b1-4888359cee3mr48983755e9.16.1775036930652; Wed, 01 Apr 2026 02:48:50 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 1/6] include: Don't include guest-host.h in cpu-ldst.h Date: Wed, 1 Apr 2026 10:48:43 +0100 Message-ID: <20260401094848.2661985-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260401094848.2661985-1-peter.maydell@linaro.org> References: <20260401094848.2661985-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1775036961021154100 We currently include user/guest-host.h from accel/tcg/cpu-ldst.h. However that file doesn't need anything from guest-host.h, since we removed the uses of g2h() in commit 9b74d403b30e ("accel/tcg: Move user-only tlb_vaddr_to_host out of line"). Move the include of guest-host.h to where it's actually needed. Signed-off-by: Peter Maydell Reviewed-by: Laurent Vivier Reviewed-by: Richard Henderson Message-id: 20260330143123.1685142-2-peter.maydell@linaro.org Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- bsd-user/qemu.h | 1 + include/accel/tcg/cpu-ldst.h | 4 ---- linux-user/qemu.h | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 2c586e546f..b0b2c249fb 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -27,6 +27,7 @@ #include "user/abitypes.h" #include "user/cpu_loop.h" #include "user/page-protection.h" +#include "user/guest-host.h" =20 extern char **environ; =20 diff --git a/include/accel/tcg/cpu-ldst.h b/include/accel/tcg/cpu-ldst.h index a5711bc15a..ea2cbf40fe 100644 --- a/include/accel/tcg/cpu-ldst.h +++ b/include/accel/tcg/cpu-ldst.h @@ -71,10 +71,6 @@ #include "accel/tcg/cpu-mmu-index.h" #include "exec/abi_ptr.h" =20 -#if defined(CONFIG_USER_ONLY) -#include "user/guest-host.h" -#endif /* CONFIG_USER_ONLY */ - static inline uint32_t cpu_ldub_mmuidx_ra(CPUArchState *env, abi_ptr addr, int mmu_idx, uintptr_t= ra) { diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 85e68eff7b..cfe5f45fc4 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -10,6 +10,7 @@ #include "syscall_defs.h" #include "target_syscall.h" #include "accel/tcg/vcpu-state.h" +#include "user/guest-host.h" =20 /* * This is the size of the host kernel's sigset_t, needed where we make --=20 2.43.0