aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2025-03-12 12:31:54 -0700
committerRichard Henderson <richard.henderson@linaro.org>2025-04-23 14:08:21 -0700
commitdfc56946a70052136126f6a207f237af8032d74a (patch)
tree622e01ef9356cca6e91d2a88187958f3e479fb9e /include
parent8be545ba5a315a9aaf7307f143a4a7926a6e605c (diff)
downloadqemu-dfc56946a70052136126f6a207f237af8032d74a.zip
qemu-dfc56946a70052136126f6a207f237af8032d74a.tar.gz
qemu-dfc56946a70052136126f6a207f237af8032d74a.tar.bz2
include/system: Move exec/address-spaces.h to system/address-spaces.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>
Diffstat (limited to 'include')
-rw-r--r--include/hw/misc/lasi.h2
-rw-r--r--include/hw/nubus/nubus.h2
-rw-r--r--include/hw/ppc/vof.h2
-rw-r--r--include/hw/tricore/triboard.h2
-rw-r--r--include/system/address-spaces.h (renamed from include/exec/address-spaces.h)8
-rw-r--r--include/system/dma.h2
6 files changed, 7 insertions, 11 deletions
diff --git a/include/hw/misc/lasi.h b/include/hw/misc/lasi.h
index f01c0f6..0bdfb11 100644
--- a/include/hw/misc/lasi.h
+++ b/include/hw/misc/lasi.h
@@ -12,7 +12,7 @@
#ifndef LASI_H
#define LASI_H
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/pci/pci_host.h"
#include "hw/boards.h"
diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
index fee79b7..7825840 100644
--- a/include/hw/nubus/nubus.h
+++ b/include/hw/nubus/nubus.h
@@ -11,7 +11,7 @@
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qom/object.h"
#include "qemu/units.h"
diff --git a/include/hw/ppc/vof.h b/include/hw/ppc/vof.h
index 2918aaa..3a0fbff 100644
--- a/include/hw/ppc/vof.h
+++ b/include/hw/ppc/vof.h
@@ -7,7 +7,7 @@
#define HW_VOF_H
#include "qom/object.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/memory.h"
#include "exec/cpu-defs.h"
diff --git a/include/hw/tricore/triboard.h b/include/hw/tricore/triboard.h
index 8250470..ca49a0c 100644
--- a/include/hw/tricore/triboard.h
+++ b/include/hw/tricore/triboard.h
@@ -21,7 +21,7 @@
#include "qapi/error.h"
#include "hw/boards.h"
#include "system/system.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qom/object.h"
#include "hw/tricore/tc27x_soc.h"
diff --git a/include/exec/address-spaces.h b/include/system/address-spaces.h
index 0d0aa61..72d17af 100644
--- a/include/exec/address-spaces.h
+++ b/include/system/address-spaces.h
@@ -11,16 +11,14 @@
*
*/
-#ifndef EXEC_ADDRESS_SPACES_H
-#define EXEC_ADDRESS_SPACES_H
+#ifndef SYSTEM_ADDRESS_SPACES_H
+#define SYSTEM_ADDRESS_SPACES_H
/*
* Internal interfaces between memory.c/exec.c/vl.c. Do not #include unless
* you're one of them.
*/
-#ifndef CONFIG_USER_ONLY
-
/* Get the root memory region. This interface should only be used temporarily
* until a proper bus interface is available.
*/
@@ -35,5 +33,3 @@ extern AddressSpace address_space_memory;
extern AddressSpace address_space_io;
#endif
-
-#endif
diff --git a/include/system/dma.h b/include/system/dma.h
index aaa03b9..82e7ad5 100644
--- a/include/system/dma.h
+++ b/include/system/dma.h
@@ -11,7 +11,7 @@
#define DMA_H
#include "system/memory.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "block/block.h"
#include "block/accounting.h"