summary refs log tree commit diff stats
path: root/include/hw/isa
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2025-03-12 12:11:21 -0700
committerRichard Henderson <richard.henderson@linaro.org>2025-04-23 14:08:21 -0700
commit8be545ba5a315a9aaf7307f143a4a7926a6e605c (patch)
treedee36b830d857d58625c4c669d23da354f2b0c67 /include/hw/isa
parent4d3ad3c3ba1f1e9c217d0581e4913a59ef2ac15f (diff)
downloadfocaccia-qemu-8be545ba5a315a9aaf7307f143a4a7926a6e605c.tar.gz
focaccia-qemu-8be545ba5a315a9aaf7307f143a4a7926a6e605c.zip
include/system: Move exec/memory.h to system/memory.h
Convert the existing includes with

  sed -i ,exec/memory.h,system/memory.h,g

Move the include within cpu-all.h into a !CONFIG_USER_ONLY block.

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/hw/isa')
-rw-r--r--include/hw/isa/apm.h2
-rw-r--r--include/hw/isa/isa.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/hw/isa/apm.h b/include/hw/isa/apm.h
index b6e070c00e..0834539045 100644
--- a/include/hw/isa/apm.h
+++ b/include/hw/isa/apm.h
@@ -1,7 +1,7 @@
 #ifndef APM_H
 #define APM_H
 
-#include "exec/memory.h"
+#include "system/memory.h"
 
 #define APM_CNT_IOPORT  0xb2
 #define ACPI_PORT_SMI_CMD APM_CNT_IOPORT
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index 40d6224a4e..1d852011b3 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -3,7 +3,7 @@
 
 /* ISA bus */
 
-#include "exec/memory.h"
+#include "system/memory.h"
 #include "exec/ioport.h"
 #include "hw/qdev-core.h"
 #include "qom/object.h"