include/system: Move exec/ramblock.h to system/ramblock.h

Convert the existing includes with sed.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index b1ac3ff7d28c2a84c7f704b8ad08491a42fd33f9..ba885010c52855bbe7768bc9b1d82456ea0a760d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3122,7 +3122,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

diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabuf.c
index 85ca23cb321b30877475b3d4e4b5e5148bee3ad7..051057747573264765aa3a3f31a412adf9131245 100644 (file)
--- 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 0b1da723c8510211e349185cead44b2dff5e6ae1..acabff2c4a5ac937a378427499638a32dc0041e8 100644 (file)
--- 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 267b612587ac7cc027834dc7e9b2347fe4862d49..48561d3c740f3bc67c5426624f2cc22345bf1e23 100644 (file)
--- 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/include/system/ram_addr.h b/include/system/ram_addr.h
index 3b81c3091f52646c8f66f29c9d443ff5f25876f6..b4e4425acbbee4ab06d4ffffd87ccb5c25651477 100644 (file)
--- a/include/system/ram_addr.h
+++ b/include/system/ram_addr.h
@@ -23,7 +23,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 "system/memory.h"
 #include "exec/target_page.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 64484cd8217a46c43316b3416297eb7f46037bc7..d8a116ba99343354ff307d0720284611a54da2d1 100644 (file)
--- 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/migration/dirtyrate.c b/migration/dirtyrate.c
index 09caf92f87ecdb1f3947aaef1ecc1d4d01969551..986624c79a1e3593139505114f8efec0be3a1faa 100644 (file)
--- 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 7f11e26f5c7ae5f887a407b1ba9540aa53060c6a..bb8031e3c7783f813dcf44f73c8025d3b633e2af 100644 (file)
--- 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 ffe75256c9fbe459dee4eb4aa8f80ae013ff2d87..94f248e8a20119345a466f80da023537461c78f5 100644 (file)
--- 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 6a0e989fae827a286feee774575146d6996d2ca0..7419e5dc0d07e210474f3bf02ae5ba8a9da0721b 100644 (file)
--- 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 88e2344af2f9a53f9bc1a79988795e9af3c784da..52902eb00cca8af08c9c40278d28744155a9a2be 100644 (file)
--- 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 6895c1f65abb6164f3e416915588ac20e32a307e..fd7cd9b5e8e73e8460346244808bae5e73b4418b 100644 (file)
--- 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 f1e988a9591c819e4f7b0d76d3b3c075ecc5648c..dbc11849216ea757424d021c496a2d4e48b0d0fb 100644 (file)
--- 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 8cf8a26bb42ba44e46112ae1093145b2474d194b..8820b2a787c9f3d6f6c3fca2207ddc8772510614 100644 (file)
--- 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 abed140855c8c5401f14b782a9930efd77000e79..3c2dcf76b0f6dfaea1161b01887f17054073a3fb 100644 (file)
--- 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 dfb5189f0ea3da97370b81e2dcf5a7f86252ae29..86c83e43c079ab53445fdd32d644a71c3bba9199 100644 (file)
--- 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 5d3edfcfec73d1559d1257fbf16727449f45d39c..995614b38c9d09740630563e0fd0a062a5fdf548 100644 (file)
--- 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 239be9372d7e77b3805ea692f90ababacbc09ed0..507de748068b5334845c094f499af11e47822eec 100644 (file)
--- 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"