summary refs log tree commit diff stats
path: root/hw/net
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 /hw/net
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 'hw/net')
-rw-r--r--hw/net/i82596.h2
-rw-r--r--hw/net/ne2000.c2
-rw-r--r--hw/net/pcnet.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/hw/net/i82596.h b/hw/net/i82596.h
index f0bbe810eb..4bdfcaf856 100644
--- a/hw/net/i82596.h
+++ b/hw/net/i82596.h
@@ -3,7 +3,7 @@
 
 #define I82596_IOPORT_SIZE       0x20
 
-#include "exec/memory.h"
+#include "system/memory.h"
 #include "exec/address-spaces.h"
 
 #define PORT_RESET              0x00    /* reset 82596 */
diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
index b482c5f3af..b1923c8c3e 100644
--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "net/eth.h"
 #include "qemu/module.h"
-#include "exec/memory.h"
+#include "system/memory.h"
 #include "hw/irq.h"
 #include "migration/vmstate.h"
 #include "ne2000.h"
diff --git a/hw/net/pcnet.h b/hw/net/pcnet.h
index eb7f46aab3..a94356ec30 100644
--- a/hw/net/pcnet.h
+++ b/hw/net/pcnet.h
@@ -7,7 +7,7 @@
 #define PCNET_LOOPTEST_CRC      1
 #define PCNET_LOOPTEST_NOCRC    2
 
-#include "exec/memory.h"
+#include "system/memory.h"
 #include "hw/irq.h"
 
 /* BUS CONFIGURATION REGISTERS */