* [Qemu-devel] [PATCH 01/12] arm: fix location of some include files
2013-04-11 16:10 [Qemu-devel] [PATCH 00/12] directory reorganization, final part Paolo Bonzini
@ 2013-04-11 16:10 ` Paolo Bonzini
2013-04-11 16:10 ` [Qemu-devel] [PATCH 02/12] virtio-9p: Fix virtio-9p no longer building after hw-dirs branch merge Paolo Bonzini
` (11 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Paolo Bonzini @ 2013-04-11 16:10 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, mst
From: Peter Maydell <peter.maydell@linaro.org>
The recent rearrangement of include files had some minor errors:
devices.h is not ARM specific and should not be in arm/
arm.h should be in arm/
Move these two headers to correct this.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/alpha/typhoon.c | 2 +-
hw/arm/armv7m.c | 2 +-
hw/arm/boot.c | 2 +-
hw/arm/collie.c | 4 ++--
hw/arm/exynos4210.c | 2 +-
hw/arm/exynos4_boards.c | 2 +-
hw/arm/gumstix.c | 2 +-
hw/arm/highbank.c | 4 ++--
hw/arm/integratorcp.c | 4 ++--
hw/arm/kzm.c | 4 ++--
hw/arm/mainstone.c | 4 ++--
hw/arm/musicpal.c | 4 ++--
hw/arm/nseries.c | 4 ++--
hw/arm/omap1.c | 2 +-
hw/arm/omap2.c | 2 +-
hw/arm/omap_sx1.c | 2 +-
hw/arm/palm.c | 4 ++--
hw/arm/pic_cpu.c | 2 +-
hw/arm/realview.c | 4 ++--
hw/arm/spitz.c | 4 ++--
hw/arm/stellaris.c | 4 ++--
hw/arm/strongarm.c | 2 +-
hw/arm/tosa.c | 4 ++--
hw/arm/versatilepb.c | 4 ++--
hw/arm/vexpress.c | 4 ++--
hw/arm/xilinx_zynq.c | 2 +-
hw/arm/z2.c | 4 ++--
hw/block/m25p80.c | 2 +-
hw/display/blizzard.c | 2 +-
hw/display/sm501.c | 2 +-
hw/display/tc6393xb.c | 2 +-
hw/input/stellaris_input.c | 2 +-
hw/input/tsc2005.c | 2 +-
hw/input/tsc210x.c | 2 +-
hw/intc/armv7m_nvic.c | 2 +-
hw/lm32/lm32_boards.c | 2 +-
hw/lm32/milkymist.c | 2 +-
hw/microblaze/petalogix_ml605_mmu.c | 2 +-
hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +-
hw/misc/cbus.c | 2 +-
hw/net/lan9118.c | 2 +-
hw/net/smc91c111.c | 2 +-
hw/ppc/virtex_ml507.c | 2 +-
hw/sh4/r2d.c | 2 +-
hw/timer/tusb6010.c | 2 +-
include/hw/{ => arm}/arm.h | 0
include/hw/{arm => }/devices.h | 0
target-arm/arm-semi.c | 2 +-
target-arm/kvm.c | 2 +-
49 files changed, 62 insertions(+), 62 deletions(-)
rename include/hw/{ => arm}/arm.h (100%)
rename include/hw/{arm => }/devices.h (100%)
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index faec8dc..68420f4 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -9,7 +9,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "hw/hw.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "alpha_sys.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index a4bdd5f..2ae3576 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -8,7 +8,7 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/loader.h"
#include "elf.h"
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index c79c590..e9c0945 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -9,7 +9,7 @@
#include "config.h"
#include "hw/hw.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/loader.h"
diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 5420bb4..a19857a 100644
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -11,9 +11,9 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "strongarm.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
index 78b8b74..c8101d3 100644
--- a/hw/arm/exynos4210.c
+++ b/hw/arm/exynos4210.c
@@ -24,7 +24,7 @@
#include "hw/boards.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/loader.h"
#include "hw/arm/exynos4210.h"
#include "hw/usb/hcd-ehci.h"
diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index ba14a1f..74f110b 100644
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -24,7 +24,7 @@
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "net/net.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "exec/address-spaces.h"
#include "hw/arm/exynos4210.h"
#include "hw/boards.h"
diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index 4d800c9..b8cab10 100644
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -38,7 +38,7 @@
#include "hw/arm/pxa.h"
#include "net/net.h"
#include "hw/block/flash.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index 58f73c1..0fd9465 100644
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -18,8 +18,8 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "hw/loader.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index 8d0fb75..cca2971 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -8,9 +8,9 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "net/net.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index 46264cd..cf90f5d 100644
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -16,8 +16,8 @@
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
#include "hw/hw.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index b78e6f0..260e314 100644
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -13,9 +13,9 @@
*/
#include "hw/hw.h"
#include "hw/arm/pxa.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "net/net.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 97b1340..d2247fa 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -10,8 +10,8 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index ba8dc3e..4976438 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -21,12 +21,12 @@
#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "hw/arm/omap.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/irq.h"
#include "ui/console.h"
#include "hw/boards.h"
#include "hw/i2c/i2c.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/block/flash.h"
#include "hw/hw.h"
#include "hw/bt.h"
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index 17caa61..f59f0f2 100644
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -17,7 +17,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw/hw.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/arm/omap.h"
#include "sysemu/sysemu.h"
#include "hw/arm/soc_dma.h"
diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index 010c483..a4b4146 100644
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -20,7 +20,7 @@
#include "sysemu/blockdev.h"
#include "hw/hw.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/arm/omap.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index aa85602..e421ece 100644
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -29,7 +29,7 @@
#include "ui/console.h"
#include "hw/arm/omap.h"
#include "hw/boards.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index 0bc11ae..b13d810 100644
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -22,8 +22,8 @@
#include "ui/console.h"
#include "hw/arm/omap.h"
#include "hw/boards.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "hw/loader.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/pic_cpu.c b/hw/arm/pic_cpu.c
index 787767f..875280a 100644
--- a/hw/arm/pic_cpu.c
+++ b/hw/arm/pic_cpu.c
@@ -8,7 +8,7 @@
*/
#include "hw/hw.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "sysemu/kvm.h"
/* Input 0 is IRQ and input 1 is FIQ. */
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index afd52d3..feabfc5 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -8,9 +8,9 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/arm/primecell.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/pci/pci.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index fa434dc..c42668a 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -12,14 +12,14 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "sysemu/sysemu.h"
#include "hw/pcmcia.h"
#include "hw/i2c/i2c.h"
#include "hw/ssi.h"
#include "hw/block/flash.h"
#include "qemu/timer.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/arm/sharpsl.h"
#include "ui/console.h"
#include "block/block.h"
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 952087c..2b61e3c 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -9,8 +9,8 @@
#include "hw/sysbus.h"
#include "hw/ssi.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "qemu/timer.h"
#include "hw/i2c/i2c.h"
#include "net/net.h"
diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index 5873a3c..75a813e 100644
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -29,7 +29,7 @@
#include "hw/sysbus.h"
#include "strongarm.h"
#include "qemu/error-report.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "char/char.h"
#include "sysemu/sysemu.h"
#include "hw/ssi.h"
diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index c4362d4..47818a5 100644
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -13,8 +13,8 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "hw/arm/sharpsl.h"
#include "hw/pcmcia.h"
#include "block/block.h"
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index d9be604..25c665a 100644
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -8,8 +8,8 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/pci/pci.h"
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index 96e0985..a077c62 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -22,9 +22,9 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/arm/primecell.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index 8d65f79..41505c3 100644
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -16,7 +16,7 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "net/net.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index 3e27208..07a127b 100644
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -13,8 +13,8 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "hw/i2c/i2c.h"
#include "hw/ssi.h"
#include "hw/boards.h"
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index cd560e3..55e9d0d 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "sysemu/blockdev.h"
#include "hw/ssi.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#ifdef M25P80_ERR_DEBUG
#define DB_PRINT(...) do { \
diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c
index 175c5cd..de7ccf8 100644
--- a/hw/display/blizzard.c
+++ b/hw/display/blizzard.c
@@ -20,7 +20,7 @@
#include "qemu-common.h"
#include "ui/console.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "vga_int.h"
#include "ui/pixel_ops.h"
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 6b660ac..9878df4 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -26,7 +26,7 @@
#include "hw/hw.h"
#include "hw/char/serial.h"
#include "ui/console.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/sysbus.h"
#include "hw/qdev-addr.h"
#include "qemu/range.h"
diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c
index e252ce9..178a21f 100644
--- a/hw/display/tc6393xb.c
+++ b/hw/display/tc6393xb.c
@@ -11,7 +11,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw/hw.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/block/flash.h"
#include "ui/console.h"
#include "ui/pixel_ops.h"
diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c
index f83fc3f..4e40792 100644
--- a/hw/input/stellaris_input.c
+++ b/hw/input/stellaris_input.c
@@ -7,7 +7,7 @@
* This code is licensed under the GPL.
*/
#include "hw/hw.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "ui/console.h"
typedef struct {
diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c
index 34ee1fb..a771cd5 100644
--- a/hw/input/tsc2005.c
+++ b/hw/input/tsc2005.c
@@ -21,7 +21,7 @@
#include "hw/hw.h"
#include "qemu/timer.h"
#include "ui/console.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10)))
diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c
index e6c217c..9b854e7 100644
--- a/hw/input/tsc210x.c
+++ b/hw/input/tsc210x.c
@@ -24,7 +24,7 @@
#include "qemu/timer.h"
#include "ui/console.h"
#include "hw/arm/omap.h" /* For I2SCodec and uWireSlave */
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#define TSC_DATA_REGISTERS_PAGE 0x0
#define TSC_CONTROL_REGISTERS_PAGE 0x1
diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index 566b4bf..8eae4fc 100644
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -12,7 +12,7 @@
#include "hw/sysbus.h"
#include "qemu/timer.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "exec/address-spaces.h"
#include "gic_internal.h"
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
index 6555a97..1ca9498 100644
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -20,7 +20,7 @@
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/block/flash.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "sysemu/blockdev.h"
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index d02ca0c..cca9374 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -21,7 +21,7 @@
#include "hw/hw.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index f61818b..ae7ff44 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -30,7 +30,7 @@
#include "net/net.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/xilinx.h"
#include "sysemu/blockdev.h"
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index eedd60e..7c258f0 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -28,7 +28,7 @@
#include "net/net.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/xilinx.h"
#include "sysemu/blockdev.h"
diff --git a/hw/misc/cbus.c b/hw/misc/cbus.c
index 3d9027f..29b467b 100644
--- a/hw/misc/cbus.c
+++ b/hw/misc/cbus.c
@@ -22,7 +22,7 @@
#include "qemu-common.h"
#include "hw/irq.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "sysemu/sysemu.h"
//#define DEBUG
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index 04cf267..403fb86 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -12,7 +12,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "hw/ptimer.h"
/* For crc32 */
diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index f659256..c2feae6 100644
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -9,7 +9,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
/* For crc32 */
#include <zlib.h>
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 92b4394..6728ba7 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -27,7 +27,7 @@
#include "hw/char/serial.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "sysemu/device_tree.h"
#include "hw/loader.h"
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 256a58c..4986dae 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -26,7 +26,7 @@
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/sh4/sh.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/pci/pci.h"
diff --git a/hw/timer/tusb6010.c b/hw/timer/tusb6010.c
index 533938a..50edc06 100644
--- a/hw/timer/tusb6010.c
+++ b/hw/timer/tusb6010.c
@@ -23,7 +23,7 @@
#include "hw/usb.h"
#include "hw/arm/omap.h"
#include "hw/irq.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/sysbus.h"
typedef struct TUSBState {
diff --git a/include/hw/arm.h b/include/hw/arm/arm.h
similarity index 100%
rename from include/hw/arm.h
rename to include/hw/arm/arm.h
diff --git a/include/hw/arm/devices.h b/include/hw/devices.h
similarity index 100%
rename from include/hw/arm/devices.h
rename to include/hw/devices.h
diff --git a/target-arm/arm-semi.c b/target-arm/arm-semi.c
index 77718c4..f0637a4 100644
--- a/target-arm/arm-semi.c
+++ b/target-arm/arm-semi.c
@@ -34,7 +34,7 @@
#else
#include "qemu-common.h"
#include "exec/gdbstub.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#endif
#define TARGET_SYS_OPEN 0x01
diff --git a/target-arm/kvm.c b/target-arm/kvm.c
index 6bfb103..d8acace 100644
--- a/target-arm/kvm.c
+++ b/target-arm/kvm.c
@@ -21,7 +21,7 @@
#include "sysemu/kvm.h"
#include "kvm_arm.h"
#include "cpu.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
KVM_CAP_LAST_INFO
--
1.8.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [Qemu-devel] [PATCH 02/12] virtio-9p: Fix virtio-9p no longer building after hw-dirs branch merge
2013-04-11 16:10 [Qemu-devel] [PATCH 00/12] directory reorganization, final part Paolo Bonzini
2013-04-11 16:10 ` [Qemu-devel] [PATCH 01/12] arm: fix location of some include files Paolo Bonzini
@ 2013-04-11 16:10 ` Paolo Bonzini
2013-04-11 16:10 ` [Qemu-devel] [PATCH 03/12] Add linux-headers to QEMU_INCLUDES Paolo Bonzini
` (10 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Paolo Bonzini @ 2013-04-11 16:10 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Hans de Goede, mst
From: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
hw/9pfs/virtio-9p-device.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index 43f930e..b476b81 100644
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -12,11 +12,11 @@
*/
#include "hw/virtio/virtio.h"
+#include "hw/virtio/virtio-9p.h"
#include "hw/i386/pc.h"
#include "qemu/sockets.h"
#include "virtio-9p.h"
#include "fsdev/qemu-fsdev.h"
-#include "virtio-9p-device.h"
#include "virtio-9p-xattr.h"
#include "virtio-9p-coth.h"
--
1.8.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [Qemu-devel] [PATCH 03/12] Add linux-headers to QEMU_INCLUDES
2013-04-11 16:10 [Qemu-devel] [PATCH 00/12] directory reorganization, final part Paolo Bonzini
2013-04-11 16:10 ` [Qemu-devel] [PATCH 01/12] arm: fix location of some include files Paolo Bonzini
2013-04-11 16:10 ` [Qemu-devel] [PATCH 02/12] virtio-9p: Fix virtio-9p no longer building after hw-dirs branch merge Paolo Bonzini
@ 2013-04-11 16:10 ` Paolo Bonzini
2013-04-11 16:10 ` [Qemu-devel] [PATCH 04/12] Fix failure to create q35 machine Paolo Bonzini
` (9 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Paolo Bonzini @ 2013-04-11 16:10 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Jan Kiszka, mst
From: Jan Kiszka <jan.kiszka@siemens.com>
virtio/dataplane/vring.c requires the Linux headers and is built for all
targets. So we need to add the corresponding include to QEMU_INCLUDES to
avoid that outdated distribution headers are used.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
configure | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/configure b/configure
index 1ed939a..ee07f07 100755
--- a/configure
+++ b/configure
@@ -544,6 +544,7 @@ Haiku)
if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
audio_possible_drivers="$audio_possible_drivers fmod"
fi
+ QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers $QEMU_INCLUDES"
;;
esac
@@ -4230,10 +4231,6 @@ else
fi
includes="-I\$(SRC_PATH)/tcg $includes"
-if test "$linux" = "yes" ; then
- includes="-I\$(SRC_PATH)/linux-headers $includes"
-fi
-
for i in $ARCH $TARGET_BASE_ARCH ; do
case "$i" in
alpha)
--
1.8.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [Qemu-devel] [PATCH 04/12] Fix failure to create q35 machine
2013-04-11 16:10 [Qemu-devel] [PATCH 00/12] directory reorganization, final part Paolo Bonzini
` (2 preceding siblings ...)
2013-04-11 16:10 ` [Qemu-devel] [PATCH 03/12] Add linux-headers to QEMU_INCLUDES Paolo Bonzini
@ 2013-04-11 16:10 ` Paolo Bonzini
2013-04-11 16:10 ` [Qemu-devel] [PATCH 05/12] configure: fix TPM logic Paolo Bonzini
` (8 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Paolo Bonzini @ 2013-04-11 16:10 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Hu Tao, mst
From: Hu Tao <hutao@cn.fujitsu.com>
This is a regression introduced by c0907c9e6417c. How to reproduce:
$ qemu-system-x86_64 -nodefaults -vnc :0 -M q35
qemu-system-x86_64: Unknown device 'q35-pcihost' for default sysbus
Aborted (core dumped)
Tested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
---
default-configs/i386-softmmu.mak | 2 +-
default-configs/x86_64-softmmu.mak | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 4ac0694..6d9d364 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -42,6 +42,6 @@ CONFIG_ISA_TESTDEV=y
CONFIG_VMPORT=y
CONFIG_SGA=y
CONFIG_LPC_ICH9=y
-CONFIG_Q35=y
+CONFIG_PCI_Q35=y
CONFIG_APIC=y
CONFIG_IOAPIC=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index bf4091c..3b06310 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -42,6 +42,6 @@ CONFIG_ISA_TESTDEV=y
CONFIG_VMPORT=y
CONFIG_SGA=y
CONFIG_LPC_ICH9=y
-CONFIG_Q35=y
+CONFIG_PCI_Q35=y
CONFIG_APIC=y
CONFIG_IOAPIC=y
--
1.8.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [Qemu-devel] [PATCH 05/12] configure: fix TPM logic
2013-04-11 16:10 [Qemu-devel] [PATCH 00/12] directory reorganization, final part Paolo Bonzini
` (3 preceding siblings ...)
2013-04-11 16:10 ` [Qemu-devel] [PATCH 04/12] Fix failure to create q35 machine Paolo Bonzini
@ 2013-04-11 16:10 ` Paolo Bonzini
2013-04-11 16:10 ` [Qemu-devel] [PATCH 06/12] tpm: reorganize headers and split hardware part Paolo Bonzini
` (7 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Paolo Bonzini @ 2013-04-11 16:10 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, mst
A non-native i386 or x86_64 emulator should not have TPM passthrough
support, since the TPM is only present for those hosts.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 24 ++++++++++++++++++------
default-configs/i386-softmmu.mak | 3 +--
default-configs/x86_64-softmmu.mak | 3 +--
tpm/Makefile.objs | 4 +---
4 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
index ee07f07..7fedb5a 100755
--- a/configure
+++ b/configure
@@ -2337,6 +2337,15 @@ EOF
fi
##########################################
+# TPM passthrough is only on x86 Linux
+
+if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64; then
+ tpm_passthrough=$tpm
+else
+ tpm_passthrough=no
+fi
+
+##########################################
# adjust virtio-blk-data-plane based on linux-aio
if test "$virtio_blk_data_plane" = "yes" -a \
@@ -3436,6 +3445,7 @@ echo "virtio-blk-data-plane $virtio_blk_data_plane"
echo "gcov $gcov_tool"
echo "gcov enabled $gcov"
echo "TPM support $tpm"
+echo "TPM passthrough $tpm_passthrough"
if test "$sdl_too_old" = "yes"; then
echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -3814,6 +3824,14 @@ bsd)
;;
esac
+# TPM passthrough support?
+if test "$tpm" = "yes"; then
+ echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak
+ if test "$tpm_passthrough" = "yes"; then
+ echo "CONFIG_TPM_PASSTHROUGH=y" >> $config_host_mak
+ fi
+fi
+
# use default implementation for tracing backend-specific routines
trace_default=yes
echo "TRACE_BACKEND=$trace_backend" >> $config_host_mak
@@ -4341,12 +4359,6 @@ if test "$gprof" = "yes" ; then
fi
fi
-if test "$tpm" = "yes"; then
- if test "$target_softmmu" = "yes" ; then
- echo "CONFIG_TPM=y" >> $config_host_mak
- fi
-fi
-
if test "$ARCH" = "tci"; then
linker_script=""
else
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 6d9d364..368a776 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -27,8 +27,7 @@ CONFIG_HPET=y
CONFIG_APPLESMC=y
CONFIG_I8259=y
CONFIG_PFLASH_CFI01=y
-CONFIG_TPM_TIS=y
-CONFIG_TPM_PASSTHROUGH=y
+CONFIG_TPM_TIS=$(CONFIG_TPM)
CONFIG_PCI_HOTPLUG=y
CONFIG_MC146818RTC=y
CONFIG_PAM=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index 3b06310..2711b83 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -27,8 +27,7 @@ CONFIG_HPET=y
CONFIG_APPLESMC=y
CONFIG_I8259=y
CONFIG_PFLASH_CFI01=y
-CONFIG_TPM_TIS=y
-CONFIG_TPM_PASSTHROUGH=y
+CONFIG_TPM_TIS=$(CONFIG_TPM)
CONFIG_PCI_HOTPLUG=y
CONFIG_MC146818RTC=y
CONFIG_PAM=y
diff --git a/tpm/Makefile.objs b/tpm/Makefile.objs
index 8676824..366e4a7 100644
--- a/tpm/Makefile.objs
+++ b/tpm/Makefile.objs
@@ -1,6 +1,4 @@
common-obj-y = tpm.o
-ifeq ($(CONFIG_TPM),y)
-common-obj-y += tpm_backend.o
+common-obj-$(CONFIG_TPM) += tpm_backend.o
common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o
common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
-endif
--
1.8.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [Qemu-devel] [PATCH 06/12] tpm: reorganize headers and split hardware part
2013-04-11 16:10 [Qemu-devel] [PATCH 00/12] directory reorganization, final part Paolo Bonzini
` (4 preceding siblings ...)
2013-04-11 16:10 ` [Qemu-devel] [PATCH 05/12] configure: fix TPM logic Paolo Bonzini
@ 2013-04-11 16:10 ` Paolo Bonzini
2013-04-11 16:10 ` [Qemu-devel] [PATCH 07/12] sysemu: avoid proliferation of include/ subdirectories Paolo Bonzini
` (6 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Paolo Bonzini @ 2013-04-11 16:10 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, mst
The TPM subsystem does not have a full front-end/back-end separation.
The sole available backend, tpm_passthrough, depends on the data
structures of the sole available frontend, tpm_tis.
However, we can at least try to split the user interface (tpm.c) from the
implementation (hw/tpm). The patches makes tpm.c not include tpm_int.h,
which is shared between tpm_tis.c and tpm_passthrough.c; instead it
moves more stuff to tpm_backend.h.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 2 +-
backends/tpm.c | 38 +++++++++++++-
hw/Makefile.objs | 1 +
{tpm => hw/tpm}/Makefile.objs | 2 -
{tpm => hw/tpm}/tpm_int.h | 37 +-------------
{tpm => hw/tpm}/tpm_passthrough.c | 20 +++++++-
{tpm => hw/tpm}/tpm_tis.c | 2 +-
{tpm => hw/tpm}/tpm_tis.h | 5 --
include/backends/tpm.h | 42 +++++++++++++++-
include/{tpm => sysemu}/tpm.h | 2 -
.../sysemu/tpm_backend_int.h | 0
monitor.c | 2 +-
tpm/tpm.c => tpm.c | 19 +------
tpm/tpm_backend.c | 58 ----------------------
vl.c | 2 +-
15 files changed, 104 insertions(+), 128 deletions(-)
rename {tpm => hw/tpm}/Makefile.objs (61%)
rename {tpm => hw/tpm}/tpm_int.h (50%)
rename {tpm => hw/tpm}/tpm_passthrough.c (96%)
rename {tpm => hw/tpm}/tpm_tis.c (99%)
rename {tpm => hw/tpm}/tpm_tis.h (96%)
rename include/{tpm => sysemu}/tpm.h (82%)
rename tpm/tpm_backend.h => include/sysemu/tpm_backend_int.h (100%)
rename tpm/tpm.c => tpm.c (93%)
delete mode 100644 tpm/tpm_backend.c
diff --git a/Makefile.objs b/Makefile.objs
index e568c01..a473348 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -65,7 +65,7 @@ common-obj-y += bt-host.o bt-vhci.o
common-obj-y += dma-helpers.o
common-obj-y += vl.o
-common-obj-y += tpm/
+common-obj-y += tpm.o
common-obj-$(CONFIG_SLIRP) += slirp/
diff --git a/backends/tpm.c b/backends/tpm.c
index 28148c2..0580108 100644
--- a/backends/tpm.c
+++ b/backends/tpm.c
@@ -13,8 +13,10 @@
*/
#include "backends/tpm.h"
-#include "tpm/tpm_int.h"
#include "qapi/qmp/qerror.h"
+#include "sysemu/tpm.h"
+#include "qemu/thread.h"
+#include "sysemu/tpm_backend_int.h"
enum TpmType tpm_backend_get_type(TPMBackend *s)
{
@@ -137,6 +139,40 @@ static void tpm_backend_instance_init(Object *obj)
NULL);
}
+void tpm_backend_thread_deliver_request(TPMBackendThread *tbt)
+{
+ g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_PROCESS_CMD, NULL);
+}
+
+void tpm_backend_thread_create(TPMBackendThread *tbt,
+ GFunc func, gpointer user_data)
+{
+ if (!tbt->pool) {
+ tbt->pool = g_thread_pool_new(func, user_data, 1, TRUE, NULL);
+ g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_INIT, NULL);
+ }
+}
+
+void tpm_backend_thread_end(TPMBackendThread *tbt)
+{
+ if (tbt->pool) {
+ g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_END, NULL);
+ g_thread_pool_free(tbt->pool, FALSE, TRUE);
+ tbt->pool = NULL;
+ }
+}
+
+void tpm_backend_thread_tpm_reset(TPMBackendThread *tbt,
+ GFunc func, gpointer user_data)
+{
+ if (!tbt->pool) {
+ tpm_backend_thread_create(tbt, func, user_data);
+ } else {
+ g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_TPM_RESET,
+ NULL);
+ }
+}
+
static const TypeInfo tpm_backend_info = {
.name = TYPE_TPM_BACKEND,
.parent = TYPE_OBJECT,
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 1cb86fa..b7a1613 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -22,6 +22,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += scsi/
devices-dirs-$(CONFIG_SOFTMMU) += sd/
devices-dirs-$(CONFIG_SOFTMMU) += ssi/
devices-dirs-$(CONFIG_SOFTMMU) += timer/
+devices-dirs-$(CONFIG_TPM) += tpm/
devices-dirs-$(CONFIG_SOFTMMU) += usb/
devices-dirs-$(CONFIG_SOFTMMU) += virtio/
devices-dirs-$(CONFIG_SOFTMMU) += watchdog/
diff --git a/tpm/Makefile.objs b/hw/tpm/Makefile.objs
similarity index 61%
rename from tpm/Makefile.objs
rename to hw/tpm/Makefile.objs
index 366e4a7..99f5983 100644
--- a/tpm/Makefile.objs
+++ b/hw/tpm/Makefile.objs
@@ -1,4 +1,2 @@
-common-obj-y = tpm.o
-common-obj-$(CONFIG_TPM) += tpm_backend.o
common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o
common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
diff --git a/tpm/tpm_int.h b/hw/tpm/tpm_int.h
similarity index 50%
rename from tpm/tpm_int.h
rename to hw/tpm/tpm_int.h
index 340bfd5..08f87cb 100644
--- a/tpm/tpm_int.h
+++ b/hw/tpm/tpm_int.h
@@ -13,7 +13,7 @@
#define TPM_TPM_INT_H
#include "exec/memory.h"
-#include "tpm/tpm_tis.h"
+#include "tpm_tis.h"
/* overall state of the TPM interface */
struct TPMState {
@@ -33,32 +33,6 @@ struct TPMState {
#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
-struct TPMDriverOps {
- enum TpmType type;
- /* get a descriptive text of the backend to display to the user */
- const char *(*desc)(void);
-
- TPMBackend *(*create)(QemuOpts *opts, const char *id);
- void (*destroy)(TPMBackend *t);
-
- /* initialize the backend */
- int (*init)(TPMBackend *t, TPMState *s, TPMRecvDataCB *datacb);
- /* start up the TPM on the backend */
- int (*startup_tpm)(TPMBackend *t);
- /* returns true if nothing will ever answer TPM requests */
- bool (*had_startup_error)(TPMBackend *t);
-
- size_t (*realloc_buffer)(TPMSizedBuffer *sb);
-
- void (*deliver_request)(TPMBackend *t);
-
- void (*reset)(TPMBackend *t);
-
- void (*cancel_cmd)(TPMBackend *t);
-
- bool (*get_tpm_established_flag)(TPMBackend *t);
-};
-
struct tpm_req_hdr {
uint16_t tag;
uint32_t len;
@@ -83,13 +57,4 @@ struct tpm_resp_hdr {
#define TPM_ORD_GetTicks 0xf1
-TPMBackend *qemu_find_tpm(const char *id);
-int tpm_register_model(enum TpmModel model);
-int tpm_register_driver(const TPMDriverOps *tdo);
-void tpm_display_backend_drivers(void);
-const TPMDriverOps *tpm_get_backend_driver(const char *type);
-void tpm_write_fatal_error_response(uint8_t *out, uint32_t out_len);
-
-extern const TPMDriverOps tpm_passthrough_driver;
-
#endif /* TPM_TPM_INT_H */
diff --git a/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
similarity index 96%
rename from tpm/tpm_passthrough.c
rename to hw/tpm/tpm_passthrough.c
index 1fdd66d..5781277 100644
--- a/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -31,8 +31,8 @@
#include "tpm_int.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
+#include "sysemu/tpm_backend_int.h"
#include "tpm_tis.h"
-#include "tpm_backend.h"
/* #define DEBUG_TPM */
@@ -48,6 +48,8 @@
#define TPM_PASSTHROUGH(obj) \
OBJECT_CHECK(TPMPassthruState, (obj), TYPE_TPM_PASSTHROUGH)
+static const TPMDriverOps tpm_passthrough_driver;
+
/* data structures */
typedef struct TPMPassthruThreadParams {
TPMState *tpm_state;
@@ -96,6 +98,20 @@ static uint32_t tpm_passthrough_get_size_from_buffer(const uint8_t *buf)
return be32_to_cpu(resp->len);
}
+/*
+ * Write an error message in the given output buffer.
+ */
+static void tpm_write_fatal_error_response(uint8_t *out, uint32_t out_len)
+{
+ if (out_len >= sizeof(struct tpm_resp_hdr)) {
+ struct tpm_resp_hdr *resp = (struct tpm_resp_hdr *)out;
+
+ resp->tag = cpu_to_be16(TPM_TAG_RSP_COMMAND);
+ resp->len = cpu_to_be32(sizeof(struct tpm_resp_hdr));
+ resp->errcode = cpu_to_be32(TPM_FAIL);
+ }
+}
+
static int tpm_passthrough_unix_tx_bufs(TPMPassthruState *tpm_pt,
const uint8_t *in, uint32_t in_len,
uint8_t *out, uint32_t out_len)
@@ -512,7 +528,7 @@ static void tpm_passthrough_destroy(TPMBackend *tb)
g_free(tpm_pt->tpm_dev);
}
-const TPMDriverOps tpm_passthrough_driver = {
+static const TPMDriverOps tpm_passthrough_driver = {
.type = TPM_TYPE_PASSTHROUGH,
.desc = tpm_passthrough_create_desc,
.create = tpm_passthrough_create,
diff --git a/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
similarity index 99%
rename from tpm/tpm_tis.c
rename to hw/tpm/tpm_tis.c
index f0a45846..faa3cec 100644
--- a/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -26,7 +26,7 @@
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci_ids.h"
-#include "tpm/tpm_tis.h"
+#include "tpm_tis.h"
#include "qemu-common.h"
/*#define DEBUG_TIS */
diff --git a/tpm/tpm_tis.h b/hw/tpm/tpm_tis.h
similarity index 96%
rename from tpm/tpm_tis.h
rename to hw/tpm/tpm_tis.h
index 1be4ddc..916152a 100644
--- a/tpm/tpm_tis.h
+++ b/hw/tpm/tpm_tis.h
@@ -35,11 +35,6 @@
#define TYPE_TPM_TIS "tpm-tis"
-struct TPMSizedBuffer {
- uint32_t size;
- uint8_t *buffer;
-};
-
typedef enum {
TPM_TIS_STATE_IDLE = 0,
TPM_TIS_STATE_READY,
diff --git a/include/backends/tpm.h b/include/backends/tpm.h
index 9e93cc5..a96b110 100644
--- a/include/backends/tpm.h
+++ b/include/backends/tpm.h
@@ -18,7 +18,7 @@
#include "qapi/error.h"
#include "qapi-types.h"
#include "qemu/option.h"
-#include "tpm/tpm.h"
+#include "sysemu/tpm.h"
#define TYPE_TPM_BACKEND "tpm-backend"
#define TPM_BACKEND(obj) \
@@ -30,6 +30,7 @@
typedef struct TPMBackendClass TPMBackendClass;
typedef struct TPMBackend TPMBackend;
+typedef struct TPMState TPMState;
typedef struct TPMDriverOps TPMDriverOps;
@@ -56,6 +57,39 @@ struct TPMBackend {
QLIST_ENTRY(TPMBackend) list;
};
+typedef void (TPMRecvDataCB)(TPMState *, uint8_t locty);
+
+typedef struct TPMSizedBuffer {
+ uint32_t size;
+ uint8_t *buffer;
+} TPMSizedBuffer;
+
+struct TPMDriverOps {
+ enum TpmType type;
+ /* get a descriptive text of the backend to display to the user */
+ const char *(*desc)(void);
+
+ TPMBackend *(*create)(QemuOpts *opts, const char *id);
+ void (*destroy)(TPMBackend *t);
+
+ /* initialize the backend */
+ int (*init)(TPMBackend *t, TPMState *s, TPMRecvDataCB *datacb);
+ /* start up the TPM on the backend */
+ int (*startup_tpm)(TPMBackend *t);
+ /* returns true if nothing will ever answer TPM requests */
+ bool (*had_startup_error)(TPMBackend *t);
+
+ size_t (*realloc_buffer)(TPMSizedBuffer *sb);
+
+ void (*deliver_request)(TPMBackend *t);
+
+ void (*reset)(TPMBackend *t);
+
+ void (*cancel_cmd)(TPMBackend *t);
+
+ bool (*get_tpm_established_flag)(TPMBackend *t);
+};
+
/**
* tpm_backend_get_type:
@@ -167,4 +201,10 @@ bool tpm_backend_get_tpm_established_flag(TPMBackend *s);
*/
void tpm_backend_open(TPMBackend *s, Error **errp);
+TPMBackend *qemu_find_tpm(const char *id);
+
+const TPMDriverOps *tpm_get_backend_driver(const char *type);
+int tpm_register_model(enum TpmModel model);
+int tpm_register_driver(const TPMDriverOps *tdo);
+
#endif
diff --git a/include/tpm/tpm.h b/include/sysemu/tpm.h
similarity index 82%
rename from include/tpm/tpm.h
rename to include/sysemu/tpm.h
index 2d457c4..13febdd 100644
--- a/include/tpm/tpm.h
+++ b/include/sysemu/tpm.h
@@ -15,8 +15,6 @@
#include "qemu/option.h"
typedef struct TPMState TPMState;
-typedef struct TPMSizedBuffer TPMSizedBuffer;
-typedef void (TPMRecvDataCB)(TPMState *, uint8_t locty);
int tpm_config_parse(QemuOptsList *opts_list, const char *optarg);
int tpm_init(void);
diff --git a/tpm/tpm_backend.h b/include/sysemu/tpm_backend_int.h
similarity index 100%
rename from tpm/tpm_backend.h
rename to include/sysemu/tpm_backend_int.h
diff --git a/monitor.c b/monitor.c
index c897e80..e605822 100644
--- a/monitor.c
+++ b/monitor.c
@@ -47,7 +47,7 @@
#include "migration/migration.h"
#include "sysemu/kvm.h"
#include "qemu/acl.h"
-#include "tpm/tpm.h"
+#include "sysemu/tpm.h"
#include "qapi/qmp/qint.h"
#include "qapi/qmp/qfloat.h"
#include "qapi/qmp/qlist.h"
diff --git a/tpm/tpm.c b/tpm.c
similarity index 93%
rename from tpm/tpm.c
rename to tpm.c
index 1f4ac8d..1e94314 100644
--- a/tpm/tpm.c
+++ b/tpm.c
@@ -16,8 +16,7 @@
#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
#include "backends/tpm.h"
-#include "tpm_int.h"
-#include "tpm/tpm.h"
+#include "sysemu/tpm.h"
#include "qemu/config-file.h"
#include "qmp-commands.h"
@@ -62,20 +61,6 @@ static bool tpm_model_is_registered(enum TpmModel model)
return false;
}
-/*
- * Write an error message in the given output buffer.
- */
-void tpm_write_fatal_error_response(uint8_t *out, uint32_t out_len)
-{
- if (out_len >= sizeof(struct tpm_resp_hdr)) {
- struct tpm_resp_hdr *resp = (struct tpm_resp_hdr *)out;
-
- resp->tag = cpu_to_be16(TPM_TAG_RSP_COMMAND);
- resp->len = cpu_to_be32(sizeof(struct tpm_resp_hdr));
- resp->errcode = cpu_to_be32(TPM_FAIL);
- }
-}
-
const TPMDriverOps *tpm_get_backend_driver(const char *type)
{
int i;
@@ -109,7 +94,7 @@ int tpm_register_driver(const TPMDriverOps *tdo)
* Walk the list of available TPM backend drivers and display them on the
* screen.
*/
-void tpm_display_backend_drivers(void)
+static void tpm_display_backend_drivers(void)
{
int i;
diff --git a/tpm/tpm_backend.c b/tpm/tpm_backend.c
deleted file mode 100644
index 4144ef7..0000000
--- a/tpm/tpm_backend.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * common TPM backend driver functions
- *
- * Copyright (c) 2012-2013 IBM Corporation
- * Authors:
- * Stefan Berger <stefanb@us.ibm.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>
- */
-
-#include "tpm/tpm.h"
-#include "qemu/thread.h"
-#include "tpm_backend.h"
-
-void tpm_backend_thread_deliver_request(TPMBackendThread *tbt)
-{
- g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_PROCESS_CMD, NULL);
-}
-
-void tpm_backend_thread_create(TPMBackendThread *tbt,
- GFunc func, gpointer user_data)
-{
- if (!tbt->pool) {
- tbt->pool = g_thread_pool_new(func, user_data, 1, TRUE, NULL);
- g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_INIT, NULL);
- }
-}
-
-void tpm_backend_thread_end(TPMBackendThread *tbt)
-{
- if (tbt->pool) {
- g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_END, NULL);
- g_thread_pool_free(tbt->pool, FALSE, TRUE);
- tbt->pool = NULL;
- }
-}
-
-void tpm_backend_thread_tpm_reset(TPMBackendThread *tbt,
- GFunc func, gpointer user_data)
-{
- if (!tbt->pool) {
- tpm_backend_thread_create(tbt, func, user_data);
- } else {
- g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_TPM_RESET,
- NULL);
- }
-}
diff --git a/vl.c b/vl.c
index d694a90..ce7bed7 100644
--- a/vl.c
+++ b/vl.c
@@ -139,7 +139,7 @@ int main(int argc, char **argv)
#include "sysemu/blockdev.h"
#include "hw/block/block.h"
#include "migration/block.h"
-#include "tpm/tpm.h"
+#include "sysemu/tpm.h"
#include "sysemu/dma.h"
#include "audio/audio.h"
#include "migration/migration.h"
--
1.8.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [Qemu-devel] [PATCH 07/12] sysemu: avoid proliferation of include/ subdirectories
2013-04-11 16:10 [Qemu-devel] [PATCH 00/12] directory reorganization, final part Paolo Bonzini
` (5 preceding siblings ...)
2013-04-11 16:10 ` [Qemu-devel] [PATCH 06/12] tpm: reorganize headers and split hardware part Paolo Bonzini
@ 2013-04-11 16:10 ` Paolo Bonzini
2013-04-11 16:10 ` [Qemu-devel] [PATCH 08/12] include: avoid useless includes of exec/ headers Paolo Bonzini
` (5 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Paolo Bonzini @ 2013-04-11 16:10 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, mst
Move all "simple" header files to include/sysemu. There is no
need for separate directories. Plus, some were in include/qemu
and some in include/backends.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
backends/baum.c | 2 +-
backends/msmouse.c | 2 +-
backends/rng-egd.c | 4 ++--
backends/rng-random.c | 4 ++--
backends/rng.c | 2 +-
backends/tpm.c | 2 +-
bt-host.c | 2 +-
bt-vhci.c | 2 +-
gdbstub.c | 2 +-
hmp.c | 2 +-
hw/arm/omap2.c | 2 +-
hw/arm/pxa2xx.c | 2 +-
hw/arm/strongarm.c | 2 +-
hw/bt/core.c | 2 +-
hw/bt/hci-csr.c | 4 ++--
hw/bt/hci.c | 2 +-
hw/char/cadence_uart.c | 2 +-
hw/char/debugcon.c | 2 +-
hw/char/escc.c | 2 +-
hw/char/etraxfs_ser.c | 2 +-
hw/char/exynos4210_uart.c | 2 +-
hw/char/grlib_apbuart.c | 2 +-
hw/char/imx_serial.c | 2 +-
hw/char/ipoctal232.c | 2 +-
hw/char/lm32_juart.c | 2 +-
hw/char/lm32_uart.c | 2 +-
hw/char/mcf_uart.c | 2 +-
hw/char/milkymist-uart.c | 2 +-
hw/char/omap_uart.c | 2 +-
hw/char/parallel.c | 2 +-
hw/char/pl011.c | 2 +-
hw/char/sclpconsole.c | 2 +-
hw/char/serial.c | 2 +-
hw/char/sh_serial.c | 2 +-
hw/char/spapr_vty.c | 2 +-
hw/char/virtio-console.c | 2 +-
hw/char/xen_console.c | 2 +-
hw/char/xilinx_uartlite.c | 2 +-
hw/core/qdev-properties-system.c | 2 +-
hw/core/qdev-properties.c | 2 +-
hw/display/xenfb.c | 2 +-
hw/isa/pc87312.c | 2 +-
hw/mips/mips_fulong2e.c | 2 +-
hw/mips/mips_malta.c | 2 +-
hw/misc/ivshmem.c | 2 +-
hw/net/xgmac.c | 2 +-
hw/ppc/spapr_events.c | 2 +-
hw/ppc/spapr_rtas.c | 2 +-
hw/sparc/leon3.c | 2 +-
hw/tpm/tpm_passthrough.c | 2 +-
hw/tpm/tpm_tis.c | 2 +-
hw/usb/ccid-card-emulated.c | 2 +-
hw/usb/ccid-card-passthru.c | 2 +-
hw/usb/dev-bluetooth.c | 2 +-
hw/usb/dev-serial.c | 2 +-
hw/usb/redirect.c | 2 +-
hw/virtio/virtio-rng.c | 2 +-
hw/xen/xen_backend.c | 2 +-
hw/xtensa/xtensa_lx60.c | 2 +-
include/hw/virtio/virtio-rng.h | 4 ++--
include/{bt => sysemu}/bt.h | 0
include/{char => sysemu}/char.h | 0
include/{qemu => sysemu}/rng-random.h | 0
include/{qemu => sysemu}/rng.h | 0
include/{backends/tpm.h => sysemu/tpm_backend.h} | 0
monitor.c | 2 +-
net/slirp.c | 2 +-
qemu-char.c | 2 +-
qmp.c | 2 +-
qtest.c | 2 +-
slirp/slirp.c | 2 +-
spice-qemu-char.c | 2 +-
tpm.c | 2 +-
ui/console.c | 2 +-
ui/gtk.c | 2 +-
util/event_notifier-posix.c | 2 +-
vl.c | 4 ++--
xen-all.c | 2 +-
78 files changed, 78 insertions(+), 78 deletions(-)
rename include/{bt => sysemu}/bt.h (100%)
rename include/{char => sysemu}/char.h (100%)
rename include/{qemu => sysemu}/rng-random.h (100%)
rename include/{qemu => sysemu}/rng.h (100%)
rename include/{backends/tpm.h => sysemu/tpm_backend.h} (100%)
diff --git a/backends/baum.c b/backends/baum.c
index ea9ffe8..4cba79f 100644
--- a/backends/baum.c
+++ b/backends/baum.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/timer.h"
#include "hw/usb.h"
#include <brlapi.h>
diff --git a/backends/msmouse.c b/backends/msmouse.c
index 61052fe..0ac05a0 100644
--- a/backends/msmouse.c
+++ b/backends/msmouse.c
@@ -23,7 +23,7 @@
*/
#include <stdlib.h>
#include "qemu-common.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "ui/console.h"
#define MSMOUSE_LO6(n) ((n) & 0x3f)
diff --git a/backends/rng-egd.c b/backends/rng-egd.c
index cc6f5ee..9e5a536 100644
--- a/backends/rng-egd.c
+++ b/backends/rng-egd.c
@@ -10,8 +10,8 @@
* See the COPYING file in the top-level directory.
*/
-#include "qemu/rng.h"
-#include "char/char.h"
+#include "sysemu/rng.h"
+#include "sysemu/char.h"
#include "qapi/qmp/qerror.h"
#include "hw/qdev.h" /* just for DEFINE_PROP_CHR */
diff --git a/backends/rng-random.c b/backends/rng-random.c
index acd20af..d5761f2 100644
--- a/backends/rng-random.c
+++ b/backends/rng-random.c
@@ -10,8 +10,8 @@
* See the COPYING file in the top-level directory.
*/
-#include "qemu/rng-random.h"
-#include "qemu/rng.h"
+#include "sysemu/rng-random.h"
+#include "sysemu/rng.h"
#include "qapi/qmp/qerror.h"
#include "qemu/main-loop.h"
diff --git a/backends/rng.c b/backends/rng.c
index 3d33898..85cb83f 100644
--- a/backends/rng.c
+++ b/backends/rng.c
@@ -10,7 +10,7 @@
* See the COPYING file in the top-level directory.
*/
-#include "qemu/rng.h"
+#include "sysemu/rng.h"
#include "qapi/qmp/qerror.h"
void rng_backend_request_entropy(RngBackend *s, size_t size,
diff --git a/backends/tpm.c b/backends/tpm.c
index 0580108..b735801 100644
--- a/backends/tpm.c
+++ b/backends/tpm.c
@@ -12,7 +12,7 @@
* Based on backends/rng.c by Anthony Liguori
*/
-#include "backends/tpm.h"
+#include "sysemu/tpm_backend.h"
#include "qapi/qmp/qerror.h"
#include "sysemu/tpm.h"
#include "qemu/thread.h"
diff --git a/bt-host.c b/bt-host.c
index 2da3c32..49205bf 100644
--- a/bt-host.c
+++ b/bt-host.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
#include "qemu/main-loop.h"
#ifndef _WIN32
diff --git a/bt-vhci.c b/bt-vhci.c
index a6a7ab0..e267c8a 100644
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
#include "hw/bt.h"
#include "qemu/main-loop.h"
diff --git a/gdbstub.c b/gdbstub.c
index 22ab12c..e80e1d3 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -30,7 +30,7 @@
#include "qemu.h"
#else
#include "monitor/monitor.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "exec/gdbstub.h"
#endif
diff --git a/hmp.c b/hmp.c
index dbe9b90..1675e77 100644
--- a/hmp.c
+++ b/hmp.c
@@ -15,7 +15,7 @@
#include "hmp.h"
#include "net/net.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/option.h"
#include "qemu/timer.h"
#include "qmp-commands.h"
diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index a4b4146..2ff4371 100644
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -24,7 +24,7 @@
#include "hw/arm/omap.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/block/flash.h"
#include "hw/arm/soc_dma.h"
#include "hw/sysbus.h"
diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index bbecc77..24b03a0 100644
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -13,7 +13,7 @@
#include "hw/char/serial.h"
#include "hw/i2c/i2c.h"
#include "hw/ssi.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "sysemu/blockdev.h"
static struct {
diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index 75a813e..4d49306 100644
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -30,7 +30,7 @@
#include "strongarm.h"
#include "qemu/error-report.h"
#include "hw/arm/arm.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "hw/ssi.h"
diff --git a/hw/bt/core.c b/hw/bt/core.c
index 24ef4de..49012e0 100644
--- a/hw/bt/core.c
+++ b/hw/bt/core.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
#include "hw/bt.h"
/* Slave implementations can ignore this */
diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c
index 55c819b..16a25cb 100644
--- a/hw/bt/hci-csr.c
+++ b/hw/bt/hci-csr.c
@@ -19,10 +19,10 @@
*/
#include "qemu-common.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/timer.h"
#include "hw/irq.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
#include "hw/bt.h"
struct csrhci_s {
diff --git a/hw/bt/hci.c b/hw/bt/hci.c
index a76edea..b53cd5d 100644
--- a/hw/bt/hci.c
+++ b/hw/bt/hci.c
@@ -21,7 +21,7 @@
#include "qemu-common.h"
#include "qemu/timer.h"
#include "hw/usb.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
#include "hw/bt.h"
struct bt_hci_s {
diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
index 421ec99..c2a7834 100644
--- a/hw/char/cadence_uart.c
+++ b/hw/char/cadence_uart.c
@@ -17,7 +17,7 @@
*/
#include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/timer.h"
#ifdef CADENCE_UART_ERR_DEBUG
diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c
index 0588eeb..02c9577 100644
--- a/hw/char/debugcon.c
+++ b/hw/char/debugcon.c
@@ -25,7 +25,7 @@
*/
#include "hw/hw.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/isa/isa.h"
#include "hw/i386/pc.h"
diff --git a/hw/char/escc.c b/hw/char/escc.c
index 067b055..c2cb07f 100644
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -25,7 +25,7 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/char/escc.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "ui/console.h"
#include "trace.h"
diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c
index b7499d7..11820f5 100644
--- a/hw/char/etraxfs_ser.c
+++ b/hw/char/etraxfs_ser.c
@@ -23,7 +23,7 @@
*/
#include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/log.h"
#define D(x)
diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
index 8b4e72c..5751816 100644
--- a/hw/char/exynos4210_uart.c
+++ b/hw/char/exynos4210_uart.c
@@ -21,7 +21,7 @@
#include "hw/sysbus.h"
#include "sysemu/sysemu.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/arm/exynos4210.h"
diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c
index 62f7990..a64453f 100644
--- a/hw/char/grlib_apbuart.c
+++ b/hw/char/grlib_apbuart.c
@@ -23,7 +23,7 @@
*/
#include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "trace.h"
diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c
index d7ec209..2a2c230 100644
--- a/hw/char/imx_serial.c
+++ b/hw/char/imx_serial.c
@@ -20,7 +20,7 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "sysemu/sysemu.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/arm/imx.h"
//#define DEBUG_SERIAL 1
diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c
index fcd0af3..c9698a6 100644
--- a/hw/char/ipoctal232.c
+++ b/hw/char/ipoctal232.c
@@ -10,7 +10,7 @@
#include "ipack.h"
#include "qemu/bitops.h"
-#include "char/char.h"
+#include "sysemu/char.h"
/* #define DEBUG_IPOCTAL */
diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c
index 93f0d15..839f3eb 100644
--- a/hw/char/lm32_juart.c
+++ b/hw/char/lm32_juart.c
@@ -20,7 +20,7 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "trace.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/lm32/lm32_juart.h"
diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c
index 32bc37a..99721ab 100644
--- a/hw/char/lm32_uart.c
+++ b/hw/char/lm32_uart.c
@@ -25,7 +25,7 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "trace.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/error-report.h"
enum {
diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index 6724b1b..3ec4705 100644
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -7,7 +7,7 @@
*/
#include "hw/hw.h"
#include "hw/m68k/mcf.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "exec/address-spaces.h"
typedef struct {
diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c
index f3bdf69..cbc7d73 100644
--- a/hw/char/milkymist-uart.c
+++ b/hw/char/milkymist-uart.c
@@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "trace.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/error-report.h"
enum {
diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c
index 26c1426..5bb36ed 100644
--- a/hw/char/omap_uart.c
+++ b/hw/char/omap_uart.c
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/hw.h"
#include "hw/arm/omap.h"
#include "hw/char/serial.h"
diff --git a/hw/char/parallel.c b/hw/char/parallel.c
index 863a6fb..b5e867f 100644
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.c
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "hw/hw.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/isa/isa.h"
#include "hw/i386/pc.h"
#include "sysemu/sysemu.h"
diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index 332d5b9..7079ef6 100644
--- a/hw/char/pl011.c
+++ b/hw/char/pl011.c
@@ -8,7 +8,7 @@
*/
#include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
typedef struct {
SysBusDevice busdev;
diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c
index 42ed54c..bcc7893 100644
--- a/hw/char/sclpconsole.c
+++ b/hw/char/sclpconsole.c
@@ -18,7 +18,7 @@
#include "hw/s390x/sclp.h"
#include "hw/s390x/event-facility.h"
-#include "char/char.h"
+#include "sysemu/char.h"
typedef struct ASCIIConsoleData {
EventBufferHeader ebh;
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 1151bf1..66b6348 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -24,7 +24,7 @@
*/
#include "hw/char/serial.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/timer.h"
#include "exec/address-spaces.h"
diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index 450c7d8..b328643 100644
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -26,7 +26,7 @@
*/
#include "hw/hw.h"
#include "hw/sh4/sh.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "exec/address-spaces.h"
//#define DEBUG_SERIAL
diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c
index 9df018a..afcec1f 100644
--- a/hw/char/spapr_vty.c
+++ b/hw/char/spapr_vty.c
@@ -1,5 +1,5 @@
#include "hw/qdev.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/ppc/spapr.h"
#include "hw/ppc/spapr_vio.h"
diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c
index 31f672c..5035030 100644
--- a/hw/char/virtio-console.c
+++ b/hw/char/virtio-console.c
@@ -10,7 +10,7 @@
* the COPYING file in the top-level directory.
*/
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/error-report.h"
#include "trace.h"
#include "hw/virtio/virtio-serial.h"
diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c
index efc3232..eb7f450 100644
--- a/hw/char/xen_console.c
+++ b/hw/char/xen_console.c
@@ -30,7 +30,7 @@
#include <sys/mman.h>
#include "hw/hw.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/xen/xen_backend.h"
#include <xen/io/console.h>
diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c
index 079f4d4..3f7e989 100644
--- a/hw/char/xilinx_uartlite.c
+++ b/hw/char/xilinx_uartlite.c
@@ -23,7 +23,7 @@
*/
#include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#define DUART(x)
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 8c2e152..0eada32 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -17,7 +17,7 @@
#include "hw/block/block.h"
#include "net/hub.h"
#include "qapi/visitor.h"
-#include "char/char.h"
+#include "sysemu/char.h"
static void get_pointer(Object *obj, Visitor *v, Property *prop,
const char *(*print)(void *ptr),
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 9a0872d..ddde18e 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -5,7 +5,7 @@
#include "hw/block/block.h"
#include "net/hub.h"
#include "qapi/visitor.h"
-#include "char/char.h"
+#include "sysemu/char.h"
void qdev_prop_set_after_realize(DeviceState *dev, const char *name,
Error **errp)
diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
index 8e42661..e371569 100644
--- a/hw/display/xenfb.c
+++ b/hw/display/xenfb.c
@@ -37,7 +37,7 @@
#include "hw/hw.h"
#include "ui/console.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/xen/xen_backend.h"
#include <xen/event_channel.h>
diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c
index 9f5e185..82f7c80 100644
--- a/hw/isa/pc87312.c
+++ b/hw/isa/pc87312.c
@@ -27,7 +27,7 @@
#include "qemu/error-report.h"
#include "sysemu/blockdev.h"
#include "sysemu/sysemu.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "trace.h"
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 3cf27fa..1aac93a 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -30,7 +30,7 @@
#include "hw/mips/mips.h"
#include "hw/mips/cpudevs.h"
#include "hw/pci/pci.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "audio/audio.h"
#include "qemu/log.h"
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index a3e936b..86f42b2 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -34,7 +34,7 @@
#include "hw/mips/mips.h"
#include "hw/mips/cpudevs.h"
#include "hw/pci/pci.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "sysemu/arch_init.h"
#include "hw/boards.h"
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index f92ce19..a19a6d6 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -24,7 +24,7 @@
#include "migration/migration.h"
#include "qapi/qmp/qerror.h"
#include "qemu/event_notifier.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include <sys/mman.h>
#include <sys/types.h>
diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c
index 5275f48..1d9074a 100644
--- a/hw/net/xgmac.c
+++ b/hw/net/xgmac.c
@@ -25,7 +25,7 @@
*/
#include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/log.h"
#include "net/net.h"
#include "net/checksum.h"
diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
index ff87ac3..c0d7e62 100644
--- a/hw/ppc/spapr_events.c
+++ b/hw/ppc/spapr_events.c
@@ -26,7 +26,7 @@
*/
#include "cpu.h"
#include "sysemu/sysemu.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/qdev.h"
#include "sysemu/device_tree.h"
diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
index b71b59c..8ecaa5f 100644
--- a/hw/ppc/spapr_rtas.c
+++ b/hw/ppc/spapr_rtas.c
@@ -26,7 +26,7 @@
*/
#include "cpu.h"
#include "sysemu/sysemu.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/qdev.h"
#include "sysemu/device_tree.h"
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 3b27d40..78c77ef 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/ptimer.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/loader.h"
diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index 5781277..416b9b6 100644
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -27,7 +27,7 @@
#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/sockets.h"
-#include "backends/tpm.h"
+#include "sysemu/tpm_backend.h"
#include "tpm_int.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index faa3cec..d4d8152 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -19,7 +19,7 @@
* specification.
*/
-#include "backends/tpm.h"
+#include "sysemu/tpm_backend.h"
#include "tpm_int.h"
#include "block/block.h"
#include "exec/address-spaces.h"
diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
index 29dcd7a..d534c94 100644
--- a/hw/usb/ccid-card-emulated.c
+++ b/hw/usb/ccid-card-emulated.c
@@ -32,7 +32,7 @@
#include <vcard_emul.h>
#include "qemu/thread.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "monitor/monitor.h"
#include "ccid.h"
diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index 5e017ae..71a45f6 100644
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -8,7 +8,7 @@
* See the COPYING file in the top-level directory.
*/
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/sockets.h"
#include "monitor/monitor.h"
#include "ccid.h"
diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
index 0f8aa48..68cc1d4 100644
--- a/hw/usb/dev-bluetooth.c
+++ b/hw/usb/dev-bluetooth.c
@@ -21,7 +21,7 @@
#include "qemu-common.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
#include "hw/bt.h"
struct USBBtState {
diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 7c314dc..dd0a608 100644
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -12,7 +12,7 @@
#include "qemu/error-report.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
-#include "char/char.h"
+#include "sysemu/char.h"
//#define DEBUG_Serial
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 0ddb081..a594e95 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -30,7 +30,7 @@
#include "monitor/monitor.h"
#include "sysemu/sysemu.h"
#include "qemu/iov.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include <dirent.h>
#include <sys/ioctl.h>
diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c
index 6079b2a..fcc223a 100644
--- a/hw/virtio/virtio-rng.c
+++ b/hw/virtio/virtio-rng.c
@@ -14,7 +14,7 @@
#include "qapi/qmp/qerror.h"
#include "hw/virtio/virtio.h"
#include "hw/virtio/virtio-rng.h"
-#include "qemu/rng.h"
+#include "sysemu/rng.h"
static bool is_guest_ready(VirtIORNG *vrng)
{
diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c
index 2a8c9f5..d82ce5d 100644
--- a/hw/xen/xen_backend.c
+++ b/hw/xen/xen_backend.c
@@ -35,7 +35,7 @@
#include <sys/signal.h>
#include "hw/hw.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/log.h"
#include "hw/xen/xen_backend.h"
diff --git a/hw/xtensa/xtensa_lx60.c b/hw/xtensa/xtensa_lx60.c
index 2682eda..650dd31 100644
--- a/hw/xtensa/xtensa_lx60.c
+++ b/hw/xtensa/xtensa_lx60.c
@@ -36,7 +36,7 @@
#include "hw/sysbus.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "xtensa_bootparam.h"
typedef struct LxBoardDesc {
diff --git a/include/hw/virtio/virtio-rng.h b/include/hw/virtio/virtio-rng.h
index 3711c97..c9cadc2 100644
--- a/include/hw/virtio/virtio-rng.h
+++ b/include/hw/virtio/virtio-rng.h
@@ -12,8 +12,8 @@
#ifndef _QEMU_VIRTIO_RNG_H
#define _QEMU_VIRTIO_RNG_H
-#include "qemu/rng.h"
-#include "qemu/rng-random.h"
+#include "sysemu/rng.h"
+#include "sysemu/rng-random.h"
/* The Virtio ID for the virtio rng device */
#define VIRTIO_ID_RNG 4
diff --git a/include/bt/bt.h b/include/sysemu/bt.h
similarity index 100%
rename from include/bt/bt.h
rename to include/sysemu/bt.h
diff --git a/include/char/char.h b/include/sysemu/char.h
similarity index 100%
rename from include/char/char.h
rename to include/sysemu/char.h
diff --git a/include/qemu/rng-random.h b/include/sysemu/rng-random.h
similarity index 100%
rename from include/qemu/rng-random.h
rename to include/sysemu/rng-random.h
diff --git a/include/qemu/rng.h b/include/sysemu/rng.h
similarity index 100%
rename from include/qemu/rng.h
rename to include/sysemu/rng.h
diff --git a/include/backends/tpm.h b/include/sysemu/tpm_backend.h
similarity index 100%
rename from include/backends/tpm.h
rename to include/sysemu/tpm_backend.h
diff --git a/monitor.c b/monitor.c
index e605822..2909ca1 100644
--- a/monitor.c
+++ b/monitor.c
@@ -33,7 +33,7 @@
#include "exec/gdbstub.h"
#include "net/net.h"
#include "net/slirp.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "ui/qemu-spice.h"
#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
diff --git a/net/slirp.c b/net/slirp.c
index eabfee6..b3f35d5 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -35,7 +35,7 @@
#include "monitor/monitor.h"
#include "qemu/sockets.h"
#include "slirp/libslirp.h"
-#include "char/char.h"
+#include "sysemu/char.h"
static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)
{
diff --git a/qemu-char.c b/qemu-char.c
index eae17fc..14707ea 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -26,7 +26,7 @@
#include "ui/console.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/usb.h"
#include "qmp-commands.h"
diff --git a/qmp.c b/qmp.c
index 55b056b..ed6c7ef 100644
--- a/qmp.c
+++ b/qmp.c
@@ -16,7 +16,7 @@
#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "qmp-commands.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "ui/qemu-spice.h"
#include "ui/vnc.h"
#include "sysemu/kvm.h"
diff --git a/qtest.c b/qtest.c
index b03b68a..3bba3e5 100644
--- a/qtest.c
+++ b/qtest.c
@@ -13,7 +13,7 @@
#include "sysemu/qtest.h"
#include "hw/qdev.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "exec/ioport.h"
#include "exec/memory.h"
#include "hw/irq.h"
diff --git a/slirp/slirp.c b/slirp/slirp.c
index bd9b7cb..80b28ea 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "qemu/timer.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "slirp.h"
#include "hw/hw.h"
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 535f955..c9403de 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -1,7 +1,7 @@
#include "config-host.h"
#include "trace.h"
#include "ui/qemu-spice.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include <spice.h>
#include <spice-experimental.h>
#include <spice/protocol.h>
diff --git a/tpm.c b/tpm.c
index 1e94314..c91da43 100644
--- a/tpm.c
+++ b/tpm.c
@@ -15,7 +15,7 @@
#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
-#include "backends/tpm.h"
+#include "sysemu/tpm_backend.h"
#include "sysemu/tpm.h"
#include "qemu/config-file.h"
#include "qmp-commands.h"
diff --git a/ui/console.c b/ui/console.c
index e84ba8b..0ed4211 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -25,7 +25,7 @@
#include "ui/console.h"
#include "qemu/timer.h"
#include "qmp-commands.h"
-#include "char/char.h"
+#include "sysemu/char.h"
//#define DEBUG_CONSOLE
#define DEFAULT_BACKSCROLL 512
diff --git a/ui/gtk.c b/ui/gtk.c
index 1a6bee6..1e105e2 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -62,7 +62,7 @@
#include "qmp-commands.h"
#include "x_keymap.h"
#include "keymaps.h"
-#include "char/char.h"
+#include "sysemu/char.h"
//#define DEBUG_GTK
diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c
index 713d756..8442c6e 100644
--- a/util/event_notifier-posix.c
+++ b/util/event_notifier-posix.c
@@ -12,7 +12,7 @@
#include "qemu-common.h"
#include "qemu/event_notifier.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/main-loop.h"
#ifdef CONFIG_EVENTFD
diff --git a/vl.c b/vl.c
index ce7bed7..cdadad0 100644
--- a/vl.c
+++ b/vl.c
@@ -126,7 +126,7 @@ int main(int argc, char **argv)
#include "hw/qdev.h"
#include "hw/loader.h"
#include "monitor/qdev.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
#include "net/net.h"
#include "net/slirp.h"
#include "monitor/monitor.h"
@@ -134,7 +134,7 @@ int main(int argc, char **argv)
#include "sysemu/sysemu.h"
#include "exec/gdbstub.h"
#include "qemu/timer.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/cache-utils.h"
#include "sysemu/blockdev.h"
#include "hw/block/block.h"
diff --git a/xen-all.c b/xen-all.c
index 31f28fc..539a154 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -16,7 +16,7 @@
#include "hw/xen/xen_backend.h"
#include "qmp-commands.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/range.h"
#include "sysemu/xen-mapcache.h"
#include "trace.h"
--
1.8.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [Qemu-devel] [PATCH 08/12] include: avoid useless includes of exec/ headers
2013-04-11 16:10 [Qemu-devel] [PATCH 00/12] directory reorganization, final part Paolo Bonzini
` (6 preceding siblings ...)
2013-04-11 16:10 ` [Qemu-devel] [PATCH 07/12] sysemu: avoid proliferation of include/ subdirectories Paolo Bonzini
@ 2013-04-11 16:10 ` Paolo Bonzini
2013-04-11 16:10 ` [Qemu-devel] [PATCH 09/12] memory: move core typedefs to qemu/typedefs.h Paolo Bonzini
` (4 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Paolo Bonzini @ 2013-04-11 16:10 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, mst
Headers in include/exec/ are for the deepest innards of QEMU,
they should almost never be included directly.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch_init.c | 1 -
dump.c | 6 +++++-
hw/alpha/typhoon.c | 1 -
hw/ide/ahci.c | 1 -
hw/ide/internal.h | 1 -
hw/net/vmxnet_tx_pkt.c | 2 +-
hw/usb/libhw.c | 2 +-
kvm-stub.c | 1 -
translate-all.c | 5 ++---
9 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 769ce77..0de3e7e 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -40,7 +40,6 @@
#include "hw/audio/audio.h"
#include "sysemu/kvm.h"
#include "migration/migration.h"
-#include "exec/gdbstub.h"
#include "hw/i386/smbios.h"
#include "exec/address-spaces.h"
#include "hw/audio/pcspk.h"
diff --git a/dump.c b/dump.c
index a25f509..b34f143 100644
--- a/dump.c
+++ b/dump.c
@@ -23,7 +23,6 @@
#include "sysemu/memory_mapping.h"
#include "qapi/error.h"
#include "qmp-commands.h"
-#include "exec/gdbstub.h"
static uint16_t cpu_convert_to_target16(uint16_t val, int endian)
{
@@ -268,6 +267,11 @@ static int write_elf64_note(DumpState *s)
return 0;
}
+static inline int cpu_index(CPUState *cpu)
+{
+ return cpu->cpu_index + 1;
+}
+
static int write_elf64_notes(DumpState *s)
{
CPUArchState *env;
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 68420f4..1ead187 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -7,7 +7,6 @@
*/
#include "cpu.h"
-#include "exec/exec-all.h"
#include "hw/hw.h"
#include "hw/devices.h"
#include "sysemu/sysemu.h"
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index d0ae8af..3405583 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -29,7 +29,6 @@
#include "monitor/monitor.h"
#include "sysemu/dma.h"
-#include "exec/cpu-common.h"
#include "internal.h"
#include <hw/ide/pci.h>
#include <hw/ide/ahci.h>
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index 2c89b50..0efb2da 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -8,7 +8,6 @@
*/
#include <hw/ide.h>
#include <hw/isa/isa.h>
-#include "exec/iorange.h"
#include "sysemu/dma.h"
#include "sysemu/sysemu.h"
#include "hw/block/block.h"
diff --git a/hw/net/vmxnet_tx_pkt.c b/hw/net/vmxnet_tx_pkt.c
index b1e795b..fc01e4d 100644
--- a/hw/net/vmxnet_tx_pkt.c
+++ b/hw/net/vmxnet_tx_pkt.c
@@ -15,6 +15,7 @@
*
*/
+#include "hw/hw.h"
#include "vmxnet_tx_pkt.h"
#include "net/eth.h"
#include "qemu-common.h"
@@ -22,7 +23,6 @@
#include "net/checksum.h"
#include "net/tap.h"
#include "net/net.h"
-#include "exec/cpu-common.h"
enum {
VMXNET_TX_PKT_VHDR_FRAG = 0,
diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c
index 75f022f..d2d4b51 100644
--- a/hw/usb/libhw.c
+++ b/hw/usb/libhw.c
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "exec/cpu-common.h"
+#include "hw/hw.h"
#include "hw/usb.h"
#include "sysemu/dma.h"
diff --git a/kvm-stub.c b/kvm-stub.c
index 760aadc..f6137d3 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -14,7 +14,6 @@
#include "hw/hw.h"
#include "hw/pci/msi.h"
#include "cpu.h"
-#include "exec/gdbstub.h"
#include "sysemu/kvm.h"
KVMState *kvm_state;
diff --git a/translate-all.c b/translate-all.c
index a98c646..08dd038 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -35,9 +35,6 @@
#include "cpu.h"
#include "disas/disas.h"
#include "tcg.h"
-#include "qemu/timer.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
#if defined(CONFIG_USER_ONLY)
#include "qemu.h"
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
@@ -55,6 +52,8 @@
#include <libutil.h>
#endif
#endif
+#else
+#include "exec/address-spaces.h"
#endif
#include "exec/cputlb.h"
--
1.8.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [Qemu-devel] [PATCH 09/12] memory: move core typedefs to qemu/typedefs.h
2013-04-11 16:10 [Qemu-devel] [PATCH 00/12] directory reorganization, final part Paolo Bonzini
` (7 preceding siblings ...)
2013-04-11 16:10 ` [Qemu-devel] [PATCH 08/12] include: avoid useless includes of exec/ headers Paolo Bonzini
@ 2013-04-11 16:10 ` Paolo Bonzini
2013-04-11 16:10 ` [Qemu-devel] [PATCH 10/12] exec: remove useless declarations from memory-internal.h Paolo Bonzini
` (3 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Paolo Bonzini @ 2013-04-11 16:10 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, mst
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/exec/memory.h | 5 -----
include/qemu/typedefs.h | 4 ++++
target-ppc/kvm_ppc.h | 2 --
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 2322732..9e88320 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -27,7 +27,6 @@
#include "qemu/int128.h"
typedef struct MemoryRegionOps MemoryRegionOps;
-typedef struct MemoryRegion MemoryRegion;
typedef struct MemoryRegionPortio MemoryRegionPortio;
typedef struct MemoryRegionMmio MemoryRegionMmio;
@@ -157,8 +156,6 @@ struct MemoryRegionPortio {
#define PORTIO_END_OF_LIST() { }
-typedef struct AddressSpace AddressSpace;
-
/**
* AddressSpace: describes a mapping of addresses to #MemoryRegion objects
*/
@@ -173,8 +170,6 @@ struct AddressSpace {
QTAILQ_ENTRY(AddressSpace) address_spaces_link;
};
-typedef struct MemoryRegionSection MemoryRegionSection;
-
/**
* MemoryRegionSection: describes a fragment of a #MemoryRegion
*
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index fd532a2..93aae81 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -18,6 +18,10 @@ typedef struct DeviceState DeviceState;
typedef struct BusState BusState;
typedef struct BusClass BusClass;
+typedef struct AddressSpace AddressSpace;
+typedef struct MemoryRegion MemoryRegion;
+typedef struct MemoryRegionSection MemoryRegionSection;
+
typedef struct NICInfo NICInfo;
typedef struct HCIInfo HCIInfo;
typedef struct AudioState AudioState;
diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h
index c30b006..6bcc5cc 100644
--- a/target-ppc/kvm_ppc.h
+++ b/target-ppc/kvm_ppc.h
@@ -9,8 +9,6 @@
#ifndef __KVM_PPC_H__
#define __KVM_PPC_H__
-#include "exec/memory.h"
-
#define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU
void kvmppc_init(void);
--
1.8.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [Qemu-devel] [PATCH 10/12] exec: remove useless declarations from memory-internal.h
2013-04-11 16:10 [Qemu-devel] [PATCH 00/12] directory reorganization, final part Paolo Bonzini
` (8 preceding siblings ...)
2013-04-11 16:10 ` [Qemu-devel] [PATCH 09/12] memory: move core typedefs to qemu/typedefs.h Paolo Bonzini
@ 2013-04-11 16:10 ` Paolo Bonzini
2013-04-11 16:10 ` [Qemu-devel] [PATCH 11/12] hw: move memory API headers to hw/ Paolo Bonzini
` (2 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Paolo Bonzini @ 2013-04-11 16:10 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, mst
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/exec/memory-internal.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h
index 977467b..1b156fd 100644
--- a/include/exec/memory-internal.h
+++ b/include/exec/memory-internal.h
@@ -49,12 +49,6 @@ ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr);
void qemu_ram_free(ram_addr_t addr);
void qemu_ram_free_from_ptr(ram_addr_t addr);
-struct MemoryRegion;
-struct MemoryRegionSection;
-
-void qemu_register_coalesced_mmio(hwaddr addr, ram_addr_t size);
-void qemu_unregister_coalesced_mmio(hwaddr addr, ram_addr_t size);
-
#define VGA_DIRTY_FLAG 0x01
#define CODE_DIRTY_FLAG 0x02
#define MIGRATION_DIRTY_FLAG 0x08
--
1.8.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [Qemu-devel] [PATCH 11/12] hw: move memory API headers to hw/
2013-04-11 16:10 [Qemu-devel] [PATCH 00/12] directory reorganization, final part Paolo Bonzini
` (9 preceding siblings ...)
2013-04-11 16:10 ` [Qemu-devel] [PATCH 10/12] exec: remove useless declarations from memory-internal.h Paolo Bonzini
@ 2013-04-11 16:10 ` Paolo Bonzini
2013-04-11 16:10 ` [Qemu-devel] [PATCH 12/12] hw: move memory API to hw/core Paolo Bonzini
2013-04-15 16:52 ` [Qemu-devel] [PATCH 00/12] directory reorganization, final part Anthony Liguori
12 siblings, 0 replies; 20+ messages in thread
From: Paolo Bonzini @ 2013-04-11 16:10 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, mst
These are the only parts of include/exec/ that is used in hardware models.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch_init.c | 2 +-
cputlb.c | 4 ++--
exec.c | 4 ++--
hw/acpi/ich9.c | 2 +-
hw/acpi/piix4.c | 4 ++--
hw/alpha/typhoon.c | 2 +-
hw/arm/collie.c | 2 +-
hw/arm/exynos4_boards.c | 2 +-
hw/arm/gumstix.c | 2 +-
hw/arm/highbank.c | 2 +-
hw/arm/integratorcp.c | 2 +-
hw/arm/kzm.c | 2 +-
hw/arm/mainstone.c | 2 +-
hw/arm/musicpal.c | 2 +-
hw/arm/nseries.c | 2 +-
hw/arm/omap_sx1.c | 2 +-
hw/arm/palm.c | 2 +-
hw/arm/realview.c | 2 +-
hw/arm/spitz.c | 2 +-
hw/arm/stellaris.c | 2 +-
hw/arm/strongarm.h | 2 +-
hw/arm/tosa.c | 2 +-
hw/arm/versatilepb.c | 2 +-
hw/arm/vexpress.c | 2 +-
hw/arm/xilinx_zynq.c | 2 +-
hw/arm/z2.c | 2 +-
hw/block/onenand.c | 4 ++--
hw/block/pflash_cfi01.c | 2 +-
hw/block/pflash_cfi02.c | 2 +-
hw/char/mcf_uart.c | 2 +-
hw/char/omap_uart.c | 2 +-
hw/char/serial.c | 2 +-
hw/char/sh_serial.c | 2 +-
hw/core/loader.c | 4 ++--
hw/core/sysbus.c | 2 +-
hw/cris/axis_dev88.c | 2 +-
hw/display/framebuffer.h | 2 +-
hw/display/vga_int.h | 2 +-
hw/dma/etraxfs_dma.c | 2 +-
hw/i386/pc.c | 4 ++--
hw/i386/pc_piix.c | 4 ++--
hw/i386/pc_q35.c | 2 +-
hw/intc/armv7m_nvic.c | 2 +-
hw/isa/isa-bus.c | 2 +-
hw/isa/isa_mmio.c | 2 +-
hw/isa/lpc_ich9.c | 2 +-
hw/isa/vt82c686.c | 2 +-
hw/lm32/lm32_boards.c | 2 +-
hw/lm32/milkymist.c | 2 +-
hw/m68k/an5206.c | 2 +-
hw/m68k/dummy_m68k.c | 2 +-
hw/m68k/mcf5206.c | 2 +-
hw/m68k/mcf5208.c | 2 +-
hw/m68k/mcf_intc.c | 2 +-
hw/microblaze/petalogix_ml605_mmu.c | 2 +-
hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +-
hw/mips/gt64xxx_pci.c | 2 +-
hw/mips/mips_fulong2e.c | 2 +-
hw/mips/mips_jazz.c | 2 +-
hw/mips/mips_malta.c | 2 +-
hw/mips/mips_mipssim.c | 2 +-
hw/mips/mips_r4k.c | 2 +-
hw/misc/omap_gpmc.c | 4 ++--
hw/misc/vfio.c | 4 ++--
hw/moxie/moxiesim.c | 2 +-
hw/net/mcf_fec.c | 2 +-
hw/net/ne2000-isa.c | 2 +-
hw/net/pcnet.h | 2 +-
hw/openrisc/openrisc_sim.c | 2 +-
hw/pci-bridge/pci_bridge_dev.c | 2 +-
hw/pci-host/apb.c | 2 +-
hw/pci-host/bonito.c | 2 +-
hw/pci-host/ppce500.c | 2 +-
hw/pci-host/prep.c | 2 +-
hw/pci-host/versatile.c | 2 +-
hw/pci/pci.c | 2 +-
hw/pci/pcie_host.c | 2 +-
hw/ppc/e500.c | 2 +-
hw/ppc/mac.h | 2 +-
hw/ppc/mac_newworld.c | 2 +-
hw/ppc/mac_oldworld.c | 2 +-
hw/ppc/ppc405_boards.c | 2 +-
hw/ppc/ppc405_uc.c | 2 +-
hw/ppc/ppc440_bamboo.c | 2 +-
hw/ppc/ppc4xx_devs.c | 2 +-
hw/ppc/ppc4xx_pci.c | 2 +-
hw/ppc/prep.c | 2 +-
hw/ppc/spapr.c | 2 +-
hw/ppc/spapr_iommu.c | 2 +-
hw/ppc/spapr_pci.c | 2 +-
hw/ppc/virtex_ml507.c | 2 +-
hw/s390x/s390-virtio-ccw.c | 2 +-
hw/s390x/s390-virtio.c | 2 +-
hw/s390x/sclp.c | 2 +-
hw/sh4/r2d.c | 2 +-
hw/sh4/sh7750.c | 2 +-
hw/sh4/sh_pci.c | 2 +-
hw/sh4/shix.c | 2 +-
hw/sparc/leon3.c | 2 +-
hw/sparc64/sun4u.c | 2 +-
hw/timer/m48t59.c | 2 +-
hw/timer/sh_timer.c | 2 +-
hw/tpm/tpm_int.h | 2 +-
hw/tpm/tpm_tis.c | 2 +-
hw/unicore32/puv3.c | 2 +-
hw/virtio/dataplane/hostmem.c | 2 +-
hw/virtio/vhost.c | 2 +-
hw/virtio/virtio-balloon.c | 2 +-
hw/xen/xen_platform.c | 2 +-
hw/xen/xen_pt.c | 2 +-
hw/xtensa/xtensa_lx60.c | 4 ++--
hw/xtensa/xtensa_sim.c | 4 ++--
include/exec/softmmu_template.h | 2 +-
include/{exec => hw}/address-spaces.h | 2 +-
include/hw/arm/arm.h | 2 +-
include/hw/arm/exynos4210.h | 2 +-
include/hw/arm/omap.h | 2 +-
include/hw/arm/pxa.h | 2 +-
include/hw/arm/soc_dma.h | 2 +-
include/hw/block/flash.h | 2 +-
include/hw/char/serial.h | 2 +-
include/hw/hw.h | 2 +-
include/hw/i386/apic_internal.h | 2 +-
include/hw/i386/ioapic_internal.h | 2 +-
include/hw/i386/pc.h | 6 +++---
include/hw/ide.h | 2 +-
include/{exec => hw}/ioport.h | 2 +-
include/{exec => hw}/iorange.h | 0
include/hw/isa/apm.h | 2 +-
include/hw/isa/isa.h | 4 ++--
include/{exec => hw}/memory.h | 4 ++--
include/hw/mips/mips.h | 2 +-
include/hw/pci-host/pam.h | 2 +-
include/hw/pci/pci.h | 2 +-
include/hw/pci/pcie_host.h | 2 +-
include/hw/pci/shpc.h | 2 +-
include/hw/ppc/mac_dbdma.h | 2 +-
include/hw/sh4/sh_intc.h | 2 +-
include/hw/sysbus.h | 2 +-
include/hw/virtio/dataplane/hostmem.h | 2 +-
include/hw/virtio/vhost.h | 2 +-
include/sysemu/dma.h | 2 +-
ioport.c | 4 ++--
kvm-all.c | 4 ++--
memory.c | 6 +++---
monitor.c | 2 +-
qtest.c | 4 ++--
savevm.c | 2 +-
target-arm/kvm_arm.h | 2 +-
target-i386/ioport-user.c | 2 +-
target-i386/kvm.c | 2 +-
target-i386/misc_helper.c | 2 +-
target-s390x/misc_helper.c | 2 +-
target-sparc/mmu_helper.c | 2 +-
translate-all.c | 2 +-
xen-all.c | 2 +-
xen-stub.c | 2 +-
157 files changed, 176 insertions(+), 176 deletions(-)
rename include/{exec => hw}/address-spaces.h (97%)
rename include/{exec => hw}/ioport.h (99%)
rename include/{exec => hw}/iorange.h (100%)
rename include/{exec => hw}/memory.h (99%)
diff --git a/arch_init.c b/arch_init.c
index 0de3e7e..f8070e1 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -41,7 +41,7 @@
#include "sysemu/kvm.h"
#include "migration/migration.h"
#include "hw/i386/smbios.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/audio/pcspk.h"
#include "migration/page_cache.h"
#include "qemu/config-file.h"
diff --git a/cputlb.c b/cputlb.c
index aba7e44..e44f2da 100644
--- a/cputlb.c
+++ b/cputlb.c
@@ -20,8 +20,8 @@
#include "config.h"
#include "cpu.h"
#include "exec/exec-all.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
#include "exec/cputlb.h"
diff --git a/exec.c b/exec.c
index fa1e0c3..9ea06be 100644
--- a/exec.c
+++ b/exec.c
@@ -34,9 +34,9 @@
#include "hw/xen/xen.h"
#include "qemu/timer.h"
#include "qemu/config-file.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "sysemu/dma.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#if defined(CONFIG_USER_ONLY)
#include <qemu.h>
#else /* !CONFIG_USER_ONLY */
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index e663d29..e09285a 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -30,7 +30,7 @@
#include "sysemu/sysemu.h"
#include "hw/acpi/acpi.h"
#include "sysemu/kvm.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/i386/ich9.h"
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 88386d7..8bb0ccf 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -26,9 +26,9 @@
#include "hw/acpi/acpi.h"
#include "sysemu/sysemu.h"
#include "qemu/range.h"
-#include "exec/ioport.h"
+#include "hw/ioport.h"
#include "hw/nvram/fw_cfg.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 1ead187..81fd565 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -11,7 +11,7 @@
#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "alpha_sys.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define TYPE_TYPHOON_PCI_HOST_BRIDGE "typhoon-pcihost"
diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index a19857a..380445a 100644
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -16,7 +16,7 @@
#include "hw/arm/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static struct arm_boot_info collie_binfo = {
.loader_start = SA_SDCS0,
diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index 74f110b..d278a4b 100644
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -25,7 +25,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/arm/arm.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/arm/exynos4210.h"
#include "hw/boards.h"
diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index b8cab10..4c47710 100644
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -41,7 +41,7 @@
#include "hw/devices.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static const int sector_len = 128 * 1024;
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index 0fd9465..d76500c 100644
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -26,7 +26,7 @@
#include "hw/boards.h"
#include "hw/sysbus.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define SMP_BOOT_ADDR 0x100
#define SMP_BOOT_REG 0x40
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index cca2971..bb5e681 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -12,7 +12,7 @@
#include "hw/boards.h"
#include "hw/arm/arm.h"
#include "net/net.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "sysemu/sysemu.h"
typedef struct {
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index cf90f5d..e9f32e2 100644
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -14,7 +14,7 @@
*/
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/hw.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index 260e314..bd210c3 100644
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -20,7 +20,7 @@
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
/* Device addresses */
#define MST_FPGA_PHYS 0x08000000
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index d2247fa..5efbde4 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -23,7 +23,7 @@
#include "ui/console.h"
#include "hw/i2c/i2c.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "ui/pixel_ops.h"
#define MP_MISC_BASE 0x80002000
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 4976438..3728fc1 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -33,7 +33,7 @@
#include "hw/loader.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
/* Nokia N8x0 support */
struct n800_s {
diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index e421ece..a9eb1f0 100644
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -32,7 +32,7 @@
#include "hw/arm/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
/*****************************************************************************/
/* Siemens SX1 Cellphone V1 */
diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index b13d810..d9338a5 100644
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -25,7 +25,7 @@
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "hw/loader.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static uint32_t static_readb(void *opaque, hwaddr offset)
{
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index feabfc5..aee0530 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -17,7 +17,7 @@
#include "hw/boards.h"
#include "hw/i2c/i2c.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define SMP_BOOT_ADDR 0xe0000000
#define SMP_BOOTREG_ADDR 0x10000030
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index c42668a..b20cb03 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -27,7 +27,7 @@
#include "hw/boards.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#undef REG_FMT
#define REG_FMT "0x%02lx"
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 2b61e3c..508d72d 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -15,7 +15,7 @@
#include "hw/i2c/i2c.h"
#include "net/net.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define GPIO_A 0
#define GPIO_B 1
diff --git a/hw/arm/strongarm.h b/hw/arm/strongarm.h
index 2893f94..ffa8c90 100644
--- a/hw/arm/strongarm.h
+++ b/hw/arm/strongarm.h
@@ -1,7 +1,7 @@
#ifndef _STRONGARM_H
#define _STRONGARM_H
-#include "exec/memory.h"
+#include "hw/memory.h"
#define SA_CS0 0x00000000
#define SA_CS1 0x08000000
diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index 47818a5..395d281 100644
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -23,7 +23,7 @@
#include "hw/ssi.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define TOSA_RAM 0x04000000
#define TOSA_ROM 0x00800000
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index 25c665a..bc53aad 100644
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -16,7 +16,7 @@
#include "hw/i2c/i2c.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/block/flash.h"
#define VERSATILE_FLASH_ADDR 0x34000000
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index a077c62..9585aaf 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -28,7 +28,7 @@
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "sysemu/blockdev.h"
#include "hw/block/flash.h"
diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index 41505c3..f1f878d 100644
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -18,7 +18,7 @@
#include "hw/sysbus.h"
#include "hw/arm/arm.h"
#include "net/net.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/block/flash.h"
diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index 07a127b..f4a4731 100644
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -23,7 +23,7 @@
#include "sysemu/blockdev.h"
#include "ui/console.h"
#include "audio/audio.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#ifdef DEBUG_Z2
#define DPRINTF(fmt, ...) \
diff --git a/hw/block/onenand.c b/hw/block/onenand.c
index 8b511a7..dd264d0 100644
--- a/hw/block/onenand.c
+++ b/hw/block/onenand.c
@@ -23,8 +23,8 @@
#include "hw/block/flash.h"
#include "hw/irq.h"
#include "sysemu/blockdev.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
#include "hw/sysbus.h"
#include "qemu/error-report.h"
diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index 3ff20e0..8bf61bf 100644
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -40,7 +40,7 @@
#include "hw/block/flash.h"
#include "block/block.h"
#include "qemu/timer.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "qemu/host-utils.h"
#include "hw/sysbus.h"
diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index 9a7fa70..c5c68c9 100644
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -39,7 +39,7 @@
#include "hw/block/flash.h"
#include "qemu/timer.h"
#include "block/block.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "qemu/host-utils.h"
#include "hw/sysbus.h"
diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index 3ec4705..2228fcf 100644
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -8,7 +8,7 @@
#include "hw/hw.h"
#include "hw/m68k/mcf.h"
#include "sysemu/char.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
typedef struct {
MemoryRegion iomem;
diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c
index 5bb36ed..bdf29a9 100644
--- a/hw/char/omap_uart.c
+++ b/hw/char/omap_uart.c
@@ -21,7 +21,7 @@
#include "hw/hw.h"
#include "hw/arm/omap.h"
#include "hw/char/serial.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
/* UARTs */
struct omap_uart_s {
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 66b6348..96b2ba2 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -26,7 +26,7 @@
#include "hw/char/serial.h"
#include "sysemu/char.h"
#include "qemu/timer.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_SERIAL
diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index b328643..a54cf00 100644
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -27,7 +27,7 @@
#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "sysemu/char.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_SERIAL
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 7507914..ab576f8 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -49,8 +49,8 @@
#include "uboot_image.h"
#include "hw/loader.h"
#include "hw/nvram/fw_cfg.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
#include <zlib.h>
diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c
index 9004d8c..241767b 100644
--- a/hw/core/sysbus.c
+++ b/hw/core/sysbus.c
@@ -19,7 +19,7 @@
#include "hw/sysbus.h"
#include "monitor/monitor.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent);
static char *sysbus_get_fw_dev_path(DeviceState *dev);
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index 7475671..2420269 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -31,7 +31,7 @@
#include "elf.h"
#include "boot.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define D(x)
#define DNAND(x)
diff --git a/hw/display/framebuffer.h b/hw/display/framebuffer.h
index 6eae035..d3221ab 100644
--- a/hw/display/framebuffer.h
+++ b/hw/display/framebuffer.h
@@ -1,7 +1,7 @@
#ifndef QEMU_FRAMEBUFFER_H
#define QEMU_FRAMEBUFFER_H
-#include "exec/memory.h"
+#include "hw/memory.h"
/* Framebuffer device helper routines. */
diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
index 260f7d6..0dc6198 100644
--- a/hw/display/vga_int.h
+++ b/hw/display/vga_int.h
@@ -26,7 +26,7 @@
#include <hw/hw.h>
#include "qapi/error.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#define ST01_V_RETRACE 0x08
#define ST01_DISP_ENABLE 0x01
diff --git a/hw/dma/etraxfs_dma.c b/hw/dma/etraxfs_dma.c
index 6a8c222..3e50074 100644
--- a/hw/dma/etraxfs_dma.c
+++ b/hw/dma/etraxfs_dma.c
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <sys/time.h>
#include "hw/hw.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "qemu-common.h"
#include "sysemu/sysemu.h"
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 8d75b34..d6e9124 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -47,8 +47,8 @@
#include "sysemu/blockdev.h"
#include "hw/block/block.h"
#include "ui/qemu-spice.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
#include "sysemu/arch_init.h"
#include "qemu/bitmap.h"
#include "qemu/config-file.h"
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index cff8013..9633eaa 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -41,8 +41,8 @@
#include "sysemu/blockdev.h"
#include "hw/i2c/smbus.h"
#include "hw/xen/xen.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
#include "cpu.h"
#ifdef CONFIG_XEN
# include <xen/hvm/hvm_info_table.h>
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 6ac1a89..b08c7b5 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -36,7 +36,7 @@
#include "sysemu/kvm.h"
#include "hw/kvm/clock.h"
#include "hw/pci-host/q35.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/i386/ich9.h"
#include "hw/ide/pci.h"
#include "hw/ide/ahci.h"
diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index 8eae4fc..68712a7 100644
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -13,7 +13,7 @@
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "hw/arm/arm.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "gic_internal.h"
typedef struct {
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 7860b17..da05fbf 100644
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -21,7 +21,7 @@
#include "hw/sysbus.h"
#include "sysemu/sysemu.h"
#include "hw/isa/isa.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static ISABus *isabus;
hwaddr isa_mem_base = 0;
diff --git a/hw/isa/isa_mmio.c b/hw/isa/isa_mmio.c
index d4dbf13..7f40dde 100644
--- a/hw/isa/isa_mmio.c
+++ b/hw/isa/isa_mmio.c
@@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "hw/isa/isa.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static void isa_mmio_writeb (void *opaque, hwaddr addr,
uint32_t val)
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index d116075..ae39431 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -42,7 +42,7 @@
#include "hw/acpi/acpi.h"
#include "hw/acpi/ich9.h"
#include "hw/pci/pci_bus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "sysemu/sysemu.h"
static int ich9_lpc_sci_irq(ICH9LPCState *lpc);
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 5261927..9aaff67 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -24,7 +24,7 @@
#include "hw/i2c/pm_smbus.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_VT82C686B
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
index 1ca9498..2c7d8a4 100644
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -27,7 +27,7 @@
#include "elf.h"
#include "lm32_hwsetup.h"
#include "lm32.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
typedef struct {
LM32CPU *cpu;
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index cca9374..5f94fbe 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -28,7 +28,7 @@
#include "sysemu/blockdev.h"
#include "milkymist-hw.h"
#include "lm32.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define BIOS_FILENAME "mmone-bios.bin"
#define BIOS_OFFSET 0x00860000
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index c4a5626..197040b 100644
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -11,7 +11,7 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define KERNEL_LOAD_ADDR 0x10000
#define AN5206_MBAR_ADDR 0x10000000
diff --git a/hw/m68k/dummy_m68k.c b/hw/m68k/dummy_m68k.c
index 544d56b..5bc46ec 100644
--- a/hw/m68k/dummy_m68k.c
+++ b/hw/m68k/dummy_m68k.c
@@ -10,7 +10,7 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define KERNEL_LOAD_ADDR 0x10000
diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
index bcc619d..3a28c69 100644
--- a/hw/m68k/mcf5206.c
+++ b/hw/m68k/mcf5206.c
@@ -10,7 +10,7 @@
#include "qemu/timer.h"
#include "hw/ptimer.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
/* General purpose timer module. */
typedef struct {
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index 05efde7..63c15c3 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -14,7 +14,7 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define SYS_FREQ 66000000
diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c
index cfe660d..c952489 100644
--- a/hw/m68k/mcf_intc.c
+++ b/hw/m68k/mcf_intc.c
@@ -7,7 +7,7 @@
*/
#include "hw/hw.h"
#include "hw/m68k/mcf.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
typedef struct {
MemoryRegion iomem;
diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index ae7ff44..aa6015e 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -35,7 +35,7 @@
#include "hw/xilinx.h"
#include "sysemu/blockdev.h"
#include "hw/char/serial.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/ssi.h"
#include "boot.h"
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index 7c258f0..389fa44 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -32,7 +32,7 @@
#include "hw/boards.h"
#include "hw/xilinx.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "boot.h"
#include "pic_cpu.h"
diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c
index 189e865..6d37720 100644
--- a/hw/mips/gt64xxx_pci.c
+++ b/hw/mips/gt64xxx_pci.c
@@ -27,7 +27,7 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
#include "hw/i386/pc.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 1aac93a..2779304 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -42,7 +42,7 @@
#include "hw/timer/mc146818rtc.h"
#include "hw/timer/i8254.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define DEBUG_FULONG2E_INIT
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index fd3a5f9..766adfd 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -41,7 +41,7 @@
#include "hw/audio/pcspk.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
enum jazz_model_e
{
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 86f42b2..c49b4bf 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -46,7 +46,7 @@
#include "hw/timer/mc146818rtc.h"
#include "hw/timer/i8254.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/sysbus.h" /* SysBusDevice */
//#define DEBUG_BOARD_INIT
diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
index d1681ec..9e6697b 100644
--- a/hw/mips/mips_mipssim.c
+++ b/hw/mips/mips_mipssim.c
@@ -36,7 +36,7 @@
#include "hw/loader.h"
#include "elf.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static struct _loaderparams {
int ram_size;
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index 4646ab6..41fa527 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -25,7 +25,7 @@
#include "hw/timer/mc146818rtc.h"
#include "hw/timer/i8254.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define MAX_IDE_BUS 2
diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c
index 91adb66..8d936a7 100644
--- a/hw/misc/omap_gpmc.c
+++ b/hw/misc/omap_gpmc.c
@@ -21,8 +21,8 @@
#include "hw/hw.h"
#include "hw/block/flash.h"
#include "hw/arm/omap.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
/* General-Purpose Memory Controller */
struct omap_gpmc_s {
diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c
index 693a9ff..601e260 100644
--- a/hw/misc/vfio.c
+++ b/hw/misc/vfio.c
@@ -27,8 +27,8 @@
#include <unistd.h>
#include "config.h"
-#include "exec/address-spaces.h"
-#include "exec/memory.h"
+#include "hw/address-spaces.h"
+#include "hw/memory.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
#include "hw/pci/pci.h"
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index 70bf28f..791b62d 100644
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -33,7 +33,7 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "hw/char/serial.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define PHYS_MEM_BASE 0x80000000
diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c
index 9b68052..d845fe6 100644
--- a/hw/net/mcf_fec.c
+++ b/hw/net/mcf_fec.c
@@ -10,7 +10,7 @@
#include "hw/m68k/mcf.h"
/* For crc32 */
#include <zlib.h>
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_FEC 1
diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c
index a093aa8..3618fc7 100644
--- a/hw/net/ne2000-isa.c
+++ b/hw/net/ne2000-isa.c
@@ -27,7 +27,7 @@
#include "hw/qdev.h"
#include "net/net.h"
#include "ne2000.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
typedef struct ISANE2000State {
ISADevice dev;
diff --git a/hw/net/pcnet.h b/hw/net/pcnet.h
index 9dee6f3..867fade 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 "hw/memory.h"
/* BUS CONFIGURATION REGISTERS */
#define BCR_MSRDA 0
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index 49bab1f..ab2985b 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -24,7 +24,7 @@
#include "hw/char/serial.h"
#include "net/net.h"
#include "hw/loader.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "sysemu/qtest.h"
diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
index 971b432..9c11b61 100644
--- a/hw/pci-bridge/pci_bridge_dev.c
+++ b/hw/pci-bridge/pci_bridge_dev.c
@@ -24,7 +24,7 @@
#include "hw/pci/msi.h"
#include "hw/pci/shpc.h"
#include "hw/pci/slotid_cap.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/pci/pci_bus.h"
struct PCIBridgeDev {
diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c
index b4981d7..c24ce10 100644
--- a/hw/pci-host/apb.c
+++ b/hw/pci-host/apb.c
@@ -33,7 +33,7 @@
#include "hw/pci/pci_bus.h"
#include "hw/pci-host/apb.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
/* debug APB */
//#define DEBUG_APB
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 974150b..89df920 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -45,7 +45,7 @@
#include "hw/mips/mips.h"
#include "hw/pci/pci_host.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_BONITO
diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index 5e7ad94..a2353cb 100644
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -317,7 +317,7 @@ static const VMStateDescription vmstate_ppce500_pci = {
}
};
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static int e500_pcihost_bridge_initfn(PCIDevice *d)
{
diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c
index 6130253..48ec673 100644
--- a/hw/pci-host/prep.c
+++ b/hw/pci-host/prep.c
@@ -28,7 +28,7 @@
#include "hw/pci/pci_bus.h"
#include "hw/pci/pci_host.h"
#include "hw/i386/pc.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define TYPE_RAVEN_PCI_DEVICE "raven"
#define TYPE_RAVEN_PCI_HOST_BRIDGE "raven-pcihost"
diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c
index d67ca79..b9c4baf 100644
--- a/hw/pci-host/versatile.c
+++ b/hw/pci-host/versatile.c
@@ -10,7 +10,7 @@
#include "hw/sysbus.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
typedef struct {
SysBusDevice busdev;
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index d5257ed..5158fe4 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -33,7 +33,7 @@
#include "qmp-commands.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_PCI
#ifdef DEBUG_PCI
diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c
index b2d942b..314dc31 100644
--- a/hw/pci/pcie_host.c
+++ b/hw/pci/pcie_host.c
@@ -22,7 +22,7 @@
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/pcie_host.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
/*
* PCI express mmcfig address
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index c1bdb6b..625f74f 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -33,7 +33,7 @@
#include "hw/loader.h"
#include "elf.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "qemu/host-utils.h"
#include "hw/pci-host/ppce500.h"
diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h
index 54efaed..92b08b2 100644
--- a/hw/ppc/mac.h
+++ b/hw/ppc/mac.h
@@ -25,7 +25,7 @@
#if !defined(__PPC_MAC_H__)
#define __PPC_MAC_H__
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/sysbus.h"
#include "hw/ide/internal.h"
#include "hw/input/adb.h"
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 4a9b883..10716c8 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -66,7 +66,7 @@
#include "kvm_ppc.h"
#include "hw/usb.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/sysbus.h"
#define MAX_IDE_BUS 2
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 3acca94..daea0b2 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -41,7 +41,7 @@
#include "sysemu/kvm.h"
#include "kvm_ppc.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define MAX_IDE_BUS 2
#define CFG_ADDR 0xf0000510
diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index 8e56b16..71e9111 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -32,7 +32,7 @@
#include "qemu/log.h"
#include "hw/loader.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define BIOS_FILENAME "ppc405_rom.bin"
#define BIOS_SIZE (2048 * 1024)
diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index c6c909e..dc7010a 100644
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -28,7 +28,7 @@
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
#include "qemu/log.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define DEBUG_OPBA
#define DEBUG_SDRAM
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index a55e717..56b63be 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -22,7 +22,7 @@
#include "sysemu/device_tree.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/char/serial.h"
#include "hw/ppc/ppc.h"
#include "ppc405.h"
diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
index d8e3dae..3ec50bf 100644
--- a/hw/ppc/ppc4xx_devs.c
+++ b/hw/ppc/ppc4xx_devs.c
@@ -25,7 +25,7 @@
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
#include "qemu/log.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_MMIO
//#define DEBUG_UNASSIGNED
diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c
index 599539b..964b64f 100644
--- a/hw/ppc/ppc4xx_pci.c
+++ b/hw/ppc/ppc4xx_pci.c
@@ -24,7 +24,7 @@
#include "hw/ppc/ppc4xx.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#undef DEBUG
#ifdef DEBUG
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index cceab3e..e204c77 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -40,7 +40,7 @@
#include "hw/isa/pc87312.h"
#include "sysemu/blockdev.h"
#include "sysemu/arch_init.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define HARD_DEBUG_PPC_IO
//#define DEBUG_PPC_IO
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 7a42501..bdbdcdf 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -47,7 +47,7 @@
#include "kvm_ppc.h"
#include "hw/pci/pci.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/usb.h"
#include "qemu/config-file.h"
diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
index d2782cf..d12edb6 100644
--- a/hw/ppc/spapr_iommu.c
+++ b/hw/ppc/spapr_iommu.c
@@ -21,7 +21,7 @@
#include "hw/qdev.h"
#include "kvm_ppc.h"
#include "sysemu/dma.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 62ff323..74e426c 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -29,7 +29,7 @@
#include "hw/pci/pci_host.h"
#include "hw/ppc/spapr.h"
#include "hw/pci-host/spapr.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include <libfdt.h>
#include "trace.h"
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 6728ba7..85d072b 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -33,7 +33,7 @@
#include "hw/loader.h"
#include "elf.h"
#include "qemu/log.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 76b63e2..31f25dc 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -10,7 +10,7 @@
*/
#include "hw/boards.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "s390-virtio.h"
#include "hw/s390x/sclp.h"
#include "ioinst.h"
diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
index f82c0e1..6a35e28 100644
--- a/hw/s390x/s390-virtio.c
+++ b/hw/s390x/s390-virtio.c
@@ -32,7 +32,7 @@
#include "hw/virtio/virtio.h"
#include "hw/sysbus.h"
#include "sysemu/kvm.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/s390x/s390-virtio-bus.h"
#include "hw/s390x/sclp.h"
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index 86d6ae0..b6cc448 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -14,7 +14,7 @@
#include "cpu.h"
#include "sysemu/kvm.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/s390x/sclp.h"
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 4986dae..a6a6b5b 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -37,7 +37,7 @@
#include "hw/usb.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define FLASH_BASE 0x00000000
#define FLASH_SIZE 0x02000000
diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index 2218b9c..e3620d8 100644
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -30,7 +30,7 @@
#include "sh7750_regnames.h"
#include "hw/sh4/sh_intc.h"
#include "cpu.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define NB_DEVICES 4
diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c
index d213a90..3cdcb94 100644
--- a/hw/sh4/sh_pci.c
+++ b/hw/sh4/sh_pci.c
@@ -26,7 +26,7 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
#include "qemu/bswap.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
typedef struct SHPCIState {
SysBusDevice busdev;
diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c
index c23d4af..f35979f 100644
--- a/hw/sh4/shix.c
+++ b/hw/sh4/shix.c
@@ -32,7 +32,7 @@
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/loader.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define BIOS_FILENAME "shix_bios.bin"
#define BIOS_ADDRESS 0xA0000000
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 78c77ef..431ffbd 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -30,7 +30,7 @@
#include "hw/loader.h"
#include "elf.h"
#include "trace.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/sparc/grlib.h"
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 0d29620..f588b47 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -39,7 +39,7 @@
#include "hw/loader.h"
#include "elf.h"
#include "sysemu/blockdev.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_IRQ
//#define DEBUG_EBUS
diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c
index 5019e06..fa65755 100644
--- a/hw/timer/m48t59.c
+++ b/hw/timer/m48t59.c
@@ -27,7 +27,7 @@
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "hw/isa/isa.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
//#define DEBUG_NVRAM
diff --git a/hw/timer/sh_timer.c b/hw/timer/sh_timer.c
index f92ff4f..5bb0cd7 100644
--- a/hw/timer/sh_timer.c
+++ b/hw/timer/sh_timer.c
@@ -11,7 +11,7 @@
#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "qemu/timer.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/ptimer.h"
//#define DEBUG_TIMER
diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h
index 08f87cb..44d5463 100644
--- a/hw/tpm/tpm_int.h
+++ b/hw/tpm/tpm_int.h
@@ -12,7 +12,7 @@
#ifndef TPM_TPM_INT_H
#define TPM_TPM_INT_H
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "tpm_tis.h"
/* overall state of the TPM interface */
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index d4d8152..da1c3bc 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -22,7 +22,7 @@
#include "sysemu/tpm_backend.h"
#include "tpm_int.h"
#include "block/block.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci_ids.h"
diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index 7c8fc36..37dd9b0 100644
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -12,7 +12,7 @@
#include "qemu-common.h"
#include "ui/console.h"
#include "elf.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
#include "hw/loader.h"
diff --git a/hw/virtio/dataplane/hostmem.c b/hw/virtio/dataplane/hostmem.c
index 37292ff..4491f03 100644
--- a/hw/virtio/dataplane/hostmem.c
+++ b/hw/virtio/dataplane/hostmem.c
@@ -11,7 +11,7 @@
*
*/
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "hw/virtio/dataplane/hostmem.h"
static int hostmem_lookup_cmp(const void *phys_, const void *region_)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 636fad0..bc2c85a 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -18,7 +18,7 @@
#include "hw/hw.h"
#include "qemu/range.h"
#include <linux/vhost.h>
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
static void vhost_dev_sync_region(struct vhost_dev *dev,
MemoryRegionSection *section,
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index c2c446e..5052347 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -22,7 +22,7 @@
#include "sysemu/balloon.h"
#include "hw/virtio/virtio-balloon.h"
#include "sysemu/kvm.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include "qapi/visitor.h"
#if defined(__linux__)
diff --git a/hw/xen/xen_platform.c b/hw/xen/xen_platform.c
index b6c6793..5d6f661 100644
--- a/hw/xen/xen_platform.c
+++ b/hw/xen/xen_platform.c
@@ -32,7 +32,7 @@
#include "hw/xen/xen_common.h"
#include "hw/xen/xen_backend.h"
#include "trace.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include <xenguest.h>
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
index c199818..224b633 100644
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -59,7 +59,7 @@
#include "hw/xen/xen_backend.h"
#include "xen_pt.h"
#include "qemu/range.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#define XEN_PT_NR_IRQS (256)
static uint8_t xen_pt_mapped_machine_irq[XEN_PT_NR_IRQS] = {0};
diff --git a/hw/xtensa/xtensa_lx60.c b/hw/xtensa/xtensa_lx60.c
index 650dd31..34f397e 100644
--- a/hw/xtensa/xtensa_lx60.c
+++ b/hw/xtensa/xtensa_lx60.c
@@ -29,8 +29,8 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
#include "hw/char/serial.h"
#include "net/net.h"
#include "hw/sysbus.h"
diff --git a/hw/xtensa/xtensa_sim.c b/hw/xtensa/xtensa_sim.c
index 5241f8d..bbf44f7 100644
--- a/hw/xtensa/xtensa_sim.c
+++ b/hw/xtensa/xtensa_sim.c
@@ -29,8 +29,8 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
static uint64_t translate_phys_addr(void *env, uint64_t addr)
{
diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_template.h
index b219191..aaa4469 100644
--- a/include/exec/softmmu_template.h
+++ b/include/exec/softmmu_template.h
@@ -22,7 +22,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/timer.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#define DATA_SIZE (1 << SHIFT)
diff --git a/include/exec/address-spaces.h b/include/hw/address-spaces.h
similarity index 97%
rename from include/exec/address-spaces.h
rename to include/hw/address-spaces.h
index 3d12cdd..d88a4c3 100644
--- a/include/exec/address-spaces.h
+++ b/include/hw/address-spaces.h
@@ -19,7 +19,7 @@
* you're one of them.
*/
-#include "exec/memory.h"
+#include "hw/memory.h"
#ifndef CONFIG_USER_ONLY
diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h
index 7b2b02d..ff4de5a 100644
--- a/include/hw/arm/arm.h
+++ b/include/hw/arm/arm.h
@@ -11,7 +11,7 @@
#ifndef ARM_MISC_H
#define ARM_MISC_H 1
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/irq.h"
/* The CPU is also modelled as an interrupt controller. */
diff --git a/include/hw/arm/exynos4210.h b/include/hw/arm/exynos4210.h
index bb9a1dd..3010baa 100644
--- a/include/hw/arm/exynos4210.h
+++ b/include/hw/arm/exynos4210.h
@@ -27,7 +27,7 @@
#define EXYNOS4210_H_
#include "qemu-common.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#define EXYNOS4210_NCPUS 2
diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h
index 188cda8..31b0f04 100644
--- a/include/hw/arm/omap.h
+++ b/include/hw/arm/omap.h
@@ -17,7 +17,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef hw_omap_h
-#include "exec/memory.h"
+#include "hw/memory.h"
# define hw_omap_h "omap.h"
#include "hw/irq.h"
diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h
index 668232c..2769b6c 100644
--- a/include/hw/arm/pxa.h
+++ b/include/hw/arm/pxa.h
@@ -9,7 +9,7 @@
#ifndef PXA_H
# define PXA_H "pxa.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
/* Interrupt numbers */
# define PXA2XX_PIC_SSP3 0
diff --git a/include/hw/arm/soc_dma.h b/include/hw/arm/soc_dma.h
index 7379731..86d241b 100644
--- a/include/hw/arm/soc_dma.h
+++ b/include/hw/arm/soc_dma.h
@@ -22,7 +22,7 @@
#define HW_SOC_DMA_H 1
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/irq.h"
struct soc_dma_s;
diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h
index 920d759..12d5025 100644
--- a/include/hw/block/flash.h
+++ b/include/hw/block/flash.h
@@ -3,7 +3,7 @@
/* NOR flash devices */
-#include "exec/memory.h"
+#include "hw/memory.h"
typedef struct pflash_t pflash_t;
diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h
index e884499..83798f1 100644
--- a/include/hw/char/serial.h
+++ b/include/hw/char/serial.h
@@ -27,7 +27,7 @@
#include "hw/hw.h"
#include "sysemu/sysemu.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#define UART_FIFO_LENGTH 16 /* 16550A Fifo Length */
diff --git a/include/hw/hw.h b/include/hw/hw.h
index 1fb9afa..d7c0503 100644
--- a/include/hw/hw.h
+++ b/include/hw/hw.h
@@ -8,7 +8,7 @@
#include "exec/cpu-common.h"
#endif
-#include "exec/ioport.h"
+#include "hw/ioport.h"
#include "hw/irq.h"
#include "block/aio.h"
#include "migration/qemu-file.h"
diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h
index 578241f..9b715ec 100644
--- a/include/hw/i386/apic_internal.h
+++ b/include/hw/i386/apic_internal.h
@@ -20,7 +20,7 @@
#ifndef QEMU_APIC_INTERNAL_H
#define QEMU_APIC_INTERNAL_H
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
diff --git a/include/hw/i386/ioapic_internal.h b/include/hw/i386/ioapic_internal.h
index 25576c8..6dc7fe8 100644
--- a/include/hw/i386/ioapic_internal.h
+++ b/include/hw/i386/ioapic_internal.h
@@ -23,7 +23,7 @@
#define QEMU_IOAPIC_INTERNAL_H
#include "hw/hw.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/sysbus.h"
#define MAX_IOAPICS 1
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 5d40914..ee77e39 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -2,12 +2,12 @@
#define HW_PC_H
#include "qemu-common.h"
-#include "exec/memory.h"
-#include "exec/ioport.h"
+#include "hw/memory.h"
+#include "hw/ioport.h"
#include "hw/isa/isa.h"
#include "hw/block/fdc.h"
#include "net/net.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/i386/ioapic.h"
/* PC-style peripherals (also used by other machines). */
diff --git a/include/hw/ide.h b/include/hw/ide.h
index 507e6d3..7e4bf18 100644
--- a/include/hw/ide.h
+++ b/include/hw/ide.h
@@ -3,7 +3,7 @@
#include "hw/isa/isa.h"
#include "hw/pci/pci.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#define MAX_IDE_DEVS 2
diff --git a/include/exec/ioport.h b/include/hw/ioport.h
similarity index 99%
rename from include/exec/ioport.h
rename to include/hw/ioport.h
index fc28350..465a0f2 100644
--- a/include/exec/ioport.h
+++ b/include/hw/ioport.h
@@ -25,7 +25,7 @@
#define IOPORT_H
#include "qemu-common.h"
-#include "exec/iorange.h"
+#include "hw/iorange.h"
typedef uint32_t pio_addr_t;
#define FMT_pioaddr PRIx32
diff --git a/include/exec/iorange.h b/include/hw/iorange.h
similarity index 100%
rename from include/exec/iorange.h
rename to include/hw/iorange.h
diff --git a/include/hw/isa/apm.h b/include/hw/isa/apm.h
index 3edea5f..e77ced3 100644
--- a/include/hw/isa/apm.h
+++ b/include/hw/isa/apm.h
@@ -4,7 +4,7 @@
#include <stdint.h>
#include "qemu-common.h"
#include "hw/hw.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
typedef void (*apm_ctrl_changed_t)(uint32_t val, void *arg);
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index 82da37c..a922900 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -3,8 +3,8 @@
/* ISA bus */
-#include "exec/ioport.h"
-#include "exec/memory.h"
+#include "hw/ioport.h"
+#include "hw/memory.h"
#include "hw/qdev.h"
#define ISA_NUM_IRQS 16
diff --git a/include/exec/memory.h b/include/hw/memory.h
similarity index 99%
rename from include/exec/memory.h
rename to include/hw/memory.h
index 9e88320..963814f 100644
--- a/include/exec/memory.h
+++ b/include/hw/memory.h
@@ -22,8 +22,8 @@
#include "exec/cpu-common.h"
#include "exec/hwaddr.h"
#include "qemu/queue.h"
-#include "exec/iorange.h"
-#include "exec/ioport.h"
+#include "hw/iorange.h"
+#include "hw/ioport.h"
#include "qemu/int128.h"
typedef struct MemoryRegionOps MemoryRegionOps;
diff --git a/include/hw/mips/mips.h b/include/hw/mips/mips.h
index 291e85f..42ab968 100644
--- a/include/hw/mips/mips.h
+++ b/include/hw/mips/mips.h
@@ -2,7 +2,7 @@
#define HW_MIPS_H
/* Definitions for mips board emulation. */
-#include "exec/memory.h"
+#include "hw/memory.h"
/* gt64xxx.c */
PCIBus *gt64120_register(qemu_irq *pic);
diff --git a/include/hw/pci-host/pam.h b/include/hw/pci-host/pam.h
index 8e9e349..0f10c32 100644
--- a/include/hw/pci-host/pam.h
+++ b/include/hw/pci-host/pam.h
@@ -51,7 +51,7 @@
*/
#include "qemu-common.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#define SMRAM_C_BASE 0xa0000
#define SMRAM_C_END 0xc0000
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 05315c0..1c56173 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -4,7 +4,7 @@
#include "qemu-common.h"
#include "hw/qdev.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "sysemu/dma.h"
/* PCI includes legacy ISA access. */
diff --git a/include/hw/pci/pcie_host.h b/include/hw/pci/pcie_host.h
index 1228e36..c1c0b6b 100644
--- a/include/hw/pci/pcie_host.h
+++ b/include/hw/pci/pcie_host.h
@@ -22,7 +22,7 @@
#define PCIE_HOST_H
#include "hw/pci/pci_host.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#define TYPE_PCIE_HOST_BRIDGE "pcie-host-bridge"
#define PCIE_HOST_BRIDGE(obj) \
diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h
index 467911a..39e63c4 100644
--- a/include/hw/pci/shpc.h
+++ b/include/hw/pci/shpc.h
@@ -2,7 +2,7 @@
#define SHPC_H
#include "qemu-common.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "migration/vmstate.h"
struct SHPCDevice {
diff --git a/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h
index 691263e..85664ef 100644
--- a/include/hw/ppc/mac_dbdma.h
+++ b/include/hw/ppc/mac_dbdma.h
@@ -22,7 +22,7 @@
#ifndef HW_MAC_DBDMA_H
#define HW_MAC_DBDMA_H 1
-#include "exec/memory.h"
+#include "hw/memory.h"
typedef struct DBDMA_io DBDMA_io;
diff --git a/include/hw/sh4/sh_intc.h b/include/hw/sh4/sh_intc.h
index b7ddcb0..e517593 100644
--- a/include/hw/sh4/sh_intc.h
+++ b/include/hw/sh4/sh_intc.h
@@ -3,7 +3,7 @@
#include "qemu-common.h"
#include "hw/irq.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
typedef unsigned char intc_enum;
diff --git a/include/hw/sysbus.h b/include/hw/sysbus.h
index 7c2e316..a517232 100644
--- a/include/hw/sysbus.h
+++ b/include/hw/sysbus.h
@@ -4,7 +4,7 @@
/* Devices attached directly to the main system bus. */
#include "hw/qdev.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#define QDEV_MAX_MMIO 32
#define QDEV_MAX_PIO 32
diff --git a/include/hw/virtio/dataplane/hostmem.h b/include/hw/virtio/dataplane/hostmem.h
index b2cf093..01b7ef9 100644
--- a/include/hw/virtio/dataplane/hostmem.h
+++ b/include/hw/virtio/dataplane/hostmem.h
@@ -14,7 +14,7 @@
#ifndef HOSTMEM_H
#define HOSTMEM_H
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "qemu/thread.h"
typedef struct {
diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
index b373be0..cdf1b19 100644
--- a/include/hw/virtio/vhost.h
+++ b/include/hw/virtio/vhost.h
@@ -3,7 +3,7 @@
#include "hw/hw.h"
#include "hw/virtio/virtio.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
/* Generic structures common for any vhost based device. */
struct vhost_virtqueue {
diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h
index a52c93a..75bd44a 100644
--- a/include/sysemu/dma.h
+++ b/include/sysemu/dma.h
@@ -11,7 +11,7 @@
#define DMA_H
#include <stdio.h>
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "hw/hw.h"
#include "block/block.h"
#include "sysemu/kvm.h"
diff --git a/ioport.c b/ioport.c
index a0ac2a0..e08958c 100644
--- a/ioport.c
+++ b/ioport.c
@@ -25,9 +25,9 @@
* splitted out ioport related stuffs from vl.c.
*/
-#include "exec/ioport.h"
+#include "hw/ioport.h"
#include "trace.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
/***********************************************************/
/* IO Port */
diff --git a/kvm-all.c b/kvm-all.c
index 9b433d3..74cf461 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -30,8 +30,8 @@
#include "exec/gdbstub.h"
#include "sysemu/kvm.h"
#include "qemu/bswap.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
#include "qemu/event_notifier.h"
/* This check must be after config-host.h is included */
diff --git a/memory.c b/memory.c
index 75ca281..ec4b1c0 100644
--- a/memory.c
+++ b/memory.c
@@ -13,9 +13,9 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
-#include "exec/ioport.h"
+#include "hw/memory.h"
+#include "hw/address-spaces.h"
+#include "hw/ioport.h"
#include "qemu/bitops.h"
#include "sysemu/kvm.h"
#include <assert.h>
diff --git a/monitor.c b/monitor.c
index 2909ca1..58fef7f 100644
--- a/monitor.c
+++ b/monitor.c
@@ -64,7 +64,7 @@
#include "trace/simple.h"
#endif
#include "ui/qemu-spice.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "qmp-commands.h"
#include "hmp.h"
#include "qemu/thread.h"
diff --git a/qtest.c b/qtest.c
index 3bba3e5..52e7362 100644
--- a/qtest.c
+++ b/qtest.c
@@ -14,8 +14,8 @@
#include "sysemu/qtest.h"
#include "hw/qdev.h"
#include "sysemu/char.h"
-#include "exec/ioport.h"
-#include "exec/memory.h"
+#include "hw/ioport.h"
+#include "hw/memory.h"
#include "hw/irq.h"
#include "sysemu/sysemu.h"
#include "sysemu/cpus.h"
diff --git a/savevm.c b/savevm.c
index b1d8988..4820c83 100644
--- a/savevm.c
+++ b/savevm.c
@@ -35,7 +35,7 @@
#include "qemu/sockets.h"
#include "qemu/queue.h"
#include "sysemu/cpus.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "qmp-commands.h"
#include "trace.h"
#include "qemu/bitops.h"
diff --git a/target-arm/kvm_arm.h b/target-arm/kvm_arm.h
index b1c54ff..256e289 100644
--- a/target-arm/kvm_arm.h
+++ b/target-arm/kvm_arm.h
@@ -12,7 +12,7 @@
#define QEMU_KVM_ARM_H
#include "sysemu/kvm.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
/**
* kvm_arm_register_device:
diff --git a/target-i386/ioport-user.c b/target-i386/ioport-user.c
index f7636e0..f3b2a96 100644
--- a/target-i386/ioport-user.c
+++ b/target-i386/ioport-user.c
@@ -21,7 +21,7 @@
#include "qemu.h"
#include "qemu-common.h"
-#include "exec/ioport.h"
+#include "hw/ioport.h"
void cpu_outb(pio_addr_t addr, uint8_t val)
{
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 397afeb..e75969c 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -30,7 +30,7 @@
#include "qemu/config-file.h"
#include "hw/i386/pc.h"
#include "hw/i386/apic.h"
-#include "exec/ioport.h"
+#include "hw/ioport.h"
#include "hyperv.h"
#include "hw/pci/pci.h"
diff --git a/target-i386/misc_helper.c b/target-i386/misc_helper.c
index dfbc07b..ca5b8b0 100644
--- a/target-i386/misc_helper.c
+++ b/target-i386/misc_helper.c
@@ -18,7 +18,7 @@
*/
#include "cpu.h"
-#include "exec/ioport.h"
+#include "hw/ioport.h"
#include "helper.h"
#if !defined(CONFIG_USER_ONLY)
diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
index 09301d0..d564011 100644
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -19,7 +19,7 @@
*/
#include "cpu.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "qemu/host-utils.h"
#include "helper.h"
#include <string.h>
diff --git a/target-sparc/mmu_helper.c b/target-sparc/mmu_helper.c
index a9649ae..da930ad 100644
--- a/target-sparc/mmu_helper.c
+++ b/target-sparc/mmu_helper.c
@@ -19,7 +19,7 @@
#include "cpu.h"
#include "trace.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
/* Sparc MMU emulation */
diff --git a/translate-all.c b/translate-all.c
index 08dd038..7c67c6b 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -53,7 +53,7 @@
#endif
#endif
#else
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#endif
#include "exec/cputlb.h"
diff --git a/xen-all.c b/xen-all.c
index 539a154..6cf32a4 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -20,7 +20,7 @@
#include "qemu/range.h"
#include "sysemu/xen-mapcache.h"
#include "trace.h"
-#include "exec/address-spaces.h"
+#include "hw/address-spaces.h"
#include <xen/hvm/ioreq.h>
#include <xen/hvm/params.h>
diff --git a/xen-stub.c b/xen-stub.c
index 6f0516a..6282018 100644
--- a/xen-stub.c
+++ b/xen-stub.c
@@ -10,7 +10,7 @@
#include "qemu-common.h"
#include "hw/xen/xen.h"
-#include "exec/memory.h"
+#include "hw/memory.h"
#include "qmp-commands.h"
void xenstore_store_pv_console_info(int i, CharDriverState *chr)
--
1.8.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* [Qemu-devel] [PATCH 12/12] hw: move memory API to hw/core
2013-04-11 16:10 [Qemu-devel] [PATCH 00/12] directory reorganization, final part Paolo Bonzini
` (10 preceding siblings ...)
2013-04-11 16:10 ` [Qemu-devel] [PATCH 11/12] hw: move memory API headers to hw/ Paolo Bonzini
@ 2013-04-11 16:10 ` Paolo Bonzini
2013-04-11 16:28 ` Peter Maydell
2013-04-15 16:52 ` [Qemu-devel] [PATCH 00/12] directory reorganization, final part Anthony Liguori
12 siblings, 1 reply; 20+ messages in thread
From: Paolo Bonzini @ 2013-04-11 16:10 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, mst
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.target | 4 ++--
hw/core/Makefile.objs | 3 +++
ioport.c => hw/core/ioport.c | 0
memory.c => hw/core/memory.c | 0
4 files changed, 5 insertions(+), 2 deletions(-)
rename ioport.c => hw/core/ioport.c (100%)
rename memory.c => hw/core/memory.c (100%)
diff --git a/Makefile.target b/Makefile.target
index 2bd6d14..9ddb9fa 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -108,13 +108,13 @@ CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y)
CONFIG_NO_GET_MEMORY_MAPPING = $(if $(subst n,,$(CONFIG_HAVE_GET_MEMORY_MAPPING)),n,y)
CONFIG_NO_CORE_DUMP = $(if $(subst n,,$(CONFIG_HAVE_CORE_DUMP)),n,y)
-obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o
+obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o
obj-y += qtest.o
obj-y += hw/
obj-$(CONFIG_FDT) += device_tree.o
obj-$(CONFIG_KVM) += kvm-all.o
obj-$(CONFIG_NO_KVM) += kvm-stub.o
-obj-y += memory.o savevm.o cputlb.o
+obj-y += savevm.o cputlb.o
obj-$(CONFIG_HAVE_GET_MEMORY_MAPPING) += memory_mapping.o
obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o
obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o
diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs
index 94109f3..b9e96ca 100644
--- a/hw/core/Makefile.objs
+++ b/hw/core/Makefile.objs
@@ -11,4 +11,7 @@ common-obj-$(CONFIG_SOFTMMU) += null-machine.o
common-obj-$(CONFIG_SOFTMMU) += loader.o
common-obj-$(CONFIG_SOFTMMU) += qdev-addr.o
common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o
+common-obj-$(CONFIG_SOFTMMU) += ioport.o
+obj-$(CONFIG_SOFTMMU) += memory.o
+
diff --git a/ioport.c b/hw/core/ioport.c
similarity index 100%
rename from ioport.c
rename to hw/core/ioport.c
diff --git a/memory.c b/hw/core/memory.c
similarity index 100%
rename from memory.c
rename to hw/core/memory.c
--
1.8.1.4
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [Qemu-devel] [PATCH 12/12] hw: move memory API to hw/core
2013-04-11 16:10 ` [Qemu-devel] [PATCH 12/12] hw: move memory API to hw/core Paolo Bonzini
@ 2013-04-11 16:28 ` Peter Maydell
2013-04-11 17:07 ` Michael S. Tsirkin
2013-04-11 17:09 ` Paolo Bonzini
0 siblings, 2 replies; 20+ messages in thread
From: Peter Maydell @ 2013-04-11 16:28 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel, mst
On 11 April 2013 17:10, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This doesn't look right. The MemoryRegion system isn't
hw-specific, it's a part of the basic QEMU emulation
system which provides functionality to hw/ and other
things (like cputlb.c).
-- PMM
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [Qemu-devel] [PATCH 12/12] hw: move memory API to hw/core
2013-04-11 16:28 ` Peter Maydell
@ 2013-04-11 17:07 ` Michael S. Tsirkin
2013-04-11 17:09 ` Paolo Bonzini
1 sibling, 0 replies; 20+ messages in thread
From: Michael S. Tsirkin @ 2013-04-11 17:07 UTC (permalink / raw)
To: Peter Maydell; +Cc: Paolo Bonzini, qemu-devel
On Thu, Apr 11, 2013 at 05:28:35PM +0100, Peter Maydell wrote:
> On 11 April 2013 17:10, Paolo Bonzini <pbonzini@redhat.com> wrote:
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>
> This doesn't look right. The MemoryRegion system isn't
> hw-specific, it's a part of the basic QEMU emulation
> system which provides functionality to hw/ and other
> things (like cputlb.c).
>
> -- PMM
I had the same thought.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [Qemu-devel] [PATCH 12/12] hw: move memory API to hw/core
2013-04-11 16:28 ` Peter Maydell
2013-04-11 17:07 ` Michael S. Tsirkin
@ 2013-04-11 17:09 ` Paolo Bonzini
2013-04-11 17:14 ` Peter Maydell
1 sibling, 1 reply; 20+ messages in thread
From: Paolo Bonzini @ 2013-04-11 17:09 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, mst
Il 11/04/2013 18:28, Peter Maydell ha scritto:
> On 11 April 2013 17:10, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> This doesn't look right. The MemoryRegion system isn't
> hw-specific, it's a part of the basic QEMU emulation
> system which provides functionality to hw/ and other
> things (like cputlb.c).
The accelerator- and target-independent parts of the basic emulation are
already in hw/core (not much really, but consider that CPUs are device
and depend on hw/core/qdev.c). The memory API is simply the interface
between the accelerators and hw/ (boards & device models).
In fact, apart from large parts of exec.c which are really part of the
memory API implementation (but I'm not moving it in this patch for
simplicity), the other users of the memory API are really the
accelerators. KVM and Xen only use listeners, TCG needs more low-level
access in cputlb.c and translate-all.c but that's pretty much it.
Paolo
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [Qemu-devel] [PATCH 12/12] hw: move memory API to hw/core
2013-04-11 17:09 ` Paolo Bonzini
@ 2013-04-11 17:14 ` Peter Maydell
2013-04-11 18:18 ` Paolo Bonzini
0 siblings, 1 reply; 20+ messages in thread
From: Peter Maydell @ 2013-04-11 17:14 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel, mst
On 11 April 2013 18:09, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 11/04/2013 18:28, Peter Maydell ha scritto:
>> On 11 April 2013 17:10, Paolo Bonzini <pbonzini@redhat.com> wrote:
>>> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> This doesn't look right. The MemoryRegion system isn't
>> hw-specific, it's a part of the basic QEMU emulation
>> system which provides functionality to hw/ and other
>> things (like cputlb.c).
>
> The accelerator- and target-independent parts of the basic emulation are
> already in hw/core (not much really, but consider that CPUs are device
> and depend on hw/core/qdev.c). The memory API is simply the interface
> between the accelerators and hw/ (boards & device models).
Yes, so it should be provided in the place we put our accelerator
implementation (ie .): it is functionality and interface exposed
*to* the code in hw/, not functionality and interface provided
*by* hw/.
-- PMM
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [Qemu-devel] [PATCH 12/12] hw: move memory API to hw/core
2013-04-11 17:14 ` Peter Maydell
@ 2013-04-11 18:18 ` Paolo Bonzini
2013-04-11 19:00 ` Michael S. Tsirkin
0 siblings, 1 reply; 20+ messages in thread
From: Paolo Bonzini @ 2013-04-11 18:18 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, mst
Il 11/04/2013 19:14, Peter Maydell ha scritto:
> On 11 April 2013 18:09, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> Il 11/04/2013 18:28, Peter Maydell ha scritto:
>>> On 11 April 2013 17:10, Paolo Bonzini <pbonzini@redhat.com> wrote:
>>>>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>>> This doesn't look right. The MemoryRegion system isn't
>>> hw-specific, it's a part of the basic QEMU emulation
>>> system which provides functionality to hw/ and other
>>> things (like cputlb.c).
>>
>> The accelerator- and target-independent parts of the basic emulation are
>> already in hw/core (not much really, but consider that CPUs are device
>> and depend on hw/core/qdev.c). The memory API is simply the interface
>> between the accelerators and hw/ (boards & device models).
>
> Yes, so it should be provided in the place we put our accelerator
> implementation (ie .): it is functionality and interface exposed
> *to* the code in hw/, not functionality and interface provided
> *by* hw/.
Ok, the historical practice was that qdev core was in hw/, and that's
what I tried to follow. It makes sense either way to me.
But then patch 11 also has to be dropped, otherwise it doesn't make
sense. Michael, what do you think?
Paolo
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [Qemu-devel] [PATCH 12/12] hw: move memory API to hw/core
2013-04-11 18:18 ` Paolo Bonzini
@ 2013-04-11 19:00 ` Michael S. Tsirkin
0 siblings, 0 replies; 20+ messages in thread
From: Michael S. Tsirkin @ 2013-04-11 19:00 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Peter Maydell, qemu-devel
On Thu, Apr 11, 2013 at 08:18:52PM +0200, Paolo Bonzini wrote:
> Il 11/04/2013 19:14, Peter Maydell ha scritto:
> > On 11 April 2013 18:09, Paolo Bonzini <pbonzini@redhat.com> wrote:
> >> Il 11/04/2013 18:28, Peter Maydell ha scritto:
> >>> On 11 April 2013 17:10, Paolo Bonzini <pbonzini@redhat.com> wrote:
> >>>>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> >>> This doesn't look right. The MemoryRegion system isn't
> >>> hw-specific, it's a part of the basic QEMU emulation
> >>> system which provides functionality to hw/ and other
> >>> things (like cputlb.c).
> >>
> >> The accelerator- and target-independent parts of the basic emulation are
> >> already in hw/core (not much really, but consider that CPUs are device
> >> and depend on hw/core/qdev.c). The memory API is simply the interface
> >> between the accelerators and hw/ (boards & device models).
> >
> > Yes, so it should be provided in the place we put our accelerator
> > implementation (ie .): it is functionality and interface exposed
> > *to* the code in hw/, not functionality and interface provided
> > *by* hw/.
>
> Ok, the historical practice was that qdev core was in hw/, and that's
> what I tried to follow. It makes sense either way to me.
>
> But then patch 11 also has to be dropped, otherwise it doesn't make
> sense. Michael, what do you think?
>
> Paolo
I agree.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [Qemu-devel] [PATCH 00/12] directory reorganization, final part
2013-04-11 16:10 [Qemu-devel] [PATCH 00/12] directory reorganization, final part Paolo Bonzini
` (11 preceding siblings ...)
2013-04-11 16:10 ` [Qemu-devel] [PATCH 12/12] hw: move memory API to hw/core Paolo Bonzini
@ 2013-04-15 16:52 ` Anthony Liguori
12 siblings, 0 replies; 20+ messages in thread
From: Anthony Liguori @ 2013-04-15 16:52 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: peter.maydell, mst
Applied. Thanks.
Regards,
Anthony Liguori
^ permalink raw reply [flat|nested] 20+ messages in thread