From patchwork Thu Apr 24 09:46:41 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: 883943 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3342006wrs; Thu, 24 Apr 2025 02:49:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVFz7v8yHXu2oyjF2fOBPZjVqdt3ZiYdQsqzs4Jc3lXDT5/SJqjtoKMqRvXdXXAWHsei0CMFw==@linaro.org X-Google-Smtp-Source: AGHT+IH2Y8rYrg0K8Q1u/sgjb65QFNOWRGEjxQwKpLiJ3BP/f6RL/s/HBuXj73Kp8CH4iR4l8X7I X-Received: by 2002:a05:620a:298d:b0:7c5:467f:d131 with SMTP id af79cd13be357-7c956f27674mr405803085a.36.1745488163289; Thu, 24 Apr 2025 02:49:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745488163; cv=none; d=google.com; s=arc-20240605; b=EvT62tVNKAa9tBh71Tstvq5dHyInN8IBBX1dcqn+pi6rOHEMb29u00bTSBKQlO/gYE 4BJQMTlhDlwmgrOqAL9XWFbD2ZZmqMlAyI/RWmqsHYvH/6u33xLtcEdyrM2HpU3N8Gjx gtkC+jFuHv+rFjYE6nnyNljFqFldMDaVPwBJOEpQ76yN094pUhyxSfUeOOzDXBZyXi7n 6WB4Vw4Ia6KnD34daaj7mRZLUfbhx2jF5Cx9xUyrTTiveagTYFVKG4fw3IA+fHSRZPxQ 9VpBCZVeUFAReggKqfAlnSh1Mj1O776wkVmqoTf/2W+0NqInQEWgQPwntwj8F9F5B2lu rCVQ== 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=OfreXVzz+9AWc5zm3wgpgY6oO4v5p5SO53/S12OWUWc=; b=WLJ3Mht2djrtujym6qBddyo0PFFHK2rN4/kIyVPICzULfaoBvq0HkAunwXy74/WKSb ujMW6OLvbmwc4BuK0eSzIyfCTK/E8X0DqK9pQcPvsOddg5aft8f5L61IHoiB7txCT4c/ 3RstK9CGxtbwC3Nc5aACQNXoDsBpI34TITLAxhuLhjcZfg0W1O/TAzfjRxbb8dC9IjR+ mNh2Ck+iUGSqWFDGGM0UWl1fBX/ZMJyG4uhU0aP3jX5LJwHDDzATYEk+PihD8tll8Bt2 eVLydExQGxS01q7w68nrC+sf42ZjCRV2t0Cpo9uuUt2MisVAeW4ibetxn0qrVTFBqTFn 5c3g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LO7zEWLJ; 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-7c958edebf1si99553585a.603.2025.04.24.02.49.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 02:49:23 -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=LO7zEWLJ; 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 1u7tAn-0007YX-8P; Thu, 24 Apr 2025 05:47:13 -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 1u7tAe-0007WE-LI for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:05 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7tAc-0002YR-Jo for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:04 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-39efc1365e4so368275f8f.1 for ; Thu, 24 Apr 2025 02:47:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745488020; x=1746092820; 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=LO7zEWLJvVtjHKL0ymERPQbHviZOBLX4NXN+PlNHYfa1cMX32ot8aGoYyPUtno9q3K OxnYLTk5HSlSYsgWntF8pb4xWTUeLOz+ewfbGi1yV6Z3BFOXmkdswhApn3LWUBy6ErVQ 253uJo1f2+dxdL/UhOflMVulsp1vBg2sPlyO2sWWkRiRbLjxKiLIEKseymNcgR7EN4LS kkocb+/+kMMEPzJ8ksjKkXE3zMIQRQONoPigK+TfDkIeY28z85pMFd1Kkpxix3l9k0+E FOdNUTm+b6xMHDe7Qt/lHG7xSX0cQ5Lq1dmEOGdEpaKjYaR80/W6bTFxIkbuv24Ma3Xw YQgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745488020; x=1746092820; 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=Lw0r42VSqzUVMqkSIBmHoKFnnCZGhqAGhz18pw4UQg2rbCuSl+VTTEOy8U0GnEVVF2 EzRLBcgOnmnGOlB8vDes7eZNfDp7kllJH+CiRj0wytpTkrYnoelAGmTQnFkaIxCL4vCc +o0p8ZLwkkWYIxgYfNRyvKCKMhSfDenpzpjKV3lWnBAtuRPeDgK5QXW0R6HjCZRkj8A1 bshKqBOydpFgUKucyrbtvR+OCM0n4OK67BS3SON9+I3vWpPPSJCa21Z2yJzlhjuxVIfV 9qi4yoiHmr4AOvK4BgaIPGKL3y6Dp/KxuNjFgwFHIOC+2mioGoTU97D82yszasZXYaI2 dBBA== X-Gm-Message-State: AOJu0Yw59LfdQCkU37nO8KiuXQJvVthV4JaiEs7Za62PaFskAzHBNiXn CtElizN87tPUxXZ2LtvAydeBkTZVX7oncwsR5PXetRM4nepr8HW+2Kk4oVxcDj9sOnK9pDXlGFz T X-Gm-Gg: ASbGncvhi7WIa/uMVaKKIss0EDPPEzyDrAg9+dr1Y5WDctD3nSEPsD8qE2oQmKVBEp/ 1HStOVpL4YQm/T6CnVYXTfYpHUxgAp9HILHb4hB/qAeW/58OjMD3mf/stNtwWwXG+PRNawiq1ZS dYBkpPXmlKnlAqHI1+OVwIJhVU9XgLq/KAJULnxew7JlOypn3rFu5HXoL7QTDGLd4j6Dk3AX3TL 259YSnf0iNkw4DYpvFZC2yjNU37IReAydzxFBWCtjc8keRHg7exIwlBLRMIC/WXwcx3tFyz38eJ 5IqplVpujxbtCwJ4IAExJzhc+4R4QNN9Ok5/wINIWurmPcM3o2sOsO3RxD9fewCvB+VhENDubrW Tmnvn9Iofil/XUZAwuXCl X-Received: by 2002:a5d:6dac:0:b0:391:4999:776c with SMTP id ffacd0b85a97d-3a06cfa854bmr1551620f8f.40.1745488020527; Thu, 24 Apr 2025 02:47:00 -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-3a06d532aa9sm1535181f8f.68.2025.04.24.02.46.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 02:46:59 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Richard Henderson Cc: Pierrick Bouvier , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 01/13] accel/tcg: Use vaddr for walk_memory_regions callback Date: Thu, 24 Apr 2025 11:46:41 +0200 Message-ID: <20250424094653.35932-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424094653.35932-1-philmd@linaro.org> References: <20250424094653.35932-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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 09:46:42 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: 883933 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3341560wrs; Thu, 24 Apr 2025 02:47:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUh37FSwVTlPJETRL3pmN301LehAY6/HR0fSr4bcFSjmS+Mz+7VO5Mx/FXuuc4N8mFtk7JhMQ==@linaro.org X-Google-Smtp-Source: AGHT+IEdFpDd8OJXOfyzloeCQGJi1PbMv2hsSjEFbLcEVLMxb0nmzLR8nchrYj9W5gaPVESDkKo2 X-Received: by 2002:a05:620a:1a13:b0:7c7:9349:e468 with SMTP id af79cd13be357-7c956eb3391mr295452185a.12.1745488070630; Thu, 24 Apr 2025 02:47:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745488070; cv=none; d=google.com; s=arc-20240605; b=RdxqfQIZqLuoRe/tluHIvvWXHHvuw698GjtzU4Kn9meFszo5PmU79mFX5IOAMeIEFr zRHU6rpCSbMBB+qAE1VC59oRvvn4HcNpBKA+RLEl8i6iVRPU481pGBsbre7auPuYbpnY 2nO0eizw1fHDNxvQN5XGvweHHp1hgimGk/xckzwrCU7NtJb039s2Neh8dY5yTdpnp27U F65geQSPErQSAi0jIk5M0/hO+FbVbdrJHWoxD5Gaa0IaGNM6AxUdtbw+Hj/5ZyEUO5lk 7vIA6gTifcfDfF1EpJenF3KLx7+VWbiCSfT7E3zmfFMcFUqiTp8detkem3Zkcz9Dt8de vGFg== 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=OfreXVzz+9AWc5zm3wgpgY6oO4v5p5SO53/S12OWUWc=; b=cgWkScyeCU9M/PI+fqj6oY9eaZ+pzCEAckRO+LO6NCaPMdZcpis4DaiQRIo9EWV+MD fmzdLLFM1hiOMKqTsi9YEJmDHvpV4JZNfc6EXuKsabajcbuq0rUbeevhoyGqBavt4wCr v+ideex8En6Ey+AW5h4199eTrgUp2B/kAPVsHrKJIBUzKJbkY9yi4uHfauN3ZU7Vidl2 YSjcjiJCZb2nrKmHNeylXkg6ErjXWNaPx7Szeat9dWEqGeGvaTd7WExhteXh0KvrPdM9 uUHBqt1tvs6Im4lFO0j8pQGTrSZUXtsf76BCrXPNwBxYAvdCLu3D3E+Ps8dA/Ws7Sdr1 I6+g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DwZq6uAJ; 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-7c958ea44fdsi97310585a.448.2025.04.24.02.47.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 02:47:50 -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=DwZq6uAJ; 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 1u7tAo-0007aL-Tv; Thu, 24 Apr 2025 05:47:14 -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 1u7tAj-0007Xn-NS for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:11 -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 1u7tAh-0002Yp-8h for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:09 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43cf628cb14so14635185e9.1 for ; Thu, 24 Apr 2025 02:47:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745488025; x=1746092825; 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=DwZq6uAJnQP5QYZjBT48eR8EQk2jwTZ1Xn+fJxTJePF+0u7c+nwi875FApNCHfHiO/ naQWg3mPLlMOhaSQnpIDCXmvyRdhqOmFT3ZXx1k9qQtYM2nNUIJtC8KnI6czYGSW/IZZ CGn/3YGTUroubjv4jyZp+SbtJA/Y+H8HvzJY2h8kp538/lRJAbZDFKSgFtoxh8x5W2cT w087j4jZLee2EnvRvAAlK3AZwFfV21UuGq3PvsIi4qZnguNgreVMmv3J31KmcM7TjU8N KkW0PlJi0nVySQnm1hHY/MIWbITRng88YLCM5cvVDZscxyOhsoAbfxn9bLgYACYjHzLJ 7jMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745488025; x=1746092825; 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=gPpZ8AK7zDBGLRYrf3tYDsUv+5yWG0wPKSYClre0LmnyveNF5hBL8GsZ0HOZcac7qC mzWKYmeEGed3rnxa9tYDmIUXTaZJtsCGoaDSDYrZypeN7jg+KKrYzb4OYLg0v8vyMB9x S5jFW+PXas/Y57x7Vo6/11UM5fmvdh+viNaltjaNFGE+amVboXh8RBiN4ucIgmP4VFJD r1FLNIWtTAyvoKoOj8td54rvhn8r9+Q+Lq/SmGuNpwxaR5fLEAUJVMMauCAq6w40s2sl rr8+/TI7O4HQztqv960t6hpO1us4+QG3UM7cfqVl3bCAvCqsU0Ulw5zEsKay7JOxS2uC coHg== X-Gm-Message-State: AOJu0YyFLRFWZ2gxSf6mpKSF/XPo/W4tpJoiGIpmXchnQarvDfhypRUp CQGbw5U5+Iv4bzGo1MqPDGTd1PM8BhDzSDC4hRrgAJDPW16qQEG6dEcVIB+yOUCBJmLcwtPUpcI f X-Gm-Gg: ASbGncuzxHjJZ1YLVzcniv1vfaHspUThJD+8uOFNK7CV47z7UClKuHyvVh4Ab5ixtMf XUcPIqhUNF08bS0veZir5qGMVrmV2gf197Q/A1DOKsj89Vz4IzJ8tH2PlQsGZBMfIx2CDycUxba RIyyoMgqJY/r9pGc3t+35xZwAWrkHFBoibGOJHUcfGPp4Cjj0GfI7ADsc6awHyaUXH/pACR/Zh6 IRmhyBKRV1crR0592gB52qSSvnrGDOdoRr00pi3acidYNFhfRybm6m2GM4rSm7aUyNXGQsBtkqS SWsOibZobAjpKduK+R8I3veQvkcGcvGhXgrkqQWf/bCEIEC/4t3wdKRLJTimic1jFLIqRBfvyMf yCBUr8hA+DC1oxPbyE4mI X-Received: by 2002:a05:600c:1c23:b0:43c:ec72:3daf with SMTP id 5b1f17b1804b1-4409c513fa7mr16522265e9.14.1745488025211; Thu, 24 Apr 2025 02:47:05 -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-4408d0a7802sm48959455e9.1.2025.04.24.02.47.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 02:47:04 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Richard Henderson Cc: Pierrick Bouvier , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 02/13] accel/tcg: Use vaddr in user/page-protection.h Date: Thu, 24 Apr 2025 11:46:42 +0200 Message-ID: <20250424094653.35932-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424094653.35932-1-philmd@linaro.org> References: <20250424094653.35932-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 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 09:46:43 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: 883931 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3341490wrs; Thu, 24 Apr 2025 02:47:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVrWqt8XOMpghPgyw2sWR9R/6eiqqjSr8vp3Tz58/aDbMdb1rI6QsQOO0JXVO6UFd/rt2Sc2w==@linaro.org X-Google-Smtp-Source: AGHT+IGpgrpGOPhPnxeW3kkWT5zkePLzqd1N8Txuatb/M/nmHVJdU5EwaTjVBhLni01cUaP9/5oI X-Received: by 2002:a05:620a:2442:b0:7c3:d5a4:3df3 with SMTP id af79cd13be357-7c956edff27mr299840985a.34.1745488048540; Thu, 24 Apr 2025 02:47:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745488048; cv=none; d=google.com; s=arc-20240605; b=kzy0sLsjJRRLcU8gOOJlWPYYZylursc9vLdvQF43rW59w0J+OML/ML4OWIkStqmUSm SCREFX6utVncpyXxaVH42DcCRWU2lRjji+AqYiYyjGqFHiYVJlEpEoDRsGmmbAZjTH0h R3xFg+wA/3JD8NP7X/TvDP52CkiEml6WfLbntsnWKUjVXxvlBOIqxjeFmZLMeikJoFvS UyOyz3X/QhBWY0jHV8bypk03zf+cl3xCqfxiPN+Jx5TIAwdHdPOf/kFzz8DyehSfnpf8 FlbOySGnurZdjq4k/IHvECEa7Uv/eZ3TNhJWvPLw6RmHw622j35HoJKtHHc5OMmt5d9G FJvw== 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=fKVbRu30xoHBRhvO25AZS8axM+b/UNVBgSZLA8vs3WU=; fh=OfreXVzz+9AWc5zm3wgpgY6oO4v5p5SO53/S12OWUWc=; b=bbOFCKHUZM4vcmbR8+5Xpi90jf127l6uhBlQpD2ZE88jXqaaw4o6W40mpsahEKS5h3 fC/+tcxhRPx53iAWCIlqSSvlfogfsqr+0xalZyjUFF71tZQ3SZ4XSFRgK3iWBY67cVsd dwU62J+loaNdeIcT+A3+NenBC6opHKXNXQ2ZzAedg6jqVpW/XdeytNq3AL4bylMwMTgt X6BbkOMjy4tb+2sBEhpCKf5m8cGrtvPCynb3V69hUaySANuuUAsfnMUCOxnj3fivyvy8 +KZsyIK+krnD9x49xP+BioXXF0ad+sjDd8SNDi1J7RIGCqgBpvPj1XpnJHox5hZx0cYS kIxQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=paEcNnRm; 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-7c958cd43c6si100197385a.136.2025.04.24.02.47.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 02:47:28 -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=paEcNnRm; 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 1u7tAp-0007ad-5Q; Thu, 24 Apr 2025 05:47: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 1u7tAn-0007Z6-No for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47: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 1u7tAl-0002ZC-MW for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:13 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43d04dc73b7so6691525e9.3 for ; Thu, 24 Apr 2025 02:47:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745488030; x=1746092830; 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=fKVbRu30xoHBRhvO25AZS8axM+b/UNVBgSZLA8vs3WU=; b=paEcNnRm1jKkH9Q1mIktk6g6jDYoNk680rfL7/c9D7Oo6ccGpxRRhHIGILrXCKsuQs VkOB3T9XzI+cnalvw8QcWdIv79xixw9MFgopMK/StG+x+GDYwn6YlH2U6mvpT78r2qTt YbPNlc5s6+Ktdqll+QwWhkie5Y8L//hWZLV1bVeZkUpfIHepCwAVUyvFe8dplNt0qRC6 wUtWymcpzNsvkBX2XCeRJJ92fsfcOpb5mW83q/DKPcj2tM/1sYPY59Gexoz7Tcl4bvXG QvX112p9dzyt7/K2wg5KQqB+o4MBKChp3RngAK3T28aHMcbdwNLjZrb9ClhLcJnngGnX EWyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745488030; x=1746092830; 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=fKVbRu30xoHBRhvO25AZS8axM+b/UNVBgSZLA8vs3WU=; b=cJqpkssy7/whTL8G/TsBu+muVmOD8yLCbXUnj4je3h/YEfW+i1s/10iiVt6FGJ3eZ3 TJ7pH7JpuRMtwAUsFhT3gjRXiZ0/g95eDw3uwiT9sv3yj3pu1p95pi8XoznUuaYYrhpL tFN3vZBagqFBimEtEMFsLjbryx4aznrSUIbXsk1N/0LgQfaUBOgkcrJu6Wd8CI0QCnas sD/AlJSx08B8hoYCyFOhE5G5jxdW8mIBd6taKOZYyCjDQdVkPOBMW6q2vX31Dk7+X2pa RikrDYoybl4ABO3DM9AAr28HWtPYeUwXfqx80BLnYGlxLqHVwh/M/aNWUAG6VVCIYIcP l0+A== X-Gm-Message-State: AOJu0YxmiMKNvU3IsGzeyjyhmCflZ9XwJpNApj7FOxKmqDHz13cELlKd Sx5tiotNGv5gkqPcPXZGEE0BRDWQET6E5ZYbeS5oaaWV8MnYHL1HpagVlV5naKMqxkN5EHlL8/C I X-Gm-Gg: ASbGncsWJmCoUASyKaWOU7MpVwdMUNQ21D0bA9jwjRcfBk/AXEx2i6GWaw8qg5SN9/m 2sEQsfLPPfyg+3i6VhB1Eq+W0N4agYfARphw0/4prFjtP3b1WnrG9Ef/3qCgIz9mN/xxCsOyFXv qmOV1ztpvTmK19Xh+0bOy2ZqjvfQ5AKwRfP+ikokxoleKOExubrADjHKDIL5vsvqgJUuTL90hju tGEqiltLyJ3s57j+7+iF/1I5giICznwzATTyqisL0CB6R23S5aWzuRgMMaclaX/r2oF7oVimf/Q /FMjSOSFIVj8qlYJ00SFbVxbzMZqlZ1V3AFDWWbIz/+cYNDZFJ2d21HzTXlFvjsEdBp9dmq99pr Lu8Svr/JVb6CPOhk+oH5w X-Received: by 2002:a05:600c:a00d:b0:43d:7588:6688 with SMTP id 5b1f17b1804b1-4409bd18492mr17380165e9.12.1745488029784; Thu, 24 Apr 2025 02:47:09 -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-4409d2ac5a9sm13920295e9.23.2025.04.24.02.47.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 02:47:09 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Richard Henderson Cc: Pierrick Bouvier , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 03/13] accel/tcg: Correct list of included headers in tcg-stub.c Date: Thu, 24 Apr 2025 11:46:43 +0200 Message-ID: <20250424094653.35932-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424094653.35932-1-philmd@linaro.org> References: <20250424094653.35932-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 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 09:46:44 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: 883939 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3341861wrs; Thu, 24 Apr 2025 02:48:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVMlOQjb3W3ayxs6PdKIMIb276gUncZBOaEnTWTJfMaE7UFpW+G6Vz0eXRqnOeaL6US+hGdBw==@linaro.org X-Google-Smtp-Source: AGHT+IGwhj74IMk9UNZI46Wsx6ERCn7kj383y/wk92LzafRx3bsejSnUSyI3tlPZ5RghWlM5aVEi X-Received: by 2002:ac8:58c1:0:b0:476:6b20:2cf3 with SMTP id d75a77b69052e-47eb4c9fd08mr21970421cf.33.1745488136831; Thu, 24 Apr 2025 02:48:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745488136; cv=none; d=google.com; s=arc-20240605; b=aca0WP3jU8MGblv6CXfHTiHDLIjSZeYNnbzfX5wpY/KyjqvgvaAYdEJfKyO54Rv3ka AOq4m8M4t0sZwMQ9Gyr8RJ/J+Qe2nVKbBvsOYH7oCX4JL43RXCrovZomLCeqFwqk1rKl GnqwbGGUvsWbVM+2PgoBbIkgANWad58goE4r6nxFUjyCfWjbVilmU4cWYaZCp/7anboO nW2meVwgFlNJTjRMtonMxugwYSGWWRCE3q9fY22ZO3MPopJWJ1PukMTWu3yHDNf+g5ZZ 6OLKGdKPt40qmS2Gxbj3rfwEXVX0Y35X4ItXVYMtGQQH9zOHGUve9JXXctM/6s7gjMDm FeHw== 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=Z+dClDFlT5FzPOmVGUogkFyrT6hsGGcZxW7y5tMgj+s=; fh=OfreXVzz+9AWc5zm3wgpgY6oO4v5p5SO53/S12OWUWc=; b=DCCJt/Sq4/SZororrfz382Pymi1zxpEiL3fL4qPqM5NgcThkmC1ZzuRzLF5Ol4rqxB A0dkFNCYr/rTa4gxvk368CKsJRQnzfLM62aiFCnuiCqT/isJAozXxLAg7LMWH05mKlSB RMsWdFMgKSTolbw06v3yv725JMFZQ09bmh3MArGX4zHNmCAHIkmUJgKA32OBipceVUXJ JiMBHIb7drgowvpfJhL0RS+PVsUl+NRA4Vt9rVjv5hteGRJ9sCa0DUzx3l6VBFDzZ30N MbL/4Vs1gD7xa6WkQqzox0Rt2BEtzTqfIa5O+Jg5AoKFh9YHKOAl2MB63QzYps2aCsA4 zXeQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KbADdO92; 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-47e9f9a2579si13965751cf.142.2025.04.24.02.48.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 02:48: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=KbADdO92; 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 1u7tAu-0007dF-4x; Thu, 24 Apr 2025 05:47:20 -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 1u7tAs-0007ce-3j for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:18 -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 1u7tAq-0002Zd-CO for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:17 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-39c31e4c3e5so513006f8f.0 for ; Thu, 24 Apr 2025 02:47:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745488034; x=1746092834; 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=Z+dClDFlT5FzPOmVGUogkFyrT6hsGGcZxW7y5tMgj+s=; b=KbADdO92CIGfFxIPHuzkaQozscuO0Ewm2Y2fh1XKiYL5KDqHBTWgnwdgufo0GfAq1C Oa2rVWHL3Gzp+j7DZ5r63WPFxLqoudv9LTzrpEPH8bW67zSZaZJ9Ho8ZBSxvOFohyZEL ud1X3L07L0ciujvO2zqqwVigzJvfKmn8K5eSwFVOswEwtLAYk4IXL1pLyHohcVxh4fH7 3NDCdC05Xmz2wse1QzLmBBuza4qW/ft3FW3pMN+xA4Lpc9nEebRkInGLf4TlNR98VVA0 FI+uXabgvTfhXVgS8ujtTxY5XW3TurrFWDtTlM8WH5KPLba/mBlMXrpP+ggUngfR+A/k yKLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745488034; x=1746092834; 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=Z+dClDFlT5FzPOmVGUogkFyrT6hsGGcZxW7y5tMgj+s=; b=ni2Pq4K5a6k/JjKjtEIVXpWCw54U2Y5rC7ODxh6HYHktNxKT93J0E98UnvxpWzlQzK aO/dKzl8TeT5Aw6SQEmhNI/s91fdC2pszzadluHn9RwZMd7E6BPcmkwGR5svD2aRKJv8 kzrrX8Bj9VMyfPb4UaBxA82HZus+gvwvcVCFiGL8LkNs5gzPOZtzRXagH85xgN+7rT6u cJedmmmZBqu/kgE/DwQ5sNlF2RWfg3q7a71IEYLhbQDhS6Ml0oMScl1wbtEN/rGw1GD4 3n6STASHc130JvvWAuToSp8LL1PYXTbNMUYwTfwkIS6LAo2DrMbfeISEYItg9Gsn7uVJ 9zfg== X-Gm-Message-State: AOJu0YyL2CRtlAX6DkbOxKO4jOE3B36BlqAP4xNt1HYR5l3pR3HY6rwV tMTNlnXe+tUnDHQWOfXt5lGoMnnReXWT8xUtfWv4g4NNafdU2kgmSK3F1NSvQ4BLDzHrtimqvFb Z X-Gm-Gg: ASbGncu5yzlWnuPcOEY7CjEIAQn5P/yKcOQteY4FzuFLvbxs6PH9y3vYumqNY3Nany1 nswTcPM2CAECSHebxdjYWtPp/+1IMaynJh1aXVphadG9ny2XACo6OVO7A68bj9PmHrWCl2yktSA Pl4oI+7rpEDbVUg69DdD1HDZ24Y8PxfgJANtQZxGq1uXunhN5Aji3VWLmi9VXOBOv1bq2Ri02Av Dlx2q4+sk2snjpiRmak5NDX8DPTNRc469FeijUuIyJjlEaSjA0FAVouDinxhyd0QzQRW+I3u4re t1Fdf9SJedk35QtQGtmjd5xEUrLpJtIO1wqyFplUlNgUSFkptd+Gj6lgeo0+kWRKEr8ibMJyrAt aDuTk8C9m4NlxtWYLXcSo X-Received: by 2002:a05:6000:228a:b0:39a:cd84:a77a with SMTP id ffacd0b85a97d-3a06cfa2f37mr1380357f8f.37.1745488034503; Thu, 24 Apr 2025 02:47:14 -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-3a06d4c4b52sm1535896f8f.55.2025.04.24.02.47.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 02:47:13 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Richard Henderson Cc: Pierrick Bouvier , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 04/13] include/exec: Include missing headers in exec-all.h Date: Thu, 24 Apr 2025 11:46:44 +0200 Message-ID: <20250424094653.35932-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424094653.35932-1-philmd@linaro.org> References: <20250424094653.35932-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 "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 09:46:45 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: 883932 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3341509wrs; Thu, 24 Apr 2025 02:47:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWvDCGoDhfQa6UIh9mC0QIREiosJqSJizR4gwsGEHqjKK1oUwddQmwg34PVQvuDjhlGTqMqBA==@linaro.org X-Google-Smtp-Source: AGHT+IFuxfcpU8be+Lo1Y44j+aOv6uO3jk7Pmb0UhAPb1nukdqIOY+BV8z2mQK4v9V2VN8Qzt3vp X-Received: by 2002:a05:622a:cf:b0:47a:e81b:ccb9 with SMTP id d75a77b69052e-47eb249042dmr30384951cf.2.1745488053178; Thu, 24 Apr 2025 02:47:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745488053; cv=none; d=google.com; s=arc-20240605; b=Glbc065DuzFmX7deR51OZeQIL+mGK4p0N4Ngato5qwvADJ8+MYwwJoetL0vYw0D47O jQNvMaiIKYqZFoHlPkvhCEGbF+Itqc/cl3SdHbnO3nwsxQKC9mZ9WSi2WTFH+K1BgAo+ HBkP66YXWeNW8uPvQ14BkljjIzgbvMRkQu7bYoo15EkCb6q/Ymp+voMz5jwU/wmEMt8V BzI2hmNrfR6CEQnclxoG43UmBqpSE/A4RP9hIYKlCi6tsjllOzSGh7Ebs02tfGlOvLx5 FrnGFpysRsDltRBhctRJxN3/d3hMK/h9xVrnnXyazD9Nbnk8H3pRvxEvlTdAyvfmAche yo6A== 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=OfreXVzz+9AWc5zm3wgpgY6oO4v5p5SO53/S12OWUWc=; b=HbNEUwxpF+EqseO/L+yW6IId7gYElKdrKuDPOWIuSTKk1Sj/T9s0v2vV5x8aDImhnR QEZjfhtdacoI4XCRsAKlJQyXTKjYGb9XGJrv9LtQpQePCbB8lKVVdkzh/q3kSJRDQfvk phZNhx7qMT2vtbFzB/1rKFKK01n9x5G0AiPjOcGn0tqt3cWhuvmKUHZGKLFQXfWBWxMy ifW41wfIPwu/WYxaTkZZgbz7FR5HUtvTmVeEe7pee/HhPDwtk6kiKxKcRCKq1Ev/bPu2 F8FNXTAsjlIlIvlRUa6LBpAZwpfljRhMbTMQHbuR7qMXRxNti/L5nrpGXzf+5cmObYMT /QNA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pjtTrJgS; 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-47e9f2ca1eesi13209631cf.36.2025.04.24.02.47.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 02:47:33 -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=pjtTrJgS; 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 1u7tAy-0007eB-Pb; Thu, 24 Apr 2025 05:47:24 -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 1u7tAx-0007dt-6m for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:23 -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 1u7tAv-0002a6-DM for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:22 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-43cebe06e9eso5034025e9.3 for ; Thu, 24 Apr 2025 02:47:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745488039; x=1746092839; 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=pjtTrJgSO307z6o36mjiv42XdYqPIuERXWyLcjJvjpb/0/zz6Lr0SLtk7pYFFuxJ5M e5EUplG1idDAg5XMxa1ls5ctn6rkqSoUK9e9yhKDazCMTlwZ3DbLTS88u1YUXXpclwUY e2kXVxliYMRty5iuBP8EJGLE9nCKMeDX8ISa/Dnr7s43BAuY2xPgFsnso7qFwClChcQ9 N1aXzY8CSuD+txoVsWe7NlV+jylMPpMkFU0AvniU0zISN8rTBliJZMI7rHa+k9+62T9x 73jOe1OlEpUmDjbYvLD+jUmrMD73DHW9tNXn6J+UaUQpmvX/qegOOyFJA8aqYRhy6cVw gAsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745488039; x=1746092839; 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=SeIMSlPSjQerOEiTIXsZJrqAPyer5La3mJ5SJXKhy3s3+ZSvn305lIWPVyanyGMB5J ig7B8z7ZaqSCjbM4X5qVmY0O86RUeKGWWHyvypoCnOH3fpnlY+DEGMhs9dfuhghQo30E vteP8SuWo/twAlPoL0GUlB3CFow6wDCKCBFZu6veDfHYdUANcFDcUeuYDNI1gNX+vkPG I2cQaUpKJiqqL/HEuv1bUIXPA1L9Fnx4I/FFwuaAxQEc2Dy2M1bbPqeNrcQSvtOil0A0 lRb2/TLbE1MjiWyMQ0gapqs1iBC0yr/rBoUj2pDoob9ludFvSeyg1ZON+tf2y/CMUAQz NeQg== X-Gm-Message-State: AOJu0Yx10ZskIhbS12kC5cn5ZFVZIjrq/Cmlu8hoNDR38Kv5mGGW1got SpNsZ9dC2PSQJ5hhIybtgNdgj0FBZAZo0BdqtfGj8XM9mU6p+e+8grokBWeNd7nOHMNMtz/Lwy1 8 X-Gm-Gg: ASbGnctStbTTqqPB0A4uZFtJ8RakmmNmJgYzgjGH8eFx/jyM6t+mSU+PaySTcdhWUFL v98d97ux5vLZmU/WY9/ulXU0oJVsqc7PtbUJLy6G6O+xvpcxI3jxANxgTR78jpTuGRmQ75jbQsF u+afxG9y+i4V35FjdLL2CKul+2pYPix5GG7nnSANSc2/HPqtQanPx/n9lyJ3mcWbBI9oXoZ5BPJ R6gLwyPWKl0nTSeCfYmJRgkaiKL5J/DL5n0JCtMWc6cVB/0YOU/TxErLlggblHDcEq8sktzhlH0 UkWV3IghGUQ9cS25IxSQe5/5UnAZk7v/V8I0u/pu+Mz9LlOz9jxMQZAFThUlAkRVTxN0j5NgGZn qtzN6SkkfX0h9bt/nXQdS X-Received: by 2002:a05:600c:8012:b0:43c:f629:66f4 with SMTP id 5b1f17b1804b1-4409bc079b8mr20784615e9.0.1745488039037; Thu, 24 Apr 2025 02:47: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 ffacd0b85a97d-3a06d4c4965sm1482024f8f.46.2025.04.24.02.47.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 02:47:18 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Richard Henderson Cc: Pierrick Bouvier , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 05/13] include/exec: Move tb_invalidate_phys_range to translation-block.h Date: Thu, 24 Apr 2025 11:46:45 +0200 Message-ID: <20250424094653.35932-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424094653.35932-1-philmd@linaro.org> References: <20250424094653.35932-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 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 09:46:46 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: 883941 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3341973wrs; Thu, 24 Apr 2025 02:49:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWaF6LMDhX7xe00JibxHAU1my2l7SwcXY3Jlc5tEjCigHVBXItP6ZilXmcv9VLfK1bgJNeyrg==@linaro.org X-Google-Smtp-Source: AGHT+IFFLMpkHbMQ84m3Cur6j4BKARx3aqC21NsHuf5kTKq2srQJgrzWDw9Y2UPuQrWUyQUuyuaL X-Received: by 2002:a05:620a:270f:b0:7c9:2612:32d6 with SMTP id af79cd13be357-7c956f45b0dmr348678985a.48.1745488155470; Thu, 24 Apr 2025 02:49:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745488155; cv=none; d=google.com; s=arc-20240605; b=ZM86q4YFg8h6HY0m1ysYwJanTdH+gzrT/TgeJSYRAZ8/WzPDJXXJsTyt5yCmZhYxSn dQXWtSqV9uiFD0CuPxCBLpoeOXkAm6jYt3/kkEy4GB9c65IaL93qvV9vzNVIc/FVF/uL 4trCHwkconG63RrcjahI34pgAG8Y6cNKizWH6Pg5W4jfrR6qBflr6LAibkZtfID6u93R YPj43+GBsFjgs4A7za/Q7m6kG8QOZnoRlO2HbKD4QUsUuU8dyEF8AGgQBu9DCZYAoE3u qI1YTWQ/YTW03U4suS8CXg8cOm6iKKaXyFwSJmDQ8ib4lUboXxSpzy6nUrdF46DwNmDi Uidw== 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=OfreXVzz+9AWc5zm3wgpgY6oO4v5p5SO53/S12OWUWc=; b=Jz8MIFRqgC03EmLXLGhAe6+L4FQRTD+RRnexviTVGbPEQhwyzX5VmFSuXwMNX6Dwyj PgiMPAZo+SvDTzWBuPiJjR/CYamL2/9jaX8B55gJ/6hmUIWQu5qSsU94O2NN/xPAIttz hH8cJWQkqo+kfR+dsl0KAF6eCB4P9v0vxoIhtjjuckf2GDQqPZNaPIFR/cne1wB6MNvp PL42S6jJVolEXq4efyPB9/qIkTwCnCyT1yPl1NuHl8DmNT2Jc///02sC/cKAJn+WeD1h 5mgbThynVNPoq/zumoJp09zoN9mBLUg8zXdGRmbdljjH0qLUa1FbvzREX+nT79xjPJC7 vmDg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TXhJZMWr; 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-7c958edf5f7si103368585a.617.2025.04.24.02.49.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 02:49:15 -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=TXhJZMWr; 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 1u7tB4-0007lB-8r; Thu, 24 Apr 2025 05:47: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 1u7tB1-0007hd-M0 for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:27 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7tAz-0002aV-Uw for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:27 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3912d2c89ecso632822f8f.2 for ; Thu, 24 Apr 2025 02:47:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745488044; x=1746092844; 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=TXhJZMWrg9aL+yPKuwJ8CiesM6zvynRcNG6zCgfbnVIsWHt5C5BowFhr/IOCm1TUZJ rCRBP0dkXqZNtKzpZM3f4PWF+aHmw4VeQOMK7DsIBIYN7YpKR4Z37s3+nrKXT1M6rzee pQ5g5bDUibwz5UFA+CI6owAMRczT45eChcbRGbm3uqBnC6KKhWfO/t4IfPUk368+Rm8U 01B4SbVlZYF8fPLUnrXdPTHCmmVbfvyFlmz8AGo9CFdQWXII/f2WMx2AFFpDxeox3mHg CVNtCxV4u/OjeTJBsRwV6HiDzH6hrgHjVHmuHVA1HkeMGBoQtutRwrzWTnZJ85Tq7urL EHMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745488044; x=1746092844; 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=FSizbHB0YUZenES1oByXNshJ8RPVSwoRRAMT+urH4wvyJ6Zwg82vuhjL9b1zCm1Hi8 4h9OlhJa3pCz/dS4oSQgMu05O8UAxTYA0E82vnyngLu3AwS1gq4gVPZyRItrkopE8FSR 1KCnnD8tUHcnGUzghUaW+NWV5Uh3BrYB2ij6G7oMDg1VO45CmrV1Ac1QaU6ToB6NLjMA GKvjV+Vlwl9iqfXuo3EfigMwQTKUgdfhpMWTf4tBEySuDBiUywzl16Ekg0um8i0TV5EC eHLrLYdXt1pWS8GHxJjaJoJurNV1BKMnWauuNvTYCg8f+GNtKTpAmZd3p38XtFiEZrvC OXiQ== X-Gm-Message-State: AOJu0YysWoSfy1/2Okg3AL0l60oUdbSYS0I6eC20+pVOuDIDGJSIjFPi 3UaWhcHqkSymUUIJgAp9DXQ3UwgLXJ7lQ3l/Y9r3ga/vT5Txl1qcjblhW9/t66MxEakXP14aKGA Q X-Gm-Gg: ASbGncurp4a+RKwEbcUAYGNbMTl9N5LMgw70adGBkLoTHoBHGnlgU6m13a/H6hEOav6 4r4k+YF1n3Wv28k7K3n4ibDTpaAe1FfMLskhlQ7PnLSbZk7Q4TgEPcZ9yYOgVJz/N6vulZSIzM2 l6bEaYZDaGJifOyDFy5z7xKgOXzhqugF2SjEPtc1p5NwwMJCPfveNZVvCzEisYqzCYiHvoS4YP9 dhIeY9dvuuDgS2qIsw3/hkpXGmCMhr88MtqRxOSgDz5A+KOyuSTPqbuGrppqLBYB72DrmhzKLDl F/+4/2Xl08GDH0bf2B7HtMWue4i4SPqzlNi7EKthSqxZbdJoyDG2B4YdzVn9D+76PvkQ9TVYZ6i rp9kMR3kLgCuxq06quLh0 X-Received: by 2002:a5d:584b:0:b0:39c:1257:cd3e with SMTP id ffacd0b85a97d-3a06cfb293cmr1453015f8f.56.1745488043767; Thu, 24 Apr 2025 02:47: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-4409d29b8efsm14195305e9.6.2025.04.24.02.47.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 02:47:23 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Richard Henderson Cc: Pierrick Bouvier , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 06/13] accel/tcg: Compile tb-maint.c twice Date: Thu, 24 Apr 2025 11:46:46 +0200 Message-ID: <20250424094653.35932-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424094653.35932-1-philmd@linaro.org> References: <20250424094653.35932-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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 09:46:47 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: 883934 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3341592wrs; Thu, 24 Apr 2025 02:47:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVuizz8MTAlUwiAoS94NwWkEaLzTUEV7ZMzn12TTCT8lY6SnfvJyvlFVZrI9EkEzvdS9tGZDg==@linaro.org X-Google-Smtp-Source: AGHT+IG5tTMvJUWgTL/61z+T/8jxyNMdLLbzFgjUAtT5xnZ2o5tZoeluewnaIbxGwB9O28BK2p2l X-Received: by 2002:ac8:570e:0:b0:474:fe31:a239 with SMTP id d75a77b69052e-47eb248db7cmr28689491cf.3.1745488078175; Thu, 24 Apr 2025 02:47:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745488078; cv=none; d=google.com; s=arc-20240605; b=SdMIlkFQuBq6Me6O74sCKN+T/NRWoWJLPoqEbQqVX9LvsxGK25bh1LtXUFywPfhg27 1UqbOAxn7ombWbl7JDI7RCfSZ56Ms0I6KOCtPEdiOKgidad/4rrkgl/WxBKAC445jiy3 E1R0EVppxUfTIviebA909n4AsRHUNwTygjAse79FvZiLuvFBbA8zzkwmwYqvD/rhdSnX SWLyeusSHeqHV8SZ++EvH4gaOOTOx83D4jQ3ncBmNust2beqMjmqImQuFzwDckHIWuko eelavr884RCQrPyPviwbXoI8+ARxVcxW+yuQeLkcPeA0aRcRS0uAadoAucvPybKkcDM1 RJfQ== 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=766nu4+voMP/IZQOGysMn7ofUaqxPgeNp6L0gDtkVMA=; fh=OfreXVzz+9AWc5zm3wgpgY6oO4v5p5SO53/S12OWUWc=; b=AKvvPRUR3hdHr9Buqna7k/nUoXbreKCKlxCLJvHARjfcDu+eTJ/JGOMfy0XoKjQGqW ePW7sUp07+18RUQX1FBJSGlMDUlIPaEtMylgLs+SO8o6WW9+Fa6xnVCN7vZ5oB2u6V9+ vI1nBtMU7eW2GdDr7VoE6FeCDOTz1pVDMI66D7NuHI0MNFG/najEKm6j89/VXjgajdQb VR0Nat/dn2iErfS2n/Mlg+C7XqgrZmHAzuOrgxm5tTUvly0rRBEPbHTKH/fTXtPTWRDy OpCxX5e4a+HLqMGkym3vYISophhqB2H6RzAw8SWh3UoSYQ8Wb+DKRsoRJGg7PCWLVPva uciQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="dM8Priw/"; 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-47ea1995e06si13503771cf.217.2025.04.24.02.47.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 02:47:58 -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="dM8Priw/"; 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 1u7tB9-0007vP-1a; Thu, 24 Apr 2025 05:47:35 -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 1u7tB6-0007qh-3P for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:32 -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 1u7tB4-0002aj-4x for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:31 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43cf034d4abso7063505e9.3 for ; Thu, 24 Apr 2025 02:47:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745488048; x=1746092848; 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=766nu4+voMP/IZQOGysMn7ofUaqxPgeNp6L0gDtkVMA=; b=dM8Priw/a6VamxtAtUE/XLYR9h3U84T1V34luaPqUhVw3O9nFGHUSIL0XGA4Oneknw H9hvfT6px/SbNj1jek99kzoQEs1XxxIybp3qkY4CVFo2jUlDiBtgwY4cgXud5drA5AGL Okln0UxNa9MqSw7cRcWFjSgWLJL28/rKk+KsbHhodVgpb7bwvmIZbrCG81zRBPslvZaR bd0PpoC/Bp5L3go/owtGlaySDeil1QqqECeWO+3FVItX8TBMBbvLlrh+wjTJHbAVBvei oscev77thg4ypB/bYcAjABaIVgf2WeOyET3a8XyMw1ftoG3IakQ5rXaCHr5HmjznR2XR /Y8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745488048; x=1746092848; 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=766nu4+voMP/IZQOGysMn7ofUaqxPgeNp6L0gDtkVMA=; b=YdvYfrD47XLNAiSClHL94a4FzQiR9LmvaUEYpqAYa8lERTk4DtDZva9+OPmVRjghCO 96siwcw5Fp3jZBb+91Ri2sDXWh8eQ1MWSG52xkIDY95Hyjvo6aTxGzQstwILMYImey3n hoAli7XFUW+D4GJAplCmnB731Lw6jbnWpX0b7iibZCN9KV7ETJoxhdtoPi2dxAki92aw oSALOSNeVVYSY5kCp+EmZomWrEyNPzUZ4cME4y4qZJD7qTgZ7FchAeW2V3P5OB9rIOJ6 YoQMYm1rMOgf8JrgC2VszF/2dXewhUGqgulsJDbXDEe3KZk3+Od6s0EwT6tI986yzfDA KScw== X-Gm-Message-State: AOJu0YzQQV6Jkcjo8GKDLZ+WACWQiJTC1Nysa1kMUtlkQNFX9odBRk0m ABVRMTmb0tGTGZFBymaht7i3tY7TgFj5ISyMCfTr40wozeVGuI6+IVLGIzGa6PufxceBraPyGqu K X-Gm-Gg: ASbGncvrQqKes51kvQ9pbOOkFBU09BBy7GBacwjF35SINjzP2+dGl86oFgrrbWnrSZe PUp1ay5eztC+0EI7Miy6MatEm0uJBrUtIUAjSMIVRHr0E1223vjMspHyVj3u0BJVopL8xCku0ZV Ion8F1TIERAKuwsHfaAygngbMbarYe5TxbCi8dtm9c3P/TjqDGt+2FxBY4Nac7Vc7cCYh+DFNx8 CEbUp1qyQx6jLJ8ki/zI7A1qh3O80is3qKPIzyIQM3Blda/bSnWAZw/GQ12lda2AStJTPESptoP u8uMsPU7x1qrpjnRouu9TNZVkdk5Kge2gZ5BxWjF9DO956WLnI25V/iN7XlvL0fNxiZx9doIs33 fuXbM00mQDGcQ7uoOyyWj X-Received: by 2002:a05:600c:450e:b0:43d:1824:aadc with SMTP id 5b1f17b1804b1-4409bd89ca4mr13272515e9.29.1745488048358; Thu, 24 Apr 2025 02:47: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-4409d2bfa93sm13947915e9.37.2025.04.24.02.47.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 02:47:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Richard Henderson Cc: Pierrick Bouvier , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 07/13] target/riscv: Include missing 'accel/tcg/getpc.h' in csr.c Date: Thu, 24 Apr 2025 11:46:47 +0200 Message-ID: <20250424094653.35932-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424094653.35932-1-philmd@linaro.org> References: <20250424094653.35932-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 "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) { | ^ 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 09:46:48 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: 883937 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3341801wrs; Thu, 24 Apr 2025 02:48:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW5fB68SXfkGtH3zxmJy5fcSW6cUXdJm0h+/6la8DrIFjQFrLN4LetRoBpsOPHVVRl/CVSx6A==@linaro.org X-Google-Smtp-Source: AGHT+IG6iEIecwqLW+ifHW2REGy9llqe/VypJcYZ7xRm3fonWYelKLtL/jMJO2Tm05g/Y0weWfDZ X-Received: by 2002:a05:6214:29e4:b0:6e8:f88f:b96b with SMTP id 6a1803df08f44-6f4bfc0b259mr34950586d6.9.1745488116336; Thu, 24 Apr 2025 02:48:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745488116; cv=none; d=google.com; s=arc-20240605; b=jfVQVhp+3o0c11kNCc+hFa9ol1+o28x9d+ACOubrTuaLYqF7gFWjUfLK8is0/bIG6H pOprwWYw+hEPjBC4vmvv+4bbe9oHRwIF2KxgG7jA2dQP+OAhMyNsHF1p09vEjeQi1PhP lxK5yptKqyryRqQ0acPlbCrUAx9d6rgc5X8jyTKzu8yjcWjjdc8MDMph84Sv41kdREth mwYe9UUyiPyRK+nR8z3eN5tHw7vnCdBD0J/thFU0einLKeaEFxaI9vo0TE0xfS53XQI2 m96iZtOezpuvmyBMVvv8uB6EArTAY+Tka+FfEgG0mGqWn34Xs4ROi21hXagUs2hXWcFP o5og== 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=J4J0VMJ6GfvwPK+ehChCjxy21KDTNZZmDYppJFi+hTg=; fh=OfreXVzz+9AWc5zm3wgpgY6oO4v5p5SO53/S12OWUWc=; b=QoXMJus1pMZOlO0MclqavfBubYeY1Kak/cdbDiuY5rSR/G6sktBTjo4vO3eI6xPOP4 wg44cm5NE9mWl1TCBR56K9na0XpOBU3zFkPSjhCHfCyXqChXpbp/w0w/nHHWNjj+DMVf 9g01vtITMDD7WrX2IF9sFdJ2OPJR5MGNZwIjKxZg8+JnlMWLKUPxj7SA3g9iPHkvz9HC 46/djNfN17RXU4cmr9IydbEslM3hnRUi3xLFQ3pvprGoUCi1FriB2AeiQOrzvcvHfv+Q tv1+Qdewu7GaLE5iyFIHJ78HNTWrvlmxe97SCtfZkzCh3mK2yJq/Tz2qtcNRFHOvFGHa VmDA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H1KiyEGF; 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-6f4c092af78si11708046d6.165.2025.04.24.02.48.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 02:48:36 -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=H1KiyEGF; 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 1u7tBE-000836-7J; Thu, 24 Apr 2025 05:47:40 -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 1u7tBA-0007zP-R7 for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:37 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7tB9-0002at-4h for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:36 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-39c0e0bc733so674713f8f.1 for ; Thu, 24 Apr 2025 02:47:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745488053; x=1746092853; 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=J4J0VMJ6GfvwPK+ehChCjxy21KDTNZZmDYppJFi+hTg=; b=H1KiyEGFkmqo+c9nDMQZx6uDHS+qSZJpXk2DV0id6h9pylbAAsiqTQpH60psywygLH QpmyGbG/rFaW1NIelgKvDoge1DatiKmEIGqndLFkGrs26EJ8+GyEK1PJ2fbO2vqYx/yE WNitpny42D7LsCMHx4bu+EdAlUp9jtjyMiQeV8GcMBDtZgNH1W1IhXwnZfutEBRcWfek ni9l17eEmkrvEzAaMoliT41gUiMKbGS5ChLqiKMkFPfhFifbLaquSxZ8GZny3p/HWUed OLxTguX3RL6NvhXoa0TdLCKHKNJyPlHCWdJbR+bnFJt46BTp2r5jPYAXOLYi4SaunSbd rkig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745488053; x=1746092853; 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=J4J0VMJ6GfvwPK+ehChCjxy21KDTNZZmDYppJFi+hTg=; b=InZi8lzMLT32px+T6qbHl/sNgEScLHfxRAW+SNZnzM+4nHXGD9dITJuCquRVFl8ScK iOAQ3V3IUza8emLUOazb3Z9WgczHQCxDnI+Asgvbm+NYp0jMft2yjbCzrti9qGJ6eIjS PzTpn5XGiadE9N5gNpa2um7UOWx83xAFzxuWYFWBxC2YwhNwtac7oiplpAaECvlyW8k9 guTo2Kh7sgZaBDiVfgBzS5q28llWQUQC6FEsO8VQYdHYyxP1vyvbTNKHz8ARbUisonBW AUNiowE9n9HfL552tzodVk5XgI803OB//rkBe6Z9wU9d+Gzg5d+6QchcpIPNx3BJF2MS q8Aw== X-Gm-Message-State: AOJu0Yy1Udhk67+FmoYana7Bg+76jF5Ztt1IFtldKSnP7bEuhq2oxnAB mM60yaalQokuPyGsu7iC+7iM1MuuhSl8BgXy6pObxKHwQ7gEVy9xRxxCR9Fb5GOYpy2XaEOrKX8 1 X-Gm-Gg: ASbGncv4MftpskZQPJm+IsgkI8nnYJGqqunAi4E8r1331mesmgGjacbrZHfQNWMLymU Rwx8dT6SUG7juqLhHPWeWAvSMFSuDqoUj66dHb3IiGQKsqKSRZptcGWnqTMBn5uDGs+6ZqnZjD3 GdfgqScoOntWXNh24UnRySHRn6KGgP9YuBWRvxvNvsP/8976ZE5bgJgj4Kl4GV/Dp/T6rnjcytQ OMDtaMrn4wtuo1vSJD0a+COJ//qrrBsEez4FUnPEGjTwYd51brh1UbAQvKUeZ39DiP/xY/Je0RE uyJrGFr11g/h+ylQNRFP9uX20En0tFFYh+fUH+PrSR5j/O6/AWLchomvcRiRqX7jVpX2yx/bZoM FubHn1OCyAuTT3AolVtnlY+aL20gcjII= X-Received: by 2002:a05:6000:22c6:b0:39e:e438:8e32 with SMTP id ffacd0b85a97d-3a06cfc5d0bmr1187599f8f.55.1745488053012; Thu, 24 Apr 2025 02:47: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 5b1f17b1804b1-4409d2a2386sm14204155e9.14.2025.04.24.02.47.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 02:47:32 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Richard Henderson Cc: Pierrick Bouvier , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 08/13] target/hexagon: Include missing 'accel/tcg/getpc.h' Date: Thu, 24 Apr 2025 11:46:48 +0200 Message-ID: <20250424094653.35932-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424094653.35932-1-philmd@linaro.org> References: <20250424094653.35932-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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 09:46:49 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: 883942 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3341998wrs; Thu, 24 Apr 2025 02:49:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXoKKbrNKDghX1bZtbCNB41z3KhQe4kg30FL+NmFeZP4qgewfhmloJmUPbFtvUFXZRb5ZljDw==@linaro.org X-Google-Smtp-Source: AGHT+IFXuUN2h7K92StppdeObIZ3+T9z4diet/4iy0Hp8DKS3ad26KbtoNTD4oo4f8N0/06fUqxn X-Received: by 2002:a05:622a:245:b0:47a:e6d1:411d with SMTP id d75a77b69052e-47eb43ab3b6mr28154571cf.40.1745488161957; Thu, 24 Apr 2025 02:49:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745488161; cv=none; d=google.com; s=arc-20240605; b=VFXQ2nwhIN2jNV0NCqYZy2VeShVHkQtHFAMS80eZ/QAa5HHNdbcRAIOQAWAPq5s7W1 AZiZkLb/O+IyBwtn8gC1CcsbkB8f8EhD40FEZDfT7KEbpeanDSQ4FKN9EAxSeIaFilON DK15GmUMmLM+8GA4VfVpDnblskLGQDoeE6cJetW7hssjQ0YEB4C3vkxem65+cDvNnvpS LV3/7XbNA9uIpogGfQZ/tkTUlXUlsdGRrWQ8zS+hdvwBGdKsXxugr20gE1a9P/OHsVhK BNXV6PDOHYUCLKvijkwgcKOYSwE0136oNYyXQuWOPSrI3H7/6vc80EJv6glJjonvhkZ/ gnZw== 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=FlhuEFGU9Yqfmcq0obyYoUcjG/F2c98mBOFnS8by1sw=; fh=OfreXVzz+9AWc5zm3wgpgY6oO4v5p5SO53/S12OWUWc=; b=cVTp0H3kjrbeAGtJ6JwCUnLwCyeB8/EETA7ZKN9uGvQtMliNxPmruRN1JnqM+FfZ/F J1Yv/o7aRRtk7uer/QWqhZchlwTyXBmsaKtfmSNnzSnD8szqVqMuHvrPOq9AluDgLAnc MAi0mYyObZrq99xmzVCU3m1ZMJXkuYKOMz+F6vy1EyTU+UdflckPfdcPO+geJn1ZNYA5 7doBlCBcZqTOOO4CvmvZmgCPxrLfBDh9Yr4gekcjaTWUjzxt71esdP6qguA5SlIgtWS8 +iOFspRFM0X9eDhjHhtub7yLSWCAzEKf5+cX3jQBICyVwr7Icsb/hl3V/OANc/yVpOtT lCzQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ruYTKxkw; 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-47ea1f96cb7si13623041cf.408.2025.04.24.02.49.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 02:49:21 -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=ruYTKxkw; 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 1u7tBI-00085p-0o; Thu, 24 Apr 2025 05:47:44 -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 1u7tBF-00084S-9s for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:41 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7tBD-0002b3-FG for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:40 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-39ee5ac4321so869328f8f.1 for ; Thu, 24 Apr 2025 02:47:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745488057; x=1746092857; 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=FlhuEFGU9Yqfmcq0obyYoUcjG/F2c98mBOFnS8by1sw=; b=ruYTKxkwv6Dpf1z7qxS4LEZXRZ7Woo/X8nAt0ucDEZe4u46YqIqwI7WmM5pccilzfk lxSnpX/Z8WKJKcG/PXpC45W3HDTePOwNAgbRx5zP6Nm5eXfscPslU1tvAnxuB2mF97pH +65bsaDXZrdl+iAYLf+BqE4xQEn1AqtyHU58M2a7ZoYE7OZgGkck6294I2Yve8RsLLZI OW5VV1R+yB0y3DKyjKpgW1QufxLHwKRDZGMqbOGi2DSvX5gv/bKNy61fXDx/G+dmXIWd U3mQ71MlojeYtSeNsN60JjDiiCMwmQg8pQbdkN0B7ccGNc0ljKozg9E1roL/T/A7IseP XcVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745488057; x=1746092857; 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=FlhuEFGU9Yqfmcq0obyYoUcjG/F2c98mBOFnS8by1sw=; b=Ggt7ANolAt5MHl7b69U6DF8KmgiyCC1e9//Lzyat/Q3iq86RIH0LX/OClqBqpbl8sv gWuG/kkautyez9B1gcDvKSe6/qBwVtu6Z85vhN3uR2bD5ufjAMkVVSUFalxHnMuSczn/ 6hQIzA6P8V7RCywiCURnkBg/tIJMhkNbpAxhR2A+wwFsmiQTE+OFQVNrnnllKhX2m1b0 vna/h8ZTJoYly9x9XIzHz1wDUMX31HEC/f+LA7ubzJ4PfntxkpMfaFf7eHsE+w/47WqM 8nKwTo1HfxB5Y3RRtCIfZxJ+u6cOXeY2g7MY516r2M1FbRB3+pV2qWb0plBfwQGXR47c QT6w== X-Gm-Message-State: AOJu0YzpFI8AxWWyqL6017M0sifvP2bX1RYlWZjt+D/BmCzKqXn3qL6I D0T3ambU5/RcvCFC41TRfcHYZM9Rs6QDd7bng3/kZwOVKZoFG2dAZXw7m6jvYKrAjwcPX9TQTs5 Y X-Gm-Gg: ASbGncvhsaNzg9FKdtAk/AuAnkBk7sCr0cxBjlbdULPdbLvCo3gFAqNOEyJV6C9xN3o Crd9FFQCPEw2kLguBok8qUHL4SE66+4kj2D8eARXbq1FZxXutI3CUjG5yWMb8fxbdbHlTCzBxba d8VzdBICAatDw8K9NNhm3e0piFbVpzU7zpTHozzDvoV4AHwEJaULs/3TJsZAd04UNCGFnNNWd2Z k/9cInVP5qByZ5cpd7A/kpa3J6Mc5xE9tGMrltD5rus1k2UY8scD4qHmh2lgfYBG4/H67uETGZs CRPV1mbr1MmuGRBCGx6FgZyhcSW8KXEWmKj6/HxqtC/bKvAyshYxURIG7d9EzOrAY0KGsaDzOQO pd7ELgSB7c1GvOXlIk8CxFP6xD5cmgoY= X-Received: by 2002:a5d:6daf:0:b0:39c:1efb:ee8a with SMTP id ffacd0b85a97d-3a06cfa3477mr1649055f8f.38.1745488057602; Thu, 24 Apr 2025 02:47:37 -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-4409d2a2fa5sm13668615e9.9.2025.04.24.02.47.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 02:47:37 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Richard Henderson Cc: Pierrick Bouvier , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 09/13] accel/tcg: Include 'accel/tcg/getpc.h' in 'exec/helper-proto' Date: Thu, 24 Apr 2025 11:46:49 +0200 Message-ID: <20250424094653.35932-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424094653.35932-1-philmd@linaro.org> References: <20250424094653.35932-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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 + 3 files changed, 3 insertions(+), 1 deletion(-) 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" From patchwork Thu Apr 24 09:46:50 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: 883936 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3341730wrs; Thu, 24 Apr 2025 02:48:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU48u+8erqwm0CkjdLS2A3TyGcDojWk2KDg21dThjRY+rjSXu7z6TEAr06yA5GKTOGgSAa16w==@linaro.org X-Google-Smtp-Source: AGHT+IEt3bvft69yni2NmyEe0aBUxVVBc9VlCn3gjvgsSBu7W7kaFrvCAbgPPCCZJbJlz/z0rZd9 X-Received: by 2002:ac8:580c:0:b0:476:b73c:4ad2 with SMTP id d75a77b69052e-47eb248cc03mr23778201cf.9.1745488101822; Thu, 24 Apr 2025 02:48:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745488101; cv=none; d=google.com; s=arc-20240605; b=eKgg9G7NZf+SV2TldT8jTQgQrIQhaZaLiQ27sYw0wk5bQ7PAS4yUDynzY+RbyXyAOK Q8OEhr8+bPrIVIj0jiPGQwWbll9YiREIuutSax3c0gHAYU/UleuaQMvBLWAtdJ4RXyW5 UeFno25It5FcWSm4/KUOJ7BrhFH+ZEtcRYOkIJEVfdww1eiaRhQlolTeDD71jdalkzSL VNmrm96Ih/Xv2KMl68HZpAdr7RQtYDvAViPUI06E8BvAGKcTvypBp5pDAgnFnWWZSeGx itcavuwQhV74tp3Wpvs9ZTnbCTNwp7++isnatl0NSIlTDfyHeW+1XZlR+QBOEdoIg2xj lhKA== 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=twrcSo4HetcJ/tOp7Scc/UtSqix7ipI/uTd3T2r+yek=; fh=OfreXVzz+9AWc5zm3wgpgY6oO4v5p5SO53/S12OWUWc=; b=JzAxKsYymgQ5RLtH+RAL+I0OIbXnnj7AgVBgSkMIUxJa6lixQ1/NS0En3hhAfUuz8O w9iwPh+NjEAndK3IyDhWGBLwkIrZuA7enJGTRBXGByYgCRGy4D+2+0619RQ0PYPZGVc/ qrhwvsCw5JCyS5MJYPbbvG5xWQDLaZN6ObLGRFJ583G6paxtSoqRXDHXLpK4KApISiVg gbhX85CoIACvNq3q/r4W+3UjhKXiSVcJiwhHSzx0NfPvRlPCrwSMRxzHRkdfjG9JFlWu agf3WE+K6Aq9WZfQ61wXfxjdSyZZXZXAjj2XGxAtwjQQNdlKr5Twj0awJWPzM29s7KaT t4cA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KQj4a+91; 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-47ea2ba96d4si13557301cf.639.2025.04.24.02.48.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 02:48:21 -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=KQj4a+91; 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 1u7tBP-0008OM-0g; Thu, 24 Apr 2025 05:47:51 -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 1u7tBK-0008G6-D0 for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:47 -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 1u7tBI-0002bD-Fe for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:46 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3913958ebf2so621052f8f.3 for ; Thu, 24 Apr 2025 02:47:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745488062; x=1746092862; 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=twrcSo4HetcJ/tOp7Scc/UtSqix7ipI/uTd3T2r+yek=; b=KQj4a+9165+0WLJK0amhTnlftVdqs8UhMSFFrpLbtNEJQF3ZakBUqjlWy1NjQonJlX 5shD0YPsnmbVNhPEy7SPoQu9D6jftItLui+lKLVQ9l55b5Eq27XpcQ1is8nSVG/hygo9 LOM045BPJelje3kO9WljPEfRVz7VBGV4V31ej+IvVtkhPQ/PnZA4MV9JsItJYxcbrsPI cg4Epxpz/VeJ3r0RtJZw8NcGw93smClt415urEHBMc7JUSJdCLBuyom4J7Urfj/3V9Yf AdLlgm39LUeVtC/RYiv+U7M7VcvnqB/M4UMJ5JOzufjeuZ9h2HnGwldAi0RNtvi9nPKl 61dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745488062; x=1746092862; 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=twrcSo4HetcJ/tOp7Scc/UtSqix7ipI/uTd3T2r+yek=; b=VvEo197YVQfr5O0JsdWAIvjrd1XmG+wtdOrHtTsRe2pcieGvsC7Pm2BegxWFj3JI0i qcf/TmB38xNCOb0gb1Z+RjgFAW7ihv54qUwwi/dOIFDeyydXSg1PE0sO8ACXgtnekUhs HIsZHSqfomrAxCAY78k1HoJSXW1dS7j8jqBaG+UQXcKaMFtViQg+bPhbK9WMSCrYNax7 lmCkJzxY+tRyWFVLK5cw1K6GEN6Y/uCOai6PvR4C48o+QsX74DhvlSijNCHNuqVS8ypb sHJyb+6ll/b1iv/hn9tv0G6i5rb4C2NveBrdKcWwpbP5x2npKXxW4o2DB2mkhPGAC3wt YaMQ== X-Gm-Message-State: AOJu0YzsHK6SCZYPQSXF/nDgU8MHj2ygdGNT2+W/HX63y+12AvH7Hgx3 5Id2S/8Rm8LldXL10qrf4bXEDtKZmAQJM8ni+jiBcgZZHRFnaYjeL6pQAeS3/yK4kIzWv6g+0at n X-Gm-Gg: ASbGncui/ClNjJlR1keS6sJFx+1IoLK6U/ifZpCX3xG2LdudVWGH2J5NTWKxEXZnIhU te9BsI4hfLi1FFbXAQMqZFnErVWr/XLnBAY4zU8iFrKfJmg+6Fz2xsv844W6LCQS6QIPFnFO1mK en57nLx8XYSAcSoUaLdlBxz5NS9SAU2NH/gdsPOW47fWcHlgDZWNt5JoaBZ9x21ADwqw2TncOih GrOYYhsvmCyqDfqvVeumJbg/+UddKQ9bjQtFpT5GHW225QgY7JDj+kkOPR3jMtwJJ09VtRMAYIz rv3eUD/GA872kuDCWR23EIU9u8lohHvBr0XPxqOSTX1aYlfWPZR/4LBQ82XuOs7B99/GTB/zwX8 hT1RuCkFp0KjN9MDIv9Jg X-Received: by 2002:a05:6000:1ace:b0:39d:8153:fde5 with SMTP id ffacd0b85a97d-3a06cf5f447mr1483441f8f.24.1745488062263; Thu, 24 Apr 2025 02:47:42 -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-3a06d54f157sm1538517f8f.98.2025.04.24.02.47.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 02:47:41 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Richard Henderson Cc: Pierrick Bouvier , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 10/13] physmem: Move TCG IOMMU methods around Date: Thu, 24 Apr 2025 11:46:50 +0200 Message-ID: <20250424094653.35932-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424094653.35932-1-philmd@linaro.org> References: <20250424094653.35932-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 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 09:46:51 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: 883938 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3341825wrs; Thu, 24 Apr 2025 02:48:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWReiZSrjIVJVx9UQf53faBJ42r572IV7Epls+YnsuZ0po6WJqbipw9lbhopuwhl0QRrsaHIg==@linaro.org X-Google-Smtp-Source: AGHT+IHsTv/IFfNCsPox8OTnu9O2W2P4USlvizKZf/44hJj4Ar5wU9BXt/+5WwCrRRbSdCSq7YYO X-Received: by 2002:a05:620a:198d:b0:7c9:35db:8ac3 with SMTP id af79cd13be357-7c956f64acbmr300353085a.41.1745488123620; Thu, 24 Apr 2025 02:48:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745488123; cv=none; d=google.com; s=arc-20240605; b=jloVwXXVvT5Lj1zCcbW6hARAe8FVD9/4x+hmmTfI6R25yDMrhPkuCvOL6YJ2e14Q5x nfIIkms54Wzp57vSCl6SAbXCkeBQOKevf5t/k1VxovQuhtIYTwn1N26BmrLfJpzzzhAO tT+56+AOQWH6WgrWaCrv+/34W3lvRT/50bwxKMln3SWCzRHaT5eucxIapDidXWJWWvCv hkb5pphV3qCNE9gK/p6dwZLhRJ510UTB4KbyahN0pA+PtOtBFAajKaBaGnGh8rEWkGh/ TshkicxgbOMxS5rX3YQW9dSm04RncXCftQvCz1nEDlTe6Bw+rfjw68s5fyWTiw8fnZPY FVQw== 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=OfreXVzz+9AWc5zm3wgpgY6oO4v5p5SO53/S12OWUWc=; b=Zc4+qP/TjWX+ZsYBshyLREacevXO7gevu0sVWlnxgrH/VQPVkH0UfJ617Z+/OnEt1u 3d5GijFqv7BePnFOwNItD75dBVdc4g2sEMy86AGHBUMQXfuZBL2GU/8NvZSJktR5/puD sLU7IKicl8nl7PbWZ/VHWPTJx4wBsTN9B3e810eZ7Eb37dOJF6a495G24rTRMemJ8bDQ 6xg7+nnFc+Ke+FGBxGiw5smnPNMI4jgX8gItFA6RnmvRLw85wOh+efcgHIE/Ih6Mf7Ht 1ZtFt9MJXe/2AMylVV0Q4+yRQV1JrFDDPMf9spy7L/VCsDFbGeGU20QQOcfvxrz/9s8B 7q/A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hxaBNYaS; 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-7c958ea45fcsi96201085a.446.2025.04.24.02.48.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 02:48:43 -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=hxaBNYaS; 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 1u7tBS-00008v-9U; Thu, 24 Apr 2025 05:47: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 1u7tBP-0008Py-D5 for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:51 -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 1u7tBN-0002bO-2X for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:51 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-39c30d9085aso577635f8f.1 for ; Thu, 24 Apr 2025 02:47:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745488067; x=1746092867; 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=hxaBNYaSW9y2IjC5ppfCotnAgZD5rY3SxJqeAWvkMjzMS1e5we2w1qMESn7u2Mumtn GS0jhEXx5AHt8DKcTwb1G+iAgmw1x9k6tCEzna5I9Wm3uSBxmV7QD3d0OaHmbZhQ6RtE SSELAHQFn4GMVqEtOw8JFo6VGiXolXSEFT0zU0hCSbv+UAi+s8Tl+IW5ID5Ms6WM+/56 rwSkuPE/CRcBc8DNGwKm7ID8sVPUPLGdw8Ifg+autfaxQne+i/wQvvVn+RB0iBjqUq08 qiwvpUt1Aook8Q1NWKr4yDm6o7FrJjUsN+iDbqKIqvZGxewr0Hdz23i0qKa6ExYQxrDq V4Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745488067; x=1746092867; 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=Vt6qS7ousWLuJTzAxz1JWuAHmi4oktb47lZ4pT+OVYnZL0/xyVHD1B09Vuviowq0tC GHW8sdTTcucfeUtR7lbwHHTbiRadUE3j5p2OT+hy+Vp7vrO6Hj3984wY3qVW3w2iVfQq DgGrPiJoC7t/ZBcEEtLq7vBHk+OywxhqmzFyFk3szTnho+o/gShDa6DU36O5vSOo7Eie 0N6uOS9WMORk4eO6VPSDl2h6XeJayUThsA6+uSm0Z3afT1IAEMcFkLu41PVduxCaff/5 qG7rgTorfbf+JObtgFLU9TF1Fvggkhc4Z8EyqhP3xfZ5PjPt4w73l8juokmPG6IBcVDe 3Lrg== X-Gm-Message-State: AOJu0YxK0XNE56qubKWrhMqEPx4wUaw5SDXM4MMZSaNRWhb16IjpirzF VIhRbNhh01/Ekrdn+q54O3LN4qqMGqpw4ZuQyXKThD1GhAVcIHPWYvMmZTAug5Uh7btktP4ssBk Y X-Gm-Gg: ASbGncsdr1pLp7ADDKZEsRxkeOapwGoB/QMMRaLbw1Iv4NiRathPHe21swpHCHwGKNa o3knMzyKVB8GJ6SAM7nLVbsRECATM6acXAmYNeqJnhat/B4diO7otJqISe0kVS4+euR08bQmK7n cX8TUkh24fJwIAUIBYQnQQydXTrdlRlN2qyBGnF/UDiiVFsLMisIiaOqKdcyfB785rT3bNbHwsW Da//6fSexJK7zOZ3c4Xtn0PLF5XBQAFYcKvy1/8C4fAw+qKM/pRchYUyx1CPtldqQHp3ufIi22o hUx4X6DXwIe5+gvJBbJg7Sawlhf0s+x6mX08ac7NGLBhOgv80jZCoGaSkPjVf17SlN8app+LQbs rtwm4pHvUquH+60QO0HzT X-Received: by 2002:a5d:5848:0:b0:39c:3122:ad55 with SMTP id ffacd0b85a97d-3a06cf5642bmr1373587f8f.18.1745488067003; Thu, 24 Apr 2025 02:47:47 -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-3a06d4c5fc4sm1537508f8f.57.2025.04.24.02.47.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 02:47:46 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Richard Henderson Cc: Pierrick Bouvier , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 11/13] physmem: Restrict TCG IOMMU code to TCG accel Date: Thu, 24 Apr 2025 11:46:51 +0200 Message-ID: <20250424094653.35932-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424094653.35932-1-philmd@linaro.org> References: <20250424094653.35932-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 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 09:46:52 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: 883935 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3341688wrs; Thu, 24 Apr 2025 02:48:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVTGtL/U4oCEnanmu7pnyYgPIozkqORDwt7uHVNQaVxn3LcKYWLfYAd/hb51XZ+mW6IfVdoMQ==@linaro.org X-Google-Smtp-Source: AGHT+IGOGu1EBqHgNpN12WHHNvNNpa1cbwWNJ7hDhc+7trFyYGXIjYLrUJGTL7ulvA3n1xivsfaf X-Received: by 2002:a05:622a:1452:b0:476:b783:c946 with SMTP id d75a77b69052e-47eb43ab803mr29887041cf.33.1745488093981; Thu, 24 Apr 2025 02:48:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745488093; cv=none; d=google.com; s=arc-20240605; b=SBIAvTXZW9Yxpu/qbsvf0J/6vMIpY6biCtf0c+Z1ph/TQTPyvIH6Cg1Q4TLHiYUssf FJm9iIIXA+ahLMxD7jAf9eAM/h3aJTmU2UCTkgdzPqzBFtaPxqVsIyi+g+m/asVyp6Cu hxJVS7344NnHP2/8GSUlrIrnfGHZgj1epdtFH/htmyXAFdBb0zlm8aXZ5+waHzUYPE5X 7i2YaYD6a4n0jkwbgyEZ3NkRfzhBfxgadsMswXzXA+H8iPU1QNPXKPzy5gv+uParmy0r u6G0j/uEk0Wyy8dWuOJpcY8XTdHge5rvXBEMPD1broWnb1vylRJDtkHGfoh4lemuyNM9 adgw== 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=TSjBpDqqccDDSqyByKqT/sgEReyZnqYYvG3Sgb4WXuQ=; fh=OfreXVzz+9AWc5zm3wgpgY6oO4v5p5SO53/S12OWUWc=; b=UfGP3Awge4/z0mvE9IvXmqtb0TKXdtxjnHD8Jz5ZDZ49tc+vlYiWn6GaVN8m923MV8 dxaHcLznBNZHEKEQ2KPgBeHwbbCMNVS7tbtwkXqidKWEDV+A3AyjJ0SIIHUgW0BkHwxg VzGLQVAf6MhTq5AN0ElTUEJcYc9awL/aYKwh5hFAxpriGncRTqNEyQbqR66khxtCqcEl PypLqzg4SU49vFO0leiaOFmpwXqkc/yLi7LviUJuU2i+Xn6qfGsAGKJ9z3q37eaz5rDt Xxft1Icse6DtPwFJZaPf1jOgDvtgFKFlvX9jcJX5yXV3u8PYW7GR7bh2xdPD2m86S7mw gnuw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DnpTxx31; 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-47ea1987881si13805321cf.241.2025.04.24.02.48.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 02:48:13 -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=DnpTxx31; 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 1u7tBZ-0000dC-1q; Thu, 24 Apr 2025 05:48:01 -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 1u7tBV-0000Mc-2c for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:57 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7tBS-0002bk-0h for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:47:56 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-440685d6afcso7715265e9.0 for ; Thu, 24 Apr 2025 02:47:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745488072; x=1746092872; 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=TSjBpDqqccDDSqyByKqT/sgEReyZnqYYvG3Sgb4WXuQ=; b=DnpTxx311h8PpZwZoK+2Kq8k6wXNmnzSZP/e+JVICqalEgWYYDIR50lkFwU97csdpk j6zP+I0HfTYjmPdXVcGSjyM+9gbsVKakmYMyQAsiotuY3cKcnRWE6fCYG51IkOmZfvBq y2sBD6YHoeQz+33VjcFrAcVWejm5n6qUAmzrHD4t4BshVcWzlLyYlLjSy2zbj0RL0E5a ectGpRRVUSCx94bmWUjX9mZir7YQke0fa7OUn+X/4pcRTCBc61PrFl7HpLO6y06zIQCx kUnV/idu5W9VDc2JUUL2VD5zQo5f3aW9k0pL785XOltSXFJ1LFDhDOXdhFAEECOBQe/x 4Luw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745488072; x=1746092872; 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=TSjBpDqqccDDSqyByKqT/sgEReyZnqYYvG3Sgb4WXuQ=; b=uVl2GbwtQQqmCwc8YMsf71dDxyHg1gZE1zbhwKjl/pEYcKOPCfJvS/Y1DLyWXSA7fU mgcWbqNo4dXuzp/6s19rRV5rTebFoHvvn4niSE4SXZg7iAbyLuvuEeQmGb4s5CS0dUuO 4GJorkhRPpfjzFXuRRRgdwnbATKY1BdxlN5BeaRiS42Smu4rDGzAjjW9VgwrWjhxbKld Go4yxSCxnOeZHg/UFBqaNpMXTjvsAXuymVZaI5IdrVnfgXkIaHmwxZp68lZiSPaYK5Cv gNJ45L3f2xdgHRcxuuCHsylufhSrpjXoc9+U9DZpDHaRIXNK0PM6QL/uF1hUmRtPF8op GpvQ== X-Gm-Message-State: AOJu0YzGWQNJ/ryeMTizI2wcNpWAh1QTMOMqZkZfhGcd12Lwyhio4yS9 Ke2QY8Ncfg1x1fxPsiVWMt8UakbZ54L6qLAR8IQTkScqfRIBfX+ALovS/+aNe3nSVjNHuRtkvB2 G X-Gm-Gg: ASbGnctl8IZWNUo899J2r4caq5jTfZlpZ33rx4gYQ7R6HmA+VJXimks7KI7PRiXNmK2 sgn5/9kd9356qNPkxzjElVaLXcvOnC0up4VjN33ObhPiwn8ly32yar1x+YpCpmXI/9oxYf6Yuxf Zl3Izh577IQVJsNRZDZLND6+s+2U9hzti2xvBZazvEMbXK7NCR3/TS9LioLO7qqmHKlPo2PzP3d 8q1dUBeHtIlLHU1QjItIuz5s6d9sd54Hc8NBDSf5O2jsuiR4noPYcD3nESCFpgMkyQ3jsG6RYdA 1OhKcbiJHEtav+7ybEB8FT836b6S8NdUJsBV29vf2Urk3NTHBoTeqDzSuNes0zor0RLfuuLGEeX VlkRHVUaRXCfwkCHCe5H8 X-Received: by 2002:a05:600c:3b8c:b0:43d:fa59:be39 with SMTP id 5b1f17b1804b1-4409bd8bd4amr14421365e9.33.1745488071811; Thu, 24 Apr 2025 02:47:51 -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-4409d2e0414sm13937315e9.40.2025.04.24.02.47.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 02:47:51 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Richard Henderson Cc: Pierrick Bouvier , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 12/13] accel/tcg: Extract probe API out of 'exec/exec-all.h' Date: Thu, 24 Apr 2025 11:46:52 +0200 Message-ID: <20250424094653.35932-13-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424094653.35932-1-philmd@linaro.org> References: <20250424094653.35932-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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. target/arm/ptw.c is the only non-TCG specific file, its call to the probe API is already guarded within CONFIG_TCG checks. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/accel/tcg/probe.h | 110 +++++++++++++++++++++++++++ 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 | 3 + 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, 134 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..b748c00ba96 --- /dev/null +++ b/include/accel/tcg/probe.h @@ -0,0 +1,110 @@ +/* + * 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 + +#ifndef CONFIG_TCG +#error Can only include this header with TCG +#endif + +#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..58f1cd0b34c 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -14,6 +14,9 @@ #include "exec/page-protection.h" #include "exec/target_page.h" #include "exec/tlb-flags.h" +#ifdef CONFIG_TCG +#include "accel/tcg/probe.h" +#endif #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 09:46:53 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: 883940 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3341919wrs; Thu, 24 Apr 2025 02:49:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW/caqaYudDpE0qFZLWHc/e/EDjWT8/QTNJfso3yz8hABygeM5otLQR866ZTclrM34u8OYBOA==@linaro.org X-Google-Smtp-Source: AGHT+IHj+V5d5LVk76SD+U2kmMOvrBs81PCVfhIGY9+6xXgSpN2jNSi1L7lMVlexWihevNsyQizn X-Received: by 2002:a05:6214:501b:b0:6e8:f387:e0d2 with SMTP id 6a1803df08f44-6f4c11aefd5mr19468836d6.11.1745488145057; Thu, 24 Apr 2025 02:49:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745488145; cv=none; d=google.com; s=arc-20240605; b=Qg0p4g1kfg7fP8o3r32AMTgNyI93Nbhxj9HDRA0l/arcDpP0GUolFCyZd5PgNfXjNm hGHkxuiGvjQ+wzM8j1LfKl+xDMCbWhEyiNraTN4WBbbbUIpjxzLYcrxFlZQCGs5febA9 fd5VzoVF6BCA+6FdjgQVz20Ozh/p8DSkNkMng8BjiNV4D8J8BAZXiEPzR7Aj8xwLwlLX Co1wxiL3fgy3m7S5M1FyhKf7cNcz+nikgYmMcO9lZr6UHXZ5ItBKKNzIHZV8QYaPjZhm +ppzLWnurC1YPknwnU5EmCEYr+pi0OOfBJom9kgtHkykG9AATjNf78LS34PgvtE6dbXq R9NQ== 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=oDpjoozX4ExeJve+TaPvlNZFm35B6U7It57+UjXm5SM=; fh=OfreXVzz+9AWc5zm3wgpgY6oO4v5p5SO53/S12OWUWc=; b=By/4zfDHvl7NsfJb1z/1c0o5dxW7UFDoPNFohkIJvSoekzCR9LfawVNawwphjwzqAr m2BcJAFtBrM/bJmpsH+2eO8Kwdp+OWPam2xtJ4KFA2Z7x5Ki5Wru8+5yz+TgygEKiwV9 bioiPVJs5ElUclZAodOLDBvmeONnP8rVdBsq1C6zdq2982xBMrcZtqVAVpejO8/qRzd3 arws0dyLZJEdszVTv3d0guQnsVZAGJXsDmWI4kXhPqx5O/UFxlFzvw6ZZdDs3BWz903E XH/fL46GuKjIdwx31T3slljmYropIi+12IKdhf1BCG0H1h+AnpjUM18V6Zyuh4j3vJsw 2zWg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="q/i6qYEx"; 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-6f4c0acb526si11595236d6.186.2025.04.24.02.49.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 02:49:05 -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="q/i6qYEx"; 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 1u7tBf-00013q-Ri; Thu, 24 Apr 2025 05:48:08 -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 1u7tBd-0000tD-IG for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:48:05 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7tBX-0002c2-Tx for qemu-devel@nongnu.org; Thu, 24 Apr 2025 05:48:05 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-39c0e0bc733so675125f8f.1 for ; Thu, 24 Apr 2025 02:47:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745488078; x=1746092878; 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=oDpjoozX4ExeJve+TaPvlNZFm35B6U7It57+UjXm5SM=; b=q/i6qYEx2wzkQVn7j+VSp4qGgMQw3mX+QMqdU5VES2sPW9QlwdLk0NnwQx0di/hwNJ +2+xCPe0vVCEplSERy6nAueu6UNOZkT1M9hTZBUGYptAJ6y5/G9z34IFV4sB62eFy3Rj ovsPpRONb4Zezxsv6oYOQ6MQCAyE9PFZvc7q6TQyUbtBxYSpej20+LVMclJyJBYzwst1 pGw1OUcvY7U/M/pCpfuN4B7ua1zKazcJvmDAPs7L4jsZO0thYjxv34XXlIHsaX9nIXp9 XYNHfRSoajlhQybgsEwVHv/GdjjagXt0nq9yjBUym4N8Cz7oLhfwjbLdpmP8BxzEp7ID Turw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745488078; x=1746092878; 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=oDpjoozX4ExeJve+TaPvlNZFm35B6U7It57+UjXm5SM=; b=bzNdjIaCfzvJr7vQst9zGOj1vbQXI3BQTQyqOG4AIeI7F3ttjg3C+zSncyQcL1mO9t Po2PtfxljmCMYcRRWpb932LzzyW87HIyleKtfPtAChriEPCc1yv8YFltFF3bS+bvXVZB n1pTL9OrpoK8MCnUz3KxVuP435F1QgGKwb2x9whezEt1KEnPeAnsHSvPDGqI1TgMgBzL X4c5WPgj1eblT/geYWXdgtvgJ1Q19OEj0LGXHtJSsTKi4DEoH3GowHV9sHxdKHL1Qclh KUZ88Gt3nJqEei5o1qkykXH1gXp5o20Tb2/QfrgSjFS11gRfUT89cSwxgTw4r3kj7J6O sxTQ== X-Gm-Message-State: AOJu0YzP5T3L3sYvGpktUpwThuELAhab4GaSl3aoeEk42yKMZZHpIMhr LRKmZt13OX/02p5Ep3s3fIHg3LT8DvONh6dLRB551/X6fRMvYHDsDA4O/Qnhh4miuGo6qQjzWBx 1 X-Gm-Gg: ASbGncvw/EBKfvJuqEZwsjxfmL3Kt5RMfmV7rkp2gP/4HKwlBeQDZn9Sx4770IMLGPD Pnru4SbLvcuc6q+OUoiXS3L5Zqmc0vYsdcW2qwZCUZCMGauCN2EXaGfC4k4S16T+MANll3bmv49 QfxPX4vblSZJuHd5PW8nEYgcpPNieVV/oz60CCENKUqBwF0iZ9cH/xKJhVekCH8xAl4/PrVDYGz f99XcHrEpFDQp5dQXVIZHDISQicwRrRkuwJvHbw6beCBZhefNCKwjOv4Wb7QSzvHr7EnHBpba3Q DOgfINnz9193s2uVpNDq/its3rMrp2f7X3pYVY0aaS84Csn8y7dFbcfFVcA+XkRMpVeHJuPrpH3 gcUzjFd76PfHGyIqwlAei X-Received: by 2002:a05:6000:4210:b0:39c:e0e:bb46 with SMTP id ffacd0b85a97d-3a06cf4b26dmr1455230f8f.4.1745488076709; Thu, 24 Apr 2025 02:47:56 -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-3a06d54c592sm1520100f8f.93.2025.04.24.02.47.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 02:47:56 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Richard Henderson Cc: Pierrick Bouvier , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 13/13] include: Remove 'exec/exec-all.h' Date: Thu, 24 Apr 2025 11:46:53 +0200 Message-ID: <20250424094653.35932-14-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424094653.35932-1-philmd@linaro.org> References: <20250424094653.35932-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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 58f1cd0b34c..894120c9aea 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)