From patchwork Thu Apr 24 20:24:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 883970 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3633569wrs; Thu, 24 Apr 2025 13:26:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVV7JxaNnW7wcVBJC6wnYAwJeGIFWxCSnZ3g0Zr8dx87emvUOC47XX8oBzCLj69jwtrz/p0bg==@linaro.org X-Google-Smtp-Source: AGHT+IEpqrkIy3f9pvACEHh/4BVr3BapGk6+HKDkxwDWIyEPs9+3ifTMCbya1nspEq3fjPdpvDqe X-Received: by 2002:a05:6214:f67:b0:6f2:bcbf:1030 with SMTP id 6a1803df08f44-6f4c95bfd4emr15928956d6.43.1745526371102; Thu, 24 Apr 2025 13:26:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745526371; cv=none; d=google.com; s=arc-20240605; b=Ol5dcEZFTA5ZubcddmZuPfnMPn89tvHRVxDrLTeMJWyfi0eklxrF5dFTkAokzgWD9H yBn3sidyjTJBvBBRVNxVBwNCLd9LnCKu2JUHhhBiuaD0M/cQQ8XItLLJsmV4j1qfLxPi et0pi5sD9GWLTnWXYwcBfuNb2Iv/u0qqFw3i2r+vrLnbvUixEQOqZLJBQtntTyapM7l2 0yOq9FuWPNgj4oZON9wSAuZAazWP8uuIvtBJREyxaqgB3VORnsP+EOxaHalinRcVHA7m KHWQvSB4DPoUTVpLf6H5klCqhTP9vPfsKplwzDrBevyQyy85Ie4aUaVR6f7QB/WHvB39 D3Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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=E3lVw6KIn3D7NgOMBRI5zDO2652ucdToVqyJMqAEbX4=; fh=6nfmBttZUHKf/gSy333eE9PR9lYgpu0inrDp9mAvHZA=; b=NPffEvCLMKEIHikVCABjgMXQN0CzJCHd30Kqqm3/oIxiZAjbnZYm1eNxXkXys3r+uP AZ+iLaBuY6hINlvbc3ZC0GgVAlDY4S88JNqlJoHQIXzumXTCsZTOnnN+xSraHxCPMCMZ ey+ND3oApJ6fQ8HCOd35YFjTOOv0RX32oagkrMiMflwBkwvASw6rk/E8tOVLaWmP9aPT iKq9JgAcceABLdvDvWPqvW4cHsTXhkVCHx8kfizBsOYGrEQKlXagC0Gs828xL04j0cQZ mCZeUytnzJBmpItRBNmS/LpiEfpo1b27S7FQFpkCbpnWEI0mCfryZD2aqZJhn/7kZU4t SkBA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nEcnab2I; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f4c0acb7cbsi23290766d6.183.2025.04.24.13.26.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 13:26:11 -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=nEcnab2I; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u837V-0008Cd-Av; Thu, 24 Apr 2025 16:24:30 -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 1u837P-0008Bx-9p for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:24:24 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u837N-0004yz-0T for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:24:22 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43cf58eea0fso6871755e9.0 for ; Thu, 24 Apr 2025 13:24:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745526259; x=1746131059; darn=nongnu.org; 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=E3lVw6KIn3D7NgOMBRI5zDO2652ucdToVqyJMqAEbX4=; b=nEcnab2IpQFDa3A6+v12Xf/nTLAUTA2SmBFiQHocFfimEfXwvPZ13Dxms6C/X2Vt1n MlI/VAtMpwKH+nOP+eQSIHtkyyXKUIw0E3PlGLaLq/G022N7Mjd+LlVmAxFYAh7Yxxnm t7XUta6wOB12KueQ2wJd6jM97MG6caX/G2xQ2diQZVAi7RBt/mhW/pKghGEQ4hGGj66c TWtgiVjP3938uY6nB41i/UsGJSqU2by+TlcQtV6sJenaL8zneKWjzfBVcKqNZ7bKvViD wsEiWuk1IuI4BrviRaSlYfnJjj0sm/YBmry8erULO3u64OFb5uWxEyyCFnj4ZmUFEwDb zEpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745526259; x=1746131059; 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=E3lVw6KIn3D7NgOMBRI5zDO2652ucdToVqyJMqAEbX4=; b=LUkZWd86o0+8UbV6LXZchWp8A/eEfOc3fT4depYacFX5xzqD6o9tsqD8ZoC4/IDnic as5Ly3g8O1DCu1jZtXaAbbWBtnY/tdArvpcZP7fdd3NwTypTChuVhJf2Hyebe/Q7v/+f vs5HSpEC6eYIreWwnrMdlyOGqKt5E3vzchGJEM3SY+b1zgOZ/YTmhLlZPLn4b4D9WBIM lAUepGnd3qWGzvXUzf6FP4vTGOZdQrO2QJSNw5PzbpBLniqTYMZ/KpFpEnnPF3/wRRpM VdqTSSIVbSLRYwXs8oqgUdXn45FzZwyKiKGNDcpsgujcgOED+PPtHhkuXwpEQxpdFX+I i/hw== X-Forwarded-Encrypted: i=1; AJvYcCX75ApQ94JYMQhMh1OyrgDtRA/hpm8cUqVstxmdp2DIh6BYP9DkpnjRwlr3rmAKl5KPaA4NkYDXABZp@nongnu.org X-Gm-Message-State: AOJu0YxUxXCbmGjs7YtcJFXehxjUvfmS95Vpyzfmb/0Wh6+fAyDfyDvU k+4pN+D4rC5vM9wWPH5qQ6iqL96wmnmiYiXbGC8pYCiiJGzCa/tPMG87U4pfb2s= X-Gm-Gg: ASbGncu5H79gPYNqYkr8llzociXv2jfS+K856LZOdEnnIoFWf9b2gASU8qe5gCibs01 3EsVcWhqyl47pL6tUj2pk9O5rFYs/pKKszWvxiKU1XBdE3Pa3iZtKFao3QBM70NELHH1tZbc01I Xle6EeG996wgonGXTbzMldbh/iwr5GY0nwdxKcpG/OjR6DKnL7Sl6pyWQfk+E/gYZB1hc6VmbY0 juzFhL+6/CUFlvsco74Kh/bkAUyT6PIsQ/TOmrO4j1coPYBftlo4Dcylee3VXVKsXm4wK2guzXt S+capeouNqiwLnEjPfWdDXsDlBcW1SWB5nRn5HLPWMj6unPEl69vkPZaKgB1kco7iCL2IECeb6o Z6v9HRd+WYOUSjeQ= X-Received: by 2002:a05:600c:3496:b0:43b:cc42:c54f with SMTP id 5b1f17b1804b1-4409bd18487mr40783235e9.14.1745526259237; Thu, 24 Apr 2025 13:24:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-440a530324dsm833685e9.10.2025.04.24.13.24.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 13:24:18 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v3 01/13] accel/tcg: Use vaddr for walk_memory_regions callback Date: Thu, 24 Apr 2025 22:24:00 +0200 Message-ID: <20250424202412.91612-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424202412.91612-1-philmd@linaro.org> References: <20250424202412.91612-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Use vaddr instead of target_ulong. At the same time, use int instead of unsigned long for flags, to match page_set_flags(). Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250424011918.599958-13-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé --- include/user/page-protection.h | 5 ++--- accel/tcg/user-exec.c | 10 +++++----- linux-user/elfload.c | 19 +++++++++---------- linux-user/syscall.c | 8 ++++---- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/include/user/page-protection.h b/include/user/page-protection.h index 1de72e31e68..8f0b769b134 100644 --- a/include/user/page-protection.h +++ b/include/user/page-protection.h @@ -14,6 +14,7 @@ #include "cpu-param.h" #include "exec/target_long.h" +#include "exec/vaddr.h" #include "exec/translation-block.h" int page_unprotect(CPUState *cpu, tb_page_addr_t address, uintptr_t pc); @@ -88,9 +89,7 @@ target_ulong page_find_range_empty(target_ulong min, target_ulong max, __attribute__((returns_nonnull)) void *page_get_target_data(target_ulong address); -typedef int (*walk_memory_regions_fn)(void *, target_ulong, - target_ulong, unsigned long); - +typedef int (*walk_memory_regions_fn)(void *, vaddr, vaddr, int); int walk_memory_regions(void *, walk_memory_regions_fn); void page_dump(FILE *f); diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 17e3be337f5..25d86567e70 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -199,13 +199,13 @@ int walk_memory_regions(void *priv, walk_memory_regions_fn fn) return rc; } -static int dump_region(void *priv, target_ulong start, - target_ulong end, unsigned long prot) +static int dump_region(void *opaque, vaddr start, vaddr end, int prot) { - FILE *f = (FILE *)priv; + FILE *f = opaque; - fprintf(f, TARGET_FMT_lx"-"TARGET_FMT_lx" "TARGET_FMT_lx" %c%c%c\n", - start, end, end - start, + fprintf(f, TARGET_ABI_FMT_ptr "-" TARGET_ABI_FMT_ptr + " " TARGET_ABI_FMT_ptr " %c%c%c\n", + (abi_ptr)start, (abi_ptr)end, (abi_ptr)(end - start), ((prot & PAGE_READ) ? 'r' : '-'), ((prot & PAGE_WRITE) ? 'w' : '-'), ((prot & PAGE_EXEC) ? 'x' : '-')); diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 7519b6bcda3..e281745e485 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -4044,8 +4044,7 @@ static inline void bswap_note(struct elf_note *en) { } /* * Calculate file (dump) size of given memory region. */ -static size_t vma_dump_size(target_ulong start, target_ulong end, - unsigned long flags) +static size_t vma_dump_size(vaddr start, vaddr end, int flags) { /* The area must be readable. */ if (!(flags & PAGE_READ)) { @@ -4238,8 +4237,8 @@ static int dump_write(int fd, const void *ptr, size_t size) return (0); } -static int wmr_page_unprotect_regions(void *opaque, target_ulong start, - target_ulong end, unsigned long flags) +static int wmr_page_unprotect_regions(void *opaque, vaddr start, + vaddr end, int flags) { if ((flags & (PAGE_WRITE | PAGE_WRITE_ORG)) == PAGE_WRITE_ORG) { size_t step = MAX(TARGET_PAGE_SIZE, qemu_real_host_page_size()); @@ -4260,8 +4259,8 @@ typedef struct { size_t size; } CountAndSizeRegions; -static int wmr_count_and_size_regions(void *opaque, target_ulong start, - target_ulong end, unsigned long flags) +static int wmr_count_and_size_regions(void *opaque, vaddr start, + vaddr end, int flags) { CountAndSizeRegions *css = opaque; @@ -4275,8 +4274,8 @@ typedef struct { off_t offset; } FillRegionPhdr; -static int wmr_fill_region_phdr(void *opaque, target_ulong start, - target_ulong end, unsigned long flags) +static int wmr_fill_region_phdr(void *opaque, vaddr start, + vaddr end, int flags) { FillRegionPhdr *d = opaque; struct elf_phdr *phdr = d->phdr; @@ -4298,8 +4297,8 @@ static int wmr_fill_region_phdr(void *opaque, target_ulong start, return 0; } -static int wmr_write_region(void *opaque, target_ulong start, - target_ulong end, unsigned long flags) +static int wmr_write_region(void *opaque, vaddr start, + vaddr end, int flags) { int fd = *(int *)opaque; size_t size = vma_dump_size(start, end, flags); diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 5826ac3adbb..23b901b7133 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8135,8 +8135,8 @@ static void open_self_maps_4(const struct open_self_maps_data *d, * Callback for walk_memory_regions, when read_self_maps() fails. * Proceed without the benefit of host /proc/self/maps cross-check. */ -static int open_self_maps_3(void *opaque, target_ulong guest_start, - target_ulong guest_end, unsigned long flags) +static int open_self_maps_3(void *opaque, vaddr guest_start, + vaddr guest_end, int flags) { static const MapInfo mi = { .is_priv = true }; @@ -8147,8 +8147,8 @@ static int open_self_maps_3(void *opaque, target_ulong guest_start, /* * Callback for walk_memory_regions, when read_self_maps() succeeds. */ -static int open_self_maps_2(void *opaque, target_ulong guest_start, - target_ulong guest_end, unsigned long flags) +static int open_self_maps_2(void *opaque, vaddr guest_start, + vaddr guest_end, int flags) { const struct open_self_maps_data *d = opaque; uintptr_t host_start = (uintptr_t)g2h_untagged(guest_start); From patchwork Thu Apr 24 20:24:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 883973 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3633920wrs; Thu, 24 Apr 2025 13:27:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWUgL4GgKEdbrKrEm+jY5qmLvuIwsoxg8DTinrNyuwOsRk7yBYhYn5VkkYVwdytMTt9ezxJ+A==@linaro.org X-Google-Smtp-Source: AGHT+IENBULLB1feD4QM1ht8RGv1bqLrwok7duUA1GcXp610kIhCtq/AHapc113wlEwqHhqqa/w0 X-Received: by 2002:ac8:7c48:0:b0:476:6f90:395e with SMTP id d75a77b69052e-47fb9bd87f3mr19969251cf.21.1745526424073; Thu, 24 Apr 2025 13:27:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745526424; cv=none; d=google.com; s=arc-20240605; b=Op3aBwzttjByqkkDT1Vw7R3gn+yrPO7xwG8FAzfkRZ9NtDn/7O+alRsl4NVcFwBZoz ok+EZgvu7HcqEsXVmYDb2Ohf+5BmhNCYVIXI+iw3QTWfiW7kxZskWbrwEt5zD+em0UJ4 lFbnfWPr1vWQ5pU5g+PIWQ0vVz5wNYV8gDNMI8g9tBzsEs/nyxoq5VVoVdzKnb7ZXUXo Hb0CwgjrlwXuaxdzloD0Hsl1hnjyEc8aM5eJUbljc4FZivWNUK4FuhPLABu8z3fPrPf3 Sz09GWT5F2yHnMWEs1bALJjWeIF+muM4ylppumdr8A6OX9Mp2gCDycfUrREyLd5+UOtR YpWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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=/lW2jqTg4HxHkTVNBXLnGF3EuDazugPr6Lu2FtcqFU8=; fh=A1kYDXhZVmoCGchjKdJilx0kard9yk5CNSNnjrKlpl0=; b=H2161kRAxMrRLKUnp65rv7rWhLQpsY9kYnMp8K0sI7LBZo1e+YAK8UVZS3eu0GYSEi 5TXSMv7xbDbjLCcqIMpffuKmBl4Sw7gRs2JpD1YOVVfvy7unioXRvNN1AR/ulnVA7hpn Vz1vMPDUU0BCIYVpeUzzPj/Lrx0Y6mL0lUjJVPQTol/i7ZC9dJPDStTGcWLkq05eWrvw POxDMEb6TCkAwXaBKItem4WaTqACCl09YeP1/ZsMrL56Dl/91vb/Wh1eYSNcBaX14hvc jCrOWfWMaTBEH6JAOSlfjo856LFwT+Xnx28idB2E7ic0R4WJhmKeo8YpDJW0de79/2Q9 jtHg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IzATmVJ8; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47ea1f99d0csi23999841cf.451.2025.04.24.13.27.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 13:27:04 -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=IzATmVJ8; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u837d-0008DX-7p; Thu, 24 Apr 2025 16:24:37 -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 1u837U-0008Ca-Sn for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:24:29 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u837S-0004zE-49 for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:24:28 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-39c0dfba946so1093392f8f.3 for ; Thu, 24 Apr 2025 13:24:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745526264; x=1746131064; darn=nongnu.org; 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=/lW2jqTg4HxHkTVNBXLnGF3EuDazugPr6Lu2FtcqFU8=; b=IzATmVJ8cIU7IXvXO/oU+oVQJJO5vcEKm1RgqyInHs73TA6gx0VnXgrZ+fKez8fIj5 aGgTa2uvIAhaPu1gCysGV6YCmd5AiZfTeTXR87dKv7gRPc4vXr8uaS+KigY0MebkoCCC 9HkxmeHHeS1wcvV9pBKsoK5XlpJIpAihqe3xJ7a0/k3JXivH2yVtmVR/FBuNeOBxS18i DK3R8g/1Q8hfQC+b5eZK65jIbeUdGGlMG976aVTKAEgv7Ru6GtoOA6R8dfgIOfROhb8G v+AQYJrJAf3iFzBl3jPkCNIFf9/F/yRZBFwhp4P8LddrLl8yRAqSFyvHz6T/Ap/Lka5E JHGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745526264; x=1746131064; 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=/lW2jqTg4HxHkTVNBXLnGF3EuDazugPr6Lu2FtcqFU8=; b=B7ZOSy73jUaMsY7Xew82W1y2vYres6SIerx7apBdpa3guGSS6H4misI3JAgVfo+Gjy BRMMtpRoCVMkDd0Udd6vilscd7UaUgMiEWec2mTFceyCBt+gOUDF/qrt7RslJWt5G5cm Vz9M02Z8I3hNT73fXGF/HRrqujnL6wM1xi4EkjFqfBFkHCBJmeSj9ab59Q8jSmiomwFc B42ShEFq17dkyC/14H1L1hRz4eXE6wBXJlM9hwng9GmEuCy1ak41jbEFpX6kc5FnNJpk mIc4kMYB+K2yu4dkASzNCPbkh1iLFwctVKB+292PtuLZY7dZhQjT1/FyEkZbSP9dpfY5 STFw== X-Forwarded-Encrypted: i=1; AJvYcCVgzi+jy2aLsgX+Z0XouUHhz/3qCPa+5+xjE+LKV7ys08cFas+Rw8NaoColUJZsfmOV0A5y19Bk646K@nongnu.org X-Gm-Message-State: AOJu0Yy8CsBhnzYM7BZlNW6qwf9bdxtjjbDrb0bJD2HmMfqDl+mm+xN1 jA2Nt9pWIEZun5QybAH8ggXRNkS/huxCwN09ZJJSaOTDu+4xA2cCe/HHIxZXMsA= X-Gm-Gg: ASbGncs1UJVX2CpFyaiZ/86zkSQ+eQZe3MwjeJxvh0jhvVA1+DK+Hq4rSgQwYL+nlxO 80RNkgSjSS1N7f2brbMQ3x6fYCzZm+pt1dbIHG8U/dzhDfLVrIxTaiv3x/GuCHVR4AVQNWTCAps 2T1efQo8DOliv1ITo+wJZiOVCtEhW1zo4zCqkZY3efZJ2c6Anldyt6mmvA+H9cIzib6ImoJ7Db3 ta257taVGUCrVgwnG+gqsfGqAjqIvfeD64g4z833ystGrYBmO0075fyo/k0f1n8ALu+gWHfHWQg 4tOsHdr974c9kAZTKL8zOdPJ+oNVvAr2CZCzzuT1pljWnIrfUyElGzV+F5uj1+Wb6EI1NTbLofz P8zmoTkzBhGc1NcE= X-Received: by 2002:a5d:5f82:0:b0:390:e158:a1b8 with SMTP id ffacd0b85a97d-3a072b606f1mr564790f8f.43.1745526263852; Thu, 24 Apr 2025 13:24:23 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4409d2ac079sm32689105e9.18.2025.04.24.13.24.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 13:24:23 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v3 02/13] accel/tcg: Use vaddr in user/page-protection.h Date: Thu, 24 Apr 2025 22:24:01 +0200 Message-ID: <20250424202412.91612-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424202412.91612-1-philmd@linaro.org> References: <20250424202412.91612-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Signed-off-by: Richard Henderson Message-ID: <20250424011918.599958-14-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé --- include/user/page-protection.h | 17 +++++------- accel/tcg/user-exec.c | 51 ++++++++++++++++------------------ 2 files changed, 31 insertions(+), 37 deletions(-) diff --git a/include/user/page-protection.h b/include/user/page-protection.h index 8f0b769b134..86143212fdd 100644 --- a/include/user/page-protection.h +++ b/include/user/page-protection.h @@ -12,14 +12,12 @@ #error Cannot include this header from system emulation #endif -#include "cpu-param.h" -#include "exec/target_long.h" #include "exec/vaddr.h" #include "exec/translation-block.h" int page_unprotect(CPUState *cpu, tb_page_addr_t address, uintptr_t pc); -int page_get_flags(target_ulong address); +int page_get_flags(vaddr address); /** * page_set_flags: @@ -32,9 +30,9 @@ int page_get_flags(target_ulong address); * The flag PAGE_WRITE_ORG is positioned automatically depending * on PAGE_WRITE. The mmap_lock should already be held. */ -void page_set_flags(target_ulong start, target_ulong last, int flags); +void page_set_flags(vaddr start, vaddr last, int flags); -void page_reset_target_data(target_ulong start, target_ulong last); +void page_reset_target_data(vaddr start, vaddr last); /** * page_check_range @@ -46,7 +44,7 @@ void page_reset_target_data(target_ulong start, target_ulong last); * Return false if any page is unmapped. Thus testing flags == 0 is * equivalent to testing for flags == PAGE_VALID. */ -bool page_check_range(target_ulong start, target_ulong last, int flags); +bool page_check_range(vaddr start, vaddr last, int flags); /** * page_check_range_empty: @@ -58,7 +56,7 @@ bool page_check_range(target_ulong start, target_ulong last, int flags); * The memory lock must be held so that the caller will can ensure * the result stays true until a new mapping can be installed. */ -bool page_check_range_empty(target_ulong start, target_ulong last); +bool page_check_range_empty(vaddr start, vaddr last); /** * page_find_range_empty @@ -72,8 +70,7 @@ bool page_check_range_empty(target_ulong start, target_ulong last); * The memory lock must be held, as the caller will want to ensure * the returned range stays empty until a new mapping can be installed. */ -target_ulong page_find_range_empty(target_ulong min, target_ulong max, - target_ulong len, target_ulong align); +vaddr page_find_range_empty(vaddr min, vaddr max, vaddr len, vaddr align); /** * page_get_target_data(address) @@ -87,7 +84,7 @@ target_ulong page_find_range_empty(target_ulong min, target_ulong max, * e.g. with the munmap system call. */ __attribute__((returns_nonnull)) -void *page_get_target_data(target_ulong address); +void *page_get_target_data(vaddr address); typedef int (*walk_memory_regions_fn)(void *, vaddr, vaddr, int); int walk_memory_regions(void *, walk_memory_regions_fn); diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 25d86567e70..43d005e24e4 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -161,7 +161,7 @@ typedef struct PageFlagsNode { static IntervalTreeRoot pageflags_root; -static PageFlagsNode *pageflags_find(target_ulong start, target_ulong last) +static PageFlagsNode *pageflags_find(vaddr start, vaddr last) { IntervalTreeNode *n; @@ -169,8 +169,7 @@ static PageFlagsNode *pageflags_find(target_ulong start, target_ulong last) return n ? container_of(n, PageFlagsNode, itree) : NULL; } -static PageFlagsNode *pageflags_next(PageFlagsNode *p, target_ulong start, - target_ulong last) +static PageFlagsNode *pageflags_next(PageFlagsNode *p, vaddr start, vaddr last) { IntervalTreeNode *n; @@ -215,14 +214,14 @@ static int dump_region(void *opaque, vaddr start, vaddr end, int prot) /* dump memory mappings */ void page_dump(FILE *f) { - const int length = sizeof(target_ulong) * 2; + const int length = sizeof(abi_ptr) * 2; fprintf(f, "%-*s %-*s %-*s %s\n", length, "start", length, "end", length, "size", "prot"); walk_memory_regions(f, dump_region); } -int page_get_flags(target_ulong address) +int page_get_flags(vaddr address) { PageFlagsNode *p = pageflags_find(address, address); @@ -245,7 +244,7 @@ int page_get_flags(target_ulong address) } /* A subroutine of page_set_flags: insert a new node for [start,last]. */ -static void pageflags_create(target_ulong start, target_ulong last, int flags) +static void pageflags_create(vaddr start, vaddr last, int flags) { PageFlagsNode *p = g_new(PageFlagsNode, 1); @@ -256,13 +255,13 @@ static void pageflags_create(target_ulong start, target_ulong last, int flags) } /* A subroutine of page_set_flags: remove everything in [start,last]. */ -static bool pageflags_unset(target_ulong start, target_ulong last) +static bool pageflags_unset(vaddr start, vaddr last) { bool inval_tb = false; while (true) { PageFlagsNode *p = pageflags_find(start, last); - target_ulong p_last; + vaddr p_last; if (!p) { break; @@ -301,8 +300,7 @@ static bool pageflags_unset(target_ulong start, target_ulong last) * A subroutine of page_set_flags: nothing overlaps [start,last], * but check adjacent mappings and maybe merge into a single range. */ -static void pageflags_create_merge(target_ulong start, target_ulong last, - int flags) +static void pageflags_create_merge(vaddr start, vaddr last, int flags) { PageFlagsNode *next = NULL, *prev = NULL; @@ -353,11 +351,11 @@ static void pageflags_create_merge(target_ulong start, target_ulong last, #define PAGE_STICKY (PAGE_ANON | PAGE_PASSTHROUGH | PAGE_TARGET_STICKY) /* A subroutine of page_set_flags: add flags to [start,last]. */ -static bool pageflags_set_clear(target_ulong start, target_ulong last, +static bool pageflags_set_clear(vaddr start, vaddr last, int set_flags, int clear_flags) { PageFlagsNode *p; - target_ulong p_start, p_last; + vaddr p_start, p_last; int p_flags, merge_flags; bool inval_tb = false; @@ -492,7 +490,7 @@ static bool pageflags_set_clear(target_ulong start, target_ulong last, return inval_tb; } -void page_set_flags(target_ulong start, target_ulong last, int flags) +void page_set_flags(vaddr start, vaddr last, int flags) { bool reset = false; bool inval_tb = false; @@ -532,9 +530,9 @@ void page_set_flags(target_ulong start, target_ulong last, int flags) } } -bool page_check_range(target_ulong start, target_ulong len, int flags) +bool page_check_range(vaddr start, vaddr len, int flags) { - target_ulong last; + vaddr last; int locked; /* tri-state: =0: unlocked, +1: global, -1: local */ bool ret; @@ -610,17 +608,16 @@ bool page_check_range(target_ulong start, target_ulong len, int flags) return ret; } -bool page_check_range_empty(target_ulong start, target_ulong last) +bool page_check_range_empty(vaddr start, vaddr last) { assert(last >= start); assert_memory_lock(); return pageflags_find(start, last) == NULL; } -target_ulong page_find_range_empty(target_ulong min, target_ulong max, - target_ulong len, target_ulong align) +vaddr page_find_range_empty(vaddr min, vaddr max, vaddr len, vaddr align) { - target_ulong len_m1, align_m1; + vaddr len_m1, align_m1; assert(min <= max); assert(max <= GUEST_ADDR_MAX); @@ -661,7 +658,7 @@ target_ulong page_find_range_empty(target_ulong min, target_ulong max, void tb_lock_page0(tb_page_addr_t address) { PageFlagsNode *p; - target_ulong start, last; + vaddr start, last; int host_page_size = qemu_real_host_page_size(); int prot; @@ -740,7 +737,7 @@ int page_unprotect(CPUState *cpu, tb_page_addr_t address, uintptr_t pc) } } else { int host_page_size = qemu_real_host_page_size(); - target_ulong start, len, i; + vaddr start, len, i; int prot; if (host_page_size <= TARGET_PAGE_SIZE) { @@ -756,7 +753,7 @@ int page_unprotect(CPUState *cpu, tb_page_addr_t address, uintptr_t pc) prot = 0; for (i = 0; i < len; i += TARGET_PAGE_SIZE) { - target_ulong addr = start + i; + vaddr addr = start + i; p = pageflags_find(addr, addr); if (p) { @@ -883,7 +880,7 @@ typedef struct TargetPageDataNode { static IntervalTreeRoot targetdata_root; -void page_reset_target_data(target_ulong start, target_ulong last) +void page_reset_target_data(vaddr start, vaddr last) { IntervalTreeNode *n, *next; @@ -897,7 +894,7 @@ void page_reset_target_data(target_ulong start, target_ulong last) n != NULL; n = next, next = next ? interval_tree_iter_next(n, start, last) : NULL) { - target_ulong n_start, n_last, p_ofs, p_len; + vaddr n_start, n_last, p_ofs, p_len; TargetPageDataNode *t = container_of(n, TargetPageDataNode, itree); if (n->start >= start && n->last <= last) { @@ -921,11 +918,11 @@ void page_reset_target_data(target_ulong start, target_ulong last) } } -void *page_get_target_data(target_ulong address) +void *page_get_target_data(vaddr address) { IntervalTreeNode *n; TargetPageDataNode *t; - target_ulong page, region, p_ofs; + vaddr page, region, p_ofs; page = address & TARGET_PAGE_MASK; region = address & TBD_MASK; @@ -956,7 +953,7 @@ void *page_get_target_data(target_ulong address) return t->data + p_ofs * TARGET_PAGE_DATA_SIZE; } #else -void page_reset_target_data(target_ulong start, target_ulong last) { } +void page_reset_target_data(vaddr start, vaddr last) { } #endif /* TARGET_PAGE_DATA_SIZE */ /* The system-mode versions of these helpers are in cputlb.c. */ From patchwork Thu Apr 24 20:24:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 883965 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3633391wrs; Thu, 24 Apr 2025 13:25:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVGZkkKdqKc3LlA5Wla4oT6gOayZlZtlZd57DlOHihIj7oqsl9jlgtvKaz11heW8MG7HblPHQ==@linaro.org X-Google-Smtp-Source: AGHT+IHXtbZNRa252sJ2q2H0WtX4zVHQ6OCj5iIwRFWNrkDPndy+h4Ul3rGOLuSHLnnEVQHzu2hd X-Received: by 2002:a05:6214:f6a:b0:6e4:4331:aae0 with SMTP id 6a1803df08f44-6f4bfbc9ab8mr59022356d6.1.1745526338198; Thu, 24 Apr 2025 13:25:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745526338; cv=none; d=google.com; s=arc-20240605; b=T9lHctz5jeiM1D2TDIV66T6lu04dok0gMc3/mww2qdCIkt8zw4yvmtwk/YKFi1KkzW 1aifTPQfR6nW2JakDzx5L650806jvb5Ns5JlZytDnUNHBMQSq73p4mX0rfAChWcqwFaO hw4oq/ZPm6ruHw47IDLNbN4hU9r9Yn0dUikR9EkQ7pTQgI+5j7Giy9VOpllNpK/QsEOU SwRtVeAFE3ECFo/4/VXvWjNBM0S2VmQ9O9o1XVBBQ/jkqkoJvB/Z7oEMHQg8Byzqa9XD n2PsfnQB+RK8eOejamSfNBrhMg1HWUGzYOsUasJbrqw2jrexyrK0j9YABLXNF2aOrp0F UO3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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=ddcO3MH/wvfN8le+HNpO9SiipEJHLq56ZFRiij0VC60=; fh=IqRLPEo5ROMH9pzYpnpoZmXVtly68f0OkpdpOrVFvDU=; b=dGisZsum3Bvktw2hSzNOeEgvOvVo/8GZWYUYyVkGksltbTtgAucdEep19I5/EFFn3m GN33PfALHLBtStGuBLBGpY40xNMtFlQ2K2lm9pqQnXuSDPiKALWZZ0bqlglyGvLaAqYf 7UteEXaJgXabTpVC3N3kBPfgSwlHickhyF8tuam6ENOYGBczI5Avg+tLoaofrPFiZBUO s1akRQz74m++nzkVkEfToE/FwFmx9EE0r9XvGIjca1fNQ2Iwrp2Wf4qXTB5JsaJ3ml52 j6XFXgMjNa6Kx60/MhDurNRjCJGRqziW/CpjoZF5ZjGuNl3mIBpsfxTiIdObvZxpeO8O gjjQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lAOvFsla; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f4c0aea45csi22359656d6.300.2025.04.24.13.25.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 13:25:38 -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=lAOvFsla; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u837l-0008Ey-OR; Thu, 24 Apr 2025 16:24:45 -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 1u837X-0008DE-W5 for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:24:33 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u837W-0004za-Co for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:24:31 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-43cf05f0c3eso10637915e9.0 for ; Thu, 24 Apr 2025 13:24:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745526268; x=1746131068; darn=nongnu.org; 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=ddcO3MH/wvfN8le+HNpO9SiipEJHLq56ZFRiij0VC60=; b=lAOvFslaf00f9nFc0JlWmm/ZQZ0+gYXD0tnWD4T0FX9fLfQv/XsF/ZxE4E/Dyysrsr rmuGf/QFDMPyfRcFBMmCrGVeATJiAMB0TarEfp1IquzhU4fnUhqIdaB/BPvZolQtVgPS qu5txQJCc6zethSDaaM4A9mfNPcXa7KVD+AFQ4/qrm6tGOgzyMZpDVL/VDTB64DeVSYt XEHS39y4LqadM6QcIz107QIL+24MbUKrKF5fU94N9MDhCMVMvtrdtaCFS2ZhWw29BYpq mAuyFsbJ02szYFbZyr3+x9x8nhSEff0Fh491+6XtkTWl6l2V2qbtfScl8H7QdZRuzA1n Gn3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745526268; x=1746131068; 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=ddcO3MH/wvfN8le+HNpO9SiipEJHLq56ZFRiij0VC60=; b=Ta38ZTz4R0Q2txdGZJc9DGdN+eDPvt3Dg+UVUsaO/Bho5DjSJJBJ5g34z5gZf7IIK8 ZgsxyU5BggN+76NetEFk5WZCvvJ1Iwt+4f7aO5fY/Puv19Y1EEJSJunYlpB2GnAvcCJJ FQqCZ7eA89JZPlmWG0JVBi09sCC4WSUinxsyfzDmTgS1Xd4vuHMnmHa9L1CkBIf7VOvj nYPFLn1qoY5lMfYP2gClp2sGXpO8IB8ABqSMCtnYSPGoSYUE4+j7c7i9niLSbPeD9uto 52kFFRjeiZW9VRIelhAdwSE6muBbOHfQD9oKWnBRLez1uLzndt5CzdjeA+FfI0/o6EDC XfLA== X-Forwarded-Encrypted: i=1; AJvYcCWnFnD5TYdRQq5LE3MXv1rpCTKe1W4f8f0+bv4musnIqWgIrjQrWGDEWiIt5iADP6bk2t/64su8BH2H@nongnu.org X-Gm-Message-State: AOJu0YwXA5WzX1a5TPThrbZ1JL9YSyBB+CdU1xrzWt0uJ9dcBopzXO6w TkGhBt6HfTiMrHcmx4YWGDOyc2GRYN7GU5pDkygStz2IuuQc67W0yZ5jSfRhKL9yMOjJcBJrHZB x X-Gm-Gg: ASbGncuK/CqsZvPx4AdQXlf7HW61fUMhBt3QCH21fDAUT6xIZR2IwReJhxn3O79QDSr QTG9+1cKYaNJlbOa6aN2fOEU/HAInWHQr02PxSDvVCREeIthDxKK2WhOooWv9glqWY1LB80ppWn NDgY2SrM4zJ5iUy+vEQanO+V5z2esc9nTSCJHixsD8gP9BEUPD3QVtZTt8PSxsjGW+uAfsdg47F vKrrndUs7WkcYidi2LvU8JCloYyP33Y4LB2w931o4/9XzgQMsV4yGtmsEDX6pkHZviqXaPG0+mp 2YzRqW7WrxTF+3sDI6VrOlR203elakR4beDvljps1eBzxZfYDU8LnvoZxeFJJ/65HmwDoiIR3zd X69WLZO64D5bPXYNJjGVfszZcBA== X-Received: by 2002:a05:600c:8710:b0:43e:afca:808f with SMTP id 5b1f17b1804b1-440a31a409bmr9219915e9.31.1745526268450; Thu, 24 Apr 2025 13:24:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4409d2ac26dsm32728515e9.21.2025.04.24.13.24.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 13:24:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Mark Cave-Ayland Subject: [PATCH v3 03/13] accel/tcg: Correct list of included headers in tcg-stub.c Date: Thu, 24 Apr 2025 22:24:02 +0200 Message-ID: <20250424202412.91612-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424202412.91612-1-philmd@linaro.org> References: <20250424202412.91612-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In commit 3549118b498 we moved cpu_loop_exit*() declarations to "exec/cpu-common.h" but neglected to update tcg-stub.c. We missed it because "exec/cpu-common.h" is indirectly pulled in via "exec/exec-all.h" -> "exec/translation-block.h". Include it directly instead of the not necessary "exec/exec-all.h". Commit bb6cf6f0168 ("accel/tcg: Factor tcg_cpu_reset_hold() out") removed the need for "exec/tb-flush.h", so remote it too. Fixes: 3549118b498 ("exec: Move cpu_loop_foo() functions to 'cpu-common.h'") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- accel/stubs/tcg-stub.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/accel/stubs/tcg-stub.c b/accel/stubs/tcg-stub.c index b2b9881bdfb..3b76b8b17c1 100644 --- a/accel/stubs/tcg-stub.c +++ b/accel/stubs/tcg-stub.c @@ -11,8 +11,7 @@ */ #include "qemu/osdep.h" -#include "exec/tb-flush.h" -#include "exec/exec-all.h" +#include "exec/cpu-common.h" G_NORETURN void cpu_loop_exit(CPUState *cpu) { From patchwork Thu Apr 24 20:24:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 883967 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3633450wrs; Thu, 24 Apr 2025 13:25:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWlnlrmQ+x8vgWGlhh7JhoqNG0DMSrBxkNKhcb2tXwU0k+jHBjf/v4riiweODQjhUnkYyrJoQ==@linaro.org X-Google-Smtp-Source: AGHT+IFYYp683tiT/Z9eC34Wudh6PvizydNM/TXsIg6TgG808SkjVwLJQj8gddr5FbwXOytmpUft X-Received: by 2002:a05:6214:d4f:b0:6e6:6c7f:111a with SMTP id 6a1803df08f44-6f4c95ea7e1mr13582766d6.40.1745526351971; Thu, 24 Apr 2025 13:25:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745526351; cv=none; d=google.com; s=arc-20240605; b=CsBZ31v7Qh2a7ZdX65iGiFV2CAQvlyCKLAo6q4oCt/TiatA2egaDqgelx/CWzTP2Yo Hi4W6xKxV9+daXMgk8uZkNFVxb12xQJpCRUsZlICQccMp6jYtxNZJGAUlL0fTNDn1zkI MZ4H3aRfYt/V8UphwsWundVz4QwVY6B227oFai1oW6s2/FAiWXG70IB2HT9CnYBOliev weKu+rcRwlt85Q+4QRMqC5+dFUegzfQAOp7+FBdjsYTu5izvy+GOWms3o23DnlHMyEqS cy/rVSb4b0SvX+cf4ftuK5zFSIMyqAdqLYfAbJ4Zpiu447dhTQU2JUVl9rS4OA3upslh Pl1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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=3zoze0HQX2v4PQHrHD9ETMHyzKW/oYRwQhqDIameM5A=; fh=zxmcgk4wB/EvkRfLEmQf180m3WH6GINYCwNvUiegGj4=; b=UrDa7jqZcIHB1fe/SsZK6DQM104869FHnhaglh9Nqs0Sa2fOZS+QqEzRdGEd0dmiaw J9mLtPbIJtLGh4tbMZCpF/o2dT2q0uE8d62fkrmJs2tjyyoYvO6gQ8MeuybCT0OkppKD 4V58zinl0GYHyiXoM4sm/a5UK7+WLjNNNHzWKDFlmw2Q8u05zO7GRglhkTSu6KnH1/Iv yJn9XRhJ9HbbD5GoQ0I4U6pqakozJDNJ8QfbYZSe9BRLtHKldNrhMDwadsxv2jrcXQKT VV//LqViabhIImujgm3JtqWo+fHuj/Qlc4yMaOxYje7Acz9ofPxUTbdivEEtWVZfndwH spwQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MpBw5sTG; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f4c08d246fsi21428536d6.50.2025.04.24.13.25.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 13:25:51 -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=MpBw5sTG; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u837n-0008GC-L6; Thu, 24 Apr 2025 16:24:47 -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 1u837c-0008Do-VF for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:24:37 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u837b-000508-5B for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:24:36 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-39ac56756f6so1414345f8f.2 for ; Thu, 24 Apr 2025 13:24:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745526273; x=1746131073; darn=nongnu.org; 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=3zoze0HQX2v4PQHrHD9ETMHyzKW/oYRwQhqDIameM5A=; b=MpBw5sTGg4HwZ8Fk2T7mJWow1pByqwJGqkfzVyFmPdd1bppfi5meGCNix6kZe9KlUn GAwTHZOFbh/4TQuYc5Nnv3Nz7V0GpWEJy7ks1KDjyKxNO9VxD3BrxcWxmmCCw4swxT/c uWr8p4Yoyuq08EgLwKaOSSqNGSXs+Bxl1cdXilrM6JX5SnEwStypT+3IHvoQsvqqQBUb g0U4cWApI9n6502G3mJfKbjZm74aRmFqNzBRZFlquYv2uj5rMa4twOpuptWSm2lcLoNU LGBi7jzvpWSrpZqlVpKcfnsSZP03pcfOuZFVmpQUZdXQkr3uH+gLw8/Htruc3qI8zYCA +VCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745526273; x=1746131073; 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=3zoze0HQX2v4PQHrHD9ETMHyzKW/oYRwQhqDIameM5A=; b=iD44I6AbLA76m58QPm0zDXC0rIsrfwZILBgsIMe+V3FXOMTifgGXfRzVAshnuRwh9K gDfaJ4ZBCghW/rZRyjdkNvDPPaqJxVWbRWOq4w8R6hnB+Pu4hW9hfcIIBNH7SPAF0q1X 6mEtbFkIl/JRcgCMPNeUuEp6X5q0HWwvPsPPn+D/vV/u021nmtIFtdBFrvuSXIoDJQaU S1X0RDtjJ6YaPrJOV28EC57CWBF/7TqmBv4giVIfSktsFSn6OD5BzNXl2TMpp7ExiWQa 1PA22W1sH02P5EC/9BLEu8PfodGJuZCkghhlJB9PvEPuIu6qnMhqJTHnnInHEkG/9E7b F6bg== X-Forwarded-Encrypted: i=1; AJvYcCVMlE8MSAe3EKcM80BKmuWtd2IVdtQvA/9zLmU7cbMSuJe/0qGxNtHzfnZvqTQz8nkgUimoGBxUs9vQ@nongnu.org X-Gm-Message-State: AOJu0Yx0fAK/cRVWUdIecUIQX0POF3k+JcFbc5g4psTS2zOysm4ay0Lp gVTFQz/pEYxMBPVWq4jzDbHlqgv8uEqsvTsokbFeLYQMznx/HRq5ap5T1itXVag= X-Gm-Gg: ASbGncu3T27tYMLM15Y8lstNE9AOxpLmY4fKcjPqZN+J22bF1ycgSEKm/gUJfWdtWjQ 6lTDE9+z1YVNUnsMS97FkxqLTzCgdSl71xbtNIszb5QLpdNCpPvhJqniCVQtDfcTQftPb/09/sb NzUb+/QV5BvlfGdY7nS9rWufRWQL+wxrQT9F8A111UFTnLAo08kThv7JVoYE9DSLeCEGodK1fi7 G9Ok55qJwgGfPA4I04Ru1XjjYhJPigpCtunOSM4MA89GPVtTiyzKj/t5rBrj0uL/F6qXm62CQGc 5lvub+vuvnoHvd+J01Txgs5Vr+AuQFZ6pQBCVm3QuB36xkGqzKzupFN+hjVG5o7V3CNz/xzZe0C 9h+C6erl+cvgNwJRqngVWp55A7A== X-Received: by 2002:a5d:5f93:0:b0:39c:30cd:352c with SMTP id ffacd0b85a97d-3a072a68d45mr604179f8f.8.1745526273129; Thu, 24 Apr 2025 13:24:33 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073cbec5csm281461f8f.43.2025.04.24.13.24.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 13:24:32 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Mark Cave-Ayland Subject: [PATCH v3 04/13] include/exec: Include missing headers in exec-all.h Date: Thu, 24 Apr 2025 22:24:03 +0200 Message-ID: <20250424202412.91612-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424202412.91612-1-philmd@linaro.org> References: <20250424202412.91612-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org "exec/exec-all.h" declares prototypes such: void *probe_access(CPUArchState *env, vaddr addr, int size, ^^^^^ MMUAccessType access_type, int mmu_idx, uintptr_t retaddr); MemoryRegionSection *iotlb_to_section(CPUState *cpu, hwaddr index, ^^^^^^ MemTxAttrs attrs); ^^^^^^^^^^ vaddr is defined in "exec/vaddr.h", hwaddr in "exec/hwaddr.h" and MemTxAttrs in "exec/memattrs.h". All these headers are indirectly pulled in via "exec/translation-block.h". Since we will remove "exec/translation-block.h" in the next commit, include the missing ones, otherwise we'd get errors such: include/exec/exec-all.h:51:1: error: unknown type name 'hwaddr' 51 | hwaddr memory_region_section_get_iotlb(CPUState *cpu, | ^ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/exec/exec-all.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 24383b6abad..c46255e66ef 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -20,8 +20,11 @@ #ifndef EXEC_ALL_H #define EXEC_ALL_H +#include "exec/hwaddr.h" +#include "exec/memattrs.h" #include "exec/mmu-access-type.h" #include "exec/translation-block.h" +#include "exec/vaddr.h" #if defined(CONFIG_TCG) #include "accel/tcg/getpc.h" From patchwork Thu Apr 24 20:24:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 883971 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3633656wrs; Thu, 24 Apr 2025 13:26:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWm+SVAzEDgp11M9CKjO/w0CcQ9SaWzkjYzUh/tsIjuw4ymMlLi9HJTwmapzNjaFuQUuibCSg==@linaro.org X-Google-Smtp-Source: AGHT+IH6c9XNMfrXeiw/SgkThBZGkz7fqO+aJGiQnAHtZAanVZnS0jCBUQ1Y2ScBvFxHUHuXK4XH X-Received: by 2002:a05:620a:248d:b0:7c5:3ca5:58fe with SMTP id af79cd13be357-7c95ef06177mr123692985a.22.1745526384895; Thu, 24 Apr 2025 13:26:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745526384; cv=none; d=google.com; s=arc-20240605; b=G24uRXBOt2qqQh7FpimsPjNWR4M9h/znnwuWOwqG8BzqHkEsp5Ee5vhrxqSQ0k1lEa eFmSOKLD063EAeFlTiamBv3norUCuEwrfUPIr/25v6qKwJkZWdIQYhwHNgMB7PcaOpEk d1JXpiqLPb2a6lw2ksxQfw0dw5s/rM8rCkeTPT8HkOzgoyttgtWQnhEZa51+z7GXyeSX 5bZyfl+GGpdKDUth9Rt/9q55bTw2Q3EAym7QdGUiAdg9ZzFOhKrQdQmo29e1yHdhON0D hhQXaXDaymc3l78HlrhMCClpwTjvBrsUcpHt9J3l3kz4WJUoVQGWVPWkdr/Hmk7q1Ryz 8Akw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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=3spF3BHyP+3nJq+PBnSsTeYKhoBB0RsO1qRS6M0pmcw=; fh=vOehegAziuTJbPz6WmDSj8zsYAZkDbOqvh/Xy6cWt58=; b=M7RbD3CTPr3IE3qiI3qiENTJCPyUncBd3ACO1tnGw5z5I+RrRcWBkhNoTgGYImmNLC lz5mHp4yw7bHzw1jd9CZdDdmBR1PHhrGWKQQvp45jKF1wBJ0YcLHmgq9AmMqX6GBbk0b SQhzh1+oWNlA6hCuNeVzIxbsUvZY+4MsFNxvgr5jjjbDglv2t3tB3vbuHOVmiKHpqe4R YZZS95KQiwLJCUvJ07f6yDVmqW+8jTNKBNscSDreJUpBNJYsQTvZb7dPWa0N+zEXOV1c lIQtgwGcQFFZtodvrUvuEl2KMK34NPn/OxF+HUHHYDv5vQRPvAGNOmtZ5Yidv8RBIc/D 1mpA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MUfkEqIB; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c958eb7c83si210358885a.480.2025.04.24.13.26.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 13:26:24 -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=MUfkEqIB; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u837p-0008HH-QS; Thu, 24 Apr 2025 16:24:49 -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 1u837h-0008F3-FQ for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:24:43 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u837f-00050Q-Rm for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:24:41 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-39c13fa05ebso988866f8f.0 for ; Thu, 24 Apr 2025 13:24:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745526278; x=1746131078; darn=nongnu.org; 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=3spF3BHyP+3nJq+PBnSsTeYKhoBB0RsO1qRS6M0pmcw=; b=MUfkEqIB7lPXGeP90ULAWyHvcSHQ9yJQur14O2b8oATemj21VJ3F7El1oFm8ps821r 0N0pYVq69lRB8px9WLCcVyXOeTG8RbqyG0d6tpnYcILM2wym7ZGuc2m2txB5GguEOyVv FhtOrpWLFALjuXPH64NcINplm1luYWffa7Cz+XegSuL24zlG29eM52LLFFIq5hTgjQl9 uLYCneLI2GpcfR+6CCfWXHvnmMZkRQJx3oJlZg1DZkA3FQQvEzIcsIopMzoFusw6F1oF eOP565x5LhVCf08EPSetAuJ0nEq0c5Fov1LEuNOlb1MYHil8SUUmrt5VyW6Gk4jEQRBw y9eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745526278; x=1746131078; 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=3spF3BHyP+3nJq+PBnSsTeYKhoBB0RsO1qRS6M0pmcw=; b=V8gFD0xh4kQ9bEjaR2Azn8QXExOOdwfsRmQ6xGCrde3Sol+4gsHyPz49aX82PvPlIG yzBdazMwcpS4YXTfm9vKAmvU3JPcDHZ0zZU18mhlzOG4U5Knf5/B9t+9ry6Qi3On3wO0 UK2dNRHkJ3t7PvJ5EKrPYZP7UAl8VNz59Vgc7TlCcPyuovkMUgCz0u1iL1sZGePbIRjk 9lcBDn4tehUGS8MpuHexvcu/b4ZhZjfa07Z7rIayyTdcNoB4DCmTb475nb1xULQNQB5m hOYPewx4HK7z4yPnWhBNCqG/WBC7cywFi8nWHgn2Mkz6DiTUc+VlD9BA7GuyPn3HOa+p Ykdg== X-Forwarded-Encrypted: i=1; AJvYcCV82L8jR9zJRzlRvHQI8BJfX+Mc2FDNtL+k5hFvgn5YV97XSzTSmLkbQtI/csKsLY+PVozyUhr22NK3@nongnu.org X-Gm-Message-State: AOJu0YwbvArH856/rSKmPlyxodtHx1EstW73ew//ajwjN/Fu9GVRGcxL Ewtp7VCMiJ28iSQpDJ42fM9/C6Wgcpj66WfIhLityP0trgKacK9fqMOwJ7c5oBI= X-Gm-Gg: ASbGncuKzEazuMoVsunJ+5uvCcrn1MqfPmwl1HGyNOASmK8N/5aX99AFUnY0f9eRu9e XHw3jlUU4OaZLmMk+h11PNmLDVVma4oO5OSpRJn8NebR+K0p63sAvdYZOHg4q8sLjob0bQ75qvL I1CwfG05ppZcuHTW3NWG8Wjo3FGHpidB3KEM5+7XaV6HpkDNv7IkIS+BuiKjEk6jBcPRgfcgxx5 /unZQxAezh3EUPRCRqBwEa5VcccwppP6BF2PsvVp0owg25/JOiJBjM9egFM9rIGl7SY+ySIKSXj mywCzHhzz63542QQgxhdRRBgaQrxYveENrI+5nGNcfcA3FxJqMmm9BD8vxeacB7R8NJ1NOBf8nk hS4u1hUnckByOmKg= X-Received: by 2002:a5d:64e3:0:b0:39a:c9d9:877b with SMTP id ffacd0b85a97d-3a072aa6a1dmr625584f8f.27.1745526278019; Thu, 24 Apr 2025 13:24:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073c8cd7fsm297607f8f.1.2025.04.24.13.24.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 13:24:37 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v3 05/13] include/exec: Move tb_invalidate_phys_range to translation-block.h Date: Thu, 24 Apr 2025 22:24:04 +0200 Message-ID: <20250424202412.91612-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424202412.91612-1-philmd@linaro.org> References: <20250424202412.91612-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250424011918.599958-15-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé --- include/exec/exec-all.h | 5 ----- include/exec/translation-block.h | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index c46255e66ef..4c5ad98c6a9 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -23,7 +23,6 @@ #include "exec/hwaddr.h" #include "exec/memattrs.h" #include "exec/mmu-access-type.h" -#include "exec/translation-block.h" #include "exec/vaddr.h" #if defined(CONFIG_TCG) @@ -123,10 +122,6 @@ int probe_access_full_mmu(CPUArchState *env, vaddr addr, int size, #endif /* !CONFIG_USER_ONLY */ #endif /* CONFIG_TCG */ -/* TranslationBlock invalidate API */ -void tb_invalidate_phys_range(CPUState *cpu, tb_page_addr_t start, - tb_page_addr_t last); - #if !defined(CONFIG_USER_ONLY) /** diff --git a/include/exec/translation-block.h b/include/exec/translation-block.h index 8b8e730561d..cdce399ebab 100644 --- a/include/exec/translation-block.h +++ b/include/exec/translation-block.h @@ -207,4 +207,8 @@ static inline void tb_set_page_addr1(TranslationBlock *tb, #endif } +/* TranslationBlock invalidate API */ +void tb_invalidate_phys_range(CPUState *cpu, tb_page_addr_t start, + tb_page_addr_t last); + #endif /* EXEC_TRANSLATION_BLOCK_H */ From patchwork Thu Apr 24 20:24:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 883976 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3634320wrs; Thu, 24 Apr 2025 13:28:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWvlFkyvAhi2dF9JYCQkP8oBjyp+HdP9Y+MeRl1VMzU2P3MjRz3guT+N/wD888zmsDXgYa/HA==@linaro.org X-Google-Smtp-Source: AGHT+IFjYqAwwnIvsS70+NpfOh3i8/P82CYItWL3XWa8z5BKQjnd5SUqIH85z6iZ4y3SkvRt/jBE X-Received: by 2002:a05:622a:1485:b0:477:bd4:6a4c with SMTP id d75a77b69052e-47ec19a3c72mr54771841cf.1.1745526507705; Thu, 24 Apr 2025 13:28:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745526507; cv=none; d=google.com; s=arc-20240605; b=haJJD/P61yjjQyakW615PCqjJt2yOBzpEd8E4UW8BQdTo9WSHznHJ6buAc99mc30iI LfDah5luJhqs6FEFXqBbL2nqLMvj95IvnQan8R4GgQTQTGDVlOJJahdUeCuYDm8MOS7O Y9wpGzIBdvLBvus1cobwrB4Iogp8HSTCq7PcVRHyigNVPTvaSGZqknfMzQgbxCEfO06f nPbfB7wfRXFp18ysgyGgrHIiizKaUKasVidH2tI7HnGfDa3aTv/ZrdG5gElrT+rDcSv6 iF+puXCH4vvOI4VjRehxqUCGaTu8bu5Zu9OtfwfVoCejiIFtjBcLNFd0/8dj14vQGb2E ND3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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=RpP1t+c/p8hP7ejHigBr04Z1PrmkdyRF/VY/JGUgbiA=; fh=HSn29kJ1vb07HFxfMtC4tBN/pYmWPhPIodsRUmFTXpI=; b=hYSIm7QmmOnsNivo6hKmKffufpRWzM5DCh1jpgHLek9Ov7IxZs2UHGIh+BTZCiR3Ut g68X6kg5QZZh47GiSf/NE5udPyVVI3QfswpC6WZRYwLTzEUTj4c2zxonR59NMGZbWE6t XG8ogu4cAw+doRKM0fIWLlZ5vHHuXgN87WZZQA3GzPLwd3r7ijRrLBb+b95Fi3jdWoT+ df/lB9nlUHQmDZs+0hRuYl7vDBio6/a9js3Za/inE/Nr3HH8gryYEu86MvhXoWL1BMQX efI4emibF93TGbGaoY0c4PcbkcudrUZ6N8LLWSqqhFXwm0kgXjJVUMzmttdncPgMd6cW nDpA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WS1iRCYy; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47ea279d8a0si23701961cf.597.2025.04.24.13.28.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 13:28: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=WS1iRCYy; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u837o-0008Gi-Pm; Thu, 24 Apr 2025 16:24:48 -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 1u837m-0008G2-Q7 for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:24:47 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u837l-00050b-3R for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:24:46 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43ede096d73so11020145e9.2 for ; Thu, 24 Apr 2025 13:24:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745526283; x=1746131083; darn=nongnu.org; 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=RpP1t+c/p8hP7ejHigBr04Z1PrmkdyRF/VY/JGUgbiA=; b=WS1iRCYyoHmD7TgCDsqT/lYhtI3SYJL6SAEv5xzdlYZFL4KLqDfV9sX17SZoMIgbLf 0FiKRQpx7l5LvaD57qcz2jsxzHWWh62q91bL40oHBh/kJ46H/M8Qc78+BHcQJdRZMSAW g4UtuMo0d0FCFTDGks2jbyVplFBTZDRNgYShAlCpS8j6xAIMYKtAl/PlLtzHpDNKpTM1 5nvrWrDXgAyk+Xybp5tFgvJPlc2/aO0cBr4gMCCyRrpysAxT+P3CDzKC0i9T9u/KRxd5 +RNEXws1XWCpkJJ1DIwq+oU/FfPR3qscIdHRPkbql+K8QJtN5PyMD+TeJqolOcB431tw 4vhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745526283; x=1746131083; 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=RpP1t+c/p8hP7ejHigBr04Z1PrmkdyRF/VY/JGUgbiA=; b=ICHtn469jR8hCfKleI/r6Uy1CCm91rBb4opxdtL3uHNB5+zEm+Y5hZeoLtHAPk725a Eu4VjcL5k58d5/MdeFPjAoNa/J7FbtCorZ+F6RM9Huk6D+8fKDViDI9+7wU4idcjziei GujXmYdA45rPIoTZJSKMn5lBcfyiIptoL7FNWaZISFLSn204JvJtAr/2BATpqX/EtS+S DnvDhThGPsRz7C5iobnUwIBtGEMaVGqOflDYxJZzVe4EorkwhZYGYO79vKXDFfnUnG/X +FLB/tqW3BmPE0KFaNf8a4KFj98i6Pu8QYOJsSp4oNqKHa54wSB5puDEdaj2a0bnOuMw QY9A== X-Forwarded-Encrypted: i=1; AJvYcCVJ9rEu8RdDZiJ9/V8pM/TYoo9LkWisGIsxbQOeipoPM1fTWKZBdb4FRegeOs/t7BhRFBKo2e/yu6oL@nongnu.org X-Gm-Message-State: AOJu0Yy9DesKxzDf2qxssa7pzDnaz+ts/rQW2nlLsLZxfAiGsDly0baN 7LPlG1s7aG8PjUcYpKqARFE6kYFshFAqD44sUOvNIQ79tGXqbhsni/EqQ3O/n7M= X-Gm-Gg: ASbGncuAA1U94EYZRwzlJ8nvWxwe4OHjaFFg10otgw2GVL4LC71QTk9oOeSIoD2Qbe8 Dp0pcB3yUSJYtUbVSvJPDpi1zxdS4zZrDspP6VhUITL3zoKWqPkrOMqs4wXOZfyYOVjH/HWsmZo A+NeBGw0h/ORGiHmOoocgJca8ktJvFVhi0DNrNC25EqHyVrwerPanq/v2e8ngQAp6fHqeYz29jh ermr1dt438MhoYHH2GRVYKujYl/8dxZpRdSL/PCLXOGn84u8w87g9y4bbv32RUggKwGvPLOAz3X nubQ6ijVyEsULFDY39z/zSud62O1jn0ALa0kA5az5lsArszuhzpLniD6Eu6tOIepSbmIg8IDHjG ZvaQ3PS9+wN/uX+4= X-Received: by 2002:a05:600c:1e0e:b0:43d:54a:221c with SMTP id 5b1f17b1804b1-440a311437dmr7725745e9.18.1745526283381; Thu, 24 Apr 2025 13:24:43 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-440a531072csm809155e9.18.2025.04.24.13.24.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 13:24:42 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v3 06/13] accel/tcg: Compile tb-maint.c twice Date: Thu, 24 Apr 2025 22:24:05 +0200 Message-ID: <20250424202412.91612-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424202412.91612-1-philmd@linaro.org> References: <20250424202412.91612-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Signed-off-by: Richard Henderson Message-ID: <20250424011918.599958-16-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé --- accel/tcg/tb-hash.h | 3 +-- accel/tcg/tb-maint.c | 2 -- accel/tcg/meson.build | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/accel/tcg/tb-hash.h b/accel/tcg/tb-hash.h index 3bc5042d9d0..f7b159f04cb 100644 --- a/accel/tcg/tb-hash.h +++ b/accel/tcg/tb-hash.h @@ -20,8 +20,7 @@ #ifndef EXEC_TB_HASH_H #define EXEC_TB_HASH_H -#include "exec/cpu-defs.h" -#include "exec/exec-all.h" +#include "exec/vaddr.h" #include "exec/target_page.h" #include "exec/translation-block.h" #include "qemu/xxhash.h" diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c index cf12a28eabf..512dae93bdf 100644 --- a/accel/tcg/tb-maint.c +++ b/accel/tcg/tb-maint.c @@ -20,10 +20,8 @@ #include "qemu/osdep.h" #include "qemu/interval-tree.h" #include "qemu/qtree.h" -#include "cpu.h" #include "exec/cputlb.h" #include "exec/log.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/mmap-lock.h" #include "exec/tb-flush.h" diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 047afa49a28..3f7b127130b 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -8,6 +8,7 @@ tcg_ss.add(files( 'cpu-exec-common.c', 'tcg-runtime.c', 'tcg-runtime-gvec.c', + 'tb-maint.c', 'translator.c', )) if get_option('plugins') @@ -21,7 +22,6 @@ tcg_specific_ss = ss.source_set() tcg_specific_ss.add(files( 'tcg-all.c', 'cpu-exec.c', - 'tb-maint.c', 'translate-all.c', )) tcg_specific_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c')) From patchwork Thu Apr 24 20:24:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 883975 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3634310wrs; Thu, 24 Apr 2025 13:28:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV0Mc1ySHOJ9ob4/EwfhfBLl77lVKrYscRiXgB6+XhBv+b7KoP461Qo9BYrIzsZpHx4hVIDNg==@linaro.org X-Google-Smtp-Source: AGHT+IFrgAgn9pBbtAG/nI/bX2Vr68LO2rKhmOq7QCE7iJ6b6VdCixcpEQxTa72Q3vrZOw/jm2mg X-Received: by 2002:ac8:7d4c:0:b0:476:9dc9:3c2a with SMTP id d75a77b69052e-47fbbb44c31mr12697661cf.48.1745526506063; Thu, 24 Apr 2025 13:28:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745526506; cv=none; d=google.com; s=arc-20240605; b=RtP4cSSQaPebtr/UKvZMK97wz9RjMr4ZT31+2+JkcPc5JY2Q82JR7/qNUMlE4XnqMX 7U0QQvtbZ9crH4P5AlZQ/ZIz4TV8Yxw1XM+bOLnYQwuOmZ1+oq2nEPCay7P7ZLk8ivL3 a3ZdSRfTKWRBOTNOr5tq6YCKaapAX7+9lgzNozy7SEYvDKqV0/mZ4qU/PSVZTbGFtaLu auUkD3jvlIS1hrxIYX4nX/5uV1kJgHdCWZWA3S2RZEv8VPDOfzZCTkKDCQy89DwnVm6L mjmOaT7wAjgdeNkUjBoMVaH0IVewwOk9oUEjNRusvtTPkWelXINxqKJUegCu75pbMaA6 tHqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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=EzYHC9R7RTf1r/vPvoxmooHSOXxbT/I1N4/WAtczuAw=; fh=FKWIFycyO1Orz3TvIvW5S2IUpOi3B7HongN0XtOmmZw=; b=gY7yducbydMchYRvZCfpF1gqMtlwnvFYv1zqeKNJgxtCXkyvX8WL0wVqMbBDTuoPmZ 4orHfXwZ3k2l5n+i0OvcgLNyMpWWk22xa++fHEgNEwXtlVx6fgK45w/0sVmVdZFVq6HP ZpsejXHmJ7tOf/wCONuKwYyiSc7qH72iQCciibiEfCRtBI+1Qt9eWICFnHyBBiZ0yOzT sHQPD+O6glu2MWuaqDPm9w3B5ZzyO1qzGO4ux8Bjs/wAwHsMCqHJfoMf4YsGKd4AZ8iJ 7LN6MM42O8ea6+WDvcic5ofpK4AfH7p+7qrjLHUI1WE5HuEajg/g6iGfzCk1a4nJjKmV Frzw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U83A04Au; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47ea1f974d9si24039061cf.411.2025.04.24.13.28.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 13:28:26 -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=U83A04Au; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u837u-0008IJ-1Z; Thu, 24 Apr 2025 16:24:54 -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 1u837r-0008I1-SY for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:24:51 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u837q-00050y-5i for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:24:51 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3912fdddf8fso1816916f8f.1 for ; Thu, 24 Apr 2025 13:24:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745526288; x=1746131088; darn=nongnu.org; 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=EzYHC9R7RTf1r/vPvoxmooHSOXxbT/I1N4/WAtczuAw=; b=U83A04Au7PvefqAAvPoSpkEOY5oqdqZUdUr8D4xOyee4kC4xAseTB3YWYQM0xlacbt sOZj7RTzgkbIHve0Tqm/AJxPBelYjM/Fl9okIXcIzVs4fZ+FTlNimYUEdP/HZVS9ovxU CuMlQHiy1idgfbQfG4MJy5vIEtJaURh5ZW8GBuQCAt3vS28AoyWNBQ7/AP4FmTpDeLcU p2Xr7arQilp+x+vAVQX3qOiymxeWqKNwWLMdwK2UClsAVL1KITZuYm5B1rd2VAJ0uCre n2JtyRjen2K3dxwhmVzWPI/BUoo38XSB1Oj1hie7cl1y5qNsiSm87F4R+PhJoSNzawJL LuoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745526288; x=1746131088; 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=EzYHC9R7RTf1r/vPvoxmooHSOXxbT/I1N4/WAtczuAw=; b=QwHcViV8oFMVOyf22sWT/OfTAwOVsQGXoz8nopccrZCYy31qAHl+7QdtA0gQ8z8RLG o36hsqSRfwBiD262ubJ5PO7ZOd9gZw6vTeTsrpRZkO/MgaCe6uuhIsYUlUiYf0IoNetO 8x2NAYR+aHSkvtqpqf7rj0m2AdF5EqBfOpGP8IpO8/a6HYtkbqLYnJPdoIi+vnp/uz3N cuV5DFe03pOv+S+U7gl2HStD3Etokt+pz9NjrpI/byhhSfrwolPUjlJRPrBYz5oy8+tE COzU3NGQ72PZZuh14/9mxHU8ZSSZIfgnl2y/NBaut/y2UzgXUP0XT0Mmp021lVLdXewJ Ymsg== X-Forwarded-Encrypted: i=1; AJvYcCWac1ucf73ueF5CqeSPMs+cbvb/J70eOc32OBh58m5gU9CgU/c/LNNyYZ8jIprxWEPWZ6cQ8xz69Ut1@nongnu.org X-Gm-Message-State: AOJu0Yz5TJBvZA+KgnUPkXKp5a7Oh+fRKX7XNKLEPgA/s0WP6DAwDvkM D1vvV37tgDwwORzAKxpTdkQ+s1KT+P4dBCNkJV61bbPGvyzRK1hPYRf6Rxd/wZY= X-Gm-Gg: ASbGncvAtH0cCXdPIFn8cG4wWwBmzVL3Akl5Ip72nI0rONZxhdwryL2AQWFn5vFZDON 8WE4w5cVGciIwVIoeGfVEkG+5Y7lRv3E25mCG6nJiFIeO/bMckxhLwzQPwSafESz3jePJNeOy3Q O+CqmbcLRQAJ6TKpDdMyZwyy9HUZgMnQIZHwJt3/8wp0pi0uihFo2KfKlv6RwUcpXhekiiy+hWW x/Yhvh/uFuTRYMbJ2b7idBIWnybR05emYBFmvRRzMuwZcL4KruCUlglyElp6RdRc1bOzhoL8BBB A/0SP8xYk799QuUUybKwp3mlN9kAjh4re1JRpO8t/gm9lori9iqI8X/VHdZTxvKzm2XohRgJaAX pOIjEFI7qdKlbbzA= X-Received: by 2002:a5d:4887:0:b0:39a:c9ae:9eea with SMTP id ffacd0b85a97d-3a06d651cb5mr2730106f8f.10.1745526288182; Thu, 24 Apr 2025 13:24:48 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073e5e198sm244598f8f.97.2025.04.24.13.24.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 13:24:47 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Mark Cave-Ayland , Alistair Francis Subject: [PATCH v3 07/13] target/riscv: Include missing 'accel/tcg/getpc.h' in csr.c Date: Thu, 24 Apr 2025 22:24:06 +0200 Message-ID: <20250424202412.91612-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424202412.91612-1-philmd@linaro.org> References: <20250424202412.91612-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org "accel/tcg/getpc.h" is pulled in indirectly. Include it explicitly to avoid when refactoring unrelated headers: target/riscv/csr.c:2117:25: error: call to undeclared function 'GETPC' [-Wimplicit-function-declaration] 2117 | if ((val & RVC) && (GETPC() & ~3) != 0) { | ^ Note the TODO comment around GETPC() added upon introduction in commit f18637cd611 ("RISC-V: Add misa runtime write support"): 2099 static RISCVException write_misa(CPURISCVState *env, int csrno, 2100 target_ulong val) 2101 { ... 2113 /* 2114 * Suppress 'C' if next instruction is not aligned 2115 * TODO: this should check next_pc 2116 */ 2117 if ((val & RVC) && (GETPC() & ~3) != 0) { 2118 val &= ~RVC; 2119 } Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Acked-by: Alistair Francis --- target/riscv/csr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index c52c87faaea..13086438552 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -28,6 +28,7 @@ #include "exec/cputlb.h" #include "exec/tb-flush.h" #include "exec/icount.h" +#include "accel/tcg/getpc.h" #include "qemu/guest-random.h" #include "qapi/error.h" #include From patchwork Thu Apr 24 20:24:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 883964 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3633323wrs; Thu, 24 Apr 2025 13:25:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWLrev/VxUx6fTgWP21M0ueTR9hIxFntVxH9O39u/MDok6jL3P8VOOehMOoghzWFtvtpECntQ==@linaro.org X-Google-Smtp-Source: AGHT+IEVH0/tfq2qGoNivr20k+zknCpDvqU45TzAQH/zWDqkdFJ4iQCoq/vjsbkXYQK2Vicj8rJr X-Received: by 2002:a05:620a:1a03:b0:7c5:9c13:2858 with SMTP id af79cd13be357-7c95ee437e3mr111052085a.0.1745526325807; Thu, 24 Apr 2025 13:25:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745526325; cv=none; d=google.com; s=arc-20240605; b=bIVa7X/YFuo9vPwvXLWEHVmzJrgAOy4OLlRqb9YbGGPGGQfDFcJamvm4XvuiuCfIBi J3SDBdwwTWrgIRucW1FT8ppdiR85CHs139Tyo5Z+QybzXSyvDfUvaMzpANpJDX4AnM7Q JgaogKRBAGh3loohLsH8BIMVeiNXfTmHb/MCMPhu97wCbZBl85Vh8EmuHW5ygT9kLvKE yfmuB8zLm7q23XDVFukIPQuZiHyQMbWX56OPYrAHym1ZeyVzp0Y9T6ioIIURzRYQvIdl meVrLWPlrNXALLoPoE2BlMkZIP+kWF+ANeVMRByronQymGVRP9Q+OKrNVhM9plti+/7w y5rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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=aaHx7PNN69uqV2de9T5YysFFHIzKyvP4EvVdC8GWNAs=; fh=W+qCh03gzNeV8wu1oKyF77S+p427/2DIjYlOfZQPJUQ=; b=eRkxIca18tTKWCDVeNGc2txOViBXINvz/8gaR6pG6dYd30FNP1At4I6PGBNykMLM80 HePlP2Tb8VBLJtiqojeVdzelQkwwFrgR9M2NI6rjJZT9Lwssh1ljz2QOqSZd/4TYf7Fr B2lryih/DQ6RGsjTUYfVCy+93swck2uhNVKzGG9YjgtfgWfkJKEHtSvUIMtXQSPcaDtc g9bewJ5o+ujAvSu7FgYPB8/PU5GLuKY/a8ZhVXAzECR7pH0ZjfJ1b2l7Nprrj60oPsAY IXuG4UKMBgmQFWfbhZ8CNCtC72mfI13y8vPy9zjuxh9OaX0HfBE5K+THPPjGNAV6zuzj GHbQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="cu/cAm0e"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c958c9d40asi216914085a.34.2025.04.24.13.25.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 13:25:25 -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="cu/cAm0e"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u837y-0008JN-EX; Thu, 24 Apr 2025 16:24:58 -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 1u837w-0008J3-Nu for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:24:56 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u837v-00051G-0Q for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:24:56 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43edb40f357so10399525e9.0 for ; Thu, 24 Apr 2025 13:24:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745526293; x=1746131093; darn=nongnu.org; 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=aaHx7PNN69uqV2de9T5YysFFHIzKyvP4EvVdC8GWNAs=; b=cu/cAm0e9IwTxEFJ6UysS7WYr0UTna4izpqTow6Dwkqd1Dezt5wnM4qrdMBEDdLCWh DIff0TEXZcuJiHBFOiFvjay4Hp0NjEGyf56Y5bLGDtGrg1dOvYMCBcuRDr8tAhYlTUP1 3ku80s5bRob5hYaFosIhGjUuP13FJQbJgQsFveGMPCzkF9opze66UxzVs01+1omiXTyq TNDBTWWk3NLb1NR+L62u43G6yBvKXexjVm4N1aunaRMQ20Auu6U20GH0TsyF84q0FoVZ 6Srz6oyjbGN2njDXpovUYCzuj7nHDAW7vQMg/MCzd8mMWO7AxAu6uh4F3p2iyOpBJxEc sPAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745526293; x=1746131093; 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=aaHx7PNN69uqV2de9T5YysFFHIzKyvP4EvVdC8GWNAs=; b=KrvyOv2juFGMVtlqRsTfbWoGND6jAiypMdZc2MLHHb0nOzPbbrzwo4KO8kQkPRqSBI BpGQffsHfFbBt7d/FGdFsxXHzsWKiREx0NkfO4SFrWS9SrabnJKsXBMnCuluSkyAx3rm 464kbuW69fFuoae2gpJuYP2nK/hR6sRuWl8ludaVKKoVf3ejnAZvbNXIdFyZ177ExgzG dz6Lg3zodhwUkYYcRkMadPTr7YCJ6/jArgF0EX+m8pUoWQYmmAndhJFDqQIBTcRQ4pRZ MkoLpCDl3nH+V7JsA3bkGTf0Hi/sOpexhKP6egWOl/YHi0iJ0vEmQUpZjV+2RQppsY/3 OSsA== X-Forwarded-Encrypted: i=1; AJvYcCXO5UkBZnTc5iwikERWVWhbVYUf/sSVroXxAx+kc6/4uO83p0lbuu+SOl4DLZgmOvgJB+pQ9ADKQO9G@nongnu.org X-Gm-Message-State: AOJu0YzAyREiql7EsGGhddEcZnGGc6/WZnuPgGqTH45VnTdNHJ1v37Ih 7MU7KAbnH/grenqgpeWadmIiH+ixKmzaszMH7DUycEzwqQZIhbaXYInw2FxnCXg= X-Gm-Gg: ASbGncupoVyWnyDf1aWSH1T+XmICvLkti2wSHmHc+lQRbG9KhKwBA+rTUaQStOyPbjW ldlEDWdipeCuZqDvI0DTcw0U/Ra1hOA7nCuJhdxNvO3sARHjNALzwPXBFN/JZt8VYZIcQE2o8a/ ZYznmAct1nUAwUY6TvQMAc7Dfqw5TZV/2i781w03luXEMUIqU5H2iREX+uxSNBpj2bgG/6sreqL Sw2/xkMy+noCJDL93uYun9wmd2KTU7NhkrQJKNfP2YJnjJTTqChda6bb/yb3yOelWi+ejt/O4+p 3JiI8tV4VbVNUU5ULtCoEwb6BLGJjAaATm7BhXCEEzhFwdqOy6eOfRDssAXku7AdWDoKjxJ/G/T PTeS0sl3C3A3gZ2Ec9zipixf2RQ== X-Received: by 2002:a05:6000:258a:b0:39c:119f:27c4 with SMTP id ffacd0b85a97d-3a06cf6385bmr3375891f8f.30.1745526292987; Thu, 24 Apr 2025 13:24:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073c9ba61sm300067f8f.9.2025.04.24.13.24.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 13:24:52 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Mark Cave-Ayland , Brian Cain Subject: [PATCH v3 08/13] target/hexagon: Include missing 'accel/tcg/getpc.h' Date: Thu, 24 Apr 2025 22:24:07 +0200 Message-ID: <20250424202412.91612-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424202412.91612-1-philmd@linaro.org> References: <20250424202412.91612-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Since the macros.h headers call GETPC(), they need to include "accel/tcg/getpc.h", which defines it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Brian Cain --- target/hexagon/macros.h | 1 + target/hexagon/mmvec/macros.h | 1 + 2 files changed, 2 insertions(+) diff --git a/target/hexagon/macros.h b/target/hexagon/macros.h index ee3d4c88e7b..6f82277a415 100644 --- a/target/hexagon/macros.h +++ b/target/hexagon/macros.h @@ -21,6 +21,7 @@ #include "cpu.h" #include "hex_regs.h" #include "reg_fields.h" +#include "accel/tcg/getpc.h" #define GET_FIELD(FIELD, REGIN) \ fEXTRACTU_BITS(REGIN, reg_field_info[FIELD].width, \ diff --git a/target/hexagon/mmvec/macros.h b/target/hexagon/mmvec/macros.h index bcd4a1e8973..c1a88392c05 100644 --- a/target/hexagon/mmvec/macros.h +++ b/target/hexagon/mmvec/macros.h @@ -21,6 +21,7 @@ #include "qemu/host-utils.h" #include "arch.h" #include "mmvec/system_ext_mmvec.h" +#include "accel/tcg/getpc.h" #ifndef QEMU_GENERATE #define VdV (*(MMVector *restrict)(VdV_void)) From patchwork Thu Apr 24 20:24:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 883974 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3634112wrs; Thu, 24 Apr 2025 13:27:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUl4A3t5bCDIs8JzRvfNT0w8t19NbqYvtfIueqPY+CWmHS6OSXSXgtBZYjs/D/Jjrw7vx1i6w==@linaro.org X-Google-Smtp-Source: AGHT+IFTnIgZa5YSLwKSFUzKE9I80rpfS6AYYVvht1LI/8Ytk3F74jsrqH01KR9O6Mky/zsi2tnY X-Received: by 2002:a05:622a:1a01:b0:476:abd1:7101 with SMTP id d75a77b69052e-47fbb8539a8mr19462681cf.46.1745526464898; Thu, 24 Apr 2025 13:27:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745526464; cv=none; d=google.com; s=arc-20240605; b=jTDRYurcg7dl/bTq4wbekAI9y6J7AknX7VkTuYazTy/SHDYGpLxYAAVqN3kdmRDkr7 ORPM7muxchCVlqgjdtV4mh37bdsvfclkoBTelcK3WX1Uq1vUckC31TbZOQF/62itwmBl fxa3zLNPmjD+Ei8yaI/kqw+TWflej9AFyzt693QJBqvf/DbzEb0kkukAIi6lIdifQGjT DpJajZuKMDzIE7CYdAl8wWQsiU2V0Fkt3fANLiah/JF4vRBjV3IrHvbywpSR0+NKiIYz DxYa2jj8JZPkJq7qXZYow1W6gEWE/bOyhWOKTjJw91SLneTiK4rzufH/FLOA24OP21lp AqlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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=+m03iEv/CwRKZ4DaA6A5ejhgsU3RRDvCte3j43cohVM=; fh=0yXuSKs2Ou24q33x5vSnBlqOTJNAPLJtdDRfH66YrNY=; b=k5elZKHdZWMb7jQ4pgzdfa6sxZ9+gXaiVP9dqQGPmsqk/0diR3yOCEUv7oUoM3Rne+ 1BM+gcSxjHLtai2LijDL3sD2rlB7UK/uFFxHBRccM11AL9+lX0PlKHvMo7Ro96b3+UIe tW0VRbOqrlibgD47E5MjLmInenobnD3vCjlZla6QbpP5wmrpQDSulHgzsal1FLWpSCpg lMEU4t2y0Fo78eIp9pDCRaXXfMOoAd8/SxwYSI9oS0dVKci08pdyZwxJaD8TmMJOPG3/ ylRtVD/dyTd3YHMHamrM8VDrTycEV4NVqGkWS8PO68pd28noP2XBHV7NmL7hcZ3BOOke Gl7g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hKArBLqe; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47e9f2cb1f1si23053071cf.89.2025.04.24.13.27.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 13:27:44 -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=hKArBLqe; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8384-0008OS-CH; Thu, 24 Apr 2025 16:25:04 -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 1u8380-0008Jh-Pq for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:25:00 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u837z-00051W-4S for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:25:00 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3912fdddf8fso1817042f8f.1 for ; Thu, 24 Apr 2025 13:24:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745526297; x=1746131097; darn=nongnu.org; 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=+m03iEv/CwRKZ4DaA6A5ejhgsU3RRDvCte3j43cohVM=; b=hKArBLqehK9zmbpbYY/EFVD9gURgHRWgFCoij/JDBlV9yJcwGyafaq+W/BN0E2nr7o l0iMGF0VNQA569EY26K+v/F9UTe8AYITMZ828D2w+8yDRTsr/i/xBpl2472fWb/kS22H ZPbO/r/RmD4ZzEw+0DnHMZ4kk9lmFpsmX4lUecOoNHRleCNKl06iP2mpzv3xq3Q3zNvM LABoP8pkUz/ydwZpsSwrqmiDaMoL8EzIaWy7H1XRwv6EfiLqUh8HVSzIFw7jPnBlqQ1/ DLmqPVcoQRmLKj4jKNQjEe/hQSsJF6UDIcB0CqPLUM4wIGZYwtjL//CXdZilYOQEyoJr uBvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745526297; x=1746131097; 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=+m03iEv/CwRKZ4DaA6A5ejhgsU3RRDvCte3j43cohVM=; b=o1t42KX2UqhRJ4wGXxz3sViBxKLuX/Kc9fQTgby8LX6L6mUvVV9eK/LsRP8RpORgyb VZK7S32agPEYNVuW4uzVbb02he0cRJRc3vylMW51yofm5kTevkGK4cqQBGEP4NKEg7Tv yCJmK+PoQcOxC3AhxAiN31dt5kXaKoYSjj7tXTyPHukfKuDfnSOw+csAuGieLdZsfVfo BbC3pyTypw0mmbhE0C4I5R7xba8Ws3SruJBb8XrIusZ37/NxSVP1A92moB9VR2bcIud6 Ty6XMSf+vZ7Y2LtVQX+h8UXdiMJt/fOtRmckV6MVYkCnwKeIfZxasE3hcuv5I7cJyG2A 96yg== X-Forwarded-Encrypted: i=1; AJvYcCULgY/l5AlmJCHG3lwa0UncU7S45p5X1psCpVCUi3VV9eEC8fmPs2xJ0lctZWAKqkO2vY2Yh/6sEGJo@nongnu.org X-Gm-Message-State: AOJu0Yyk7epSq0vqUonIL42SUT2W7sgQS7cuy0RlYzurEWxuyg9XKoI+ CccesmRMtcei+s9WPXwW8Wkuk3kbp0pEW6lXoNsYFvBhJxY+24jux0xKs1dW5X0= X-Gm-Gg: ASbGncsXmx474RdbsdzPLOekELpaPb5yvPHFHmPj8x67+7BSQ2NKq41+7ZyTg8K4X83 DQA0mjo414eXQ74qJK/FceHK4B59GKtxsbWG9CzWSIFlNBZQmBcX9/Vh1j1IGEwKM2KB9Q7P29Y 1nBZbugdjsVlcWRtcS2hf3/ftKd9QLiMKSP06VHHC4/OgBX48B4RdmvUf5H7ZDbCOgsaqyEJ3Iv UKobEuobl1QmeBtcKSl1XQaCoLkuZG+wRxwo30YjcPzudtH6qwmHsLEovo2eFMEEfYR7sH+0ewo h68yuVKbn/a/kls5O2Iwj67stEWmihnYIjWm6AKPcjMl6081EJpOwZzkGHVxZ0iW/MaMf/Vrmqw Vxz9NNbbwMnB12fI= X-Received: by 2002:a05:6000:2510:b0:39f:c05:c220 with SMTP id ffacd0b85a97d-3a06d6dc253mr3665833f8f.22.1745526297657; Thu, 24 Apr 2025 13:24:57 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-440a5310ad2sm801495e9.21.2025.04.24.13.24.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 13:24:57 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v3 09/13] accel/tcg: Include 'accel/tcg/getpc.h' in 'exec/helper-proto' Date: Thu, 24 Apr 2025 22:24:08 +0200 Message-ID: <20250424202412.91612-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424202412.91612-1-philmd@linaro.org> References: <20250424202412.91612-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Most files including "exec/helper-proto.h" call GETPC(). Include it there (in the common part) instead of the unspecific "exec/exec-all.h" header. Signed-off-by: Philippe Mathieu-Daudé --- include/exec/exec-all.h | 1 - include/exec/helper-proto-common.h | 2 ++ accel/tcg/translate-all.c | 1 + target/avr/helper.c | 1 - 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 4c5ad98c6a9..816274bf905 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -26,7 +26,6 @@ #include "exec/vaddr.h" #if defined(CONFIG_TCG) -#include "accel/tcg/getpc.h" /** * probe_access: diff --git a/include/exec/helper-proto-common.h b/include/exec/helper-proto-common.h index 16782ef46c8..76e6c25becb 100644 --- a/include/exec/helper-proto-common.h +++ b/include/exec/helper-proto-common.h @@ -13,4 +13,6 @@ #include "exec/helper-proto.h.inc" #undef HELPER_H +#include "accel/tcg/getpc.h" + #endif /* HELPER_PROTO_COMMON_H */ diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 38819a507b2..0408e2522a8 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -61,6 +61,7 @@ #include "system/tcg.h" #include "qapi/error.h" #include "accel/tcg/cpu-ops.h" +#include "accel/tcg/getpc.h" #include "tb-jmp-cache.h" #include "tb-hash.h" #include "tb-context.h" diff --git a/target/avr/helper.c b/target/avr/helper.c index afa591470fe..b9cd6d5ef27 100644 --- a/target/avr/helper.c +++ b/target/avr/helper.c @@ -23,7 +23,6 @@ #include "qemu/error-report.h" #include "cpu.h" #include "accel/tcg/cpu-ops.h" -#include "accel/tcg/getpc.h" #include "exec/cputlb.h" #include "exec/page-protection.h" #include "exec/target_page.h" From patchwork Thu Apr 24 20:24:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 883966 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3633405wrs; Thu, 24 Apr 2025 13:25:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVQYfmW5dAsv/4oAjpgptRWjlL/1sTQ7Fzmk6XGkLR1pwhLBmFbm+5GYo0H8zDdRFPausPIBA==@linaro.org X-Google-Smtp-Source: AGHT+IFNc3P+Wm1RwJE/CowRz6eXy9yP/9OuAxi4YsNQjelFJpAHZqT7kLRrhL7OWpM9KuS2rMs0 X-Received: by 2002:a05:620a:4391:b0:7c7:a5b7:b288 with SMTP id af79cd13be357-7c956ee66b6mr615486885a.19.1745526341670; Thu, 24 Apr 2025 13:25:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745526341; cv=none; d=google.com; s=arc-20240605; b=gpGjAj7d9uu/savSgpS+co4rIqjQyvc2NNuXQAYfwIOUs+7UkIyiMW9TZK0hzF7chp 01/MUeaCGEvyWaQpmJsxCYkEo2WuqG9zTbAXXR2eQX9miwi4mCRLkiDTI5Hl7Uw7Vz37 RJG+/z3Un6B5YPncsSkuub6lzc40Iy94Xp6R1g6RJlVWDuwfTB3kRZRehpVnnzhy/0zM ZDw12clJK+CNs3NJMdmNIC/EdHXfx73LMDgjN1Ty8YVXzJK3kxo6OSy0MzZwMmCEvKg/ MDMdTlZdR+Xc22nsiDOY3F6vap/uH6bxEBuBtW9JoQXLiT8MMdigwh5uzlTnNIzTQTlW kOZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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=3ZaZUiVtvhip+YjUPzbukhiUty3aZRnPrZlaJVYneow=; fh=1mxLTSurd/RoyeUkAXZf1Zi5XiP0/BkCO25nlcdxaSw=; b=ern8KeJBSUNJG3uHP9omFDSqgazCGYhxqeXc2MW7AE6qGpv5xjLDfhTst+FfcWswTo 26LPfG5a/BBuFQstI2XBD8ejH1tkQRkpLwq83oK/5C8E3hTGTXa8fVPZGwoEWZyzpgrr JB26fQA46cFca1OtCCTsRolK7bGFRqawLgsjwFk68vOvKvSvm41bvK1SoKYIOaaC7yrO rz2hW4Q/YOQ1c6RD0MNfJIBhkECGV5hAQHdA5PminMb0N+GYhmPcR0EQaCwQZQuQCdY4 Yf2GCO4NpQTFNBGs0VCIxXwf/b0+SAX9aDF6h0s9v0aZuN/47La0QU7FY3BD7rS38OV3 bm+w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=l+AdB8Hc; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c958ee17b2si200548685a.618.2025.04.24.13.25.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 13:25:41 -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=l+AdB8Hc; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u838D-0000LA-FO; Thu, 24 Apr 2025 16:25:15 -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 1u8386-0008V0-Gx for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:25:06 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8384-00052C-Cs for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:25:06 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43d04dc73b7so13304675e9.3 for ; Thu, 24 Apr 2025 13:25:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745526302; x=1746131102; darn=nongnu.org; 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=3ZaZUiVtvhip+YjUPzbukhiUty3aZRnPrZlaJVYneow=; b=l+AdB8HclIJLhxMv4eS5VDnF3VoSN689AljGoi6MUnHhtG5kaNcHX0UdCBK3HjPoqv EGIATutv6sJNSy5sH6Wl7zSTsF0E91eu5hkXf/RRQCOYbJWA71v0c3hCyqZE//dAbRAc HunPzEzQK6THvyZeWRatVcXwApRr6m0gdaQ1t63ldgj9o0bVjLfVaQQqYxKJqeQt+gaT CXaycBWQVyhAZpDLnYBIYLmQm+mbeJ5QCcSbce/ZIH7kxcI2GmIv9cdpCQzJpxCI2+CV lYvNYaMxy+Y6RH12oR+6qose6rnLkH3ZOfyua6MhrqdkyO/XWP3gX80gZS5BfLLlwlOA iZIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745526302; x=1746131102; 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=3ZaZUiVtvhip+YjUPzbukhiUty3aZRnPrZlaJVYneow=; b=UKhVG4ktq7lRMRGHjSJGVXa8z648Hf3BXPWW2TlCa4q7lgtGejbr9gOXeKNWAfwsWy 1Kkq7hjXfHay8ypOGiEu+o3BTv5oPxBMkHVBIG/IzGFDSHzJtIwzAoFNbblQs29z2M0N KrrTljMlTafPXI8K4FgJT0hMdR4hN9e/UdwqRPkORmXjB6f8CWAcA6jrcGbT1H2P0bGn xNaBLAudpNE/GD4S3NGn34OIf4HxJVRyrJhUMX2XalqdGrONP+5DDs4P+IhqPkBlZtlD ZY/gqmgR0DmHvadtlRxZFIIBA3wfygi3zUL7PhWPNFVxacOoQqq+bX8ZpWpcBY2ecfHa bDrQ== X-Forwarded-Encrypted: i=1; AJvYcCUfzkNSmZ2c1SNyLSs1ro6S/8oC/TxweadfKwvYLaGJcxERD1uZtUvomc5Z/hoLDss5O5m31jexiZqA@nongnu.org X-Gm-Message-State: AOJu0Yz9WAG4u+FRkUSfAdscaoj6/CgVGpT/S1mnMtPaDk4SgiMDf54G vh9RE7PJwF5OsPMADSiDPPBhtsTaPUZ2fj1uoQdVbh+LHE7dZzN/My8RaRk7BDU= X-Gm-Gg: ASbGncucNY2sd/mKfb/zoeGEF+WMS5KU9bt6hAToOi/+gwTYSZrFg0hvHW+87DnEX1C OdZ02zv8AjU0t74b0Fmf3pVZYucBnVmfrp0p63pAWjJOtBDTKYHJkHE+42jG2uIBoTOfexUjcif Zssz8mh3Py4Z+4urZwzL7HunBsfIEz+UIwDoBgUKk8iXyIZhozPeAzJKE7vTAG4xgStYwmkh13/ CeX2vaE9byNc80uY67fNAvWS9PFutXlvevdyEWDc2CxgbpLgNtdAaCm/J7SwCtCE8h8KubZAjDO At6lhCu7/gJK/EJSNdOTeVcBtBdcWGf8pXddmgrhnA23b1OgR13ZLlW8THBkSnBVtDozK42GEcY R/GcNhjWVc1w0Dso= X-Received: by 2002:a05:600c:510e:b0:43c:fee3:2bce with SMTP id 5b1f17b1804b1-440a3173a9fmr5815295e9.26.1745526302531; Thu, 24 Apr 2025 13:25:02 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-440a538f691sm622195e9.37.2025.04.24.13.25.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 13:25:01 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Mark Cave-Ayland Subject: [PATCH v3 10/13] physmem: Move TCG IOTLB methods around Date: Thu, 24 Apr 2025 22:24:09 +0200 Message-ID: <20250424202412.91612-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424202412.91612-1-philmd@linaro.org> References: <20250424202412.91612-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The next commit will restrict TCG specific code in physmem.c using some #ifdef'ry. In order to keep it simple, move iotlb_to_section() and memory_region_section_get_iotlb() around close together. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Mark Cave-Ayland --- system/physmem.c | 50 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/system/physmem.c b/system/physmem.c index 637f2d85324..ccbeae241c4 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -746,6 +746,31 @@ translate_fail: return &d->map.sections[PHYS_SECTION_UNASSIGNED]; } +MemoryRegionSection *iotlb_to_section(CPUState *cpu, + hwaddr index, MemTxAttrs attrs) +{ + int asidx = cpu_asidx_from_attrs(cpu, attrs); + CPUAddressSpace *cpuas = &cpu->cpu_ases[asidx]; + AddressSpaceDispatch *d = cpuas->memory_dispatch; + int section_index = index & ~TARGET_PAGE_MASK; + MemoryRegionSection *ret; + + assert(section_index < d->map.sections_nb); + ret = d->map.sections + section_index; + assert(ret->mr); + assert(ret->mr->ops); + + return ret; +} + +/* Called from RCU critical section */ +hwaddr memory_region_section_get_iotlb(CPUState *cpu, + MemoryRegionSection *section) +{ + AddressSpaceDispatch *d = flatview_to_dispatch(section->fv); + return section - d->map.sections; +} + void cpu_address_space_init(CPUState *cpu, int asidx, const char *prefix, MemoryRegion *mr) { @@ -1002,14 +1027,6 @@ bool cpu_physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap, return false; } -/* Called from RCU critical section */ -hwaddr memory_region_section_get_iotlb(CPUState *cpu, - MemoryRegionSection *section) -{ - AddressSpaceDispatch *d = flatview_to_dispatch(section->fv); - return section - d->map.sections; -} - static int subpage_register(subpage_t *mmio, uint32_t start, uint32_t end, uint16_t section); static subpage_t *subpage_init(FlatView *fv, hwaddr base); @@ -2669,23 +2686,6 @@ static uint16_t dummy_section(PhysPageMap *map, FlatView *fv, MemoryRegion *mr) return phys_section_add(map, §ion); } -MemoryRegionSection *iotlb_to_section(CPUState *cpu, - hwaddr index, MemTxAttrs attrs) -{ - int asidx = cpu_asidx_from_attrs(cpu, attrs); - CPUAddressSpace *cpuas = &cpu->cpu_ases[asidx]; - AddressSpaceDispatch *d = cpuas->memory_dispatch; - int section_index = index & ~TARGET_PAGE_MASK; - MemoryRegionSection *ret; - - assert(section_index < d->map.sections_nb); - ret = d->map.sections + section_index; - assert(ret->mr); - assert(ret->mr->ops); - - return ret; -} - static void io_mem_init(void) { memory_region_init_io(&io_mem_unassigned, NULL, &unassigned_mem_ops, NULL, From patchwork Thu Apr 24 20:24:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 883969 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3633485wrs; Thu, 24 Apr 2025 13:25:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUq5lP88pBOEMcFnp/On1a7sQ4mBpTBgAwpZOtOskA89qcssmfm9mJhrz91FiSVZoshmrj/Mg==@linaro.org X-Google-Smtp-Source: AGHT+IGWQWXd2PskJJfwar/k5PeRg7gsEJwL8dm+cz54uHBDeoJ5cJuAppyQFipoulSm93nRDGfT X-Received: by 2002:ac8:5912:0:b0:476:870c:300c with SMTP id d75a77b69052e-47eb32af949mr50562151cf.25.1745526356571; Thu, 24 Apr 2025 13:25:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745526356; cv=none; d=google.com; s=arc-20240605; b=IkpWYCf4ezq2hpQazaQPM4azHh0faRF1mKsRLYeJ3bJxriI4WUq9thYIOYmFqF1iAH /EJbq4OoqLEZhEep5L6Tca7SBFC7GGevcyqcc2LoxT1PwH/SSV5pbys/E2EDkFpTio2t DwoDWuT+QdXf/0NaOurxTJ3Z4CahjpMGDIqYjAMBkzFA4HYSC8geYdeSw6aOYyJ0Sl03 k9coE9y7gyB8ZuUsCMa0giONcIFJoVc2CdEaQ3gLZmSS12/zNS38/bL3kgOWZv2DuAQc 8QGtRmN8TR1u1YSKpmJdXXkysC919z57b/OEVdZH16UMmi8pM6qXW14euHpw6GoZCkek PStg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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=oDnRsco8X4925YTV8UTDqMtG98oA60/dC49QTKfKMmw=; fh=c6l+FP3O0RH/XAbImpmt4wP7ojtV9slhzsUyZWkTlVg=; b=hdrL22wEobKWnzD/1zCothzrJZfi3bLjisiOlh99rmrkK9alcQmmAKK6luKUxZZZzV rhI3mUmsFarFfVfH8oZE1jBhuFe2Q3xCNJIPml/mX7DpGTxsC9wqc05FjItDDNUGvmeB f9vyOo8BerEz2c2cxZVf3EGT+NfXyYsxonf0L9V+ROHLDvDJRD/tyfzLv5oPvMxPDVnC 3Ve07zc3F9cNa4Ev2olhiP4cQFyaQu1+7Mm5eW6ZpIQg//neBgOrXmj2jRy698VA4tD8 LXuNTP+liXiHkBn5/tU8hvUg4FI3aJA65pt0XkGJZp4XeXammrVvUCmQqapI39+jsDb0 rx9Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gBvBYkeH; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47e9fa9d4e2si24139411cf.173.2025.04.24.13.25.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 13:25:56 -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=gBvBYkeH; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u838a-0000fo-Cz; Thu, 24 Apr 2025 16:25:38 -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 1u838C-0000Pk-2P for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:25:13 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8389-0005Dg-Mi for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:25:11 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43cf05f0c3eso10643055e9.0 for ; Thu, 24 Apr 2025 13:25:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745526307; x=1746131107; darn=nongnu.org; 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=oDnRsco8X4925YTV8UTDqMtG98oA60/dC49QTKfKMmw=; b=gBvBYkeHpyhw8e+sOcKcg0xM0MMb3Jv2BGbAzIOX1yriTqawWH51LMTKE4YMQ+YcCh CZIadNKcw+TbYlir0JMLB2z7+Vgm4D1mRLvPSKBvMyCxVXCr//NtfZrxxBVSn2CQT7kQ AMJEMWk7/IFQqIDpkIqqVg50fsubrQnUoewIejfmoJrVBMjE66qQQZjdNTbt7JNUeKkq pdo2hfcgOqsGYI5QNF5MeXMpW8KzILrLdktiTKBU3oZKJM/yPiLBmE9zdMuE9QjAty58 s2WJ33DywpMv2dHQ7dLTxMekUquGDVlDlY9YTq30SjgIEDUWUmlGM1mdPLeG8hEurHV3 qypA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745526307; x=1746131107; 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=oDnRsco8X4925YTV8UTDqMtG98oA60/dC49QTKfKMmw=; b=TMXV6dIWJybmcrIyQrz6lpXQcUrW1BTRszI3rihAl+F3e1/yqs4S6dzaMN4uui07eF Mi6y1qA5pi9eac2B7YglY8k9aMvhAh3Wp71fGwxnj9PAcF+0OBUGpaRagrPMJUJLKJbw Qbz9a6Rre7WXzkctvZy3Z5vHXuleSQ/YXYRcmnTVrTV/0Q5FU+R5cd5RnZV9AlpICCrp 1hDFG/Bki/xepF4GgaljF2lsLK8hH4yxL1pH9pXRQWwzAHVgxAQQStXvU6KvFN87Gmge u/3FawCvIyVD7jyf86RniVsSGyuLb3Tj367gB1Y8BqMHI9cqzauviYHkcG5k3dVHBMki z/QA== X-Forwarded-Encrypted: i=1; AJvYcCXSEh4oMsa0ayshXfYRSWg4f48Q+vhDl8k3y+rLpwZISb4PZHXClDEGvY7Q/KRVL6eMTgRblzwf4jxi@nongnu.org X-Gm-Message-State: AOJu0YwuUi+yQwpJCFVOhiYsr+F+8E8DuycI9MToV8MtjzeKT/CgK2s8 eynOFM3zNWgWeRd69CdFzESfhVCLyvqlRwMdYnNxvO7exiiWef6UPQ7cEM5mh5g= X-Gm-Gg: ASbGncvjEGs1YcGRwXaaYUhGfA5Ke0Ml+mVYbplrg5vuCUCAEs+rRv1J9HE7299lU53 uU3cViD5GJmI6R238Wa6PjEzXEWHO9tHF8KrGeGBpDNH35v+UxHi0kgLbQE23LqxCbotE0cKbmL +yX1e+ml8dEs5DbV8hCevwYYY7apigg5VL5hhtBeD5Y76VP0cNH48eOc1Tx9kOg6cNL2gNDMEmF 5fFZ5KzziuZPpZ+HzISg7liuCGjUlVxhVzAISsi+3uc5+5Uso+UppBLuN8WCcjLStVxdYcvg/xk GpgiJBlPt8r6IdjymFiw7gQJTPc6OL4buC3m94mpkBaJNMc2B4s31Vs2B1uYZsckRBMgAQf5Qfz FP743Tj6DamW6fIfVbmEP5eiseA== X-Received: by 2002:a05:6000:40cb:b0:390:fb37:1bd with SMTP id ffacd0b85a97d-3a072bb51a6mr568656f8f.46.1745526307256; Thu, 24 Apr 2025 13:25:07 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073cb2acbsm290110f8f.40.2025.04.24.13.25.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 13:25:06 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v3 11/13] physmem: Restrict TCG IOTLB code to TCG accel Date: Thu, 24 Apr 2025 22:24:10 +0200 Message-ID: <20250424202412.91612-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424202412.91612-1-philmd@linaro.org> References: <20250424202412.91612-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Restrict iotlb_to_section(), address_space_translate_for_iotlb() and memory_region_section_get_iotlb() to TCG. Declare them in the new "accel/tcg/iommu.h" header. Declare iotlb_to_section() using the MemoryRegionSection typedef. Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 2 +- include/accel/tcg/iommu.h | 41 +++++++++++++++++++++++++++++++++++++++ include/exec/exec-all.h | 26 ------------------------- accel/tcg/cputlb.c | 1 + system/physmem.c | 5 +++++ 5 files changed, 48 insertions(+), 27 deletions(-) create mode 100644 include/accel/tcg/iommu.h diff --git a/MAINTAINERS b/MAINTAINERS index 661a47db5ac..3a37cc73af7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -168,7 +168,7 @@ F: include/exec/helper*.h.inc F: include/exec/helper-info.c.inc F: include/exec/page-protection.h F: include/system/tcg.h -F: include/accel/tcg/cpu-ops.h +F: include/accel/tcg/ F: host/include/*/host/cpuinfo.h F: util/cpuinfo-*.c F: include/tcg/ diff --git a/include/accel/tcg/iommu.h b/include/accel/tcg/iommu.h new file mode 100644 index 00000000000..90cfd6c0ed1 --- /dev/null +++ b/include/accel/tcg/iommu.h @@ -0,0 +1,41 @@ +/* + * TCG IOMMU translations. + * + * Copyright (c) 2003 Fabrice Bellard + * SPDX-License-Identifier: LGPL-2.1-or-later + */ +#ifndef ACCEL_TCG_IOMMU_H +#define ACCEL_TCG_IOMMU_H + +#ifdef CONFIG_USER_ONLY +#error Cannot include accel/tcg/iommu.h from user emulation +#endif + +#include "exec/hwaddr.h" +#include "exec/memattrs.h" + +/** + * iotlb_to_section: + * @cpu: CPU performing the access + * @index: TCG CPU IOTLB entry + * + * Given a TCG CPU IOTLB entry, return the MemoryRegionSection that + * it refers to. @index will have been initially created and returned + * by memory_region_section_get_iotlb(). + */ +MemoryRegionSection *iotlb_to_section(CPUState *cpu, + hwaddr index, MemTxAttrs attrs); + +MemoryRegionSection *address_space_translate_for_iotlb(CPUState *cpu, + int asidx, + hwaddr addr, + hwaddr *xlat, + hwaddr *plen, + MemTxAttrs attrs, + int *prot); + +hwaddr memory_region_section_get_iotlb(CPUState *cpu, + MemoryRegionSection *section); + +#endif + diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 816274bf905..b9eb9bc4b63 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -21,7 +21,6 @@ #define EXEC_ALL_H #include "exec/hwaddr.h" -#include "exec/memattrs.h" #include "exec/mmu-access-type.h" #include "exec/vaddr.h" @@ -121,29 +120,4 @@ int probe_access_full_mmu(CPUArchState *env, vaddr addr, int size, #endif /* !CONFIG_USER_ONLY */ #endif /* CONFIG_TCG */ -#if !defined(CONFIG_USER_ONLY) - -/** - * iotlb_to_section: - * @cpu: CPU performing the access - * @index: TCG CPU IOTLB entry - * - * Given a TCG CPU IOTLB entry, return the MemoryRegionSection that - * it refers to. @index will have been initially created and returned - * by memory_region_section_get_iotlb(). - */ -struct MemoryRegionSection *iotlb_to_section(CPUState *cpu, - hwaddr index, MemTxAttrs attrs); -#endif - -#if !defined(CONFIG_USER_ONLY) - -MemoryRegionSection * -address_space_translate_for_iotlb(CPUState *cpu, int asidx, hwaddr addr, - hwaddr *xlat, hwaddr *plen, - MemTxAttrs attrs, int *prot); -hwaddr memory_region_section_get_iotlb(CPUState *cpu, - MemoryRegionSection *section); -#endif - #endif diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index ca69128232c..d11989f5674 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" #include "accel/tcg/cpu-ops.h" +#include "accel/tcg/iommu.h" #include "exec/exec-all.h" #include "exec/page-protection.h" #include "system/memory.h" diff --git a/system/physmem.c b/system/physmem.c index ccbeae241c4..f1ec0902c78 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -29,6 +29,7 @@ #ifdef CONFIG_TCG #include "accel/tcg/cpu-ops.h" +#include "accel/tcg/iommu.h" #endif /* CONFIG_TCG */ #include "exec/exec-all.h" @@ -587,6 +588,8 @@ MemoryRegion *flatview_translate(FlatView *fv, hwaddr addr, hwaddr *xlat, return mr; } +#ifdef CONFIG_TCG + typedef struct TCGIOMMUNotifier { IOMMUNotifier n; MemoryRegion *mr; @@ -771,6 +774,8 @@ hwaddr memory_region_section_get_iotlb(CPUState *cpu, return section - d->map.sections; } +#endif /* CONFIG_TCG */ + void cpu_address_space_init(CPUState *cpu, int asidx, const char *prefix, MemoryRegion *mr) { From patchwork Thu Apr 24 20:24:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 883972 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3633859wrs; Thu, 24 Apr 2025 13:26:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWwbo5uykrJRtfg3j+joyivg05dewm712F8vGp0Feah5SaZpDLhbyzS8iR0w0iNYKDqdqVwiQ==@linaro.org X-Google-Smtp-Source: AGHT+IEPp3iB0KmGDMQPNtKZXkXl2a8G7Z9gpci/Lnk8Qt11lMGnh+TkLLF+oUkssz29a5P0hYBT X-Received: by 2002:a05:620a:470a:b0:7c9:4c25:9eb7 with SMTP id af79cd13be357-7c956eb80fbmr598566385a.23.1745526414178; Thu, 24 Apr 2025 13:26:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745526414; cv=none; d=google.com; s=arc-20240605; b=b0xhVPb9gzjH1Lh9iAHY6+0l5LGJnoD7Xhh5tFiN8/uk33cQ2WkCGIrXQf6gngxNSS y/j6SZjXh3StC5QyziaHeH3mAIG7HqJkkyDiNEYoDDzmyAmWiD7FsoX4GJKAYXMmv5jb fUI0OA3fSw8EHK0YhP/IcZaHHxAk2b84C9RsNBxmmHtatzqmkfp611cPp79874hA6Z+A NX6LUnrEmSZpBqbv7lqS7GRvO+ccJ+th6V+QMxlNr5M6eD60PnrlSz28qM5Ebr8X2FKW Q4wdG/XGc3TjxwOZ1SmIZx17P5cL4eepBQXTXQBdxKs2de2EXnF4ZWVKlIxHySGt5KI7 +bDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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=4lZONEHEuuJQBslleeoZuXsDj5n6OnplL9h7o1dVzq8=; fh=w6p0Gw1mkjQi7It7Zs53DJRJw50/pUJkFIXEJ4vDYaE=; b=BDGCWefxkPiNlXdtzFFwcnyJihDV+IlgSR4Rdq0Gyb/q6JatXZbu42uv5ls9Hrj6rq 01hRQWhcBQaVTEHl1o5FVT/7MK7FUBw6mvbYZIdY0c5tpHzKzKr7/Q5cAa+vDh/2KUED 0BynL1YtnVZeaCSbOuxbPFFZIarsUd9w06f0+L3Ak6oSF/s+AsW+h4CnDfj277ELwPzh IAYsT9E6w61x5Xn0QCP7Nm1cYjJIGq2YBJB4oCy7mc1ukF4624Zz2Y4yo/kFAzc+jcgs 0zX71KSEvhrtg7OYL4F1tmOs2L8vesYsHIqvcI/yhgFirDGEmEMtQtvsvub6Kw8ScVtC qEhw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MSc5FLn+; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47ea1f9b3e5si23040831cf.430.2025.04.24.13.26.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 13:26:54 -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=MSc5FLn+; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u838n-000194-BR; Thu, 24 Apr 2025 16:25:49 -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 1u838J-0000TV-4w for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:25:25 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u838F-0005E4-0b for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:25:18 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43ce70f9afbso12565525e9.0 for ; Thu, 24 Apr 2025 13:25:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745526312; x=1746131112; darn=nongnu.org; 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=4lZONEHEuuJQBslleeoZuXsDj5n6OnplL9h7o1dVzq8=; b=MSc5FLn+sXmEOW06NP8UNvKM34P+CgMoOEIOP7lEQAf5bxPBxf+4CRf7zVn2ovFWcz CjBfNgok45IA3Hpms3fHauFz5VScYGZe/9ftwS9TBPwteFQB44mXWfAPrnSP29UB59Ph 8R+mUpufRvqohj0EIo+4qXv8QTVz8r6mlEuw744rFZf70V3j2D+QYKtq3xUmkwYcKO/L j8l29CxXrjp2JIHdkXQD43X40nCxijwahkCKixR+xa0X1O22ef0yOZTrfjMrgkiQSCjK 3Kyws9sU9T0qTHxOgyT6ln127y3YqTYjz2UHphqU5kveKuOcmMDeY2TalILybL6fIXZN hQPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745526312; x=1746131112; 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=4lZONEHEuuJQBslleeoZuXsDj5n6OnplL9h7o1dVzq8=; b=FNYqG+Bvdqyx0+XgpfmfYNC6AvZ3vl3YNWyMiNSRsetnj46fKqjZtte6SRHIIBcc56 Sfd3sXMahQVi4RtdrjeV5orTmT10bRdI9prejwNcEVrC5y88TnuR6uHthJ6jesNstuP4 KkT2z5BvQXQB+35S/YrAlHQuajHsF8rxlG+MzztdgwlvqzKSc6nyjRJie+9TUDAHvJKk Mf19FKG1kB4FjbkKbTDC/CnrUe4I6OPvYo39XKAKudd1rVXWcTrq/5C8UqC882qYRKUd ROfK4hRzParKIUq8HAgiZuLuhskMOXOtxJH31ip4XTDWvLUfT3/giaWusJ3HiP0NJVwF Krhw== X-Forwarded-Encrypted: i=1; AJvYcCWtBOrk7V5prtClEcjhwt3015eob6DFwo0T00rqG9dS5WaGLhsB0aDBKoR8l2s1/BBb7zOJQswt342I@nongnu.org X-Gm-Message-State: AOJu0YyhGluXxABHr8Lyza26ODmDDBaaEJ1tj4GEwZgKIvagE6cW9Isn uVUdLEWlZEDJ6V9tMcEMg5AoFHZTsZ9yg4nZ+FzcLq55EjayqzeDD0SdId1zcPM= X-Gm-Gg: ASbGncu+FNprz3AhZ50Xb2Oe+yY3BhK/MIRi+ip+G2CKiYoiqwRw4ncXHHuamm4wHLE ADLeaeWcVdNA5p2c3hLYcX0/r0s/5XmKkWKr7NdJC29cF0/qZIfQ7EgpoByT03AzLrWQoeGJwo4 3sKXq2AAZlmo++Gy4idzlKWHeIPi1QMu+VrLxlZt7IiqpIabLNKV4pJd8MbQp8oHkMz/3RoVVn3 YuvechTTR6ZlWbQmHbI5OC+AbF6PXSIlkfnWPWVLuxh/+g638qz3+hbXQYm+LK9tBOamr7gfD+a iG6ORde+KF2q/G3HEuIBjzg3+MXMl4/UIj+iME9Ctn8ERUj5UyeYsRPBtwx8P/A+6off93DcSjQ T8wy3r8zFgX/eCwk= X-Received: by 2002:a7b:cdf7:0:b0:43d:160:cd9e with SMTP id 5b1f17b1804b1-440a3111c5fmr5827025e9.17.1745526312119; Thu, 24 Apr 2025 13:25:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4409d2a2e59sm32658225e9.16.2025.04.24.13.25.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 13:25:11 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Mark Cave-Ayland Subject: [PATCH v3 12/13] accel/tcg: Extract probe API out of 'exec/exec-all.h' Date: Thu, 24 Apr 2025 22:24:11 +0200 Message-ID: <20250424202412.91612-13-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424202412.91612-1-philmd@linaro.org> References: <20250424202412.91612-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Declare probe methods in "accel/tcg/probe.h" to emphasize they are specific to TCG accelerator. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/accel/tcg/probe.h | 106 +++++++++++++++++++++++++++ include/exec/exec-all.h | 100 ------------------------- target/hexagon/mmvec/macros.h | 1 + accel/tcg/cputlb.c | 1 + accel/tcg/user-exec.c | 1 + semihosting/uaccess.c | 1 + target/arm/helper.c | 1 + target/arm/ptw.c | 1 + target/arm/tcg/helper-a64.c | 1 + target/arm/tcg/mte_helper.c | 1 + target/arm/tcg/op_helper.c | 1 + target/arm/tcg/sve_helper.c | 1 + target/hexagon/op_helper.c | 1 + target/hppa/mem_helper.c | 1 + target/hppa/op_helper.c | 1 + target/i386/tcg/access.c | 1 + target/i386/tcg/seg_helper.c | 1 + target/i386/tcg/system/excp_helper.c | 1 + target/mips/tcg/msa_helper.c | 1 + target/ppc/mem_helper.c | 1 + target/riscv/op_helper.c | 1 + target/riscv/vector_helper.c | 1 + target/s390x/tcg/mem_helper.c | 1 + target/xtensa/mmu_helper.c | 1 + 24 files changed, 128 insertions(+), 100 deletions(-) create mode 100644 include/accel/tcg/probe.h diff --git a/include/accel/tcg/probe.h b/include/accel/tcg/probe.h new file mode 100644 index 00000000000..177bd1608d1 --- /dev/null +++ b/include/accel/tcg/probe.h @@ -0,0 +1,106 @@ +/* + * Probe guest virtual addresses for access permissions. + * + * Copyright (c) 2003 Fabrice Bellard + * SPDX-License-Identifier: LGPL-2.1-or-later + */ +#ifndef ACCEL_TCG_PROBE_H +#define ACCEL_TCG_PROBE_H + +#include "exec/mmu-access-type.h" +#include "exec/vaddr.h" + +/** + * probe_access: + * @env: CPUArchState + * @addr: guest virtual address to look up + * @size: size of the access + * @access_type: read, write or execute permission + * @mmu_idx: MMU index to use for lookup + * @retaddr: return address for unwinding + * + * Look up the guest virtual address @addr. Raise an exception if the + * page does not satisfy @access_type. Raise an exception if the + * access (@addr, @size) hits a watchpoint. For writes, mark a clean + * page as dirty. + * + * Finally, return the host address for a page that is backed by RAM, + * or NULL if the page requires I/O. + */ +void *probe_access(CPUArchState *env, vaddr addr, int size, + MMUAccessType access_type, int mmu_idx, uintptr_t retaddr); + +static inline void *probe_write(CPUArchState *env, vaddr addr, int size, + int mmu_idx, uintptr_t retaddr) +{ + return probe_access(env, addr, size, MMU_DATA_STORE, mmu_idx, retaddr); +} + +static inline void *probe_read(CPUArchState *env, vaddr addr, int size, + int mmu_idx, uintptr_t retaddr) +{ + return probe_access(env, addr, size, MMU_DATA_LOAD, mmu_idx, retaddr); +} + +/** + * probe_access_flags: + * @env: CPUArchState + * @addr: guest virtual address to look up + * @size: size of the access + * @access_type: read, write or execute permission + * @mmu_idx: MMU index to use for lookup + * @nonfault: suppress the fault + * @phost: return value for host address + * @retaddr: return address for unwinding + * + * Similar to probe_access, loosely returning the TLB_FLAGS_MASK for + * the page, and storing the host address for RAM in @phost. + * + * If @nonfault is set, do not raise an exception but return TLB_INVALID_MASK. + * Do not handle watchpoints, but include TLB_WATCHPOINT in the returned flags. + * Do handle clean pages, so exclude TLB_NOTDIRY from the returned flags. + * For simplicity, all "mmio-like" flags are folded to TLB_MMIO. + */ +int probe_access_flags(CPUArchState *env, vaddr addr, int size, + MMUAccessType access_type, int mmu_idx, + bool nonfault, void **phost, uintptr_t retaddr); + +#ifndef CONFIG_USER_ONLY + +/** + * probe_access_full: + * Like probe_access_flags, except also return into @pfull. + * + * The CPUTLBEntryFull structure returned via @pfull is transient + * and must be consumed or copied immediately, before any further + * access or changes to TLB @mmu_idx. + * + * This function will not fault if @nonfault is set, but will + * return TLB_INVALID_MASK if the page is not mapped, or is not + * accessible with @access_type. + * + * This function will return TLB_MMIO in order to force the access + * to be handled out-of-line if plugins wish to instrument the access. + */ +int probe_access_full(CPUArchState *env, vaddr addr, int size, + MMUAccessType access_type, int mmu_idx, + bool nonfault, void **phost, + CPUTLBEntryFull **pfull, uintptr_t retaddr); + +/** + * probe_access_full_mmu: + * Like probe_access_full, except: + * + * This function is intended to be used for page table accesses by + * the target mmu itself. Since such page walking happens while + * handling another potential mmu fault, this function never raises + * exceptions (akin to @nonfault true for probe_access_full). + * Likewise this function does not trigger plugin instrumentation. + */ +int probe_access_full_mmu(CPUArchState *env, vaddr addr, int size, + MMUAccessType access_type, int mmu_idx, + void **phost, CPUTLBEntryFull **pfull); + +#endif /* !CONFIG_USER_ONLY */ + +#endif diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index b9eb9bc4b63..9ef7569a0b8 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -20,104 +20,4 @@ #ifndef EXEC_ALL_H #define EXEC_ALL_H -#include "exec/hwaddr.h" -#include "exec/mmu-access-type.h" -#include "exec/vaddr.h" - -#if defined(CONFIG_TCG) - -/** - * probe_access: - * @env: CPUArchState - * @addr: guest virtual address to look up - * @size: size of the access - * @access_type: read, write or execute permission - * @mmu_idx: MMU index to use for lookup - * @retaddr: return address for unwinding - * - * Look up the guest virtual address @addr. Raise an exception if the - * page does not satisfy @access_type. Raise an exception if the - * access (@addr, @size) hits a watchpoint. For writes, mark a clean - * page as dirty. - * - * Finally, return the host address for a page that is backed by RAM, - * or NULL if the page requires I/O. - */ -void *probe_access(CPUArchState *env, vaddr addr, int size, - MMUAccessType access_type, int mmu_idx, uintptr_t retaddr); - -static inline void *probe_write(CPUArchState *env, vaddr addr, int size, - int mmu_idx, uintptr_t retaddr) -{ - return probe_access(env, addr, size, MMU_DATA_STORE, mmu_idx, retaddr); -} - -static inline void *probe_read(CPUArchState *env, vaddr addr, int size, - int mmu_idx, uintptr_t retaddr) -{ - return probe_access(env, addr, size, MMU_DATA_LOAD, mmu_idx, retaddr); -} - -/** - * probe_access_flags: - * @env: CPUArchState - * @addr: guest virtual address to look up - * @size: size of the access - * @access_type: read, write or execute permission - * @mmu_idx: MMU index to use for lookup - * @nonfault: suppress the fault - * @phost: return value for host address - * @retaddr: return address for unwinding - * - * Similar to probe_access, loosely returning the TLB_FLAGS_MASK for - * the page, and storing the host address for RAM in @phost. - * - * If @nonfault is set, do not raise an exception but return TLB_INVALID_MASK. - * Do not handle watchpoints, but include TLB_WATCHPOINT in the returned flags. - * Do handle clean pages, so exclude TLB_NOTDIRY from the returned flags. - * For simplicity, all "mmio-like" flags are folded to TLB_MMIO. - */ -int probe_access_flags(CPUArchState *env, vaddr addr, int size, - MMUAccessType access_type, int mmu_idx, - bool nonfault, void **phost, uintptr_t retaddr); - -#ifndef CONFIG_USER_ONLY - -/** - * probe_access_full: - * Like probe_access_flags, except also return into @pfull. - * - * The CPUTLBEntryFull structure returned via @pfull is transient - * and must be consumed or copied immediately, before any further - * access or changes to TLB @mmu_idx. - * - * This function will not fault if @nonfault is set, but will - * return TLB_INVALID_MASK if the page is not mapped, or is not - * accessible with @access_type. - * - * This function will return TLB_MMIO in order to force the access - * to be handled out-of-line if plugins wish to instrument the access. - */ -int probe_access_full(CPUArchState *env, vaddr addr, int size, - MMUAccessType access_type, int mmu_idx, - bool nonfault, void **phost, - CPUTLBEntryFull **pfull, uintptr_t retaddr); - -/** - * probe_access_full_mmu: - * Like probe_access_full, except: - * - * This function is intended to be used for page table accesses by - * the target mmu itself. Since such page walking happens while - * handling another potential mmu fault, this function never raises - * exceptions (akin to @nonfault true for probe_access_full). - * Likewise this function does not trigger plugin instrumentation. - */ -int probe_access_full_mmu(CPUArchState *env, vaddr addr, int size, - MMUAccessType access_type, int mmu_idx, - void **phost, CPUTLBEntryFull **pfull); - -#endif /* !CONFIG_USER_ONLY */ -#endif /* CONFIG_TCG */ - #endif diff --git a/target/hexagon/mmvec/macros.h b/target/hexagon/mmvec/macros.h index c1a88392c05..c7840fbf2e1 100644 --- a/target/hexagon/mmvec/macros.h +++ b/target/hexagon/mmvec/macros.h @@ -22,6 +22,7 @@ #include "arch.h" #include "mmvec/system_ext_mmvec.h" #include "accel/tcg/getpc.h" +#include "accel/tcg/probe.h" #ifndef QEMU_GENERATE #define VdV (*(MMVector *restrict)(VdV_void)) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index d11989f5674..b346af942a0 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -21,6 +21,7 @@ #include "qemu/main-loop.h" #include "accel/tcg/cpu-ops.h" #include "accel/tcg/iommu.h" +#include "accel/tcg/probe.h" #include "exec/exec-all.h" #include "exec/page-protection.h" #include "system/memory.h" diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 43d005e24e4..697fdf18241 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -27,6 +27,7 @@ #include "qemu/bitops.h" #include "qemu/rcu.h" #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/probe.h" #include "user/cpu_loop.h" #include "qemu/main-loop.h" #include "user/page-protection.h" diff --git a/semihosting/uaccess.c b/semihosting/uaccess.c index 81ffecaaba4..ebbb300f86a 100644 --- a/semihosting/uaccess.c +++ b/semihosting/uaccess.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "accel/tcg/cpu-mmu-index.h" +#include "accel/tcg/probe.h" #include "exec/exec-all.h" #include "exec/target_page.h" #include "exec/tlb-flags.h" diff --git a/target/arm/helper.c b/target/arm/helper.c index c6fd2900126..2f039b2db33 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -30,6 +30,7 @@ #include "qapi/error.h" #include "qemu/guest-random.h" #ifdef CONFIG_TCG +#include "accel/tcg/probe.h" #include "semihosting/common-semi.h" #endif #include "cpregs.h" diff --git a/target/arm/ptw.c b/target/arm/ptw.c index e0e82ae507f..87d707b5923 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -14,6 +14,7 @@ #include "exec/page-protection.h" #include "exec/target_page.h" #include "exec/tlb-flags.h" +#include "accel/tcg/probe.h" #include "cpu.h" #include "internals.h" #include "cpu-features.h" diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c index 08d8f63ffea..ac86629432a 100644 --- a/target/arm/tcg/helper-a64.c +++ b/target/arm/tcg/helper-a64.c @@ -31,6 +31,7 @@ #include "exec/cpu-common.h" #include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/probe.h" #include "exec/target_page.h" #include "exec/tlb-flags.h" #include "qemu/int128.h" diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c index 7dc5fb776b3..8fbdcc8fb95 100644 --- a/target/arm/tcg/mte_helper.c +++ b/target/arm/tcg/mte_helper.c @@ -30,6 +30,7 @@ #include "system/ram_addr.h" #endif #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/probe.h" #include "exec/helper-proto.h" #include "exec/tlb-flags.h" #include "accel/tcg/cpu-ops.h" diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index 38d49cbb9d8..d50b8720ad6 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -25,6 +25,7 @@ #include "cpu-features.h" #include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/probe.h" #include "cpregs.h" #define SIGNBIT (uint32_t)0x80000000 diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index 87b6b4b3e64..50aca54eaa3 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -32,6 +32,7 @@ #include "sve_ldst_internal.h" #include "accel/tcg/cpu-ldst.h" #include "accel/tcg/cpu-ops.h" +#include "accel/tcg/probe.h" #ifdef CONFIG_USER_ONLY #include "user/page-protection.h" #endif diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index 3f3d86db2b2..dd726b43187 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -19,6 +19,7 @@ #include "qemu/log.h" #include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/probe.h" #include "exec/helper-proto.h" #include "fpu/softfloat.h" #include "cpu.h" diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index 554d7bf4d14..a5f73aedf82 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -23,6 +23,7 @@ #include "exec/exec-all.h" #include "exec/cputlb.h" #include "accel/tcg/cpu-mmu-index.h" +#include "accel/tcg/probe.h" #include "exec/page-protection.h" #include "exec/target_page.h" #include "exec/helper-proto.h" diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c index 2398ce2c648..32207c1a4c8 100644 --- a/target/hppa/op_helper.c +++ b/target/hppa/op_helper.c @@ -23,6 +23,7 @@ #include "exec/exec-all.h" #include "exec/helper-proto.h" #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/probe.h" #include "qemu/timer.h" #include "trace.h" #ifdef CONFIG_USER_ONLY diff --git a/target/i386/tcg/access.c b/target/i386/tcg/access.c index 0fdd587eddf..ee5b4514597 100644 --- a/target/i386/tcg/access.c +++ b/target/i386/tcg/access.c @@ -4,6 +4,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/probe.h" #include "exec/exec-all.h" #include "exec/target_page.h" #include "access.h" diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index 3af902e0ec5..e45d71fa1ad 100644 --- a/target/i386/tcg/seg_helper.c +++ b/target/i386/tcg/seg_helper.c @@ -24,6 +24,7 @@ #include "exec/helper-proto.h" #include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/probe.h" #include "exec/log.h" #include "helper-tcg.h" #include "seg_helper.h" diff --git a/target/i386/tcg/system/excp_helper.c b/target/i386/tcg/system/excp_helper.c index 93614aa3e54..c1626215877 100644 --- a/target/i386/tcg/system/excp_helper.c +++ b/target/i386/tcg/system/excp_helper.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/probe.h" #include "exec/cputlb.h" #include "exec/page-protection.h" #include "exec/target_page.h" diff --git a/target/mips/tcg/msa_helper.c b/target/mips/tcg/msa_helper.c index 14de4a71ff6..4d9a4468e53 100644 --- a/target/mips/tcg/msa_helper.c +++ b/target/mips/tcg/msa_helper.c @@ -23,6 +23,7 @@ #include "tcg/tcg.h" #include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/probe.h" #include "exec/helper-proto.h" #include "exec/memop.h" #include "exec/target_page.h" diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c index d7e8d678f4b..50f05a915ed 100644 --- a/target/ppc/mem_helper.c +++ b/target/ppc/mem_helper.c @@ -25,6 +25,7 @@ #include "exec/helper-proto.h" #include "helper_regs.h" #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/probe.h" #include "internal.h" #include "qemu/atomic128.h" diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index 5b0db2c45ab..abb1d284dce 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -24,6 +24,7 @@ #include "exec/exec-all.h" #include "exec/cputlb.h" #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/probe.h" #include "exec/helper-proto.h" #include "exec/tlb-flags.h" #include "trace.h" diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c index b8ae7044578..5ccb294e319 100644 --- a/target/riscv/vector_helper.c +++ b/target/riscv/vector_helper.c @@ -23,6 +23,7 @@ #include "exec/memop.h" #include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/probe.h" #include "exec/page-protection.h" #include "exec/helper-proto.h" #include "exec/tlb-flags.h" diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index 0cdfd380ce4..9e77cde81bd 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -29,6 +29,7 @@ #include "exec/cputlb.h" #include "exec/page-protection.h" #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/probe.h" #include "exec/target_page.h" #include "exec/tlb-flags.h" #include "accel/tcg/cpu-ops.h" diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c index a7dd8100555..182c6e35c17 100644 --- a/target/xtensa/mmu_helper.c +++ b/target/xtensa/mmu_helper.c @@ -34,6 +34,7 @@ #include "qemu/host-utils.h" #include "exec/cputlb.h" #include "accel/tcg/cpu-mmu-index.h" +#include "accel/tcg/probe.h" #include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/target_page.h" From patchwork Thu Apr 24 20:24:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 883968 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3633475wrs; Thu, 24 Apr 2025 13:25:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV96stl2LVMDsF1qvDokqLhW9QNIIDIWJWPZWqXO+FHvtAGb8nPOKirax+cge7ml1CQkV4a6w==@linaro.org X-Google-Smtp-Source: AGHT+IFSObZhSAsCsQIVSFohngPrpbqx6RkTvGCLioc9IWaobdxi9Lo1j3sRJWsyvlBxawpp7Tlb X-Received: by 2002:a05:6214:caa:b0:6e8:ad15:e0b9 with SMTP id 6a1803df08f44-6f4c950babemr17910776d6.20.1745526355427; Thu, 24 Apr 2025 13:25:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745526355; cv=none; d=google.com; s=arc-20240605; b=I/p1woyzu6rehkfml4GSdqvin5Nsi/EOmfy5/xiIC/pWyh4cAI5dq16ffx5UywuChc 4Zdf/iDE+ViwDHjOtcuOKvJzue3mU3e6fz+QU6CBtEUzvZQnvutX1Tc9MDXFgp4KgbSW 3t+XlwdDdx/eiYgb4WeHiiLARAMW+UQ9h76yMtE1EuOz+UobMOdhLg5vwzvYblgIXufk 55dRWdTRun4TbsCDk2wchQ+Qh3Tc3tGwH1Wqv/99/UzC4MBQsRoSoJL3a9Qwdv1h+NRo EK7JF3FEeUDls7xyKKgGC9gR6ee11eJqe9c1Cb0RQqR+4v/MLAdzWKvpv7nOEtUB63wY kzrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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=syDOnz80Hqm13S2ocYbs4DdGcFq66uebgm0GfT/bAw8=; fh=nbQwzbUTMXyrCLFUBuzRKn+6qjcJ8bn4G+qp2FLgQXQ=; b=M4KYWAotsCdW6zC3h0HQnFMNuCKscVvPgTtFoChQVKZDiyrNrjwdfPq53fg1EXGj6H SAmpojsyqTpuZK8Yn7Fwwm3ufPSDmAkpsXyGkYjQZcS0EvEjEUX3bASpwsd5MzRrbjSx 9M72YJgzZxR3LExlEmWyazcIG9Spe3e7V9Mh5knLNJs6JYQipsIStUWSTJo4V7iwQt8v k+wnrKleK6+UUHEPtPDYzfLmx2EyYaNDLoMt7p0Pfk5gSn4J5jyYf97sSm27pKIY0I3j Qklg4CnHZVJW65et7Ddr08u8IFNlncllcXSIjiv1zXX/CHNtDrKC5BfFj0JkRP8rdJnl /vwg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=z8sIDb80; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f4c0b2115asi22635976d6.489.2025.04.24.13.25.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 13:25:55 -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=z8sIDb80; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u838l-00013D-3w; Thu, 24 Apr 2025 16:25:47 -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 1u838Q-0000cM-WA for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:25:30 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u838J-0005EM-UF for qemu-devel@nongnu.org; Thu, 24 Apr 2025 16:25:24 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43cebe06e9eso10724615e9.3 for ; Thu, 24 Apr 2025 13:25:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745526318; x=1746131118; darn=nongnu.org; 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=syDOnz80Hqm13S2ocYbs4DdGcFq66uebgm0GfT/bAw8=; b=z8sIDb80PsKOILyGk512WnUhTGgxYoglaMwSNHxzm2tyyN6C44S3P7zHJ48uq3DcK+ IBnC48kU/08DtRFzalOIl6XQXjcYeHKuuLzEczCDfQ8cev2YTXITmgx1UYW2pYvKYrhl Kjck8eUB7EjuJ7+XrnlEWPzu1CulAy9vNafL9w84x0DmHODQatXvwKKi4KlRihhXBEd9 6YS1MtST4YBNtoQF9TTxqmVg9qHdetJfkYBJN5U8HnTUMU0mGbJLHFp/umzZ5Id+XtY3 RsWc9RDt0olpj8kZnqlDmfAEtfnAvtsH5efUBSGyxIdYKQu6NhTMhPPmyR7RdwUDURKl F7Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745526318; x=1746131118; 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=syDOnz80Hqm13S2ocYbs4DdGcFq66uebgm0GfT/bAw8=; b=RFWiUn5q5CGtyz4qzhRxL6tHgwvICyWU2GsnWxtcXT2OQLa/IZaZBHL1ihPZEFnw6w ShIynLO8Ioten4wfAgnzMMhFd+JIOgRbDRpQAONPKYjcZwtppYFwCNCWwIBHN44cH2Ms cKPqdTAAYqOAUefepYDUpYpPcB7K66HxD/67xkd+oV3RJwHIC1XauI0k1P4eGB7T4Lp+ lSdugCyTpOYZFta93ijSHEDT+zI+dp0d2Pnss3BVOlynFuv3hJwHYE6aj8e843S9gMfG iPh5z8slrFZ8vmS7EbCA8hJkys0iR7bNEB01YIItiCl9rDvjQrV5YIb7S7mmhxAErj4O dtbQ== X-Forwarded-Encrypted: i=1; AJvYcCVrrkQqeAShZGh44zNBDFf3NiiKHtk9NjojreO48MxPBpD1qNDWsbOxeLKG1V+dLxT4deXHYuLiZ0V3@nongnu.org X-Gm-Message-State: AOJu0YxA/6goPj1OvcUhg4d7reZ1JmUswxjgO+jJbTI2tzVwnBQD6XMO kW8RqWw41vrQ7dPEtB9XSFhmyXv6BKEpgIPoPe2+Z9YN3ZMdurrSGs0m8zX6KCo= X-Gm-Gg: ASbGnctZ+DL4/8+6XTbu3Fe1iVHGk8K6DNvEBcKhvo33dV12TjSFMo3qhwl3fCpK+Tr U1aECNDSOecmwpuZn9CT4bbD8SUMa43CIUhBd3i3O/fIgOWc8bdvITNAiU+C1VOY3mvM2pSvvdb J9nOn/2bQ3P10MKWM9EHYUdjkBWvMnFZRY97Bu2NsCrvWyzKigki5d2U9iQxY5oX0NxSbK/BKMy AXlIeN18JB/evtpuUH6Y2VScqfaQvoZxE1QS7nXe/Bmej4WR6GP7MobpJeAA+DEMxA4TAlaJw+Q moxTe9QhBMo96veLKDkHRmunU56qKZPP97aw8djE7tSPukoWbv80iXZajzMiaIDyCPfNKLBc8JS 8MVLN0rKUrzvlHKw= X-Received: by 2002:a05:600c:4447:b0:43d:53c:1ad6 with SMTP id 5b1f17b1804b1-440a3156265mr5853195e9.26.1745526317177; Thu, 24 Apr 2025 13:25:17 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4409d2aab65sm32484085e9.17.2025.04.24.13.25.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 13:25:16 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Mark Cave-Ayland Subject: [PATCH v3 13/13] include: Remove 'exec/exec-all.h' Date: Thu, 24 Apr 2025 22:24:12 +0200 Message-ID: <20250424202412.91612-14-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424202412.91612-1-philmd@linaro.org> References: <20250424202412.91612-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org "exec/exec-all.h" is now fully empty, let's remove it. Mechanical change running: $ sed -i '/exec\/exec-all.h/d' $(git grep -wl exec/exec-all.h) Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- MAINTAINERS | 1 - bsd-user/qemu.h | 1 - include/exec/exec-all.h | 23 ----------------------- include/system/ram_addr.h | 1 - linux-user/user-internals.h | 1 - target/arm/tcg/translate.h | 1 - target/i386/tcg/helper-tcg.h | 1 - accel/hvf/hvf-accel-ops.c | 1 - accel/tcg/cputlb.c | 1 - accel/tcg/translate-all.c | 1 - accel/tcg/user-exec.c | 1 - bsd-user/main.c | 1 - hw/ppc/spapr_nested.c | 1 - hw/riscv/riscv-iommu-sys.c | 1 - hw/sh4/sh7750.c | 1 - linux-user/main.c | 1 - semihosting/uaccess.c | 1 - system/physmem.c | 1 - target/alpha/cpu.c | 1 - target/alpha/fpu_helper.c | 1 - target/alpha/int_helper.c | 1 - target/alpha/mem_helper.c | 1 - target/alpha/translate.c | 1 - target/alpha/vax_helper.c | 1 - target/arm/cpu.c | 1 - target/arm/debug_helper.c | 1 - target/arm/helper.c | 1 - target/arm/ptw.c | 1 - target/arm/tcg/helper-a64.c | 1 - target/arm/tcg/m_helper.c | 1 - target/arm/tcg/mte_helper.c | 1 - target/arm/tcg/mve_helper.c | 1 - target/arm/tcg/op_helper.c | 1 - target/arm/tcg/pauth_helper.c | 1 - target/arm/tcg/sme_helper.c | 1 - target/arm/tcg/sve_helper.c | 1 - target/arm/tcg/tlb_helper.c | 1 - target/arm/tcg/translate-a64.c | 1 - target/avr/cpu.c | 1 - target/avr/translate.c | 1 - target/hexagon/cpu.c | 1 - target/hexagon/op_helper.c | 1 - target/hppa/cpu.c | 1 - target/hppa/fpu_helper.c | 1 - target/hppa/helper.c | 1 - target/hppa/mem_helper.c | 1 - target/hppa/op_helper.c | 1 - target/hppa/sys_helper.c | 1 - target/hppa/translate.c | 1 - target/i386/tcg/access.c | 1 - target/i386/tcg/excp_helper.c | 1 - target/i386/tcg/int_helper.c | 1 - target/i386/tcg/mem_helper.c | 1 - target/i386/tcg/mpx_helper.c | 1 - target/i386/tcg/seg_helper.c | 1 - target/i386/tcg/system/bpt_helper.c | 1 - target/i386/tcg/translate.c | 1 - target/i386/tcg/user/excp_helper.c | 1 - target/i386/tcg/user/seg_helper.c | 1 - target/loongarch/cpu.c | 1 - target/loongarch/tcg/fpu_helper.c | 1 - target/loongarch/tcg/iocsr_helper.c | 1 - target/loongarch/tcg/op_helper.c | 1 - target/loongarch/tcg/tlb_helper.c | 1 - target/loongarch/tcg/vec_helper.c | 1 - target/m68k/fpu_helper.c | 1 - target/m68k/helper.c | 1 - target/m68k/op_helper.c | 1 - target/m68k/translate.c | 1 - target/microblaze/cpu.c | 1 - target/microblaze/op_helper.c | 1 - target/microblaze/translate.c | 1 - target/mips/cpu.c | 1 - target/mips/system/physaddr.c | 1 - target/mips/tcg/exception.c | 1 - target/mips/tcg/fpu_helper.c | 1 - target/mips/tcg/ldst_helper.c | 1 - target/mips/tcg/msa_helper.c | 1 - target/mips/tcg/op_helper.c | 1 - target/mips/tcg/system/special_helper.c | 1 - target/mips/tcg/system/tlb_helper.c | 1 - target/openrisc/cpu.c | 1 - target/openrisc/exception.c | 1 - target/openrisc/exception_helper.c | 1 - target/openrisc/fpu_helper.c | 1 - target/openrisc/interrupt.c | 1 - target/openrisc/interrupt_helper.c | 1 - target/openrisc/sys_helper.c | 1 - target/openrisc/translate.c | 1 - target/ppc/excp_helper.c | 1 - target/ppc/fpu_helper.c | 1 - target/ppc/machine.c | 1 - target/ppc/mem_helper.c | 1 - target/ppc/misc_helper.c | 1 - target/ppc/mmu-hash32.c | 1 - target/ppc/mmu-hash64.c | 1 - target/ppc/mmu-radix64.c | 1 - target/ppc/mmu_common.c | 1 - target/ppc/mmu_helper.c | 1 - target/ppc/power8-pmu.c | 1 - target/ppc/tcg-excp_helper.c | 1 - target/ppc/timebase_helper.c | 1 - target/ppc/translate.c | 1 - target/ppc/user_only_helper.c | 1 - target/riscv/cpu.c | 1 - target/riscv/cpu_helper.c | 1 - target/riscv/crypto_helper.c | 1 - target/riscv/csr.c | 1 - target/riscv/debug.c | 1 - target/riscv/fpu_helper.c | 1 - target/riscv/m128_helper.c | 1 - target/riscv/op_helper.c | 1 - target/riscv/tcg/tcg-cpu.c | 1 - target/riscv/translate.c | 1 - target/riscv/vcrypto_helper.c | 1 - target/riscv/vector_helper.c | 1 - target/riscv/zce_helper.c | 1 - target/rx/op_helper.c | 1 - target/rx/translate.c | 1 - target/s390x/interrupt.c | 1 - target/s390x/mmu_helper.c | 1 - target/s390x/sigp.c | 1 - target/s390x/tcg/cc_helper.c | 1 - target/s390x/tcg/crypto_helper.c | 1 - target/s390x/tcg/excp_helper.c | 1 - target/s390x/tcg/fpu_helper.c | 1 - target/s390x/tcg/int_helper.c | 1 - target/s390x/tcg/mem_helper.c | 1 - target/s390x/tcg/misc_helper.c | 1 - target/s390x/tcg/translate.c | 1 - target/s390x/tcg/vec_fpu_helper.c | 1 - target/s390x/tcg/vec_helper.c | 1 - target/sh4/cpu.c | 1 - target/sh4/helper.c | 1 - target/sh4/op_helper.c | 1 - target/sh4/translate.c | 1 - target/sparc/cpu.c | 1 - target/sparc/fop_helper.c | 1 - target/sparc/helper.c | 1 - target/sparc/ldst_helper.c | 1 - target/sparc/machine.c | 1 - target/sparc/translate.c | 1 - target/sparc/win_helper.c | 1 - target/tricore/cpu.c | 1 - target/tricore/op_helper.c | 1 - target/tricore/translate.c | 1 - target/xtensa/dbg_helper.c | 1 - target/xtensa/exc_helper.c | 1 - target/xtensa/fpu_helper.c | 1 - target/xtensa/mmu_helper.c | 1 - target/xtensa/op_helper.c | 1 - target/xtensa/translate.c | 1 - target/xtensa/win_helper.c | 1 - 153 files changed, 175 deletions(-) delete mode 100644 include/exec/exec-all.h diff --git a/MAINTAINERS b/MAINTAINERS index 3a37cc73af7..9e677a26c52 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -493,7 +493,6 @@ M: Richard Henderson R: Paolo Bonzini S: Maintained F: include/exec/cpu*.h -F: include/exec/exec-all.h F: include/exec/target_long.h F: include/qemu/accel.h F: include/system/accel-*.h diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 244670dd24d..93388e7c34e 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -23,7 +23,6 @@ #include "cpu.h" #include "qemu/units.h" #include "accel/tcg/cpu-ldst.h" -#include "exec/exec-all.h" #include "user/abitypes.h" #include "user/cpu_loop.h" diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h deleted file mode 100644 index 9ef7569a0b8..00000000000 --- a/include/exec/exec-all.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * internal execution defines for qemu - * - * Copyright (c) 2003 Fabrice Bellard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see . - */ - -#ifndef EXEC_ALL_H -#define EXEC_ALL_H - -#endif diff --git a/include/system/ram_addr.h b/include/system/ram_addr.h index b4e4425acbb..15a1b1a4fa2 100644 --- a/include/system/ram_addr.h +++ b/include/system/ram_addr.h @@ -24,7 +24,6 @@ #include "exec/cputlb.h" #include "exec/ramlist.h" #include "system/ramblock.h" -#include "exec/exec-all.h" #include "system/memory.h" #include "exec/target_page.h" #include "qemu/rcu.h" diff --git a/linux-user/user-internals.h b/linux-user/user-internals.h index 4aa253b5663..691b9a1775f 100644 --- a/linux-user/user-internals.h +++ b/linux-user/user-internals.h @@ -19,7 +19,6 @@ #define LINUX_USER_USER_INTERNALS_H #include "user/thunk.h" -#include "exec/exec-all.h" #include "qemu/log.h" extern char *exec_path; diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h index 53e485d28ac..1bfdb0fb9bb 100644 --- a/target/arm/tcg/translate.h +++ b/target/arm/tcg/translate.h @@ -4,7 +4,6 @@ #include "cpu.h" #include "tcg/tcg-op.h" #include "tcg/tcg-op-gvec.h" -#include "exec/exec-all.h" #include "exec/translator.h" #include "exec/translation-block.h" #include "exec/helper-gen.h" diff --git a/target/i386/tcg/helper-tcg.h b/target/i386/tcg/helper-tcg.h index 54d845379cd..6b3f19855f1 100644 --- a/target/i386/tcg/helper-tcg.h +++ b/target/i386/tcg/helper-tcg.h @@ -20,7 +20,6 @@ #ifndef I386_HELPER_TCG_H #define I386_HELPER_TCG_H -#include "exec/exec-all.h" #include "qemu/host-utils.h" /* Maximum instruction code size */ diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index 601c3bc0ac6..bbd774dbc94 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -51,7 +51,6 @@ #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "system/address-spaces.h" -#include "exec/exec-all.h" #include "gdbstub/enums.h" #include "hw/boards.h" #include "system/accel-ops.h" diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index b346af942a0..5b6d6f79751 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -22,7 +22,6 @@ #include "accel/tcg/cpu-ops.h" #include "accel/tcg/iommu.h" #include "accel/tcg/probe.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "system/memory.h" #include "accel/tcg/cpu-ldst.h" diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 0408e2522a8..31c7f9927f2 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -21,7 +21,6 @@ #include "trace.h" #include "disas/disas.h" -#include "exec/exec-all.h" #include "tcg/tcg.h" #if defined(CONFIG_USER_ONLY) #include "qemu.h" diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 697fdf18241..70feee8df99 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -21,7 +21,6 @@ #include "disas/disas.h" #include "cpu.h" #include "exec/vaddr.h" -#include "exec/exec-all.h" #include "exec/tlb-flags.h" #include "tcg/tcg.h" #include "qemu/bitops.h" diff --git a/bsd-user/main.c b/bsd-user/main.c index fdb160bed0f..fa7645a56ea 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -36,7 +36,6 @@ #include "qemu/help_option.h" #include "qemu/module.h" #include "qemu/plugin.h" -#include "exec/exec-all.h" #include "user/guest-base.h" #include "user/page-protection.h" #include "tcg/startup.h" diff --git a/hw/ppc/spapr_nested.c b/hw/ppc/spapr_nested.c index a79e398c132..9cc6083feee 100644 --- a/hw/ppc/spapr_nested.c +++ b/hw/ppc/spapr_nested.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" -#include "exec/exec-all.h" #include "exec/cputlb.h" #include "exec/target_long.h" #include "helper_regs.h" diff --git a/hw/riscv/riscv-iommu-sys.c b/hw/riscv/riscv-iommu-sys.c index 65b24fb07de..bbe839ed241 100644 --- a/hw/riscv/riscv-iommu-sys.c +++ b/hw/riscv/riscv-iommu-sys.c @@ -26,7 +26,6 @@ #include "qemu/host-utils.h" #include "qemu/module.h" #include "qom/object.h" -#include "exec/exec-all.h" #include "trace.h" #include "riscv-iommu.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 41306fb6008..300eabc595d 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -36,7 +36,6 @@ #include "sh7750_regnames.h" #include "hw/sh4/sh_intc.h" #include "hw/timer/tmu012.h" -#include "exec/exec-all.h" #include "exec/cputlb.h" #include "trace.h" diff --git a/linux-user/main.c b/linux-user/main.c index e2ec5970bed..4af7f49f383 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -40,7 +40,6 @@ #include "qemu/plugin.h" #include "user/guest-base.h" #include "user/page-protection.h" -#include "exec/exec-all.h" #include "exec/gdbstub.h" #include "gdbstub/user.h" #include "tcg/startup.h" diff --git a/semihosting/uaccess.c b/semihosting/uaccess.c index ebbb300f86a..4554844e15b 100644 --- a/semihosting/uaccess.c +++ b/semihosting/uaccess.c @@ -10,7 +10,6 @@ #include "qemu/osdep.h" #include "accel/tcg/cpu-mmu-index.h" #include "accel/tcg/probe.h" -#include "exec/exec-all.h" #include "exec/target_page.h" #include "exec/tlb-flags.h" #include "semihosting/uaccess.h" diff --git a/system/physmem.c b/system/physmem.c index f1ec0902c78..3f4fd69d9a5 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -32,7 +32,6 @@ #include "accel/tcg/iommu.h" #endif /* CONFIG_TCG */ -#include "exec/exec-all.h" #include "exec/cputlb.h" #include "exec/page-protection.h" #include "exec/target_page.h" diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index 35fb145d27f..cb3f382dc64 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -23,7 +23,6 @@ #include "qapi/error.h" #include "qemu/qemu-print.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/translation-block.h" #include "exec/target_page.h" #include "fpu/softfloat.h" diff --git a/target/alpha/fpu_helper.c b/target/alpha/fpu_helper.c index 6aefb9b851a..30f3c7fd185 100644 --- a/target/alpha/fpu_helper.c +++ b/target/alpha/fpu_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "fpu/softfloat.h" diff --git a/target/alpha/int_helper.c b/target/alpha/int_helper.c index 5672696f6f1..6bfe63500e0 100644 --- a/target/alpha/int_helper.c +++ b/target/alpha/int_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" diff --git a/target/alpha/mem_helper.c b/target/alpha/mem_helper.c index a4d5adb40c6..2113fe33ae2 100644 --- a/target/alpha/mem_helper.c +++ b/target/alpha/mem_helper.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" static void do_unaligned_access(CPUAlphaState *env, vaddr addr, uintptr_t retaddr) diff --git a/target/alpha/translate.c b/target/alpha/translate.c index 7f3195a5dcc..cebab0318cf 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -21,7 +21,6 @@ #include "cpu.h" #include "system/cpus.h" #include "qemu/host-utils.h" -#include "exec/exec-all.h" #include "tcg/tcg-op.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" diff --git a/target/alpha/vax_helper.c b/target/alpha/vax_helper.c index f94fb519dbd..c1d201e7b4d 100644 --- a/target/alpha/vax_helper.c +++ b/target/alpha/vax_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "fpu/softfloat.h" diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 377791c84dd..e149a462505 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -33,7 +33,6 @@ #endif /* CONFIG_TCG */ #include "internals.h" #include "cpu-features.h" -#include "exec/exec-all.h" #include "exec/target_page.h" #include "hw/qdev-properties.h" #if !defined(CONFIG_USER_ONLY) diff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c index 473ee2af38e..de7999f6a94 100644 --- a/target/arm/debug_helper.c +++ b/target/arm/debug_helper.c @@ -11,7 +11,6 @@ #include "internals.h" #include "cpu-features.h" #include "cpregs.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "exec/watchpoint.h" #include "system/tcg.h" diff --git a/target/arm/helper.c b/target/arm/helper.c index 2f039b2db33..8de4eb2c1fa 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -20,7 +20,6 @@ #include "qemu/bitops.h" #include "qemu/qemu-print.h" #include "exec/cputlb.h" -#include "exec/exec-all.h" #include "exec/translation-block.h" #include "hw/irq.h" #include "system/cpu-timers.h" diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 87d707b5923..1040a189627 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -10,7 +10,6 @@ #include "qemu/log.h" #include "qemu/range.h" #include "qemu/main-loop.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/target_page.h" #include "exec/tlb-flags.h" diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c index ac86629432a..590717ecd8c 100644 --- a/target/arm/tcg/helper-a64.c +++ b/target/arm/tcg/helper-a64.c @@ -29,7 +29,6 @@ #include "internals.h" #include "qemu/crc32c.h" #include "exec/cpu-common.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "accel/tcg/probe.h" #include "exec/target_page.h" diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c index 37dc98dc35c..6614719832e 100644 --- a/target/arm/tcg/m_helper.c +++ b/target/arm/tcg/m_helper.c @@ -15,7 +15,6 @@ #include "qemu/main-loop.h" #include "qemu/bitops.h" #include "qemu/log.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #ifdef CONFIG_TCG #include "accel/tcg/cpu-ldst.h" diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c index 8fbdcc8fb95..13d7ac00972 100644 --- a/target/arm/tcg/mte_helper.c +++ b/target/arm/tcg/mte_helper.c @@ -21,7 +21,6 @@ #include "qemu/log.h" #include "cpu.h" #include "internals.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #ifdef CONFIG_USER_ONLY #include "user/cpu_loop.h" diff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c index f9f67d1f88e..506d1c34757 100644 --- a/target/arm/tcg/mve_helper.c +++ b/target/arm/tcg/mve_helper.c @@ -23,7 +23,6 @@ #include "vec_internal.h" #include "exec/helper-proto.h" #include "accel/tcg/cpu-ldst.h" -#include "exec/exec-all.h" #include "tcg/tcg.h" #include "fpu/softfloat.h" #include "crypto/clmul.h" diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index d50b8720ad6..dc3f83c37dc 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -23,7 +23,6 @@ #include "exec/target_page.h" #include "internals.h" #include "cpu-features.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "accel/tcg/probe.h" #include "cpregs.h" diff --git a/target/arm/tcg/pauth_helper.c b/target/arm/tcg/pauth_helper.c index 59bf27541dc..c591c3052c3 100644 --- a/target/arm/tcg/pauth_helper.c +++ b/target/arm/tcg/pauth_helper.c @@ -21,7 +21,6 @@ #include "cpu.h" #include "internals.h" #include "cpu-features.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "exec/helper-proto.h" #include "tcg/tcg-gvec-desc.h" diff --git a/target/arm/tcg/sme_helper.c b/target/arm/tcg/sme_helper.c index 96b84c37a2d..3226895cae3 100644 --- a/target/arm/tcg/sme_helper.c +++ b/target/arm/tcg/sme_helper.c @@ -23,7 +23,6 @@ #include "tcg/tcg-gvec-desc.h" #include "exec/helper-proto.h" #include "accel/tcg/cpu-ldst.h" -#include "exec/exec-all.h" #include "qemu/int128.h" #include "fpu/softfloat.h" #include "vec_internal.h" diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index 50aca54eaa3..9f20ecb51d3 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "internals.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/helper-proto.h" #include "exec/target_page.h" diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c index 8841f039bc6..5ea4d6590f2 100644 --- a/target/arm/tcg/tlb_helper.c +++ b/target/arm/tcg/tlb_helper.c @@ -9,7 +9,6 @@ #include "cpu.h" #include "internals.h" #include "cpu-features.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 43408c71bbd..11053f083a0 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -17,7 +17,6 @@ * License along with this library; if not, see . */ #include "qemu/osdep.h" -#include "exec/exec-all.h" #include "exec/target_page.h" #include "translate.h" #include "translate-a64.h" diff --git a/target/avr/cpu.c b/target/avr/cpu.c index 84f3b839c9b..86e53ef9f65 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/qemu-print.h" -#include "exec/exec-all.h" #include "exec/translation-block.h" #include "system/address-spaces.h" #include "cpu.h" diff --git a/target/avr/translate.c b/target/avr/translate.c index b9c592c899a..804b0b21dbd 100644 --- a/target/avr/translate.c +++ b/target/avr/translate.c @@ -22,7 +22,6 @@ #include "qemu/qemu-print.h" #include "tcg/tcg.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/translation-block.h" #include "tcg/tcg-op.h" #include "exec/helper-proto.h" diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index 3c5191282ea..9f93c170092 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -19,7 +19,6 @@ #include "qemu/qemu-print.h" #include "cpu.h" #include "internal.h" -#include "exec/exec-all.h" #include "exec/translation-block.h" #include "qapi/error.h" #include "hw/qdev-properties.h" diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index dd726b43187..444799d3ade 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -17,7 +17,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "accel/tcg/probe.h" #include "exec/helper-proto.h" diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 10e18c945ef..6acbf3de27a 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -24,7 +24,6 @@ #include "qemu/timer.h" #include "cpu.h" #include "qemu/module.h" -#include "exec/exec-all.h" #include "exec/translation-block.h" #include "exec/target_page.h" #include "fpu/softfloat.h" diff --git a/target/hppa/fpu_helper.c b/target/hppa/fpu_helper.c index a62d9d30831..ddd0a343d63 100644 --- a/target/hppa/fpu_helper.c +++ b/target/hppa/fpu_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "fpu/softfloat.h" diff --git a/target/hppa/helper.c b/target/hppa/helper.c index ac7f58f0afe..d7f8495d982 100644 --- a/target/hppa/helper.c +++ b/target/hppa/helper.c @@ -21,7 +21,6 @@ #include "qemu/log.h" #include "cpu.h" #include "fpu/softfloat.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "qemu/qemu-print.h" #include "hw/hppa/hppa_hardware.h" diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index a5f73aedf82..9bdd0a6f23d 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/cputlb.h" #include "accel/tcg/cpu-mmu-index.h" #include "accel/tcg/probe.h" diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c index 32207c1a4c8..0458378abb2 100644 --- a/target/hppa/op_helper.c +++ b/target/hppa/op_helper.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "accel/tcg/cpu-ldst.h" #include "accel/tcg/probe.h" diff --git a/target/hppa/sys_helper.c b/target/hppa/sys_helper.c index 052a6a88a27..6e65fadcc7b 100644 --- a/target/hppa/sys_helper.c +++ b/target/hppa/sys_helper.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "qemu/timer.h" #include "system/runstate.h" diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 14f38333222..156c3dedd18 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "qemu/host-utils.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "tcg/tcg-op.h" #include "tcg/tcg-op-gvec.h" diff --git a/target/i386/tcg/access.c b/target/i386/tcg/access.c index ee5b4514597..97e3f0e7568 100644 --- a/target/i386/tcg/access.c +++ b/target/i386/tcg/access.c @@ -5,7 +5,6 @@ #include "cpu.h" #include "accel/tcg/cpu-ldst.h" #include "accel/tcg/probe.h" -#include "exec/exec-all.h" #include "exec/target_page.h" #include "access.h" diff --git a/target/i386/tcg/excp_helper.c b/target/i386/tcg/excp_helper.c index de71e68f986..6fb8036d988 100644 --- a/target/i386/tcg/excp_helper.c +++ b/target/i386/tcg/excp_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "qemu/log.h" #include "system/runstate.h" #include "exec/helper-proto.h" diff --git a/target/i386/tcg/int_helper.c b/target/i386/tcg/int_helper.c index 1a02e9d8434..46741d9f68a 100644 --- a/target/i386/tcg/int_helper.c +++ b/target/i386/tcg/int_helper.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "cpu.h" -#include "exec/exec-all.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" #include "qapi/error.h" diff --git a/target/i386/tcg/mem_helper.c b/target/i386/tcg/mem_helper.c index 84a08152171..9e7c2d80293 100644 --- a/target/i386/tcg/mem_helper.c +++ b/target/i386/tcg/mem_helper.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "qemu/int128.h" #include "qemu/atomic128.h" diff --git a/target/i386/tcg/mpx_helper.c b/target/i386/tcg/mpx_helper.c index a0f816dfae0..fa8abcc4820 100644 --- a/target/i386/tcg/mpx_helper.c +++ b/target/i386/tcg/mpx_helper.c @@ -21,7 +21,6 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "accel/tcg/cpu-ldst.h" -#include "exec/exec-all.h" #include "exec/target_page.h" #include "helper-tcg.h" diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index e45d71fa1ad..0ca081b286d 100644 --- a/target/i386/tcg/seg_helper.c +++ b/target/i386/tcg/seg_helper.c @@ -22,7 +22,6 @@ #include "cpu.h" #include "qemu/log.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "accel/tcg/probe.h" #include "exec/log.h" diff --git a/target/i386/tcg/system/bpt_helper.c b/target/i386/tcg/system/bpt_helper.c index 08ccd3f5e69..aebb5caac37 100644 --- a/target/i386/tcg/system/bpt_helper.c +++ b/target/i386/tcg/system/bpt_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "exec/watchpoint.h" #include "tcg/helper-tcg.h" diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 1dcc35f5dfa..6eaa0457314 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -21,7 +21,6 @@ #include "qemu/host-utils.h" #include "cpu.h" #include "accel/tcg/cpu-mmu-index.h" -#include "exec/exec-all.h" #include "exec/translation-block.h" #include "tcg/tcg-op.h" #include "tcg/tcg-op-gvec.h" diff --git a/target/i386/tcg/user/excp_helper.c b/target/i386/tcg/user/excp_helper.c index b3bdb7831a7..98fab4cbc3f 100644 --- a/target/i386/tcg/user/excp_helper.c +++ b/target/i386/tcg/user/excp_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "tcg/helper-tcg.h" void x86_cpu_record_sigsegv(CPUState *cs, vaddr addr, diff --git a/target/i386/tcg/user/seg_helper.c b/target/i386/tcg/user/seg_helper.c index 5692dd51953..263f59937fe 100644 --- a/target/i386/tcg/user/seg_helper.c +++ b/target/i386/tcg/user/seg_helper.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "tcg/helper-tcg.h" #include "tcg/seg_helper.h" diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index fe9462b3b7e..b6f89f0f392 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -15,7 +15,6 @@ #include "system/kvm.h" #include "kvm/kvm_loongarch.h" #include "hw/qdev-properties.h" -#include "exec/exec-all.h" #include "exec/translation-block.h" #include "cpu.h" #include "internals.h" diff --git a/target/loongarch/tcg/fpu_helper.c b/target/loongarch/tcg/fpu_helper.c index fc3fd0561e3..fc9c64c20a8 100644 --- a/target/loongarch/tcg/fpu_helper.c +++ b/target/loongarch/tcg/fpu_helper.c @@ -8,7 +8,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "fpu/softfloat.h" #include "internals.h" diff --git a/target/loongarch/tcg/iocsr_helper.c b/target/loongarch/tcg/iocsr_helper.c index e62170de3ce..c155f48564d 100644 --- a/target/loongarch/tcg/iocsr_helper.c +++ b/target/loongarch/tcg/iocsr_helper.c @@ -9,7 +9,6 @@ #include "cpu.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #define GET_MEMTXATTRS(cas) \ diff --git a/target/loongarch/tcg/op_helper.c b/target/loongarch/tcg/op_helper.c index 94e3b28016a..16ac0d43bc9 100644 --- a/target/loongarch/tcg/op_helper.c +++ b/target/loongarch/tcg/op_helper.c @@ -10,7 +10,6 @@ #include "cpu.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "internals.h" #include "qemu/crc32c.h" diff --git a/target/loongarch/tcg/tlb_helper.c b/target/loongarch/tcg/tlb_helper.c index 9a76a2a205f..1d5ba567b97 100644 --- a/target/loongarch/tcg/tlb_helper.c +++ b/target/loongarch/tcg/tlb_helper.c @@ -13,7 +13,6 @@ #include "internals.h" #include "exec/helper-proto.h" #include "exec/cputlb.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/target_page.h" #include "accel/tcg/cpu-ldst.h" diff --git a/target/loongarch/tcg/vec_helper.c b/target/loongarch/tcg/vec_helper.c index 3faf52cbc46..a270998e638 100644 --- a/target/loongarch/tcg/vec_helper.c +++ b/target/loongarch/tcg/vec_helper.c @@ -7,7 +7,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "fpu/softfloat.h" #include "internals.h" diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index ac4a0d85be5..56012863c85 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "softfloat.h" diff --git a/target/m68k/helper.c b/target/m68k/helper.c index f73e0def234..5479acc5b99 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/cputlb.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/target_page.h" #include "exec/gdbstub.h" diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index 242aecccbbc..f29ae12af84 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -20,7 +20,6 @@ #include "qemu/log.h" #include "cpu.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "semihosting/semihost.h" diff --git a/target/m68k/translate.c b/target/m68k/translate.c index b1266a7875b..97afceb1297 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/translation-block.h" #include "exec/target_page.h" #include "tcg/tcg-op.h" diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index edfb05758b3..658d3cb3d7b 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -27,7 +27,6 @@ #include "cpu.h" #include "qemu/module.h" #include "hw/qdev-properties.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "exec/gdbstub.h" #include "exec/translation-block.h" diff --git a/target/microblaze/op_helper.c b/target/microblaze/op_helper.c index 4624ce5b672..9e838dfa153 100644 --- a/target/microblaze/op_helper.c +++ b/target/microblaze/op_helper.c @@ -23,7 +23,6 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "fpu/softfloat.h" diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 7dcad6cf0d7..ad4a85407d0 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "tcg/tcg-op.h" #include "exec/helper-proto.h" diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 473cecdebca..26f4f038cde 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -29,7 +29,6 @@ #include "qemu/module.h" #include "system/kvm.h" #include "system/qtest.h" -#include "exec/exec-all.h" #include "hw/qdev-properties.h" #include "hw/qdev-clock.h" #include "fpu_helper.h" diff --git a/target/mips/system/physaddr.c b/target/mips/system/physaddr.c index 505781d84c1..b8e1a5ac98e 100644 --- a/target/mips/system/physaddr.c +++ b/target/mips/system/physaddr.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "../internal.h" diff --git a/target/mips/tcg/exception.c b/target/mips/tcg/exception.c index 1a8902ea1bc..d32bcebf469 100644 --- a/target/mips/tcg/exception.c +++ b/target/mips/tcg/exception.c @@ -23,7 +23,6 @@ #include "cpu.h" #include "internal.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "exec/translation-block.h" target_ulong exception_resume_pc(CPUMIPSState *env) diff --git a/target/mips/tcg/fpu_helper.c b/target/mips/tcg/fpu_helper.c index 45d593de489..36af9808025 100644 --- a/target/mips/tcg/fpu_helper.c +++ b/target/mips/tcg/fpu_helper.c @@ -24,7 +24,6 @@ #include "cpu.h" #include "internal.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "fpu/softfloat.h" #include "fpu_helper.h" diff --git a/target/mips/tcg/ldst_helper.c b/target/mips/tcg/ldst_helper.c index 2fb879fcbcc..10319bf03a6 100644 --- a/target/mips/tcg/ldst_helper.c +++ b/target/mips/tcg/ldst_helper.c @@ -23,7 +23,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "exec/memop.h" #include "internal.h" diff --git a/target/mips/tcg/msa_helper.c b/target/mips/tcg/msa_helper.c index 4d9a4468e53..fe4cd1c7b5f 100644 --- a/target/mips/tcg/msa_helper.c +++ b/target/mips/tcg/msa_helper.c @@ -21,7 +21,6 @@ #include "cpu.h" #include "internal.h" #include "tcg/tcg.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "accel/tcg/probe.h" #include "exec/helper-proto.h" diff --git a/target/mips/tcg/op_helper.c b/target/mips/tcg/op_helper.c index 65403f1a87b..b906d10204b 100644 --- a/target/mips/tcg/op_helper.c +++ b/target/mips/tcg/op_helper.c @@ -22,7 +22,6 @@ #include "cpu.h" #include "internal.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "exec/memop.h" #include "fpu_helper.h" diff --git a/target/mips/tcg/system/special_helper.c b/target/mips/tcg/system/special_helper.c index 3ce3ae1e124..b54cbe88a38 100644 --- a/target/mips/tcg/system/special_helper.c +++ b/target/mips/tcg/system/special_helper.c @@ -22,7 +22,6 @@ #include "qemu/log.h" #include "cpu.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "exec/translation-block.h" #include "internal.h" diff --git a/target/mips/tcg/system/tlb_helper.c b/target/mips/tcg/system/tlb_helper.c index e477ef812ae..eccaf3624cb 100644 --- a/target/mips/tcg/system/tlb_helper.c +++ b/target/mips/tcg/system/tlb_helper.c @@ -22,7 +22,6 @@ #include "cpu.h" #include "internal.h" #include "exec/cputlb.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/target_page.h" #include "accel/tcg/cpu-ldst.h" diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index 6601e0c0666..d3c366dd86a 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -21,7 +21,6 @@ #include "qapi/error.h" #include "qemu/qemu-print.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/translation-block.h" #include "fpu/softfloat-helpers.h" #include "tcg/tcg.h" diff --git a/target/openrisc/exception.c b/target/openrisc/exception.c index 8699c3dcea4..e213be36b6b 100644 --- a/target/openrisc/exception.c +++ b/target/openrisc/exception.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exception.h" G_NORETURN void raise_exception(OpenRISCCPU *cpu, uint32_t excp) diff --git a/target/openrisc/exception_helper.c b/target/openrisc/exception_helper.c index 1f5be4bed90..c2c9d136528 100644 --- a/target/openrisc/exception_helper.c +++ b/target/openrisc/exception_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "exception.h" diff --git a/target/openrisc/fpu_helper.c b/target/openrisc/fpu_helper.c index 8b81d2f62f7..dba997255c6 100644 --- a/target/openrisc/fpu_helper.c +++ b/target/openrisc/fpu_helper.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "fpu/softfloat.h" diff --git a/target/openrisc/interrupt.c b/target/openrisc/interrupt.c index b3b5b405779..486823094c8 100644 --- a/target/openrisc/interrupt.c +++ b/target/openrisc/interrupt.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "cpu.h" -#include "exec/exec-all.h" #include "gdbstub/helpers.h" #include "qemu/host-utils.h" #ifndef CONFIG_USER_ONLY diff --git a/target/openrisc/interrupt_helper.c b/target/openrisc/interrupt_helper.c index ab4ea88b692..1553ebc71b0 100644 --- a/target/openrisc/interrupt_helper.c +++ b/target/openrisc/interrupt_helper.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" void HELPER(rfe)(CPUOpenRISCState *env) diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c index 92badf017f7..951f8e247a7 100644 --- a/target/openrisc/sys_helper.c +++ b/target/openrisc/sys_helper.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/cputlb.h" #include "exec/target_page.h" #include "exec/helper-proto.h" diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index d4ce60188bd..3b6843768b0 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "accel/tcg/cpu-mmu-index.h" -#include "exec/exec-all.h" #include "tcg/tcg-op.h" #include "qemu/log.h" #include "qemu/bitops.h" diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index da8b525a41b..1efdc4066eb 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -24,7 +24,6 @@ #include "system/system.h" #include "system/runstate.h" #include "cpu.h" -#include "exec/exec-all.h" #include "internal.h" #include "helper_regs.h" #include "hw/ppc/ppc.h" diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c index d93cfed17b4..07b782f971b 100644 --- a/target/ppc/fpu_helper.c +++ b/target/ppc/fpu_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "internal.h" #include "fpu/softfloat.h" diff --git a/target/ppc/machine.c b/target/ppc/machine.c index 98df5b4a3a2..d72e5ecb94b 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "system/kvm.h" #include "system/tcg.h" #include "helper_regs.h" diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c index 50f05a915ed..aa1af44d22a 100644 --- a/target/ppc/mem_helper.c +++ b/target/ppc/mem_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/target_page.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" diff --git a/target/ppc/misc_helper.c b/target/ppc/misc_helper.c index 46ae454afd3..e7d94625185 100644 --- a/target/ppc/misc_helper.c +++ b/target/ppc/misc_helper.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/cputlb.h" #include "exec/helper-proto.h" #include "qemu/error-report.h" diff --git a/target/ppc/mmu-hash32.c b/target/ppc/mmu-hash32.c index 5bd3efe70e8..8b980a5aa90 100644 --- a/target/ppc/mmu-hash32.c +++ b/target/ppc/mmu-hash32.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/target_page.h" #include "system/kvm.h" diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c index 3ba4810497e..dd337558aa6 100644 --- a/target/ppc/mmu-hash64.c +++ b/target/ppc/mmu-hash64.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "qemu/error-report.h" #include "qemu/qemu-print.h" diff --git a/target/ppc/mmu-radix64.c b/target/ppc/mmu-radix64.c index 4ab5f3bb920..33ac3412901 100644 --- a/target/ppc/mmu-radix64.c +++ b/target/ppc/mmu-radix64.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "qemu/error-report.h" #include "system/kvm.h" diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c index 394a0c9bb60..52d48615ac2 100644 --- a/target/ppc/mmu_common.c +++ b/target/ppc/mmu_common.c @@ -24,7 +24,6 @@ #include "kvm_ppc.h" #include "mmu-hash64.h" #include "mmu-hash32.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/target_page.h" #include "exec/log.h" diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index 2138666122b..ac607054027 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -25,7 +25,6 @@ #include "mmu-hash64.h" #include "mmu-hash32.h" #include "exec/cputlb.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/target_page.h" #include "exec/log.h" diff --git a/target/ppc/power8-pmu.c b/target/ppc/power8-pmu.c index db9ee8e96b0..2a7a5b493af 100644 --- a/target/ppc/power8-pmu.c +++ b/target/ppc/power8-pmu.c @@ -13,7 +13,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "helper_regs.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "qemu/error-report.h" #include "qemu/timer.h" diff --git a/target/ppc/tcg-excp_helper.c b/target/ppc/tcg-excp_helper.c index 2b15e5f2f07..f835be51563 100644 --- a/target/ppc/tcg-excp_helper.c +++ b/target/ppc/tcg-excp_helper.c @@ -21,7 +21,6 @@ #include "qemu/log.h" #include "target/ppc/cpu.h" #include "accel/tcg/cpu-ldst.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "system/runstate.h" diff --git a/target/ppc/timebase_helper.c b/target/ppc/timebase_helper.c index 73120323b4e..7209b418fb6 100644 --- a/target/ppc/timebase_helper.c +++ b/target/ppc/timebase_helper.c @@ -20,7 +20,6 @@ #include "cpu.h" #include "hw/ppc/ppc.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "qemu/log.h" #include "qemu/main-loop.h" diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 399107d319a..f2cd3308f80 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "internal.h" -#include "exec/exec-all.h" #include "exec/target_page.h" #include "tcg/tcg-op.h" #include "tcg/tcg-op-gvec.h" diff --git a/target/ppc/user_only_helper.c b/target/ppc/user_only_helper.c index a4d07a0d0dd..ae210eb8474 100644 --- a/target/ppc/user_only_helper.c +++ b/target/ppc/user_only_helper.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "internal.h" void ppc_cpu_record_sigsegv(CPUState *cs, vaddr address, diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 2b830b33178..1b2a42141f0 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -24,7 +24,6 @@ #include "cpu.h" #include "cpu_vendorid.h" #include "internals.h" -#include "exec/exec-all.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "qemu/error-report.h" diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 619c76cc001..f2e90a9889f 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -24,7 +24,6 @@ #include "internals.h" #include "pmu.h" #include "exec/cputlb.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/target_page.h" #include "system/memory.h" diff --git a/target/riscv/crypto_helper.c b/target/riscv/crypto_helper.c index bb084e00efe..a0fb54bc50c 100644 --- a/target/riscv/crypto_helper.c +++ b/target/riscv/crypto_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "crypto/aes.h" #include "crypto/aes-round.h" diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 13086438552..a32e1455c91 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -24,7 +24,6 @@ #include "tcg/tcg-cpu.h" #include "pmu.h" #include "time_helper.h" -#include "exec/exec-all.h" #include "exec/cputlb.h" #include "exec/tb-flush.h" #include "exec/icount.h" diff --git a/target/riscv/debug.c b/target/riscv/debug.c index 7fc9e121e11..94f06b25737 100644 --- a/target/riscv/debug.c +++ b/target/riscv/debug.c @@ -28,7 +28,6 @@ #include "qapi/error.h" #include "cpu.h" #include "trace.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "exec/watchpoint.h" #include "system/cpu-timers.h" diff --git a/target/riscv/fpu_helper.c b/target/riscv/fpu_helper.c index 91b1a56d10a..706bdfa61d5 100644 --- a/target/riscv/fpu_helper.c +++ b/target/riscv/fpu_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "qemu/host-utils.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "fpu/softfloat.h" #include "internals.h" diff --git a/target/riscv/m128_helper.c b/target/riscv/m128_helper.c index ec14aaa901a..7d9b83b1b2c 100644 --- a/target/riscv/m128_helper.c +++ b/target/riscv/m128_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" target_ulong HELPER(divu_i128)(CPURISCVState *env, diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index abb1d284dce..05316f2088c 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "internals.h" -#include "exec/exec-all.h" #include "exec/cputlb.h" #include "accel/tcg/cpu-ldst.h" #include "accel/tcg/probe.h" diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index 426145c3b9f..916fd6fb43a 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "exec/exec-all.h" #include "exec/translation-block.h" #include "tcg-cpu.h" #include "cpu.h" diff --git a/target/riscv/translate.c b/target/riscv/translate.c index cef61b5b290..85128f997b7 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -20,7 +20,6 @@ #include "qemu/log.h" #include "cpu.h" #include "tcg/tcg-op.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" #include "exec/target_page.h" diff --git a/target/riscv/vcrypto_helper.c b/target/riscv/vcrypto_helper.c index 1526de96f53..9a0d9b4f536 100644 --- a/target/riscv/vcrypto_helper.c +++ b/target/riscv/vcrypto_helper.c @@ -26,7 +26,6 @@ #include "crypto/aes-round.h" #include "crypto/sm4.h" #include "exec/memop.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "internals.h" #include "vector_internals.h" diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c index 5ccb294e319..8eea3e6df03 100644 --- a/target/riscv/vector_helper.c +++ b/target/riscv/vector_helper.c @@ -21,7 +21,6 @@ #include "qemu/bitops.h" #include "cpu.h" #include "exec/memop.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "accel/tcg/probe.h" #include "exec/page-protection.h" diff --git a/target/riscv/zce_helper.c b/target/riscv/zce_helper.c index 50d65f386c7..55221f5f375 100644 --- a/target/riscv/zce_helper.c +++ b/target/riscv/zce_helper.c @@ -18,7 +18,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "accel/tcg/cpu-ldst.h" diff --git a/target/rx/op_helper.c b/target/rx/op_helper.c index a2f1f3824d9..2b190a4b2cf 100644 --- a/target/rx/op_helper.c +++ b/target/rx/op_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "qemu/bitops.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "accel/tcg/cpu-ldst.h" #include "fpu/softfloat.h" diff --git a/target/rx/translate.c b/target/rx/translate.c index bbda703be86..19a9584a829 100644 --- a/target/rx/translate.c +++ b/target/rx/translate.c @@ -20,7 +20,6 @@ #include "qemu/bswap.h" #include "qemu/qemu-print.h" #include "cpu.h" -#include "exec/exec-all.h" #include "tcg/tcg-op.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c index 4ae6e2ddeaa..1dca835c5d8 100644 --- a/target/s390x/interrupt.c +++ b/target/s390x/interrupt.c @@ -11,7 +11,6 @@ #include "cpu.h" #include "kvm/kvm_s390x.h" #include "s390x-internal.h" -#include "exec/exec-all.h" #include "system/kvm.h" #include "system/tcg.h" #include "hw/s390x/ioinst.h" diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 0e133cb9a53..00946e9c0fe 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -23,7 +23,6 @@ #include "kvm/kvm_s390x.h" #include "system/kvm.h" #include "system/tcg.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/target_page.h" #include "hw/hw.h" diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c index a3347f12362..5e95c4978f9 100644 --- a/target/s390x/sigp.c +++ b/target/s390x/sigp.c @@ -16,7 +16,6 @@ #include "system/runstate.h" #include "system/address-spaces.h" #include "exec/cputlb.h" -#include "exec/exec-all.h" #include "system/tcg.h" #include "trace.h" #include "qapi/qapi-types-machine.h" diff --git a/target/s390x/tcg/cc_helper.c b/target/s390x/tcg/cc_helper.c index b36f8cdc8b9..6595ac763c3 100644 --- a/target/s390x/tcg/cc_helper.c +++ b/target/s390x/tcg/cc_helper.c @@ -22,7 +22,6 @@ #include "cpu.h" #include "s390x-internal.h" #include "tcg_s390x.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" diff --git a/target/s390x/tcg/crypto_helper.c b/target/s390x/tcg/crypto_helper.c index 642c1b18c4c..4447bb66eee 100644 --- a/target/s390x/tcg/crypto_helper.c +++ b/target/s390x/tcg/crypto_helper.c @@ -17,7 +17,6 @@ #include "s390x-internal.h" #include "tcg_s390x.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" static uint64_t R(uint64_t x, int c) diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c index 6cd813e1abf..e4c75d0ce01 100644 --- a/target/s390x/tcg/excp_helper.c +++ b/target/s390x/tcg/excp_helper.c @@ -23,7 +23,6 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "exec/cputlb.h" -#include "exec/exec-all.h" #include "exec/target_page.h" #include "exec/watchpoint.h" #include "s390x-internal.h" diff --git a/target/s390x/tcg/fpu_helper.c b/target/s390x/tcg/fpu_helper.c index 5041c139627..1ba43715ac1 100644 --- a/target/s390x/tcg/fpu_helper.c +++ b/target/s390x/tcg/fpu_helper.c @@ -22,7 +22,6 @@ #include "cpu.h" #include "s390x-internal.h" #include "tcg_s390x.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "fpu/softfloat.h" diff --git a/target/s390x/tcg/int_helper.c b/target/s390x/tcg/int_helper.c index 253c0364157..fbda396f5b4 100644 --- a/target/s390x/tcg/int_helper.c +++ b/target/s390x/tcg/int_helper.c @@ -22,7 +22,6 @@ #include "cpu.h" #include "s390x-internal.h" #include "tcg_s390x.h" -#include "exec/exec-all.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" #include "accel/tcg/cpu-ldst.h" diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index 9e77cde81bd..857005b1202 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -25,7 +25,6 @@ #include "tcg_s390x.h" #include "exec/helper-proto.h" #include "exec/cpu-common.h" -#include "exec/exec-all.h" #include "exec/cputlb.h" #include "exec/page-protection.h" #include "accel/tcg/cpu-ldst.h" diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c index d5088493ead..f7101be5745 100644 --- a/target/s390x/tcg/misc_helper.c +++ b/target/s390x/tcg/misc_helper.c @@ -26,7 +26,6 @@ #include "qemu/host-utils.h" #include "exec/helper-proto.h" #include "qemu/timer.h" -#include "exec/exec-all.h" #include "exec/cputlb.h" #include "accel/tcg/cpu-ldst.h" #include "exec/target_page.h" diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 00073c5560e..4fdb79f1747 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -31,7 +31,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "s390x-internal.h" -#include "exec/exec-all.h" #include "tcg/tcg-op.h" #include "tcg/tcg-op-gvec.h" #include "qemu/log.h" diff --git a/target/s390x/tcg/vec_fpu_helper.c b/target/s390x/tcg/vec_fpu_helper.c index 1bbaa82fe8a..744f800fb6c 100644 --- a/target/s390x/tcg/vec_fpu_helper.c +++ b/target/s390x/tcg/vec_fpu_helper.c @@ -15,7 +15,6 @@ #include "vec.h" #include "tcg_s390x.h" #include "tcg/tcg-gvec-desc.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "fpu/softfloat.h" diff --git a/target/s390x/tcg/vec_helper.c b/target/s390x/tcg/vec_helper.c index 781ccc565bd..46ec4a947dd 100644 --- a/target/s390x/tcg/vec_helper.c +++ b/target/s390x/tcg/vec_helper.c @@ -17,7 +17,6 @@ #include "tcg/tcg-gvec-desc.h" #include "exec/helper-proto.h" #include "accel/tcg/cpu-ldst.h" -#include "exec/exec-all.h" void HELPER(gvec_vbperm)(void *v1, const void *v2, const void *v3, uint32_t desc) diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index 861fdd47f76..0a04f149d70 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -24,7 +24,6 @@ #include "qemu/qemu-print.h" #include "cpu.h" #include "migration/vmstate.h" -#include "exec/exec-all.h" #include "exec/translation-block.h" #include "fpu/softfloat-helpers.h" #include "tcg/tcg.h" diff --git a/target/sh4/helper.c b/target/sh4/helper.c index b41d14d5d7c..fb7642bda1b 100644 --- a/target/sh4/helper.c +++ b/target/sh4/helper.c @@ -21,7 +21,6 @@ #include "cpu.h" #include "exec/cputlb.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/target_page.h" #include "exec/log.h" diff --git a/target/sh4/op_helper.c b/target/sh4/op_helper.c index e7fcad3c1b7..557b1bf4972 100644 --- a/target/sh4/op_helper.c +++ b/target/sh4/op_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include "fpu/softfloat.h" diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 5ce477d0add..f2877157b1c 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "tcg/tcg-op.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index f7d231c6f8b..c864217175b 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -23,7 +23,6 @@ #include "qemu/module.h" #include "qemu/qemu-print.h" #include "accel/tcg/cpu-mmu-index.h" -#include "exec/exec-all.h" #include "exec/translation-block.h" #include "hw/qdev-properties.h" #include "qapi/visitor.h" diff --git a/target/sparc/fop_helper.c b/target/sparc/fop_helper.c index c25097d07f5..a49334150d3 100644 --- a/target/sparc/fop_helper.c +++ b/target/sparc/fop_helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "fpu/softfloat.h" diff --git a/target/sparc/helper.c b/target/sparc/helper.c index 7846ddd6f62..9163b9d46ad 100644 --- a/target/sparc/helper.c +++ b/target/sparc/helper.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "qemu/timer.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" diff --git a/target/sparc/ldst_helper.c b/target/sparc/ldst_helper.c index 4c5dba19d11..2c63eb9e036 100644 --- a/target/sparc/ldst_helper.c +++ b/target/sparc/ldst_helper.c @@ -23,7 +23,6 @@ #include "cpu.h" #include "tcg/tcg.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "exec/cputlb.h" #include "exec/page-protection.h" #include "exec/target_page.h" diff --git a/target/sparc/machine.c b/target/sparc/machine.c index 222e5709c55..4dd75aff74a 100644 --- a/target/sparc/machine.c +++ b/target/sparc/machine.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "qemu/timer.h" #include "migration/cpu.h" diff --git a/target/sparc/translate.c b/target/sparc/translate.c index adebddf27b2..241378889c3 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -22,7 +22,6 @@ #include "cpu.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "exec/target_page.h" #include "tcg/tcg-op.h" #include "tcg/tcg-op-gvec.h" diff --git a/target/sparc/win_helper.c b/target/sparc/win_helper.c index 0c4b09f2c14..9ad9d01e8b9 100644 --- a/target/sparc/win_helper.c +++ b/target/sparc/win_helper.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/helper-proto.h" #include "trace.h" diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index a4f93e7d910..bdbcaf0dfcc 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" -#include "exec/exec-all.h" #include "exec/translation-block.h" #include "qemu/error-report.h" #include "tcg/debug-assert.h" diff --git a/target/tricore/op_helper.c b/target/tricore/op_helper.c index ae559b69220..9910c13f4b5 100644 --- a/target/tricore/op_helper.c +++ b/target/tricore/op_helper.c @@ -18,7 +18,6 @@ #include "cpu.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "accel/tcg/cpu-ldst.h" #include /* for crc32 */ diff --git a/target/tricore/translate.c b/target/tricore/translate.c index 7cd26d8eaba..11496654e4b 100644 --- a/target/tricore/translate.c +++ b/target/tricore/translate.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "tcg/tcg-op.h" #include "accel/tcg/cpu-ldst.h" #include "qemu/qemu-print.h" diff --git a/target/xtensa/dbg_helper.c b/target/xtensa/dbg_helper.c index c4f4298a50c..3b91f7c38ac 100644 --- a/target/xtensa/dbg_helper.c +++ b/target/xtensa/dbg_helper.c @@ -30,7 +30,6 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" -#include "exec/exec-all.h" #include "exec/watchpoint.h" #include "system/address-spaces.h" diff --git a/target/xtensa/exc_helper.c b/target/xtensa/exc_helper.c index ca629f071d1..b611c9bf97c 100644 --- a/target/xtensa/exc_helper.c +++ b/target/xtensa/exc_helper.c @@ -32,7 +32,6 @@ #include "exec/helper-proto.h" #include "qemu/host-utils.h" #include "qemu/atomic.h" -#include "exec/exec-all.h" void HELPER(exception)(CPUXtensaState *env, uint32_t excp) { diff --git a/target/xtensa/fpu_helper.c b/target/xtensa/fpu_helper.c index 53fc7cfd2af..5358060c50a 100644 --- a/target/xtensa/fpu_helper.c +++ b/target/xtensa/fpu_helper.c @@ -30,7 +30,6 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" -#include "exec/exec-all.h" #include "fpu/softfloat.h" enum { diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c index 182c6e35c17..71330fc84b9 100644 --- a/target/xtensa/mmu_helper.c +++ b/target/xtensa/mmu_helper.c @@ -35,7 +35,6 @@ #include "exec/cputlb.h" #include "accel/tcg/cpu-mmu-index.h" #include "accel/tcg/probe.h" -#include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/target_page.h" #include "system/memory.h" diff --git a/target/xtensa/op_helper.c b/target/xtensa/op_helper.c index c125fa49464..fc47ebaaf50 100644 --- a/target/xtensa/op_helper.c +++ b/target/xtensa/op_helper.c @@ -30,7 +30,6 @@ #include "exec/helper-proto.h" #include "exec/page-protection.h" #include "qemu/host-utils.h" -#include "exec/exec-all.h" #include "system/memory.h" #include "qemu/atomic.h" #include "qemu/timer.h" diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index 5ebd4a512c9..2ba4b1ae66d 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -31,7 +31,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/exec-all.h" #include "tcg/tcg-op.h" #include "qemu/log.h" #include "qemu/qemu-print.h" diff --git a/target/xtensa/win_helper.c b/target/xtensa/win_helper.c index ec9ff44db05..4b25f8f4de7 100644 --- a/target/xtensa/win_helper.c +++ b/target/xtensa/win_helper.c @@ -30,7 +30,6 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" -#include "exec/exec-all.h" static void copy_window_from_phys(CPUXtensaState *env, uint32_t window, uint32_t phys, uint32_t n)