diff mbox series

[24/24] exec: Move 'ram_addr.h' header under sysemu/ namespace

Message ID 20241114011310.3615-25-philmd@linaro.org (mailing list archive)
State New
Headers show
Series exec: Build up 'cputlb.h' and 'ram_addr.h' headers | expand

Commit Message

Philippe Mathieu-Daudé Nov. 14, 2024, 1:13 a.m. UTC 
"ram_addr.h" contains declarations specific to system emulation,
move it under the sysemu/ directory to clarify the API namespace.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 MAINTAINERS                         | 2 +-
 include/exec/cpu-common.h           | 2 +-
 include/exec/memory.h               | 2 +-
 include/exec/translation-block.h    | 2 +-
 include/sysemu/physmem-target.h     | 2 +-
 include/{exec => sysemu}/ram_addr.h | 0
 accel/kvm/kvm-all.c                 | 2 +-
 accel/tcg/cputlb.c                  | 2 +-
 accel/tcg/translate-all.c           | 2 +-
 hw/ppc/spapr.c                      | 2 +-
 hw/ppc/spapr_caps.c                 | 2 +-
 hw/ppc/spapr_pci.c                  | 2 +-
 hw/remote/memory.c                  | 2 +-
 hw/remote/proxy-memory-listener.c   | 2 +-
 hw/s390x/s390-stattrib-kvm.c        | 2 +-
 hw/s390x/s390-stattrib.c            | 2 +-
 hw/s390x/s390-virtio-ccw.c          | 2 +-
 hw/vfio/common.c                    | 2 +-
 hw/vfio/container.c                 | 2 +-
 hw/vfio/iommufd.c                   | 2 +-
 hw/vfio/migration.c                 | 2 +-
 hw/vfio/spapr.c                     | 2 +-
 hw/virtio/virtio-mem.c              | 2 +-
 migration/ram.c                     | 2 +-
 plugins/api.c                       | 2 +-
 system/memory.c                     | 2 +-
 system/physmem.c                    | 2 +-
 target/arm/tcg/mte_helper.c         | 2 +-
 target/ppc/kvm.c                    | 2 +-
 target/s390x/kvm/kvm.c              | 2 +-
 30 files changed, 29 insertions(+), 29 deletions(-)
 rename include/{exec => sysemu}/ram_addr.h (100%)

Comments

