From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, philmd@linaro.org
Subject: Re: [PATCH 24/37] include/system: Move exec/ramblock.h to system/ramblock.h
Date: Thu, 13 Mar 2025 13:56:03 -0700 [thread overview]
Message-ID: <fa9b6aca-6dce-4ba2-84b4-c09ba8daddd1@linaro.org> (raw)
In-Reply-To: <20250313034524.3069690-25-richard.henderson@linaro.org>
On 3/12/25 20:45, Richard Henderson wrote:
> Convert the existing includes with sed.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/system/ram_addr.h | 2 +-
> include/{exec => system}/ramblock.h | 9 ++++-----
> hw/display/virtio-gpu-udmabuf.c | 2 +-
> hw/hyperv/hv-balloon.c | 2 +-
> hw/virtio/vhost-user.c | 2 +-
> migration/dirtyrate.c | 2 +-
> migration/file.c | 2 +-
> migration/multifd-nocomp.c | 2 +-
> migration/multifd-qatzip.c | 2 +-
> migration/multifd-qpl.c | 2 +-
> migration/multifd-uadk.c | 2 +-
> migration/multifd-zero-page.c | 2 +-
> migration/multifd-zlib.c | 2 +-
> migration/multifd-zstd.c | 2 +-
> migration/multifd.c | 2 +-
> migration/postcopy-ram.c | 2 +-
> tests/qtest/fuzz/generic_fuzz.c | 2 +-
> MAINTAINERS | 2 +-
> 18 files changed, 21 insertions(+), 22 deletions(-)
> rename include/{exec => system}/ramblock.h (96%)
>
> diff --git a/include/system/ram_addr.h b/include/system/ram_addr.h
> index 65f8f37b2a..eceb8fbe4b 100644
> --- a/include/system/ram_addr.h
> +++ b/include/system/ram_addr.h
> @@ -24,7 +24,7 @@
> #include "system/tcg.h"
> #include "exec/cputlb.h"
> #include "exec/ramlist.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "exec/exec-all.h"
> #include "qemu/rcu.h"
>
> diff --git a/include/exec/ramblock.h b/include/system/ramblock.h
> similarity index 96%
> rename from include/exec/ramblock.h
> rename to include/system/ramblock.h
> index 64484cd821..d8a116ba99 100644
> --- a/include/exec/ramblock.h
> +++ b/include/system/ramblock.h
> @@ -16,11 +16,10 @@
> * The functions declared here will be removed soon.
> */
>
> -#ifndef QEMU_EXEC_RAMBLOCK_H
> -#define QEMU_EXEC_RAMBLOCK_H
> +#ifndef SYSTEM_RAMBLOCK_H
> +#define SYSTEM_RAMBLOCK_H
>
> -#ifndef CONFIG_USER_ONLY
> -#include "cpu-common.h"
> +#include "exec/cpu-common.h"
> #include "qemu/rcu.h"
> #include "exec/ramlist.h"
>
> @@ -91,5 +90,5 @@ struct RAMBlock {
> */
> ram_addr_t postcopy_length;
> };
> -#endif
> +
> #endif
> diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabuf.c
> index 85ca23cb32..0510577475 100644
> --- a/hw/display/virtio-gpu-udmabuf.c
> +++ b/hw/display/virtio-gpu-udmabuf.c
> @@ -19,7 +19,7 @@
> #include "hw/virtio/virtio-gpu.h"
> #include "hw/virtio/virtio-gpu-pixman.h"
> #include "trace.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "system/hostmem.h"
> #include <sys/ioctl.h>
> #include <linux/memfd.h>
> diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c
> index 0b1da723c8..acabff2c4a 100644
> --- a/hw/hyperv/hv-balloon.c
> +++ b/hw/hyperv/hv-balloon.c
> @@ -12,7 +12,7 @@
>
> #include "system/address-spaces.h"
> #include "exec/cpu-common.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "hw/boards.h"
> #include "hw/hyperv/dynmem-proto.h"
> #include "hw/hyperv/hv-balloon.h"
> diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
> index 267b612587..48561d3c74 100644
> --- a/hw/virtio/vhost-user.c
> +++ b/hw/virtio/vhost-user.c
> @@ -28,7 +28,7 @@
> #include "system/cryptodev.h"
> #include "migration/postcopy-ram.h"
> #include "trace.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
>
> #include <sys/ioctl.h>
> #include <sys/socket.h>
> diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
> index 09caf92f87..986624c79a 100644
> --- a/migration/dirtyrate.c
> +++ b/migration/dirtyrate.c
> @@ -14,7 +14,7 @@
> #include "qemu/error-report.h"
> #include "hw/core/cpu.h"
> #include "qapi/error.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "exec/target_page.h"
> #include "qemu/rcu_queue.h"
> #include "qemu/main-loop.h"
> diff --git a/migration/file.c b/migration/file.c
> index 7f11e26f5c..bb8031e3c7 100644
> --- a/migration/file.c
> +++ b/migration/file.c
> @@ -6,7 +6,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> diff --git a/migration/multifd-nocomp.c b/migration/multifd-nocomp.c
> index ffe75256c9..94f248e8a2 100644
> --- a/migration/multifd-nocomp.c
> +++ b/migration/multifd-nocomp.c
> @@ -11,7 +11,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "exec/target_page.h"
> #include "file.h"
> #include "migration-stats.h"
> diff --git a/migration/multifd-qatzip.c b/migration/multifd-qatzip.c
> index 6a0e989fae..7419e5dc0d 100644
> --- a/migration/multifd-qatzip.c
> +++ b/migration/multifd-qatzip.c
> @@ -13,7 +13,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "qapi/qapi-types-migration.h"
> diff --git a/migration/multifd-qpl.c b/migration/multifd-qpl.c
> index 88e2344af2..52902eb00c 100644
> --- a/migration/multifd-qpl.c
> +++ b/migration/multifd-qpl.c
> @@ -14,7 +14,7 @@
> #include "qemu/module.h"
> #include "qapi/error.h"
> #include "qapi/qapi-types-migration.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "multifd.h"
> #include "qpl/qpl.h"
>
> diff --git a/migration/multifd-uadk.c b/migration/multifd-uadk.c
> index 6895c1f65a..fd7cd9b5e8 100644
> --- a/migration/multifd-uadk.c
> +++ b/migration/multifd-uadk.c
> @@ -13,7 +13,7 @@
> #include "qemu/osdep.h"
> #include "qemu/module.h"
> #include "qapi/error.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "migration.h"
> #include "multifd.h"
> #include "options.h"
> diff --git a/migration/multifd-zero-page.c b/migration/multifd-zero-page.c
> index f1e988a959..dbc1184921 100644
> --- a/migration/multifd-zero-page.c
> +++ b/migration/multifd-zero-page.c
> @@ -12,7 +12,7 @@
>
> #include "qemu/osdep.h"
> #include "qemu/cutils.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "migration.h"
> #include "migration-stats.h"
> #include "multifd.h"
> diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c
> index 8cf8a26bb4..8820b2a787 100644
> --- a/migration/multifd-zlib.c
> +++ b/migration/multifd-zlib.c
> @@ -13,7 +13,7 @@
> #include "qemu/osdep.h"
> #include <zlib.h>
> #include "qemu/rcu.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "exec/target_page.h"
> #include "qapi/error.h"
> #include "migration.h"
> diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c
> index abed140855..3c2dcf76b0 100644
> --- a/migration/multifd-zstd.c
> +++ b/migration/multifd-zstd.c
> @@ -13,7 +13,7 @@
> #include "qemu/osdep.h"
> #include <zstd.h>
> #include "qemu/rcu.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "exec/target_page.h"
> #include "qapi/error.h"
> #include "migration.h"
> diff --git a/migration/multifd.c b/migration/multifd.c
> index dfb5189f0e..86c83e43c0 100644
> --- a/migration/multifd.c
> +++ b/migration/multifd.c
> @@ -16,7 +16,7 @@
> #include "qemu/rcu.h"
> #include "exec/target_page.h"
> #include "system/system.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> #include "file.h"
> diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
> index 5d3edfcfec..995614b38c 100644
> --- a/migration/postcopy-ram.c
> +++ b/migration/postcopy-ram.c
> @@ -31,7 +31,7 @@
> #include "qemu/error-report.h"
> #include "trace.h"
> #include "hw/boards.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "socket.h"
> #include "yank_functions.h"
> #include "tls.h"
> diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c
> index 239be9372d..507de74806 100644
> --- a/tests/qtest/fuzz/generic_fuzz.c
> +++ b/tests/qtest/fuzz/generic_fuzz.c
> @@ -21,7 +21,7 @@
> #include "fuzz.h"
> #include "string.h"
> #include "system/memory.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "hw/qdev-core.h"
> #include "hw/pci/pci.h"
> #include "hw/pci/pci_device.h"
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 2cc0b54ec4..212435e302 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3111,7 +3111,7 @@ F: include/system/ioport.h
> F: include/exec/memop.h
> F: include/system/memory.h
> F: include/system/ram_addr.h
> -F: include/exec/ramblock.h
> +F: include/system/ramblock.h
> F: include/system/memory_mapping.h
> F: system/dma-helpers.c
> F: system/ioport.c
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
next prev parent reply other threads:[~2025-03-13 20:56 UTC|newest]
Thread overview: 115+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
2025-03-13 3:44 ` [PATCH 01/37] accel/tcg: Build user-exec-stub.c once Richard Henderson
2025-03-13 9:43 ` Philippe Mathieu-Daudé
2025-03-13 16:37 ` Pierrick Bouvier
2025-03-13 22:56 ` Alex Bennée
2025-03-13 3:44 ` [PATCH 02/37] accel/tcg: Build plugin-gen.c once Richard Henderson
2025-03-13 16:46 ` Pierrick Bouvier
2025-03-13 22:57 ` Alex Bennée
2025-03-13 3:44 ` [PATCH 03/37] include/exec: Use vaddr for *_mmu guest memory access routines Richard Henderson
2025-03-13 16:48 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 04/37] include/exec: Split out cpu-ldst-common.h Richard Henderson
2025-03-13 16:50 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 05/37] include/exec: Inline *_mmuidx_ra memory operations Richard Henderson
2025-03-13 16:59 ` Pierrick Bouvier
2025-03-13 18:05 ` Richard Henderson
2025-03-13 18:26 ` Philippe Mathieu-Daudé
2025-03-14 0:07 ` Richard Henderson
2025-03-13 20:14 ` Pierrick Bouvier
2025-03-13 17:11 ` Pierrick Bouvier
2025-03-13 17:55 ` Richard Henderson
2025-03-13 3:44 ` [PATCH 06/37] include/exec: Inline *_data_ra " Richard Henderson
2025-03-13 16:22 ` Alex Bennée
2025-03-14 0:20 ` Richard Henderson
2025-03-13 17:04 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 07/37] include/exec: Inline *_data " Richard Henderson
2025-03-13 17:05 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 08/37] include/exec: Inline *_code " Richard Henderson
2025-03-13 17:08 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 09/37] accel/tcg: Perform aligned atomic reads in translator_ld Richard Henderson
2025-03-13 17:14 ` Pierrick Bouvier
2025-03-14 0:47 ` Richard Henderson
2025-03-13 3:44 ` [PATCH 10/37] accel/tcg: Use cpu_ld*_code_mmu in translator.c Richard Henderson
2025-03-13 9:54 ` Philippe Mathieu-Daudé
2025-03-13 9:57 ` Philippe Mathieu-Daudé
2025-03-13 17:21 ` Pierrick Bouvier
2025-03-14 0:57 ` Richard Henderson
2025-03-13 3:44 ` [PATCH 11/37] accel/tcg: Implement translator_ld*_end Richard Henderson
2025-03-13 17:33 ` Pierrick Bouvier
2025-03-13 18:17 ` Richard Henderson
2025-03-13 20:49 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 12/37] accel/tcg: Remove mmap_lock/unlock from watchpoint.c Richard Henderson
2025-03-13 9:57 ` Philippe Mathieu-Daudé
2025-03-13 17:27 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 13/37] include/exec: Split out mmap-lock.h Richard Henderson
2025-03-13 9:58 ` Philippe Mathieu-Daudé
2025-03-14 1:40 ` Richard Henderson
2025-03-13 17:34 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 14/37] include/system: Move exec/memory.h to system/memory.h Richard Henderson
2025-03-13 10:00 ` Philippe Mathieu-Daudé
2025-03-13 17:34 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 15/37] include/system: Move exec/address-spaces.h to system/address-spaces.h Richard Henderson
2025-03-13 10:01 ` Philippe Mathieu-Daudé
2025-03-13 17:34 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 16/37] include/system: Move exec/ioport.h to system/ioport.h Richard Henderson
2025-03-13 17:35 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 17/37] meson: Introduce top-level libuser_ss and libsystem_ss Richard Henderson
2025-03-13 17:36 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 18/37] gdbstub: Move syscalls.c out of common_ss Richard Henderson
2025-03-13 17:46 ` Pierrick Bouvier
2025-03-13 18:31 ` Richard Henderson
2025-03-13 3:44 ` [PATCH 19/37] accel/tcg: Use libuser_ss and libsystem_ss Richard Henderson
2025-03-13 20:53 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 20/37] target/mips: Protect semihosting call with CONFIG_SEMIHOSTING Richard Henderson
2025-03-13 20:51 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 21/37] target/xtensa: " Richard Henderson
2025-03-13 20:54 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 22/37] semihosting: Move user-only implementation out-of-line Richard Henderson
2025-03-13 10:04 ` Philippe Mathieu-Daudé
2025-03-13 10:28 ` Philippe Mathieu-Daudé
2025-03-13 3:45 ` [PATCH 23/37] include/system: Move exec/ram_addr.h to system/ram_addr.h Richard Henderson
2025-03-13 17:22 ` Alex Bennée
2025-03-13 20:55 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 24/37] include/system: Move exec/ramblock.h to system/ramblock.h Richard Henderson
2025-03-13 20:56 ` Pierrick Bouvier [this message]
2025-03-13 3:45 ` [PATCH 25/37] common-user: Split out watchpoint-stub.c Richard Henderson
2025-03-13 10:07 ` Philippe Mathieu-Daudé
2025-03-13 10:39 ` Philippe Mathieu-Daudé
2025-03-14 16:37 ` Richard Henderson
2025-03-14 16:53 ` Pierrick Bouvier
2025-03-13 20:57 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 26/37] hw/core: Move unconditional files to libsystem_ss, libuser_ss Richard Henderson
2025-03-13 20:57 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 27/37] system: Move watchpoint.c to libsystem_ss Richard Henderson
2025-03-13 20:57 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 28/37] plugins: Move api.c, core.c to libuser_ss, libsystem_ss Richard Henderson
2025-03-13 20:57 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 29/37] include/exec: Split out cpu-mmu-index.h Richard Henderson
2025-03-13 20:58 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 30/37] include/exec: Drop ifndef CONFIG_USER_ONLY from cpu-common.h Richard Henderson
2025-03-13 20:58 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 31/37] include/hw/core: Drop ifndef CONFIG_USER_ONLY from cpu.h Richard Henderson
2025-03-13 20:58 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 32/37] include/hw/intc: Remove ifndef CONFIG_USER_ONLY from armv7m_nvic.h Richard Henderson
2025-03-13 21:00 ` Pierrick Bouvier
2025-03-14 18:13 ` Richard Henderson
2025-03-14 18:36 ` Pierrick Bouvier
2025-03-14 20:03 ` Richard Henderson
2025-03-14 20:34 ` Pierrick Bouvier
2025-03-14 20:59 ` Richard Henderson
2025-03-14 22:05 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 33/37] include/hw/s390x: Remove ifndef CONFIG_USER_ONLY in css.h Richard Henderson
2025-03-13 21:00 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 34/37] include/system: Remove ifndef CONFIG_USER_ONLY Richard Henderson
2025-03-13 10:18 ` Philippe Mathieu-Daudé
2025-03-13 21:02 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 35/37] include/qemu: Remove ifndef CONFIG_USER_ONLY from accel.h Richard Henderson
2025-03-13 21:03 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 36/37] target/riscv: Remove ifndef CONFIG_USER_ONLY from cpu_cfg.h Richard Henderson
2025-03-13 21:03 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 37/37] meson: Only allow CONFIG_USER_ONLY from certain source sets Richard Henderson
2025-03-13 20:50 ` Pierrick Bouvier
2025-03-13 13:56 ` [PATCH 00/37] accel/tcg, codebase: Build once patches Alex Bennée
2025-03-13 16:36 ` Pierrick Bouvier
2025-03-13 17:48 ` Philippe Mathieu-Daudé
2025-03-13 20:13 ` Pierrick Bouvier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fa9b6aca-6dce-4ba2-84b4-c09ba8daddd1@linaro.org \
--to=pierrick.bouvier@linaro.org \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).