Pierrick Bouvier Nov. 14, 2024, 4:16 a.m. UTC | #1 
On 11/13/24 17:13, Philippe Mathieu-Daudé wrote:
> "ram_addr.h" contains declarations specific to system emulation,
> move it under the sysemu/ directory to clarify the API namespace.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   MAINTAINERS                         | 2 +-
>   include/exec/cpu-common.h           | 2 +-
>   include/exec/memory.h               | 2 +-
>   include/exec/translation-block.h    | 2 +-
>   include/sysemu/physmem-target.h     | 2 +-
>   include/{exec => sysemu}/ram_addr.h | 0
>   accel/kvm/kvm-all.c                 | 2 +-
>   accel/tcg/cputlb.c                  | 2 +-
>   accel/tcg/translate-all.c           | 2 +-
>   hw/ppc/spapr.c                      | 2 +-
>   hw/ppc/spapr_caps.c                 | 2 +-
>   hw/ppc/spapr_pci.c                  | 2 +-
>   hw/remote/memory.c                  | 2 +-
>   hw/remote/proxy-memory-listener.c   | 2 +-
>   hw/s390x/s390-stattrib-kvm.c        | 2 +-
>   hw/s390x/s390-stattrib.c            | 2 +-
>   hw/s390x/s390-virtio-ccw.c          | 2 +-
>   hw/vfio/common.c                    | 2 +-
>   hw/vfio/container.c                 | 2 +-
>   hw/vfio/iommufd.c                   | 2 +-
>   hw/vfio/migration.c                 | 2 +-
>   hw/vfio/spapr.c                     | 2 +-
>   hw/virtio/virtio-mem.c              | 2 +-
>   migration/ram.c                     | 2 +-
>   plugins/api.c                       | 2 +-
>   system/memory.c                     | 2 +-
>   system/physmem.c                    | 2 +-
>   target/arm/tcg/mte_helper.c         | 2 +-
>   target/ppc/kvm.c                    | 2 +-
>   target/s390x/kvm/kvm.c              | 2 +-
>   30 files changed, 29 insertions(+), 29 deletions(-)
>   rename include/{exec => sysemu}/ram_addr.h (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 0027e56fa5..f303f73534 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3024,10 +3024,10 @@ S: Supported
>   F: include/exec/ioport.h
>   F: include/exec/memop.h
>   F: include/exec/memory.h
> -F: include/exec/ram_addr.h
>   F: include/exec/ramblock.h
>   F: include/sysemu/memory_mapping.h
>   F: include/sysemu/physmem-target.h
> +F: include/sysemu/ram_addr.h
>   F: system/dma-helpers.c
>   F: system/ioport.c
>   F: system/memory.c
> diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
> index b790202c56..27f047b13b 100644
> --- a/include/exec/cpu-common.h
> +++ b/include/exec/cpu-common.h
> @@ -54,7 +54,7 @@ enum device_endian {
>   #define DEVICE_HOST_ENDIAN DEVICE_LITTLE_ENDIAN
>   #endif
>   
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   
>   /**
>    * cpu_address_space_init:
> diff --git a/include/exec/memory.h b/include/exec/memory.h
> index 58faa3eb08..b2e2d4590a 100644
> --- a/include/exec/memory.h
> +++ b/include/exec/memory.h
> @@ -28,7 +28,7 @@
>   #include "qemu/notify.h"
>   #include "qom/object.h"
>   #include "qemu/rcu.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   
>   #define RAM_ADDR_INVALID (~(ram_addr_t)0)
>   
> diff --git a/include/exec/translation-block.h b/include/exec/translation-block.h
> index 9c4757882c..b72fcbbb18 100644
> --- a/include/exec/translation-block.h
> +++ b/include/exec/translation-block.h
> @@ -8,7 +8,7 @@
>   #define EXEC_TRANSLATION_BLOCK_H
>   
>   #include "qemu/thread.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "exec/vaddr.h"
>   #ifdef CONFIG_USER_ONLY
>   #include "qemu/interval-tree.h"
> diff --git a/include/sysemu/physmem-target.h b/include/sysemu/physmem-target.h
> index b30c42da60..32efaf80b6 100644
> --- a/include/sysemu/physmem-target.h
> +++ b/include/sysemu/physmem-target.h
> @@ -23,7 +23,7 @@
>   #include "sysemu/xen.h"
>   #include "sysemu/tcg.h"
>   #include "exec/cputlb.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "exec/ramlist.h"
>   #include "exec/ramblock.h"
>   #include "qemu/rcu.h"
> diff --git a/include/exec/ram_addr.h b/include/sysemu/ram_addr.h
> similarity index 100%
> rename from include/exec/ram_addr.h
> rename to include/sysemu/ram_addr.h
> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> index a80547006b..1ec73400a7 100644
> --- a/accel/kvm/kvm-all.c
> +++ b/accel/kvm/kvm-all.c
> @@ -34,7 +34,7 @@
>   #include "sysemu/accel-blocker.h"
>   #include "qemu/bswap.h"
>   #include "exec/memory.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "qemu/event_notifier.h"
>   #include "qemu/main-loop.h"
> diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
> index d4b381641c..46f35ddd59 100644
> --- a/accel/tcg/cputlb.c
> +++ b/accel/tcg/cputlb.c
> @@ -27,7 +27,7 @@
>   #include "exec/cputlb.h"
>   #include "exec/tb-flush.h"
>   #include "exec/memory-internal.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "exec/mmu-access-type.h"
>   #include "exec/tlb-common.h"
> diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
> index 48015be829..6d165fded6 100644
> --- a/accel/tcg/translate-all.c
> +++ b/accel/tcg/translate-all.c
> @@ -40,7 +40,7 @@
>   #endif
>   #endif
>   #else
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #endif
>   
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index a9833530c7..ac9ab5986a 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -74,7 +74,7 @@
>   #include "hw/virtio/virtio-scsi.h"
>   #include "hw/virtio/vhost-scsi-common.h"
>   
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "exec/confidential-guest-support.h"
>   #include "hw/usb.h"
> diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
> index 5eef7475c1..1d9ad3d6fc 100644
> --- a/hw/ppc/spapr_caps.c
> +++ b/hw/ppc/spapr_caps.c
> @@ -27,7 +27,7 @@
>   #include "qapi/error.h"
>   #include "qapi/visitor.h"
>   #include "sysemu/hw_accel.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "target/ppc/cpu.h"
>   #include "target/ppc/mmu-hash64.h"
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index a91fea1304..f6b2cb7396 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -34,7 +34,7 @@
>   #include "hw/pci/pci_host.h"
>   #include "hw/ppc/spapr.h"
>   #include "hw/pci-host/spapr.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include <libfdt.h>
>   #include "trace.h"
> diff --git a/hw/remote/memory.c b/hw/remote/memory.c
> index 0af2a2f3fe..23df49099a 100644
> --- a/hw/remote/memory.c
> +++ b/hw/remote/memory.c
> @@ -11,7 +11,7 @@
>   #include "qemu/osdep.h"
>   
>   #include "hw/remote/memory.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "qapi/error.h"
>   
> diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-listener.c
> index 3948751ed7..0baf145016 100644
> --- a/hw/remote/proxy-memory-listener.c
> +++ b/hw/remote/proxy-memory-listener.c
> @@ -12,7 +12,7 @@
>   #include "qemu/range.h"
>   #include "exec/memory.h"
>   #include "exec/cpu-common.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "qapi/error.h"
>   #include "qemu/error-report.h"
> diff --git a/hw/s390x/s390-stattrib-kvm.c b/hw/s390x/s390-stattrib-kvm.c
> index b495d81296..48fd8e56cc 100644
> --- a/hw/s390x/s390-stattrib-kvm.c
> +++ b/hw/s390x/s390-stattrib-kvm.c
> @@ -15,7 +15,7 @@
>   #include "hw/s390x/storage-attributes.h"
>   #include "qemu/error-report.h"
>   #include "sysemu/kvm.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "kvm/kvm_s390x.h"
>   #include "qapi/error.h"
> diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c
> index fe7945e856..5bad70ae5c 100644
> --- a/hw/s390x/s390-stattrib.c
> +++ b/hw/s390x/s390-stattrib.c
> @@ -16,7 +16,7 @@
>   #include "hw/qdev-properties.h"
>   #include "hw/s390x/storage-attributes.h"
>   #include "qemu/error-report.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "qapi/error.h"
>   #include "qapi/qmp/qdict.h"
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 5b6fe1a18a..823a45cdec 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -13,7 +13,7 @@
>   
>   #include "qemu/osdep.h"
>   #include "qapi/error.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "exec/confidential-guest-support.h"
>   #include "hw/boards.h"
> diff --git a/hw/vfio/common.c b/hw/vfio/common.c
> index 2e7a02cd4b..01aae36194 100644
> --- a/hw/vfio/common.c
> +++ b/hw/vfio/common.c
> @@ -29,7 +29,7 @@
>   #include "hw/vfio/pci.h"
>   #include "exec/address-spaces.h"
>   #include "exec/memory.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "hw/hw.h"
>   #include "qemu/error-report.h"
> diff --git a/hw/vfio/container.c b/hw/vfio/container.c
> index f0bc9e8c2b..fe2254962b 100644
> --- a/hw/vfio/container.c
> +++ b/hw/vfio/container.c
> @@ -25,7 +25,7 @@
>   #include "hw/vfio/vfio-common.h"
>   #include "exec/address-spaces.h"
>   #include "exec/memory.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "qemu/error-report.h"
>   #include "qemu/range.h"
> diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
> index 120c82f3de..0b539cd55a 100644
> --- a/hw/vfio/iommufd.c
> +++ b/hw/vfio/iommufd.c
> @@ -25,7 +25,7 @@
>   #include "qemu/cutils.h"
>   #include "qemu/chardev_open.h"
>   #include "pci.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   
>   static int iommufd_cdev_map(const VFIOContainerBase *bcontainer, hwaddr iova,
> diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
> index f5698eeae0..a057034e2a 100644
> --- a/hw/vfio/migration.c
> +++ b/hw/vfio/migration.c
> @@ -26,7 +26,7 @@
>   #include "qapi/error.h"
>   #include "qapi/qapi-events-vfio.h"
>   #include "exec/ramlist.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "pci.h"
>   #include "trace.h"
> diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c
> index 980147338a..7b4159948f 100644
> --- a/hw/vfio/spapr.c
> +++ b/hw/vfio/spapr.c
> @@ -19,7 +19,7 @@
>   
>   #include "hw/vfio/vfio-common.h"
>   #include "hw/hw.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "qemu/error-report.h"
>   #include "qapi/error.h"
> diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
> index dae94dbbde..1cccec24c3 100644
> --- a/hw/virtio/virtio-mem.c
> +++ b/hw/virtio/virtio-mem.c
> @@ -24,7 +24,7 @@
>   #include "hw/virtio/virtio-mem.h"
>   #include "qapi/error.h"
>   #include "qapi/visitor.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "migration/misc.h"
>   #include "hw/boards.h"
> diff --git a/migration/ram.c b/migration/ram.c
> index 82c44e8213..5da14601c1 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -48,7 +48,7 @@
>   #include "qapi/qapi-commands-migration.h"
>   #include "qapi/qmp/qerror.h"
>   #include "trace.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "exec/target_page.h"
>   #include "qemu/rcu_queue.h"
> diff --git a/plugins/api.c b/plugins/api.c
> index 77b55cff74..24bf31804f 100644
> --- a/plugins/api.c
> +++ b/plugins/api.c
> @@ -49,7 +49,7 @@
>   #ifndef CONFIG_USER_ONLY
>   #include "qapi/error.h"
>   #include "migration/blocker.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "qemu/plugin-memory.h"
>   #include "hw/boards.h"
> diff --git a/system/memory.c b/system/memory.c
> index 7eae1bbda7..281f3c94e1 100644
> --- a/system/memory.c
> +++ b/system/memory.c
> @@ -26,7 +26,7 @@
>   #include "trace.h"
>   
>   #include "exec/memory-internal.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "sysemu/kvm.h"
>   #include "sysemu/runstate.h"
> diff --git a/system/physmem.c b/system/physmem.c
> index 26cfb84454..d856c77d8b 100644
> --- a/system/physmem.c
> +++ b/system/physmem.c
> @@ -66,7 +66,7 @@
>   #include "sysemu/replay.h"
>   
>   #include "exec/memory-internal.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   
>   #include "qemu/pmem.h"
> diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c
> index 0950a1c6f1..c401a0981c 100644
> --- a/target/arm/tcg/mte_helper.c
> +++ b/target/arm/tcg/mte_helper.c
> @@ -24,7 +24,7 @@
>   #include "exec/exec-all.h"
>   #include "exec/page-protection.h"
>   #ifndef CONFIG_USER_ONLY
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #endif
>   #include "exec/cpu_ldst.h"
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index f764931426..f9dc722f3f 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -41,7 +41,7 @@
>   #include "trace.h"
>   #include "gdbstub/enums.h"
>   #include "exec/memattrs.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "sysemu/hostmem.h"
>   #include "qemu/cutils.h"
> diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
> index c8045d873c..7dd4e403aa 100644
> --- a/target/s390x/kvm/kvm.c
> +++ b/target/s390x/kvm/kvm.c
> @@ -41,7 +41,7 @@
>   #include "sysemu/runstate.h"
>   #include "sysemu/device_tree.h"
>   #include "gdbstub/enums.h"
> -#include "exec/ram_addr.h"
> +#include "sysemu/ram_addr.h"
>   #include "sysemu/physmem-target.h"
>   #include "trace.h"
>   #include "hw/s390x/s390-pci-inst.h"

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
diff mbox series

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 0027e56fa5..f303f73534 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3024,10 +3024,10 @@  S: Supported
 F: include/exec/ioport.h
 F: include/exec/memop.h
 F: include/exec/memory.h
-F: include/exec/ram_addr.h
 F: include/exec/ramblock.h
 F: include/sysemu/memory_mapping.h
 F: include/sysemu/physmem-target.h
+F: include/sysemu/ram_addr.h
 F: system/dma-helpers.c
 F: system/ioport.c
 F: system/memory.c
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index b790202c56..27f047b13b 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -54,7 +54,7 @@  enum device_endian {
 #define DEVICE_HOST_ENDIAN DEVICE_LITTLE_ENDIAN
 #endif
 
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 
 /**
  * cpu_address_space_init:
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 58faa3eb08..b2e2d4590a 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -28,7 +28,7 @@ 
 #include "qemu/notify.h"
 #include "qom/object.h"
 #include "qemu/rcu.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 
 #define RAM_ADDR_INVALID (~(ram_addr_t)0)
 
diff --git a/include/exec/translation-block.h b/include/exec/translation-block.h
index 9c4757882c..b72fcbbb18 100644
--- a/include/exec/translation-block.h
+++ b/include/exec/translation-block.h
@@ -8,7 +8,7 @@ 
 #define EXEC_TRANSLATION_BLOCK_H
 
 #include "qemu/thread.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "exec/vaddr.h"
 #ifdef CONFIG_USER_ONLY
 #include "qemu/interval-tree.h"
diff --git a/include/sysemu/physmem-target.h b/include/sysemu/physmem-target.h
index b30c42da60..32efaf80b6 100644
--- a/include/sysemu/physmem-target.h
+++ b/include/sysemu/physmem-target.h
@@ -23,7 +23,7 @@ 
 #include "sysemu/xen.h"
 #include "sysemu/tcg.h"
 #include "exec/cputlb.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "exec/ramlist.h"
 #include "exec/ramblock.h"
 #include "qemu/rcu.h"
diff --git a/include/exec/ram_addr.h b/include/sysemu/ram_addr.h
similarity index 100%
rename from include/exec/ram_addr.h
rename to include/sysemu/ram_addr.h
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index a80547006b..1ec73400a7 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -34,7 +34,7 @@ 
 #include "sysemu/accel-blocker.h"
 #include "qemu/bswap.h"
 #include "exec/memory.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "qemu/event_notifier.h"
 #include "qemu/main-loop.h"
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index d4b381641c..46f35ddd59 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -27,7 +27,7 @@ 
 #include "exec/cputlb.h"
 #include "exec/tb-flush.h"
 #include "exec/memory-internal.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "exec/mmu-access-type.h"
 #include "exec/tlb-common.h"
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 48015be829..6d165fded6 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -40,7 +40,7 @@ 
 #endif
 #endif
 #else
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #endif
 
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index a9833530c7..ac9ab5986a 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -74,7 +74,7 @@ 
 #include "hw/virtio/virtio-scsi.h"
 #include "hw/virtio/vhost-scsi-common.h"
 
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "exec/confidential-guest-support.h"
 #include "hw/usb.h"
diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
index 5eef7475c1..1d9ad3d6fc 100644
--- a/hw/ppc/spapr_caps.c
+++ b/hw/ppc/spapr_caps.c
@@ -27,7 +27,7 @@ 
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "sysemu/hw_accel.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "target/ppc/cpu.h"
 #include "target/ppc/mmu-hash64.h"
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index a91fea1304..f6b2cb7396 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -34,7 +34,7 @@ 
 #include "hw/pci/pci_host.h"
 #include "hw/ppc/spapr.h"
 #include "hw/pci-host/spapr.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include <libfdt.h>
 #include "trace.h"
diff --git a/hw/remote/memory.c b/hw/remote/memory.c
index 0af2a2f3fe..23df49099a 100644
--- a/hw/remote/memory.c
+++ b/hw/remote/memory.c
@@ -11,7 +11,7 @@ 
 #include "qemu/osdep.h"
 
 #include "hw/remote/memory.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "qapi/error.h"
 
diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-listener.c
index 3948751ed7..0baf145016 100644
--- a/hw/remote/proxy-memory-listener.c
+++ b/hw/remote/proxy-memory-listener.c
@@ -12,7 +12,7 @@ 
 #include "qemu/range.h"
 #include "exec/memory.h"
 #include "exec/cpu-common.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
diff --git a/hw/s390x/s390-stattrib-kvm.c b/hw/s390x/s390-stattrib-kvm.c
index b495d81296..48fd8e56cc 100644
--- a/hw/s390x/s390-stattrib-kvm.c
+++ b/hw/s390x/s390-stattrib-kvm.c
@@ -15,7 +15,7 @@ 
 #include "hw/s390x/storage-attributes.h"
 #include "qemu/error-report.h"
 #include "sysemu/kvm.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "kvm/kvm_s390x.h"
 #include "qapi/error.h"
diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c
index fe7945e856..5bad70ae5c 100644
--- a/hw/s390x/s390-stattrib.c
+++ b/hw/s390x/s390-stattrib.c
@@ -16,7 +16,7 @@ 
 #include "hw/qdev-properties.h"
 #include "hw/s390x/storage-attributes.h"
 #include "qemu/error-report.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 5b6fe1a18a..823a45cdec 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -13,7 +13,7 @@ 
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "exec/confidential-guest-support.h"
 #include "hw/boards.h"
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 2e7a02cd4b..01aae36194 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -29,7 +29,7 @@ 
 #include "hw/vfio/pci.h"
 #include "exec/address-spaces.h"
 #include "exec/memory.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "hw/hw.h"
 #include "qemu/error-report.h"
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index f0bc9e8c2b..fe2254962b 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -25,7 +25,7 @@ 
 #include "hw/vfio/vfio-common.h"
 #include "exec/address-spaces.h"
 #include "exec/memory.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "qemu/error-report.h"
 #include "qemu/range.h"
diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
index 120c82f3de..0b539cd55a 100644
--- a/hw/vfio/iommufd.c
+++ b/hw/vfio/iommufd.c
@@ -25,7 +25,7 @@ 
 #include "qemu/cutils.h"
 #include "qemu/chardev_open.h"
 #include "pci.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 
 static int iommufd_cdev_map(const VFIOContainerBase *bcontainer, hwaddr iova,
diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
index f5698eeae0..a057034e2a 100644
--- a/hw/vfio/migration.c
+++ b/hw/vfio/migration.c
@@ -26,7 +26,7 @@ 
 #include "qapi/error.h"
 #include "qapi/qapi-events-vfio.h"
 #include "exec/ramlist.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "pci.h"
 #include "trace.h"
diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c
index 980147338a..7b4159948f 100644
--- a/hw/vfio/spapr.c
+++ b/hw/vfio/spapr.c
@@ -19,7 +19,7 @@ 
 
 #include "hw/vfio/vfio-common.h"
 #include "hw/hw.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index dae94dbbde..1cccec24c3 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -24,7 +24,7 @@ 
 #include "hw/virtio/virtio-mem.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "migration/misc.h"
 #include "hw/boards.h"
diff --git a/migration/ram.c b/migration/ram.c
index 82c44e8213..5da14601c1 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -48,7 +48,7 @@ 
 #include "qapi/qapi-commands-migration.h"
 #include "qapi/qmp/qerror.h"
 #include "trace.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "exec/target_page.h"
 #include "qemu/rcu_queue.h"
diff --git a/plugins/api.c b/plugins/api.c
index 77b55cff74..24bf31804f 100644
--- a/plugins/api.c
+++ b/plugins/api.c
@@ -49,7 +49,7 @@ 
 #ifndef CONFIG_USER_ONLY
 #include "qapi/error.h"
 #include "migration/blocker.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "qemu/plugin-memory.h"
 #include "hw/boards.h"
diff --git a/system/memory.c b/system/memory.c
index 7eae1bbda7..281f3c94e1 100644
--- a/system/memory.c
+++ b/system/memory.c
@@ -26,7 +26,7 @@ 
 #include "trace.h"
 
 #include "exec/memory-internal.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "sysemu/kvm.h"
 #include "sysemu/runstate.h"
diff --git a/system/physmem.c b/system/physmem.c
index 26cfb84454..d856c77d8b 100644
--- a/system/physmem.c
+++ b/system/physmem.c
@@ -66,7 +66,7 @@ 
 #include "sysemu/replay.h"
 
 #include "exec/memory-internal.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 
 #include "qemu/pmem.h"
diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c
index 0950a1c6f1..c401a0981c 100644
--- a/target/arm/tcg/mte_helper.c
+++ b/target/arm/tcg/mte_helper.c
@@ -24,7 +24,7 @@ 
 #include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #ifndef CONFIG_USER_ONLY
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #endif
 #include "exec/cpu_ldst.h"
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index f764931426..f9dc722f3f 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -41,7 +41,7 @@ 
 #include "trace.h"
 #include "gdbstub/enums.h"
 #include "exec/memattrs.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "sysemu/hostmem.h"
 #include "qemu/cutils.h"
diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
index c8045d873c..7dd4e403aa 100644
--- a/target/s390x/kvm/kvm.c
+++ b/target/s390x/kvm/kvm.c
@@ -41,7 +41,7 @@ 
 #include "sysemu/runstate.h"
 #include "sysemu/device_tree.h"
 #include "gdbstub/enums.h"
-#include "exec/ram_addr.h"
+#include "sysemu/ram_addr.h"
 #include "sysemu/physmem-target.h"
 #include "trace.h"
 #include "hw/s390x/s390-pci-inst.h"