* [Qemu-devel] [PATCH 01/32] libcacard: simplify rules for recursive build
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 02/32] vscclient: use per-target variables Paolo Bonzini
` (33 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 17e2d58..5fc94ef 100644
--- a/Makefile
+++ b/Makefile
@@ -141,19 +141,11 @@ version-obj-$(CONFIG_WIN32) += version.o
# Support building shared library libcacard
.PHONY: libcacard.la install-libcacard
-ifeq ($(LIBTOOL),)
-libcacard.la:
- @echo "libtool is missing, please install and rerun configure"; exit 1
-
-install-libcacard:
- @echo "libtool is missing, please install and rerun configure"; exit 1
-else
-libcacard.la: $(oslib-obj-y) qemu-timer-common.o $(addsuffix .lo, $(basename $(trace-obj-y)))
+libcacard.la: $(oslib-obj-y) qemu-timer-common.o $(trace-obj-y)
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" libcacard.la,)
install-libcacard: libcacard.la
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" install-libcacard,)
-endif
######################################################################
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 02/32] vscclient: use per-target variables
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 01/32] libcacard: simplify rules for recursive build Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 03/32] build: adjust setting of QEMU_INCLUDES Paolo Bonzini
` (32 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 5fc94ef..21b4ded 100644
--- a/Makefile
+++ b/Makefile
@@ -162,8 +162,9 @@ qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y)
qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o
+vscclient$(EXESUF): LIBS += $(libcacard_libs)
vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) $(tools-obj-y) qemu-timer-common.o libcacard/vscclient.o
- $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(libcacard_libs) $(LIBS)," LINK $@")
+ $(call LINK, $^)
fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y)
fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 03/32] build: adjust setting of QEMU_INCLUDES
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 01/32] libcacard: simplify rules for recursive build Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 02/32] vscclient: use per-target variables Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines Paolo Bonzini
` (31 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Make it correct for nested directories, and move the static part
from Makefile to configure.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 2 --
configure | 3 +--
rules.mak | 3 +++
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 21b4ded..00126b9 100644
--- a/Makefile
+++ b/Makefile
@@ -123,8 +123,6 @@ audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS)
QEMU_CFLAGS+=$(CURL_CFLAGS)
-QEMU_CFLAGS += -I$(SRC_PATH)/include
-
ui/cocoa.o: ui/cocoa.m
ui/sdl.o audio/sdlaudio.o ui/sdl_zoom.o hw/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS)
diff --git a/configure b/configure
index fa5657f..e4285e5 100755
--- a/configure
+++ b/configure
@@ -268,7 +268,7 @@ QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
-QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu"
+QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/include -I\$(SRC_PATH)/fpu"
if test "$debug_info" = "yes"; then
CFLAGS="-g $CFLAGS"
LDFLAGS="-g $LDFLAGS"
@@ -3261,7 +3261,6 @@ fi
if test "$slirp" = "yes" ; then
echo "CONFIG_SLIRP=y" >> $config_host_mak
echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
- QEMU_INCLUDES="-I\$(SRC_PATH)/slirp $QEMU_INCLUDES"
fi
if test "$vde" = "yes" ; then
echo "CONFIG_VDE=y" >> $config_host_mak
diff --git a/rules.mak b/rules.mak
index 1b173aa..e77c76a 100644
--- a/rules.mak
+++ b/rules.mak
@@ -14,6 +14,9 @@ MAKEFLAGS += -rR
# Flags for dependency generation
QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
+# Same as -I$(SRC_PATH) -I., but for the nested source/object directories
+QEMU_CFLAGS += -I$(<D) -I$(@D)
+
%.o: %.c
$(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@")
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (2 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 03/32] build: adjust setting of QEMU_INCLUDES Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 05/32] build: move rules from Makefile to */Makefile.objs Paolo Bonzini
` (30 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
rules.mak | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/rules.mak b/rules.mak
index e77c76a..471afcd 100644
--- a/rules.mak
+++ b/rules.mak
@@ -71,7 +71,7 @@ TRACETOOL=$(PYTHON) $(SRC_PATH)/scripts/tracetool.py
@test -f $@ || cp $< $@
%.h-timestamp: %.mak
- $(call quiet-command, sh $(SRC_PATH)/scripts/create_config < $< > $@, " GEN $*.h")
+ $(call quiet-command, sh $(SRC_PATH)/scripts/create_config < $< > $@, " GEN $(TARGET_DIR)$*.h")
@cmp $@ $*.h >/dev/null 2>&1 || cp $@ $*.h
# will delete the target of a rule if commands exit with a nonzero exit status
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 05/32] build: move rules from Makefile to */Makefile.objs
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (3 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 06/32] build: create ldscripts/ Paolo Bonzini
` (29 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 10 ----------
audio/Makefile.objs | 3 +++
block/Makefile.objs | 2 ++
hw/Makefile.objs | 2 ++
ui/Makefile.objs | 5 +++++
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 00126b9..3cfe5af 100644
--- a/Makefile
+++ b/Makefile
@@ -119,16 +119,6 @@ ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS))
recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
-audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS)
-
-QEMU_CFLAGS+=$(CURL_CFLAGS)
-
-ui/cocoa.o: ui/cocoa.m
-
-ui/sdl.o audio/sdlaudio.o ui/sdl_zoom.o hw/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS)
-
-ui/vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
-
bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
version.o: $(SRC_PATH)/version.rc config-host.h
diff --git a/audio/Makefile.objs b/audio/Makefile.objs
index 0f2932d..d71a877 100644
--- a/audio/Makefile.objs
+++ b/audio/Makefile.objs
@@ -12,3 +12,6 @@ common-obj-$(CONFIG_WINWAVE) += winwaveaudio.o
common-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o
common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o
common-obj-y += wavcapture.o
+
+$(obj)/audio.o $(obj)/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS)
+$(obj)/sdlaudio.o: QEMU_CFLAGS += $(SDL_CFLAGS)
diff --git a/block/Makefile.objs b/block/Makefile.objs
index 554f429..1b508c8 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -12,3 +12,5 @@ block-obj-$(CONFIG_GLUSTERFS) += gluster.o
common-obj-y += stream.o
common-obj-y += commit.o
+
+$(obj)/curl.o: QEMU_CFLAGS+=$(CURL_CFLAGS)
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index af4ab0c..994a60b 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -206,3 +206,5 @@ ifeq ($(CONFIG_PCI), y)
obj-$(CONFIG_KVM) += ivshmem.o
obj-$(CONFIG_LINUX) += vfio_pci.o
endif
+
+$(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS)
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index adc07be..fd339d2 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -12,3 +12,8 @@ common-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o
common-obj-$(CONFIG_COCOA) += cocoa.o
common-obj-$(CONFIG_CURSES) += curses.o
common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
+
+$(obj)/sdl.o $(obj)/sdl_zoom.o: QEMU_CFLAGS += $(SDL_CFLAGS)
+$(obj)/vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
+
+$(obj)/cocoa.o: $(SRC_PATH)/$(obj)/cocoa.m
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 06/32] build: create ldscripts/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (4 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 05/32] build: move rules from Makefile to */Makefile.objs Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 07/32] build: kill libdis, move disassemblers to disas/ Paolo Bonzini
` (28 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 2 +-
alpha.ld => ldscripts/alpha.ld | 0
arm.ld => ldscripts/arm.ld | 0
hppa.ld => ldscripts/hppa.ld | 0
i386.ld => ldscripts/i386.ld | 0
ia64.ld => ldscripts/ia64.ld | 0
m68k.ld => ldscripts/m68k.ld | 0
mips.ld => ldscripts/mips.ld | 0
ppc.ld => ldscripts/ppc.ld | 0
ppc64.ld => ldscripts/ppc64.ld | 0
s390.ld => ldscripts/s390.ld | 0
sparc.ld => ldscripts/sparc.ld | 0
sparc64.ld => ldscripts/sparc64.ld | 0
x86_64.ld => ldscripts/x86_64.ld | 0
14 files changed, 1 insertions(+), 1 deletions(-)
rename alpha.ld => ldscripts/alpha.ld (100%)
rename arm.ld => ldscripts/arm.ld (100%)
rename hppa.ld => ldscripts/hppa.ld (100%)
rename i386.ld => ldscripts/i386.ld (100%)
rename ia64.ld => ldscripts/ia64.ld (100%)
rename m68k.ld => ldscripts/m68k.ld (100%)
rename mips.ld => ldscripts/mips.ld (100%)
rename ppc.ld => ldscripts/ppc.ld (100%)
rename ppc64.ld => ldscripts/ppc64.ld (100%)
rename s390.ld => ldscripts/s390.ld (100%)
rename sparc.ld => ldscripts/sparc.ld (100%)
rename sparc64.ld => ldscripts/sparc64.ld (100%)
rename x86_64.ld => ldscripts/x86_64.ld (100%)
diff --git a/configure b/configure
index e4285e5..1642a2f 100755
--- a/configure
+++ b/configure
@@ -4058,7 +4058,7 @@ fi
if test "$ARCH" = "tci"; then
linker_script=""
else
- linker_script="-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/\$(ARCH).ld"
+ linker_script="-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/ldscripts/\$(ARCH).ld"
fi
if test "$target_linux_user" = "yes" -o "$target_bsd_user" = "yes" ; then
diff --git a/alpha.ld b/ldscripts/alpha.ld
similarity index 100%
rename from alpha.ld
rename to ldscripts/alpha.ld
diff --git a/arm.ld b/ldscripts/arm.ld
similarity index 100%
rename from arm.ld
rename to ldscripts/arm.ld
diff --git a/hppa.ld b/ldscripts/hppa.ld
similarity index 100%
rename from hppa.ld
rename to ldscripts/hppa.ld
diff --git a/i386.ld b/ldscripts/i386.ld
similarity index 100%
rename from i386.ld
rename to ldscripts/i386.ld
diff --git a/ia64.ld b/ldscripts/ia64.ld
similarity index 100%
rename from ia64.ld
rename to ldscripts/ia64.ld
diff --git a/m68k.ld b/ldscripts/m68k.ld
similarity index 100%
rename from m68k.ld
rename to ldscripts/m68k.ld
diff --git a/mips.ld b/ldscripts/mips.ld
similarity index 100%
rename from mips.ld
rename to ldscripts/mips.ld
diff --git a/ppc.ld b/ldscripts/ppc.ld
similarity index 100%
rename from ppc.ld
rename to ldscripts/ppc.ld
diff --git a/ppc64.ld b/ldscripts/ppc64.ld
similarity index 100%
rename from ppc64.ld
rename to ldscripts/ppc64.ld
diff --git a/s390.ld b/ldscripts/s390.ld
similarity index 100%
rename from s390.ld
rename to ldscripts/s390.ld
diff --git a/sparc.ld b/ldscripts/sparc.ld
similarity index 100%
rename from sparc.ld
rename to ldscripts/sparc.ld
diff --git a/sparc64.ld b/ldscripts/sparc64.ld
similarity index 100%
rename from sparc64.ld
rename to ldscripts/sparc64.ld
diff --git a/x86_64.ld b/ldscripts/x86_64.ld
similarity index 100%
rename from x86_64.ld
rename to ldscripts/x86_64.ld
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 07/32] build: kill libdis, move disassemblers to disas/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (5 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 06/32] build: create ldscripts/ Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 13:51 ` Peter Maydell
2012-10-24 12:58 ` [Qemu-devel] [PATCH 08/32] build: kill libuser Paolo Bonzini
` (27 subsequent siblings)
34 siblings, 1 reply; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.gitignore | 1 +
Makefile | 9 +++---
Makefile.dis | 20 --------------
Makefile.objs | 19 ++-----------
Makefile.target | 5 +---
bsd-user/elfload.c | 2 +-
configure | 45 ++++++++++++--------------------
cpu-exec.c | 2 +-
disas.c | 4 +-
disas/Makefile.objs | 16 +++++++++++
alpha-dis.c => disas/alpha.c | 2 +-
arm-dis.c => disas/arm.c | 2 +-
cris-dis.c => disas/cris.c | 2 +-
hppa-dis.c => disas/hppa.c | 2 +-
i386-dis.c => disas/i386.c | 2 +-
ia64-dis.c => disas/ia64.c | 2 +-
lm32-dis.c => disas/lm32.c | 2 +-
m68k-dis.c => disas/m68k.c | 2 +-
microblaze-dis.c => disas/microblaze.c | 2 +-
mips-dis.c => disas/mips.c | 2 +-
ppc-dis.c => disas/ppc.c | 2 +-
s390-dis.c => disas/s390.c | 2 +-
sh4-dis.c => disas/sh4.c | 2 +-
sparc-dis.c => disas/sparc.c | 2 +-
tci-dis.c => disas/tci.c | 2 +-
hw/loader.c | 2 +-
dis-asm.h => include/disas/bfd.h | 0
disas.h => include/disas/disas.h | 0
linux-user/elfload.c | 2 +-
monitor.c | 2 +-
qemu-log.h | 2 +-
target-alpha/translate.c | 2 +-
target-arm/translate.c | 2 +-
target-cris/translate.c | 2 +-
target-i386/translate.c | 2 +-
target-lm32/translate.c | 2 +-
target-m68k/translate.c | 2 +-
target-microblaze/helper.c | 2 +-
target-microblaze/translate.c | 2 +-
target-mips/translate.c | 2 +-
target-openrisc/translate.c | 2 +-
target-ppc/translate.c | 2 +-
target-ppc/translate_init.c | 2 +-
target-s390x/translate.c | 2 +-
target-sh4/translate.c | 2 +-
target-sparc/translate.c | 2 +-
target-unicore32/translate.c | 2 +-
target-xtensa/translate.c | 2 +-
translate-all.c | 2 +-
user-exec.c | 2 +-
vl.c | 2 +-
51 files changed, 86 insertions(+), 115 deletions(-)
delete mode 100644 Makefile.dis
create mode 100644 disas/Makefile.objs
rename alpha-dis.c => disas/alpha.c (99%)
rename arm-dis.c => disas/arm.c (99%)
rename cris-dis.c => disas/cris.c (99%)
rename hppa-dis.c => disas/hppa.c (99%)
rename i386-dis.c => disas/i386.c (99%)
rename ia64-dis.c => disas/ia64.c (99%)
rename lm32-dis.c => disas/lm32.c (99%)
rename m68k-dis.c => disas/m68k.c (99%)
rename microblaze-dis.c => disas/microblaze.c (99%)
rename mips-dis.c => disas/mips.c (99%)
rename ppc-dis.c => disas/ppc.c (99%)
rename s390-dis.c => disas/s390.c (99%)
rename sh4-dis.c => disas/sh4.c (99%)
rename sparc-dis.c => disas/sparc.c (99%)
rename tci-dis.c => disas/tci.c (98%)
rename dis-asm.h => include/disas/bfd.h (100%)
rename disas.h => include/disas/disas.h (100%)
diff --git a/.gitignore b/.gitignore
index bd6ba1c..3f560bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
config-devices.*
config-all-devices.*
+config-all-disass.*
config-host.*
config-target.*
trace.h
diff --git a/Makefile b/Makefile
index 3cfe5af..5691e9e 100644
--- a/Makefile
+++ b/Makefile
@@ -88,6 +88,7 @@ defconfig:
rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
-include config-all-devices.mak
+-include config-all-disass.mak
all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
@@ -107,9 +108,9 @@ endif
subdir-libcacard: $(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o
-$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y) subdir-libdis
+$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y)
-$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libdis-user subdir-libuser
+$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libuser
ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
romsubdir-%:
@@ -196,7 +197,7 @@ $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(tools-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y)
-QEMULIBS=libuser libdis libdis-user
+QEMULIBS=libuser
clean:
# avoid old build problems by removing potentially incorrect old files
@@ -228,7 +229,7 @@ qemu-%.tar.bz2:
distclean: clean
rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi
- rm -f config-all-devices.mak
+ rm -f config-all-devices.mak config-all-disass.mak
rm -f roms/seabios/config.mak roms/vgabios/config.mak
rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps qemu-doc.dvi
rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys
diff --git a/Makefile.dis b/Makefile.dis
deleted file mode 100644
index 2cfec6a..0000000
--- a/Makefile.dis
+++ /dev/null
@@ -1,20 +0,0 @@
-# Makefile for disassemblers.
-
-include ../config-host.mak
-include config.mak
-include $(SRC_PATH)/rules.mak
-
-.PHONY: all
-
-$(call set-vpath, $(SRC_PATH))
-
-QEMU_CFLAGS+=-I..
-
-include $(SRC_PATH)/Makefile.objs
-
-all: $(libdis-y)
-# Dummy command so that make thinks it has done something
- @true
-
-clean:
- rm -f *.o *.d *.a *~
diff --git a/Makefile.objs b/Makefile.objs
index 9eca179..ea4171d 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -120,24 +120,10 @@ user-obj-y += $(trace-obj-y)
user-obj-y += qom/
######################################################################
-# libdis
+# disassemblers
# NOTE: the disassembler code is only needed for debugging
-libdis-y =
-libdis-$(CONFIG_ALPHA_DIS) += alpha-dis.o
-libdis-$(CONFIG_ARM_DIS) += arm-dis.o
-libdis-$(CONFIG_CRIS_DIS) += cris-dis.o
-libdis-$(CONFIG_HPPA_DIS) += hppa-dis.o
-libdis-$(CONFIG_I386_DIS) += i386-dis.o
-libdis-$(CONFIG_IA64_DIS) += ia64-dis.o
-libdis-$(CONFIG_M68K_DIS) += m68k-dis.o
-libdis-$(CONFIG_MICROBLAZE_DIS) += microblaze-dis.o
-libdis-$(CONFIG_MIPS_DIS) += mips-dis.o
-libdis-$(CONFIG_PPC_DIS) += ppc-dis.o
-libdis-$(CONFIG_S390_DIS) += s390-dis.o
-libdis-$(CONFIG_SH4_DIS) += sh4-dis.o
-libdis-$(CONFIG_SPARC_DIS) += sparc-dis.o
-libdis-$(CONFIG_LM32_DIS) += lm32-dis.o
+universal-obj-y += disas/
######################################################################
# trace
@@ -245,5 +231,6 @@ nested-vars += \
block-obj-y \
user-obj-y \
common-obj-y \
+ universal-obj-y \
extra-obj-y
dummy := $(call unnest-vars)
diff --git a/Makefile.target b/Makefile.target
index 3822bc5..29ff39a 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -70,9 +70,8 @@ obj-y = exec.o translate-all.o cpu-exec.o
obj-y += tcg/tcg.o tcg/optimize.o
obj-$(CONFIG_TCG_INTERPRETER) += tci.o
obj-y += fpu/softfloat.o
-obj-y += disas.o
-obj-$(CONFIG_TCI_DIS) += tci-dis.o
obj-y += target-$(TARGET_BASE_ARCH)/
+obj-y += disas.o
obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/tci
@@ -153,11 +152,9 @@ all-obj-y += $(addprefix ../, $(universal-obj-y))
ifdef CONFIG_SOFTMMU
all-obj-y += $(addprefix ../, $(common-obj-y))
-all-obj-y += $(addprefix ../libdis/, $(libdis-y))
all-obj-y += $(addprefix ../, $(trace-obj-y))
else
all-obj-y += $(addprefix ../libuser/, $(user-obj-y))
-all-obj-y += $(addprefix ../libdis-user/, $(libdis-y))
endif #CONFIG_LINUX_USER
ifdef QEMU_PROGW
diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
index 55b2136..a6cd3ab 100644
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -10,7 +10,7 @@
#include <string.h>
#include "qemu.h"
-#include "disas.h"
+#include "disas/disas.h"
#ifdef _ARCH_PPC64
#undef ARCH_DLINFO
diff --git a/configure b/configure
index 1642a2f..9776cda 100755
--- a/configure
+++ b/configure
@@ -3606,11 +3606,6 @@ if test -f ${config_host_ld}~ ; then
fi
fi
-for d in libdis libdis-user; do
- symlink "$source_path/Makefile.dis" "$d/Makefile"
- echo > $d/config.mak
-done
-
# use included Linux headers
if test "$linux" = "yes" ; then
mkdir -p linux-headers
@@ -3943,83 +3938,77 @@ if test "$linux" = "yes" ; then
includes="-I\$(SRC_PATH)/linux-headers $includes"
fi
-if test "$target_user_only" = "yes" ; then
- libdis_config_mak=libdis-user/config.mak
-else
- libdis_config_mak=libdis/config.mak
-fi
-
for i in $ARCH $TARGET_BASE_ARCH ; do
case "$i" in
alpha)
echo "CONFIG_ALPHA_DIS=y" >> $config_target_mak
- echo "CONFIG_ALPHA_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_ALPHA_DIS=y" >> config-all-disass.mak
;;
arm)
echo "CONFIG_ARM_DIS=y" >> $config_target_mak
- echo "CONFIG_ARM_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_ARM_DIS=y" >> config-all-disass.mak
;;
cris)
echo "CONFIG_CRIS_DIS=y" >> $config_target_mak
- echo "CONFIG_CRIS_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_CRIS_DIS=y" >> config-all-disass.mak
;;
hppa)
echo "CONFIG_HPPA_DIS=y" >> $config_target_mak
- echo "CONFIG_HPPA_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_HPPA_DIS=y" >> config-all-disass.mak
;;
i386|x86_64)
echo "CONFIG_I386_DIS=y" >> $config_target_mak
- echo "CONFIG_I386_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_I386_DIS=y" >> config-all-disass.mak
;;
ia64*)
echo "CONFIG_IA64_DIS=y" >> $config_target_mak
- echo "CONFIG_IA64_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_IA64_DIS=y" >> config-all-disass.mak
;;
lm32)
echo "CONFIG_LM32_DIS=y" >> $config_target_mak
- echo "CONFIG_LM32_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_LM32_DIS=y" >> config-all-disass.mak
;;
m68k)
echo "CONFIG_M68K_DIS=y" >> $config_target_mak
- echo "CONFIG_M68K_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_M68K_DIS=y" >> config-all-disass.mak
;;
microblaze*)
echo "CONFIG_MICROBLAZE_DIS=y" >> $config_target_mak
- echo "CONFIG_MICROBLAZE_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_MICROBLAZE_DIS=y" >> config-all-disass.mak
;;
mips*)
echo "CONFIG_MIPS_DIS=y" >> $config_target_mak
- echo "CONFIG_MIPS_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_MIPS_DIS=y" >> config-all-disass.mak
;;
or32)
echo "CONFIG_OPENRISC_DIS=y" >> $config_target_mak
- echo "CONFIG_OPENRISC_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_OPENRISC_DIS=y" >> config-all-disass.mak
;;
ppc*)
echo "CONFIG_PPC_DIS=y" >> $config_target_mak
- echo "CONFIG_PPC_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_PPC_DIS=y" >> config-all-disass.mak
;;
s390*)
echo "CONFIG_S390_DIS=y" >> $config_target_mak
- echo "CONFIG_S390_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_S390_DIS=y" >> config-all-disass.mak
;;
sh4)
echo "CONFIG_SH4_DIS=y" >> $config_target_mak
- echo "CONFIG_SH4_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_SH4_DIS=y" >> config-all-disass.mak
;;
sparc*)
echo "CONFIG_SPARC_DIS=y" >> $config_target_mak
- echo "CONFIG_SPARC_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_SPARC_DIS=y" >> config-all-disass.mak
;;
xtensa*)
echo "CONFIG_XTENSA_DIS=y" >> $config_target_mak
- echo "CONFIG_XTENSA_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_XTENSA_DIS=y" >> config-all-disass.mak
;;
esac
done
if test "$tcg_interpreter" = "yes" ; then
echo "CONFIG_TCI_DIS=y" >> $config_target_mak
- echo "CONFIG_TCI_DIS=y" >> $libdis_config_mak
+ echo "CONFIG_TCI_DIS=y" >> config-all-disass.mak
fi
case "$ARCH" in
diff --git a/cpu-exec.c b/cpu-exec.c
index 252da86..4bc8918 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -18,7 +18,7 @@
*/
#include "config.h"
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "tcg.h"
#include "qemu-barrier.h"
#include "qtest.h"
diff --git a/disas.c b/disas.c
index b801c8f..57906f1 100644
--- a/disas.c
+++ b/disas.c
@@ -1,11 +1,11 @@
/* General "disassemble this chunk" code. Used for debugging. */
#include "config.h"
-#include "dis-asm.h"
+#include "disas/bfd.h"
#include "elf.h"
#include <errno.h>
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
/* Filled in by elfload.c. Simplistic, but will do for now. */
struct syminfo *syminfos = NULL;
diff --git a/disas/Makefile.objs b/disas/Makefile.objs
new file mode 100644
index 0000000..9134429
--- /dev/null
+++ b/disas/Makefile.objs
@@ -0,0 +1,16 @@
+universal-obj-$(CONFIG_ALPHA_DIS) += alpha.o
+universal-obj-$(CONFIG_ARM_DIS) += arm.o
+universal-obj-$(CONFIG_CRIS_DIS) += cris.o
+universal-obj-$(CONFIG_HPPA_DIS) += hppa.o
+universal-obj-$(CONFIG_I386_DIS) += i386.o
+universal-obj-$(CONFIG_IA64_DIS) += ia64.o
+universal-obj-$(CONFIG_M68K_DIS) += m68k.o
+universal-obj-$(CONFIG_MICROBLAZE_DIS) += microblaze.o
+universal-obj-$(CONFIG_MIPS_DIS) += mips.o
+universal-obj-$(CONFIG_PPC_DIS) += ppc.o
+universal-obj-$(CONFIG_S390_DIS) += s390.o
+universal-obj-$(CONFIG_SH4_DIS) += sh4.o
+universal-obj-$(CONFIG_SPARC_DIS) += sparc.o
+universal-obj-$(CONFIG_LM32_DIS) += lm32.o
+
+universal-obj-$(CONFIG_TCI_DIS) += tci.o
diff --git a/alpha-dis.c b/disas/alpha.c
similarity index 99%
rename from alpha-dis.c
rename to disas/alpha.c
index ae331b3..a950b9c 100644
--- a/alpha-dis.c
+++ b/disas/alpha.c
@@ -20,7 +20,7 @@ along with this file; see the file COPYING. If not, see
<http://www.gnu.org/licenses/>. */
#include <stdio.h>
-#include "dis-asm.h"
+#include "disas/bfd.h"
/* MAX is redefined below, so remove any previous definition. */
#undef MAX
diff --git a/arm-dis.c b/disas/arm.c
similarity index 99%
rename from arm-dis.c
rename to disas/arm.c
index 6bc4d71..4927d8a 100644
--- a/arm-dis.c
+++ b/disas/arm.c
@@ -22,7 +22,7 @@
/* Start of qemu specific additions. Mostly this is stub definitions
for things we don't care about. */
-#include "dis-asm.h"
+#include "disas/bfd.h"
#define ATTRIBUTE_UNUSED __attribute__((unused))
#define ISSPACE(x) ((x) == ' ' || (x) == '\t' || (x) == '\n')
diff --git a/cris-dis.c b/disas/cris.c
similarity index 99%
rename from cris-dis.c
rename to disas/cris.c
index 1d174ba..9dfb4e3 100644
--- a/cris-dis.c
+++ b/disas/cris.c
@@ -19,7 +19,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>. */
#include "qemu-common.h"
-#include "dis-asm.h"
+#include "disas/bfd.h"
//#include "sysdep.h"
#include "target-cris/opcode-cris.h"
//#include "libiberty.h"
diff --git a/hppa-dis.c b/disas/hppa.c
similarity index 99%
rename from hppa-dis.c
rename to disas/hppa.c
index 420a7d2..c7c8be6 100644
--- a/hppa-dis.c
+++ b/disas/hppa.c
@@ -18,7 +18,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 "dis-asm.h"
+#include "disas/bfd.h"
/* HP PA-RISC SOM object file format: definitions internal to BFD.
Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
diff --git a/i386-dis.c b/disas/i386.c
similarity index 99%
rename from i386-dis.c
rename to disas/i386.c
index c4a81c9..3b006b1 100644
--- a/i386-dis.c
+++ b/disas/i386.c
@@ -32,7 +32,7 @@
the Intel manual for details. */
#include <stdlib.h>
-#include "dis-asm.h"
+#include "disas/bfd.h"
/* include/opcode/i386.h r1.78 */
/* opcode/i386.h -- Intel 80386 opcode macros
diff --git a/ia64-dis.c b/disas/ia64.c
similarity index 99%
rename from ia64-dis.c
rename to disas/ia64.c
index 2a103e6..a8fe26c 100644
--- a/ia64-dis.c
+++ b/disas/ia64.c
@@ -21,7 +21,7 @@
#include <assert.h>
#include <string.h>
-#include "dis-asm.h"
+#include "disas/bfd.h"
/* ia64.h -- Header file for ia64 opcode table
Copyright (C) 1998, 1999, 2000, 2002, 2005, 2006
diff --git a/lm32-dis.c b/disas/lm32.c
similarity index 99%
rename from lm32-dis.c
rename to disas/lm32.c
index 709ed32..a8eefe0 100644
--- a/lm32-dis.c
+++ b/disas/lm32.c
@@ -19,7 +19,7 @@
*/
#include <stdio.h>
-#include "dis-asm.h"
+#include "disas/bfd.h"
typedef enum {
LM32_OP_SRUI = 0, LM32_OP_NORI, LM32_OP_MULI, LM32_OP_SH, LM32_OP_LB,
diff --git a/m68k-dis.c b/disas/m68k.c
similarity index 99%
rename from m68k-dis.c
rename to disas/m68k.c
index 2b155de..c950241 100644
--- a/m68k-dis.c
+++ b/disas/m68k.c
@@ -5,7 +5,7 @@
#include <math.h>
#include <stdio.h>
-#include "dis-asm.h"
+#include "disas/bfd.h"
/* **** floatformat.h from sourceware.org CVS 2005-08-14. */
/* IEEE floating point support declarations, for GDB, the GNU Debugger.
diff --git a/microblaze-dis.c b/disas/microblaze.c
similarity index 99%
rename from microblaze-dis.c
rename to disas/microblaze.c
index 16c312f..ec91af3 100644
--- a/microblaze-dis.c
+++ b/disas/microblaze.c
@@ -582,7 +582,7 @@ char pvr_register_prefix[] = "rpvr";
#endif /* MICROBLAZE_OPC */
-#include "dis-asm.h"
+#include "disas/bfd.h"
#include <strings.h>
#define get_field_rd(instr) get_field(instr, RD_MASK, RD_LOW)
diff --git a/mips-dis.c b/disas/mips.c
similarity index 99%
rename from mips-dis.c
rename to disas/mips.c
index e3a6e0b..2106b57 100644
--- a/mips-dis.c
+++ b/disas/mips.c
@@ -19,7 +19,7 @@ GNU General Public License for more details.
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 "dis-asm.h"
+#include "disas/bfd.h"
/* mips.h. Mips opcode list for GDB, the GNU debugger.
Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/ppc-dis.c b/disas/ppc.c
similarity index 99%
rename from ppc-dis.c
rename to disas/ppc.c
index bc98cbe..c149506 100644
--- a/ppc-dis.c
+++ b/disas/ppc.c
@@ -18,7 +18,7 @@ the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this file; see the file COPYING. If not,
see <http://www.gnu.org/licenses/>. */
-#include "dis-asm.h"
+#include "disas/bfd.h"
#define BFD_DEFAULT_TARGET_SIZE 64
/* ppc.h -- Header file for PowerPC opcode table
diff --git a/s390-dis.c b/disas/s390.c
similarity index 99%
rename from s390-dis.c
rename to disas/s390.c
index 8abcdf0..0859dfa 100644
--- a/s390-dis.c
+++ b/disas/s390.c
@@ -21,7 +21,7 @@
02110-1301, USA. */
#include "qemu-common.h"
-#include "dis-asm.h"
+#include "disas/bfd.h"
/* include/opcode/s390.h revision 1.9 */
/* s390.h -- Header file for S390 opcode table
diff --git a/sh4-dis.c b/disas/sh4.c
similarity index 99%
rename from sh4-dis.c
rename to disas/sh4.c
index 673bc78..f6cadd5 100644
--- a/sh4-dis.c
+++ b/disas/sh4.c
@@ -16,7 +16,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>. */
#include <stdio.h>
-#include "dis-asm.h"
+#include "disas/bfd.h"
#define DEFINE_TABLE
diff --git a/sparc-dis.c b/disas/sparc.c
similarity index 99%
rename from sparc-dis.c
rename to disas/sparc.c
index 1d017fa..8eb22e6 100644
--- a/sparc-dis.c
+++ b/disas/sparc.c
@@ -27,7 +27,7 @@
see <http://www.gnu.org/licenses/>. */
#include <stdlib.h>
-#include "dis-asm.h"
+#include "disas/bfd.h"
/* The SPARC opcode table (and other related data) is defined in
the opcodes library in sparc-opc.c. If you change anything here, make
diff --git a/tci-dis.c b/disas/tci.c
similarity index 98%
rename from tci-dis.c
rename to disas/tci.c
index 10c411b..a606b63 100644
--- a/tci-dis.c
+++ b/disas/tci.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "dis-asm.h"
+#include "disas/bfd.h"
#include "tcg/tcg.h"
/* Disassemble TCI bytecode. */
diff --git a/hw/loader.c b/hw/loader.c
index 33acc2f..172fdd1 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -43,7 +43,7 @@
*/
#include "hw.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "monitor.h"
#include "sysemu.h"
#include "uboot_image.h"
diff --git a/dis-asm.h b/include/disas/bfd.h
similarity index 100%
rename from dis-asm.h
rename to include/disas/bfd.h
diff --git a/disas.h b/include/disas/disas.h
similarity index 100%
rename from disas.h
rename to include/disas/disas.h
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 1d8bcb4..89db49c 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -14,7 +14,7 @@
#include <time.h>
#include "qemu.h"
-#include "disas.h"
+#include "disas/disas.h"
#ifdef _ARCH_PPC64
#undef ARCH_DLINFO
diff --git a/monitor.c b/monitor.c
index 131b325..5129bb1 100644
--- a/monitor.c
+++ b/monitor.c
@@ -41,7 +41,7 @@
#include "console.h"
#include "blockdev.h"
#include "audio/audio.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "balloon.h"
#include "qemu-timer.h"
#include "migration.h"
diff --git a/qemu-log.h b/qemu-log.h
index ce6bb09..b16ab3a 100644
--- a/qemu-log.h
+++ b/qemu-log.h
@@ -3,7 +3,7 @@
#include <stdarg.h>
#ifdef NEED_CPU_H
-#include "disas.h"
+#include "disas/disas.h"
#endif
/* Private global variables, don't use */
diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index f707d8d..17d6458 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -18,7 +18,7 @@
*/
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "host-utils.h"
#include "tcg-op.h"
diff --git a/target-arm/translate.c b/target-arm/translate.c
index daccb15..6f2914d 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -25,7 +25,7 @@
#include <inttypes.h>
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "tcg-op.h"
#include "qemu-log.h"
diff --git a/target-cris/translate.c b/target-cris/translate.c
index 755de65..4a4224d 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -24,7 +24,7 @@
*/
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "tcg-op.h"
#include "helper.h"
#include "mmu.h"
diff --git a/target-i386/translate.c b/target-i386/translate.c
index ee75850..eac1c17 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -24,7 +24,7 @@
#include <signal.h>
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "tcg-op.h"
#include "helper.h"
diff --git a/target-lm32/translate.c b/target-lm32/translate.c
index 77c2866..8df04de 100644
--- a/target-lm32/translate.c
+++ b/target-lm32/translate.c
@@ -18,7 +18,7 @@
*/
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "helper.h"
#include "tcg-op.h"
diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index 451ef74..d60cd6e 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -19,7 +19,7 @@
*/
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "tcg-op.h"
#include "qemu-log.h"
diff --git a/target-microblaze/helper.c b/target-microblaze/helper.c
index 74fce26..29c4679 100644
--- a/target-microblaze/helper.c
+++ b/target-microblaze/helper.c
@@ -198,7 +198,7 @@ void do_interrupt(CPUMBState *env)
t = (env->sregs[SR_MSR] & (MSR_VM | MSR_UM)) << 1;
#if 0
-#include "disas.h"
+#include "disas/disas.h"
/* Useful instrumentation when debugging interrupt issues in either
the models or in sw. */
diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c
index 7d864b1..e9a5d32 100644
--- a/target-microblaze/translate.c
+++ b/target-microblaze/translate.c
@@ -19,7 +19,7 @@
*/
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "tcg-op.h"
#include "helper.h"
#include "microblaze-decode.h"
diff --git a/target-mips/translate.c b/target-mips/translate.c
index 454e5cc..bd1ad10 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -21,7 +21,7 @@
*/
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "tcg-op.h"
#include "helper.h"
diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c
index e2cad3a..ba2efd4 100644
--- a/target-openrisc/translate.c
+++ b/target-openrisc/translate.c
@@ -20,7 +20,7 @@
#include "cpu.h"
#include "exec-all.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "tcg-op.h"
#include "qemu-common.h"
#include "qemu-log.h"
diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index 1042268..4f5ecff 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -19,7 +19,7 @@
*/
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "tcg-op.h"
#include "host-utils.h"
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index a972287..bc9a21e 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -23,7 +23,7 @@
* inside "#if defined(TODO) ... #endif" statements to make tests easier.
*/
-#include "dis-asm.h"
+#include "disas/bfd.h"
#include "gdbstub.h"
#include <kvm.h>
#include "kvm_ppc.h"
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index db464cc..443912e 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -30,7 +30,7 @@
#endif
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "tcg-op.h"
#include "qemu-log.h"
diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index 9d955eb..ba6b127 100644
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -21,7 +21,7 @@
//#define SH4_SINGLE_STEP
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "tcg-op.h"
#include "helper.h"
diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index 4321393..705ab6e 100644
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -25,7 +25,7 @@
#include <inttypes.h>
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "helper.h"
#include "tcg-op.h"
diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c
index c3cdafa..03c28f1 100644
--- a/target-unicore32/translate.c
+++ b/target-unicore32/translate.c
@@ -15,7 +15,7 @@
#include <inttypes.h>
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "tcg-op.h"
#include "qemu-log.h"
diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c
index 82e8ccc..03e5451 100644
--- a/target-xtensa/translate.c
+++ b/target-xtensa/translate.c
@@ -32,7 +32,7 @@
#include "cpu.h"
#include "exec-all.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "tcg-op.h"
#include "qemu-log.h"
#include "sysemu.h"
diff --git a/translate-all.c b/translate-all.c
index 5bd2d37..8cf72ae 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -26,7 +26,7 @@
#define NO_CPU_IO_DEFS
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "tcg.h"
#include "qemu-timer.h"
diff --git a/user-exec.c b/user-exec.c
index ef9b172..6f5a1cd 100644
--- a/user-exec.c
+++ b/user-exec.c
@@ -18,7 +18,7 @@
*/
#include "config.h"
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "tcg.h"
#undef EAX
diff --git a/vl.c b/vl.c
index 9f99ef4..5d73a55 100644
--- a/vl.c
+++ b/vl.c
@@ -154,7 +154,7 @@ int main(int argc, char **argv)
#endif
#include "qtest.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "qemu_socket.h"
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 08/32] build: kill libuser
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (6 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 07/32] build: kill libdis, move disassemblers to disas/ Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 09/32] janitor: move iovector functions out of cutils.c Paolo Bonzini
` (26 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 8 +++-----
Makefile.objs | 3 ++-
Makefile.target | 3 +--
Makefile.user | 24 ------------------------
configure | 3 ---
5 files changed, 6 insertions(+), 35 deletions(-)
delete mode 100644 Makefile.user
diff --git a/Makefile b/Makefile
index 5691e9e..07b7049 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ subdir-libcacard: $(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o
$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y)
-$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libuser
+$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(user-obj-y)
ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
romsubdir-%:
@@ -197,8 +197,6 @@ $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(tools-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y)
-QEMULIBS=libuser
-
clean:
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
@@ -215,7 +213,7 @@ clean:
rm -rf qapi-generated
rm -rf qga/qapi-generated
$(MAKE) -C tests/tcg clean
- for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \
+ for d in $(ALL_SUBDIRS) libcacard; do \
if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
rm -f $$d/qemu-options.def; \
done
@@ -238,7 +236,7 @@ distclean: clean
rm -f config.log
rm -f linux-headers/asm
rm -f qemu-tech.info qemu-tech.aux qemu-tech.cp qemu-tech.dvi qemu-tech.fn qemu-tech.info qemu-tech.ky qemu-tech.log qemu-tech.pdf qemu-tech.pg qemu-tech.toc qemu-tech.tp qemu-tech.vr
- for d in $(TARGET_DIRS) $(QEMULIBS); do \
+ for d in $(TARGET_DIRS); do \
rm -rf $$d || exit 1 ; \
done
diff --git a/Makefile.objs b/Makefile.objs
index ea4171d..0b89b8a 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -116,7 +116,6 @@ user-obj-y += tcg-runtime.o host-utils.o
user-obj-y += cutils.o iov.o cache-utils.o
user-obj-y += module.o
user-obj-y += qemu-user.o
-user-obj-y += $(trace-obj-y)
user-obj-y += qom/
######################################################################
@@ -189,6 +188,8 @@ trace-obj-y += trace/control.o
$(trace-obj-y): $(GENERATED_HEADERS)
+universal-obj-y += $(trace-obj-y)
+
######################################################################
# smartcard
diff --git a/Makefile.target b/Makefile.target
index 29ff39a..0ab8556 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -152,9 +152,8 @@ all-obj-y += $(addprefix ../, $(universal-obj-y))
ifdef CONFIG_SOFTMMU
all-obj-y += $(addprefix ../, $(common-obj-y))
-all-obj-y += $(addprefix ../, $(trace-obj-y))
else
-all-obj-y += $(addprefix ../libuser/, $(user-obj-y))
+all-obj-y += $(addprefix ../, $(user-obj-y))
endif #CONFIG_LINUX_USER
ifdef QEMU_PROGW
diff --git a/Makefile.user b/Makefile.user
deleted file mode 100644
index 9302d33..0000000
--- a/Makefile.user
+++ /dev/null
@@ -1,24 +0,0 @@
-# Makefile for qemu target independent user files.
-
-include ../config-host.mak
-include $(SRC_PATH)/rules.mak
--include config.mak
-
-.PHONY: all
-
-$(call set-vpath, $(SRC_PATH))
-
-QEMU_CFLAGS+=-I..
-QEMU_CFLAGS += -I$(SRC_PATH)/include
-QEMU_CFLAGS += -DCONFIG_USER_ONLY
-
-include $(SRC_PATH)/Makefile.objs
-
-all: $(user-obj-y)
-# Dummy command so that make thinks it has done something
- @true
-
-clean:
- for d in . trace; do \
- rm -f $$d/*.o $$d/*.d $$d/*.a $$d/*~; \
- done
diff --git a/configure b/configure
index 9776cda..9329b97 100755
--- a/configure
+++ b/configure
@@ -4108,9 +4108,6 @@ for rom in seabios vgabios ; do
echo "LD=$ld" >> $config_mak
done
-d=libuser
-symlink "$source_path/Makefile.user" "$d/Makefile"
-
if test "$docs" = "yes" ; then
mkdir -p QMP
fi
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 09/32] janitor: move iovector functions out of cutils.c
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (7 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 08/32] build: kill libuser Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 10/32] janitor: do not rely on indirect inclusions from qemu-char.h Paolo Bonzini
` (25 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
This removes the dependency of cutils.c on iov.c, and lets us remove
iov.o from several builds.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 2 +-
Makefile.objs | 4 +-
cutils.c | 103 ---------------------------------------------------------
iov.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 106 insertions(+), 106 deletions(-)
diff --git a/Makefile b/Makefile
index 07b7049..3361d24 100644
--- a/Makefile
+++ b/Makefile
@@ -142,7 +142,7 @@ qemu-img.o: qemu-img-cmds.h
tools-obj-y = $(oslib-obj-y) $(trace-obj-y) qemu-tool.o qemu-timer.o \
qemu-timer-common.o main-loop.o notify.o \
- iohandler.o cutils.o iov.o async.o error.o
+ iohandler.o cutils.o async.o error.o
tools-obj-$(CONFIG_POSIX) += compatfd.o
qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y)
diff --git a/Makefile.objs b/Makefile.objs
index 0b89b8a..66a0b3d 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -92,7 +92,7 @@ common-obj-y += ui/
common-obj-y += bt-host.o bt-vhci.o
common-obj-y += dma-helpers.o
-common-obj-y += iov.o acl.o
+common-obj-y += acl.o
common-obj-$(CONFIG_POSIX) += compatfd.o
common-obj-y += event_notifier.o
common-obj-y += qemu-timer.o qemu-timer-common.o
@@ -113,7 +113,7 @@ endif
user-obj-y =
user-obj-y += envlist.o path.o
user-obj-y += tcg-runtime.o host-utils.o
-user-obj-y += cutils.o iov.o cache-utils.o
+user-obj-y += cutils.o cache-utils.o
user-obj-y += module.o
user-obj-y += qemu-user.o
user-obj-y += qom/
diff --git a/cutils.c b/cutils.c
index 8edd8fa..6f9f799 100644
--- a/cutils.c
+++ b/cutils.c
@@ -142,109 +142,6 @@ int qemu_fdatasync(int fd)
#endif
}
-/* io vectors */
-
-void qemu_iovec_init(QEMUIOVector *qiov, int alloc_hint)
-{
- qiov->iov = g_malloc(alloc_hint * sizeof(struct iovec));
- qiov->niov = 0;
- qiov->nalloc = alloc_hint;
- qiov->size = 0;
-}
-
-void qemu_iovec_init_external(QEMUIOVector *qiov, struct iovec *iov, int niov)
-{
- int i;
-
- qiov->iov = iov;
- qiov->niov = niov;
- qiov->nalloc = -1;
- qiov->size = 0;
- for (i = 0; i < niov; i++)
- qiov->size += iov[i].iov_len;
-}
-
-void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len)
-{
- assert(qiov->nalloc != -1);
-
- if (qiov->niov == qiov->nalloc) {
- qiov->nalloc = 2 * qiov->nalloc + 1;
- qiov->iov = g_realloc(qiov->iov, qiov->nalloc * sizeof(struct iovec));
- }
- qiov->iov[qiov->niov].iov_base = base;
- qiov->iov[qiov->niov].iov_len = len;
- qiov->size += len;
- ++qiov->niov;
-}
-
-/*
- * Concatenates (partial) iovecs from src to the end of dst.
- * It starts copying after skipping `soffset' bytes at the
- * beginning of src and adds individual vectors from src to
- * dst copies up to `sbytes' bytes total, or up to the end
- * of src if it comes first. This way, it is okay to specify
- * very large value for `sbytes' to indicate "up to the end
- * of src".
- * Only vector pointers are processed, not the actual data buffers.
- */
-void qemu_iovec_concat(QEMUIOVector *dst,
- QEMUIOVector *src, size_t soffset, size_t sbytes)
-{
- int i;
- size_t done;
- struct iovec *siov = src->iov;
- assert(dst->nalloc != -1);
- assert(src->size >= soffset);
- for (i = 0, done = 0; done < sbytes && i < src->niov; i++) {
- if (soffset < siov[i].iov_len) {
- size_t len = MIN(siov[i].iov_len - soffset, sbytes - done);
- qemu_iovec_add(dst, siov[i].iov_base + soffset, len);
- done += len;
- soffset = 0;
- } else {
- soffset -= siov[i].iov_len;
- }
- }
- /* return done; */
-}
-
-void qemu_iovec_destroy(QEMUIOVector *qiov)
-{
- assert(qiov->nalloc != -1);
-
- qemu_iovec_reset(qiov);
- g_free(qiov->iov);
- qiov->nalloc = 0;
- qiov->iov = NULL;
-}
-
-void qemu_iovec_reset(QEMUIOVector *qiov)
-{
- assert(qiov->nalloc != -1);
-
- qiov->niov = 0;
- qiov->size = 0;
-}
-
-size_t qemu_iovec_to_buf(QEMUIOVector *qiov, size_t offset,
- void *buf, size_t bytes)
-{
- return iov_to_buf(qiov->iov, qiov->niov, offset, buf, bytes);
-}
-
-size_t qemu_iovec_from_buf(QEMUIOVector *qiov, size_t offset,
- const void *buf, size_t bytes)
-{
- return iov_from_buf(qiov->iov, qiov->niov, offset, buf, bytes);
-}
-
-size_t qemu_iovec_memset(QEMUIOVector *qiov, size_t offset,
- int fillc, size_t bytes)
-{
- return iov_memset(qiov->iov, qiov->niov, offset, fillc, bytes);
-}
-
/*
* Checks if a buffer is all zeroes
*
diff --git a/iov.c b/iov.c
index c6a66f0..ae17e7d 100644
--- a/iov.c
+++ b/iov.c
@@ -228,3 +228,106 @@ void iov_hexdump(const struct iovec *iov, const unsigned int iov_cnt,
fprintf(fp, "\n");
}
}
+
+/* io vectors */
+
+void qemu_iovec_init(QEMUIOVector *qiov, int alloc_hint)
+{
+ qiov->iov = g_malloc(alloc_hint * sizeof(struct iovec));
+ qiov->niov = 0;
+ qiov->nalloc = alloc_hint;
+ qiov->size = 0;
+}
+
+void qemu_iovec_init_external(QEMUIOVector *qiov, struct iovec *iov, int niov)
+{
+ int i;
+
+ qiov->iov = iov;
+ qiov->niov = niov;
+ qiov->nalloc = -1;
+ qiov->size = 0;
+ for (i = 0; i < niov; i++)
+ qiov->size += iov[i].iov_len;
+}
+
+void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len)
+{
+ assert(qiov->nalloc != -1);
+
+ if (qiov->niov == qiov->nalloc) {
+ qiov->nalloc = 2 * qiov->nalloc + 1;
+ qiov->iov = g_realloc(qiov->iov, qiov->nalloc * sizeof(struct iovec));
+ }
+ qiov->iov[qiov->niov].iov_base = base;
+ qiov->iov[qiov->niov].iov_len = len;
+ qiov->size += len;
+ ++qiov->niov;
+}
+
+/*
+ * Concatenates (partial) iovecs from src to the end of dst.
+ * It starts copying after skipping `soffset' bytes at the
+ * beginning of src and adds individual vectors from src to
+ * dst copies up to `sbytes' bytes total, or up to the end
+ * of src if it comes first. This way, it is okay to specify
+ * very large value for `sbytes' to indicate "up to the end
+ * of src".
+ * Only vector pointers are processed, not the actual data buffers.
+ */
+void qemu_iovec_concat(QEMUIOVector *dst,
+ QEMUIOVector *src, size_t soffset, size_t sbytes)
+{
+ int i;
+ size_t done;
+ struct iovec *siov = src->iov;
+ assert(dst->nalloc != -1);
+ assert(src->size >= soffset);
+ for (i = 0, done = 0; done < sbytes && i < src->niov; i++) {
+ if (soffset < siov[i].iov_len) {
+ size_t len = MIN(siov[i].iov_len - soffset, sbytes - done);
+ qemu_iovec_add(dst, siov[i].iov_base + soffset, len);
+ done += len;
+ soffset = 0;
+ } else {
+ soffset -= siov[i].iov_len;
+ }
+ }
+ /* return done; */
+}
+
+void qemu_iovec_destroy(QEMUIOVector *qiov)
+{
+ assert(qiov->nalloc != -1);
+
+ qemu_iovec_reset(qiov);
+ g_free(qiov->iov);
+ qiov->nalloc = 0;
+ qiov->iov = NULL;
+}
+
+void qemu_iovec_reset(QEMUIOVector *qiov)
+{
+ assert(qiov->nalloc != -1);
+
+ qiov->niov = 0;
+ qiov->size = 0;
+}
+
+size_t qemu_iovec_to_buf(QEMUIOVector *qiov, size_t offset,
+ void *buf, size_t bytes)
+{
+ return iov_to_buf(qiov->iov, qiov->niov, offset, buf, bytes);
+}
+
+size_t qemu_iovec_from_buf(QEMUIOVector *qiov, size_t offset,
+ const void *buf, size_t bytes)
+{
+ return iov_from_buf(qiov->iov, qiov->niov, offset, buf, bytes);
+}
+
+size_t qemu_iovec_memset(QEMUIOVector *qiov, size_t offset,
+ int fillc, size_t bytes)
+{
+ return iov_memset(qiov->iov, qiov->niov, offset, fillc, bytes);
+}
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 10/32] janitor: do not rely on indirect inclusions from qemu-char.h
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (8 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 09/32] janitor: move iovector functions out of cutils.c Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 11/32] janitor: do not include qemu-char everywhere Paolo Bonzini
` (24 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Various header files rely on qemu-char.h including qemu-config.h or
main-loop.h, but they really do not need qemu-char.h at all (particularly
interesting is the case of the block layer!). Clean this up, and also
complete the set of inclusions of qemu-config.h itself.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch_init.c | 1 +
audio/alsaaudio.c | 1 +
audio/ossaudio.c | 1 +
block/blkdebug.c | 1 +
block/iscsi.c | 1 +
bt-host.c | 1 +
bt-vhci.c | 1 +
event_notifier.c | 1 +
exec.c | 1 +
hw/arm_boot.c | 1 +
hw/dma.c | 1 +
hw/fw_cfg.c | 1 +
hw/mac_dbdma.c | 1 +
hw/qdev-monitor.c | 1 +
hw/usb/dev-network.c | 1 +
linux-aio.c | 1 +
net.c | 1 +
qemu-aio.h | 1 +
qemu-config.h | 1 +
target-i386/kvm.c | 1 +
20 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index e6effe8..dde7fad 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -46,6 +46,7 @@
#include "exec-memory.h"
#include "hw/pcspk.h"
#include "qemu/page_cache.h"
+#include "qemu-config.h"
#include "qmp-commands.h"
#include "trace.h"
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index cb45b49..564d632 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -23,6 +23,7 @@
*/
#include <alsa/asoundlib.h>
#include "qemu-common.h"
+#include "main-loop.h"
#include "qemu-char.h"
#include "audio.h"
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index df51b7c..45abe39 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -31,6 +31,7 @@
#include <sys/soundcard.h>
#endif
#include "qemu-common.h"
+#include "main-loop.h"
#include "host-utils.h"
#include "qemu-char.h"
#include "audio.h"
diff --git a/block/blkdebug.c b/block/blkdebug.c
index 1206d52..152c0a8 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -23,6 +23,7 @@
*/
#include "qemu-common.h"
+#include "qemu-config.h"
#include "block_int.h"
#include "module.h"
diff --git a/block/iscsi.c b/block/iscsi.c
index d0b1a10..9f182ac 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -27,6 +27,7 @@
#include <poll.h>
#include <arpa/inet.h>
#include "qemu-common.h"
+#include "qemu-config.h"
#include "qemu-error.h"
#include "block_int.h"
#include "trace.h"
diff --git a/bt-host.c b/bt-host.c
index 0d3ad28..8b47370 100644
--- a/bt-host.c
+++ b/bt-host.c
@@ -21,6 +21,7 @@
#include "qemu-char.h"
#include "net.h"
#include "bt-host.h"
+#include "main-loop.h"
#ifndef _WIN32
# include <errno.h>
diff --git a/bt-vhci.c b/bt-vhci.c
index bbc1029..878460a 100644
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -21,6 +21,7 @@
#include "qemu-char.h"
#include "net.h"
#include "hw/bt.h"
+#include "main-loop.h"
#define VHCI_DEV "/dev/vhci"
#define VHCI_UDEV "/dev/hci_vhci"
diff --git a/event_notifier.c b/event_notifier.c
index 2c207e1..23d5128 100644
--- a/event_notifier.c
+++ b/event_notifier.c
@@ -13,6 +13,7 @@
#include "qemu-common.h"
#include "event_notifier.h"
#include "qemu-char.h"
+#include "main-loop.h"
#ifdef CONFIG_EVENTFD
#include <sys/eventfd.h>
diff --git a/exec.c b/exec.c
index 750008c..1821aef 100644
--- a/exec.c
+++ b/exec.c
@@ -33,6 +33,7 @@
#include "kvm.h"
#include "hw/xen.h"
#include "qemu-timer.h"
+#include "qemu-config.h"
#include "memory.h"
#include "exec-memory.h"
#if defined(CONFIG_USER_ONLY)
diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index a6e9143..740ecfb 100644
--- a/hw/arm_boot.c
+++ b/hw/arm_boot.c
@@ -15,6 +15,7 @@
#include "loader.h"
#include "elf.h"
#include "device_tree.h"
+#include "qemu-config.h"
#define KERNEL_ARGS_ADDR 0x100
#define KERNEL_LOAD_ADDR 0x00010000
diff --git a/hw/dma.c b/hw/dma.c
index 0a9322d..8053ded 100644
--- a/hw/dma.c
+++ b/hw/dma.c
@@ -23,6 +23,7 @@
*/
#include "hw.h"
#include "isa.h"
+#include "main-loop.h"
/* #define DEBUG_DMA */
diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c
index dcde1a9..2e54a43 100644
--- a/hw/fw_cfg.c
+++ b/hw/fw_cfg.c
@@ -27,6 +27,7 @@
#include "fw_cfg.h"
#include "sysbus.h"
#include "qemu-error.h"
+#include "qemu-config.h"
/* debug firmware config */
//#define DEBUG_FW_CFG
diff --git a/hw/mac_dbdma.c b/hw/mac_dbdma.c
index 1791ec1..ac98fe9 100644
--- a/hw/mac_dbdma.c
+++ b/hw/mac_dbdma.c
@@ -39,6 +39,7 @@
#include "hw.h"
#include "isa.h"
#include "mac_dbdma.h"
+#include "main-loop.h"
/* debug DBDMA */
//#define DEBUG_DBDMA
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
index 479eecd..6e5eb45 100644
--- a/hw/qdev-monitor.c
+++ b/hw/qdev-monitor.c
@@ -21,6 +21,7 @@
#include "monitor.h"
#include "qmp-commands.h"
#include "arch_init.h"
+#include "qemu-config.h"
/*
* Aliases were a bad idea from the start. Let's keep them
diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index e4a4359..df8a3bb 100644
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -28,6 +28,7 @@
#include "hw/usb/desc.h"
#include "net.h"
#include "qemu-queue.h"
+#include "qemu-config.h"
#include "sysemu.h"
#include "iov.h"
diff --git a/linux-aio.c b/linux-aio.c
index ce9b5d4..f3d8ef3 100644
--- a/linux-aio.c
+++ b/linux-aio.c
@@ -9,6 +9,7 @@
*/
#include "qemu-common.h"
#include "qemu-aio.h"
+#include "qemu-queue.h"
#include "block/raw-posix-aio.h"
#include <sys/eventfd.h>
diff --git a/net.c b/net.c
index ae4bc0d..72d1c33 100644
--- a/net.c
+++ b/net.c
@@ -32,6 +32,7 @@
#include "monitor.h"
#include "qemu-common.h"
#include "qemu_socket.h"
+#include "qemu-config.h"
#include "qmp-commands.h"
#include "hw/qdev.h"
#include "iov.h"
diff --git a/qemu-aio.h b/qemu-aio.h
index bfdd35f..a61cd83 100644
--- a/qemu-aio.h
+++ b/qemu-aio.h
@@ -16,6 +16,7 @@
#include "qemu-common.h"
#include "qemu-char.h"
+#include "main-loop.h"
typedef struct BlockDriverAIOCB BlockDriverAIOCB;
typedef void BlockDriverCompletionFunc(void *opaque, int ret);
diff --git a/qemu-config.h b/qemu-config.h
index 5557562..daf1539 100644
--- a/qemu-config.h
+++ b/qemu-config.h
@@ -2,6 +2,7 @@
#define QEMU_CONFIG_H
#include "error.h"
+#include "qemu-option.h"
extern QemuOptsList qemu_fsdev_opts;
extern QemuOptsList qemu_virtfs_opts;
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 5b18383..c918276 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -27,6 +27,7 @@
#include "cpu.h"
#include "gdbstub.h"
#include "host-utils.h"
+#include "qemu-config.h"
#include "hw/pc.h"
#include "hw/apic.h"
#include "ioport.h"
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 11/32] janitor: do not include qemu-char everywhere
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (9 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 10/32] janitor: do not rely on indirect inclusions from qemu-char.h Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 12/32] net: move Bluetooth stuff out of net.h Paolo Bonzini
` (23 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Touching char/char.h basically causes the whole of QEMU to
be rebuilt. Avoid this, it is usually unnecessary.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
audio/alsaaudio.c | 1 -
audio/ossaudio.c | 1 -
block/raw-posix.c | 1 -
bt-host.c | 1 -
bt-vhci.c | 1 -
buffered_file.c | 1 -
console.c | 1 +
console.h | 1 -
event_notifier.c | 1 -
hmp.c | 1 +
hw/9pfs/virtio-9p-coth.c | 1 -
hw/ivshmem.c | 1 +
hw/qdev-properties.c | 1 +
hw/qdev.h | 1 -
hw/spapr_hcall.c | 2 --
hw/strongarm.c | 1 +
hw/xen_disk.c | 1 -
hw/xen_nic.c | 1 -
hw/xilinx_axidma.c | 1 -
hw/xilinx_axienet.c | 1 -
hw/xtensa_lx60.c | 1 +
iohandler.c | 1 -
migration-exec.c | 1 -
migration-fd.c | 1 -
migration-tcp.c | 1 -
migration-unix.c | 1 -
monitor.h | 1 -
net/slirp.c | 1 +
net/socket.c | 1 -
net/tap.c | 1 -
net/vde.c | 1 -
qemu-aio.h | 1 -
qmp.c | 1 +
savevm.c | 1 -
ui/qemu-spice.h | 1 -
35 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 564d632..cd553c2 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -24,7 +24,6 @@
#include <alsa/asoundlib.h>
#include "qemu-common.h"
#include "main-loop.h"
-#include "qemu-char.h"
#include "audio.h"
#if QEMU_GNUC_PREREQ(4, 3)
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index 45abe39..8249a00 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -33,7 +33,6 @@
#include "qemu-common.h"
#include "main-loop.h"
#include "host-utils.h"
-#include "qemu-char.h"
#include "audio.h"
#define AUDIO_CAP "oss"
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 28d439f..5f868bf 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -23,7 +23,6 @@
*/
#include "qemu-common.h"
#include "qemu-timer.h"
-#include "qemu-char.h"
#include "qemu-log.h"
#include "block_int.h"
#include "module.h"
diff --git a/bt-host.c b/bt-host.c
index 8b47370..3118645 100644
--- a/bt-host.c
+++ b/bt-host.c
@@ -18,7 +18,6 @@
*/
#include "qemu-common.h"
-#include "qemu-char.h"
#include "net.h"
#include "bt-host.h"
#include "main-loop.h"
diff --git a/bt-vhci.c b/bt-vhci.c
index 878460a..6fecb66 100644
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -18,7 +18,6 @@
*/
#include "qemu-common.h"
-#include "qemu-char.h"
#include "net.h"
#include "hw/bt.h"
#include "main-loop.h"
diff --git a/buffered_file.c b/buffered_file.c
index ed92df1..068c0d7 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -16,7 +16,6 @@
#include "qemu-common.h"
#include "hw/hw.h"
#include "qemu-timer.h"
-#include "qemu-char.h"
#include "buffered_file.h"
//#define DEBUG_BUFFERED_FILE
diff --git a/console.c b/console.c
index 3f3d254..eb46d79 100644
--- a/console.c
+++ b/console.c
@@ -25,6 +25,7 @@
#include "console.h"
#include "qemu-timer.h"
#include "qmp-commands.h"
+#include "qemu-char.h"
//#define DEBUG_CONSOLE
#define DEFAULT_BACKSCROLL 512
diff --git a/console.h b/console.h
index 6099d8d..a9f8952 100644
--- a/console.h
+++ b/console.h
@@ -1,7 +1,6 @@
#ifndef CONSOLE_H
#define CONSOLE_H
-#include "qemu-char.h"
#include "qdict.h"
#include "notify.h"
#include "monitor.h"
diff --git a/event_notifier.c b/event_notifier.c
index 23d5128..f0d10bb 100644
--- a/event_notifier.c
+++ b/event_notifier.c
@@ -12,7 +12,6 @@
#include "qemu-common.h"
#include "event_notifier.h"
-#include "qemu-char.h"
#include "main-loop.h"
#ifdef CONFIG_EVENTFD
diff --git a/hmp.c b/hmp.c
index 2b97982..264f226 100644
--- a/hmp.c
+++ b/hmp.c
@@ -15,6 +15,7 @@
#include "hmp.h"
#include "net.h"
+#include "qemu-char.h"
#include "qemu-option.h"
#include "qemu-timer.h"
#include "qmp-commands.h"
diff --git a/hw/9pfs/virtio-9p-coth.c b/hw/9pfs/virtio-9p-coth.c
index 25556cc..9368df7 100644
--- a/hw/9pfs/virtio-9p-coth.c
+++ b/hw/9pfs/virtio-9p-coth.c
@@ -12,7 +12,6 @@
*
*/
-#include "qemu-char.h"
#include "fsdev/qemu-fsdev.h"
#include "qemu-thread.h"
#include "qemu-coroutine.h"
diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index 5c4ccb8..0c62d43 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -24,6 +24,7 @@
#include "migration.h"
#include "qerror.h"
#include "event_notifier.h"
+#include "qemu-char.h"
#include <sys/mman.h>
#include <sys/types.h>
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 8aca0d4..fab3888 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -4,6 +4,7 @@
#include "blockdev.h"
#include "hw/block-common.h"
#include "net/hub.h"
+#include "qemu-char.h"
void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
{
diff --git a/hw/qdev.h b/hw/qdev.h
index c6ac636..8ba1613 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -3,7 +3,6 @@
#include "hw.h"
#include "qemu-queue.h"
-#include "qemu-char.h"
#include "qemu-option.h"
#include "qapi/qapi-visit-core.h"
#include "qemu/object.h"
diff --git a/hw/spapr_hcall.c b/hw/spapr_hcall.c
index 194d9c2..ea6119e 100644
--- a/hw/spapr_hcall.c
+++ b/hw/spapr_hcall.c
@@ -1,8 +1,6 @@
#include "sysemu.h"
#include "cpu.h"
-#include "qemu-char.h"
#include "sysemu.h"
-#include "qemu-char.h"
#include "helper_regs.h"
#include "hw/spapr.h"
diff --git a/hw/strongarm.c b/hw/strongarm.c
index 7150eeb..4847e43 100644
--- a/hw/strongarm.c
+++ b/hw/strongarm.c
@@ -30,6 +30,7 @@
#include "strongarm.h"
#include "qemu-error.h"
#include "arm-misc.h"
+#include "qemu-char.h"
#include "sysemu.h"
#include "ssi.h"
diff --git a/hw/xen_disk.c b/hw/xen_disk.c
index e6bb2f2..423b580 100644
--- a/hw/xen_disk.c
+++ b/hw/xen_disk.c
@@ -36,7 +36,6 @@
#include <sys/uio.h>
#include "hw.h"
-#include "qemu-char.h"
#include "xen_backend.h"
#include "xen_blkif.h"
#include "blockdev.h"
diff --git a/hw/xen_nic.c b/hw/xen_nic.c
index cf7d559..dadacb1 100644
--- a/hw/xen_nic.c
+++ b/hw/xen_nic.c
@@ -39,7 +39,6 @@
#include "net.h"
#include "net/checksum.h"
#include "net/util.h"
-#include "qemu-char.h"
#include "xen_backend.h"
#include <xen/io/netif.h>
diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c
index 0e28c51..264cb6e 100644
--- a/hw/xilinx_axidma.c
+++ b/hw/xilinx_axidma.c
@@ -23,7 +23,6 @@
*/
#include "sysbus.h"
-#include "qemu-char.h"
#include "qemu-timer.h"
#include "ptimer.h"
#include "qemu-log.h"
diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c
index eec155d..c680187 100644
--- a/hw/xilinx_axienet.c
+++ b/hw/xilinx_axienet.c
@@ -23,7 +23,6 @@
*/
#include "sysbus.h"
-#include "qemu-char.h"
#include "qemu-log.h"
#include "net.h"
#include "net/checksum.h"
diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index 0c407d3..dc2f7ce 100644
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -36,6 +36,7 @@
#include "sysbus.h"
#include "flash.h"
#include "blockdev.h"
+#include "qemu-char.h"
#include "xtensa_bootparam.h"
typedef struct LxBoardDesc {
diff --git a/iohandler.c b/iohandler.c
index a2d871b..fb0bc11 100644
--- a/iohandler.c
+++ b/iohandler.c
@@ -24,7 +24,6 @@
#include "config-host.h"
#include "qemu-common.h"
-#include "qemu-char.h"
#include "qemu-queue.h"
#include "main-loop.h"
diff --git a/migration-exec.c b/migration-exec.c
index 519af57..ed63187 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -18,7 +18,6 @@
#include "qemu-common.h"
#include "qemu_socket.h"
#include "migration.h"
-#include "qemu-char.h"
#include "buffered_file.h"
#include "block.h"
#include <sys/types.h>
diff --git a/migration-fd.c b/migration-fd.c
index ce6932d..b1e3cca 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -17,7 +17,6 @@
#include "qemu_socket.h"
#include "migration.h"
#include "monitor.h"
-#include "qemu-char.h"
#include "buffered_file.h"
#include "block.h"
#include "qemu_socket.h"
diff --git a/migration-tcp.c b/migration-tcp.c
index 46f6ac5..7006fdb 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -16,7 +16,6 @@
#include "qemu-common.h"
#include "qemu_socket.h"
#include "migration.h"
-#include "qemu-char.h"
#include "buffered_file.h"
#include "block.h"
diff --git a/migration-unix.c b/migration-unix.c
index ed3db3a..570bc94 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -16,7 +16,6 @@
#include "qemu-common.h"
#include "qemu_socket.h"
#include "migration.h"
-#include "qemu-char.h"
#include "buffered_file.h"
#include "block.h"
diff --git a/monitor.h b/monitor.h
index b6e7d95..76c59f7 100644
--- a/monitor.h
+++ b/monitor.h
@@ -2,7 +2,6 @@
#define MONITOR_H
#include "qemu-common.h"
-#include "qemu-char.h"
#include "qerror.h"
#include "qdict.h"
#include "block.h"
diff --git a/net/slirp.c b/net/slirp.c
index bf86a44..422a3a4 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -35,6 +35,7 @@
#include "monitor.h"
#include "qemu_socket.h"
#include "slirp/libslirp.h"
+#include "qemu-char.h"
static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)
{
diff --git a/net/socket.c b/net/socket.c
index b75d567..c9019eb 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -26,7 +26,6 @@
#include "net.h"
#include "clients.h"
#include "monitor.h"
-#include "qemu-char.h"
#include "qemu-common.h"
#include "qemu-error.h"
#include "qemu-option.h"
diff --git a/net/tap.c b/net/tap.c
index df89caa..0230ae5 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -37,7 +37,6 @@
#include "clients.h"
#include "monitor.h"
#include "sysemu.h"
-#include "qemu-char.h"
#include "qemu-common.h"
#include "qemu-error.h"
diff --git a/net/vde.c b/net/vde.c
index 275bda9..cc5a07d 100644
--- a/net/vde.c
+++ b/net/vde.c
@@ -27,7 +27,6 @@
#include "net.h"
#include "clients.h"
-#include "qemu-char.h"
#include "qemu-common.h"
#include "qemu-option.h"
diff --git a/qemu-aio.h b/qemu-aio.h
index a61cd83..40053b4 100644
--- a/qemu-aio.h
+++ b/qemu-aio.h
@@ -15,7 +15,6 @@
#define QEMU_AIO_H
#include "qemu-common.h"
-#include "qemu-char.h"
#include "main-loop.h"
typedef struct BlockDriverAIOCB BlockDriverAIOCB;
diff --git a/qmp.c b/qmp.c
index 31bc3bf..1d3f7d7 100644
--- a/qmp.c
+++ b/qmp.c
@@ -16,6 +16,7 @@
#include "qemu-common.h"
#include "sysemu.h"
#include "qmp-commands.h"
+#include "qemu-char.h"
#include "ui/qemu-spice.h"
#include "ui/vnc.h"
#include "kvm.h"
diff --git a/savevm.c b/savevm.c
index b080d37..7176424 100644
--- a/savevm.c
+++ b/savevm.c
@@ -76,7 +76,6 @@
#include "monitor.h"
#include "sysemu.h"
#include "qemu-timer.h"
-#include "qemu-char.h"
#include "audio/audio.h"
#include "migration.h"
#include "qemu_socket.h"
diff --git a/ui/qemu-spice.h b/ui/qemu-spice.h
index 3299da8..5857b8a 100644
--- a/ui/qemu-spice.h
+++ b/ui/qemu-spice.h
@@ -24,7 +24,6 @@
#include "qemu-option.h"
#include "qemu-config.h"
-#include "qemu-char.h"
#include "monitor.h"
extern int using_spice;
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 12/32] net: move Bluetooth stuff out of net.h
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (10 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 11/32] janitor: do not include qemu-char everywhere Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 13/32] net: do not include net.h everywhere Paolo Bonzini
` (22 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
bt-host.c | 1 -
bt-host.h | 13 ++++++++++++-
bt-vhci.c | 2 +-
hw/bt-hci-csr.c | 2 +-
hw/bt-hci.c | 2 +-
hw/bt.c | 2 +-
hw/usb/dev-bluetooth.c | 2 +-
net.h | 14 --------------
8 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/bt-host.c b/bt-host.c
index 3118645..65aaca3 100644
--- a/bt-host.c
+++ b/bt-host.c
@@ -18,7 +18,6 @@
*/
#include "qemu-common.h"
-#include "net.h"
#include "bt-host.h"
#include "main-loop.h"
diff --git a/bt-host.h b/bt-host.h
index f1eff65..2bc6d53 100644
--- a/bt-host.h
+++ b/bt-host.h
@@ -1,9 +1,20 @@
#ifndef BT_HOST_H
#define BT_HOST_H
-struct HCIInfo;
+/* BT HCI info */
+
+struct HCIInfo {
+ int (*bdaddr_set)(struct HCIInfo *hci, const uint8_t *bd_addr);
+ void (*cmd_send)(struct HCIInfo *hci, const uint8_t *data, int len);
+ void (*sco_send)(struct HCIInfo *hci, const uint8_t *data, int len);
+ void (*acl_send)(struct HCIInfo *hci, const uint8_t *data, int len);
+ void *opaque;
+ void (*evt_recv)(void *opaque, const uint8_t *data, int len);
+ void (*acl_recv)(void *opaque, const uint8_t *data, int len);
+};
/* bt-host.c */
struct HCIInfo *bt_host_hci(const char *id);
+struct HCIInfo *qemu_next_hci(void);
#endif
diff --git a/bt-vhci.c b/bt-vhci.c
index 6fecb66..13c0e53 100644
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "net.h"
+#include "bt-host.h"
#include "hw/bt.h"
#include "main-loop.h"
diff --git a/hw/bt-hci-csr.c b/hw/bt-hci-csr.c
index 772b677..0faabbb 100644
--- a/hw/bt-hci-csr.c
+++ b/hw/bt-hci-csr.c
@@ -22,7 +22,7 @@
#include "qemu-char.h"
#include "qemu-timer.h"
#include "irq.h"
-#include "net.h"
+#include "bt-host.h"
#include "bt.h"
struct csrhci_s {
diff --git a/hw/bt-hci.c b/hw/bt-hci.c
index e54cfd7..d2ad57f 100644
--- a/hw/bt-hci.c
+++ b/hw/bt-hci.c
@@ -21,7 +21,7 @@
#include "qemu-common.h"
#include "qemu-timer.h"
#include "usb.h"
-#include "net.h"
+#include "bt-host.h"
#include "bt.h"
struct bt_hci_s {
diff --git a/hw/bt.c b/hw/bt.c
index dc99fc2..3fea098 100644
--- a/hw/bt.c
+++ b/hw/bt.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "net.h"
+#include "bt-host.h"
#include "bt.h"
/* Slave implementations can ignore this */
diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
index 55bc191..3b64587 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 "net.h"
+#include "bt-host.h"
#include "hw/bt.h"
struct USBBtState {
diff --git a/net.h b/net.h
index 04fda1d..1d0816b 100644
--- a/net.h
+++ b/net.h
@@ -133,20 +133,6 @@ extern int nb_nics;
extern NICInfo nd_table[MAX_NICS];
extern int default_net;
-/* BT HCI info */
-
-struct HCIInfo {
- int (*bdaddr_set)(struct HCIInfo *hci, const uint8_t *bd_addr);
- void (*cmd_send)(struct HCIInfo *hci, const uint8_t *data, int len);
- void (*sco_send)(struct HCIInfo *hci, const uint8_t *data, int len);
- void (*acl_send)(struct HCIInfo *hci, const uint8_t *data, int len);
- void *opaque;
- void (*evt_recv)(void *opaque, const uint8_t *data, int len);
- void (*acl_recv)(void *opaque, const uint8_t *data, int len);
-};
-
-struct HCIInfo *qemu_next_hci(void);
-
/* from net.c */
extern const char *legacy_tftp_prefix;
extern const char *legacy_bootp_filename;
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 13/32] net: do not include net.h everywhere
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (11 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 12/32] net: move Bluetooth stuff out of net.h Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 14/32] net: move net.c to net/ Paolo Bonzini
` (21 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch_init.c | 1 -
hw/alpha_sys.h | 1 -
hw/device-hotplug.c | 1 -
hw/lm32_boards.c | 1 -
hw/milkymist-hw.h | 1 +
hw/milkymist.c | 1 -
hw/s390-virtio-bus.c | 1 -
hw/spapr_vscsi.c | 1 -
hw/virtex_ml507.c | 1 -
hw/virtio-net.h | 1 -
hw/virtio-pci.c | 1 -
hw/virtio-scsi.h | 1 -
hw/xen_backend.h | 1 -
hw/xen_platform.c | 1 -
input.c | 1 -
qemu-char.c | 1 -
qemu-timer.c | 1 -
17 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index dde7fad..1973037 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -40,7 +40,6 @@
#include "hw/audiodev.h"
#include "kvm.h"
#include "migration.h"
-#include "net.h"
#include "gdbstub.h"
#include "hw/smbios.h"
#include "exec-memory.h"
diff --git a/hw/alpha_sys.h b/hw/alpha_sys.h
index 7604d09..f39723d 100644
--- a/hw/alpha_sys.h
+++ b/hw/alpha_sys.h
@@ -6,7 +6,6 @@
#include "pci.h"
#include "pci_host.h"
#include "ide.h"
-#include "net.h"
#include "pc.h"
#include "irq.h"
diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c
index eec0fe3..f896cb4 100644
--- a/hw/device-hotplug.c
+++ b/hw/device-hotplug.c
@@ -24,7 +24,6 @@
#include "hw.h"
#include "boards.h"
-#include "net.h"
#include "blockdev.h"
#include "qemu-config.h"
#include "sysemu.h"
diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c
index c5a62c8..8417ed3 100644
--- a/hw/lm32_boards.c
+++ b/hw/lm32_boards.c
@@ -19,7 +19,6 @@
#include "sysbus.h"
#include "hw.h"
-#include "net.h"
#include "flash.h"
#include "devices.h"
#include "boards.h"
diff --git a/hw/milkymist-hw.h b/hw/milkymist-hw.h
index 9f358a7..b293152 100644
--- a/hw/milkymist-hw.h
+++ b/hw/milkymist-hw.h
@@ -3,6 +3,7 @@
#include "qdev.h"
#include "qdev-addr.h"
+#include "net.h"
static inline DeviceState *milkymist_uart_create(target_phys_addr_t base,
qemu_irq irq)
diff --git a/hw/milkymist.c b/hw/milkymist.c
index ca9ed43..1cf7f05 100644
--- a/hw/milkymist.c
+++ b/hw/milkymist.c
@@ -19,7 +19,6 @@
#include "sysbus.h"
#include "hw.h"
-#include "net.h"
#include "flash.h"
#include "sysemu.h"
#include "devices.h"
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index a245684..b28bd75 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -20,7 +20,6 @@
#include "hw.h"
#include "block.h"
#include "sysemu.h"
-#include "net.h"
#include "boards.h"
#include "monitor.h"
#include "loader.h"
diff --git a/hw/spapr_vscsi.c b/hw/spapr_vscsi.c
index e3d4b23..2d81132 100644
--- a/hw/spapr_vscsi.c
+++ b/hw/spapr_vscsi.c
@@ -34,7 +34,6 @@
#include "hw.h"
#include "scsi.h"
#include "scsi-defs.h"
-#include "net.h" /* Remove that when we can */
#include "srp.h"
#include "hw/qdev.h"
#include "hw/spapr.h"
diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index c59e1cb..c7b446c 100644
--- a/hw/virtex_ml507.c
+++ b/hw/virtex_ml507.c
@@ -25,7 +25,6 @@
#include "sysbus.h"
#include "hw.h"
#include "serial.h"
-#include "net.h"
#include "flash.h"
#include "sysemu.h"
#include "devices.h"
diff --git a/hw/virtio-net.h b/hw/virtio-net.h
index 36aa463..58661d9 100644
--- a/hw/virtio-net.h
+++ b/hw/virtio-net.h
@@ -15,7 +15,6 @@
#define _QEMU_VIRTIO_NET_H
#include "virtio.h"
-#include "net.h"
#include "pci.h"
#define ETH_ALEN 6
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index 400f3c2..f1a4c06 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -26,7 +26,6 @@
#include "qemu-error.h"
#include "msi.h"
#include "msix.h"
-#include "net.h"
#include "loader.h"
#include "kvm.h"
#include "blockdev.h"
diff --git a/hw/virtio-scsi.h b/hw/virtio-scsi.h
index 91924f6..8635dab 100644
--- a/hw/virtio-scsi.h
+++ b/hw/virtio-scsi.h
@@ -15,7 +15,6 @@
#define _QEMU_VIRTIO_SCSI_H
#include "virtio.h"
-#include "net.h"
#include "pci.h"
/* The ID for virtio_scsi */
diff --git a/hw/xen_backend.h b/hw/xen_backend.h
index fea86dd..3305630 100644
--- a/hw/xen_backend.h
+++ b/hw/xen_backend.h
@@ -4,7 +4,6 @@
#include "xen_common.h"
#include "sysemu.h"
#include "net.h"
-#include "net/hub.h"
/* ------------------------------------------------------------- */
diff --git a/hw/xen_platform.c b/hw/xen_platform.c
index 956dbfe..c0f0caa 100644
--- a/hw/xen_platform.c
+++ b/hw/xen_platform.c
@@ -30,7 +30,6 @@
#include "pci.h"
#include "irq.h"
#include "xen_common.h"
-#include "net.h"
#include "xen_backend.h"
#include "trace.h"
#include "exec-memory.h"
diff --git a/input.c b/input.c
index 25d3973..123bb23 100644
--- a/input.c
+++ b/input.c
@@ -23,7 +23,6 @@
*/
#include "sysemu.h"
-#include "net.h"
#include "monitor.h"
#include "console.h"
#include "error.h"
diff --git a/qemu-char.c b/qemu-char.c
index afe2bfb..255a3ae 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -22,7 +22,6 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "net.h"
#include "monitor.h"
#include "console.h"
#include "sysemu.h"
diff --git a/qemu-timer.c b/qemu-timer.c
index 908a103..204f13e 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -23,7 +23,6 @@
*/
#include "sysemu.h"
-#include "net.h"
#include "monitor.h"
#include "console.h"
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 14/32] net: move net.c to net/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (12 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 13/32] net: do not include net.h everywhere Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 15/32] net: reorganize headers Paolo Bonzini
` (20 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 2 +-
net/Makefile.objs | 2 +-
net.c => net/net.c | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
rename net.c => net/net.c (99%)
diff --git a/Makefile.objs b/Makefile.objs
index 66a0b3d..7bbe646 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -62,7 +62,7 @@ endif
# single QEMU executable should support all CPUs and machines.
common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/
-common-obj-y += net.o net/
+common-obj-y += net/
common-obj-y += qom/
common-obj-y += readline.o console.o cursor.o
common-obj-y += $(oslib-obj-y)
diff --git a/net/Makefile.objs b/net/Makefile.objs
index cf04187..a08cd14 100644
--- a/net/Makefile.objs
+++ b/net/Makefile.objs
@@ -1,4 +1,4 @@
-common-obj-y = queue.o checksum.o util.o hub.o
+common-obj-y = net.o queue.o checksum.o util.o hub.o
common-obj-y += socket.o
common-obj-y += dump.o
common-obj-$(CONFIG_POSIX) += tap.o
diff --git a/net.c b/net/net.c
similarity index 99%
rename from net.c
rename to net/net.c
index 72d1c33..317e258 100644
--- a/net.c
+++ b/net/net.c
@@ -24,10 +24,10 @@
#include "config-host.h"
#include "net.h"
-#include "net/clients.h"
-#include "net/hub.h"
-#include "net/slirp.h"
-#include "net/util.h"
+#include "clients.h"
+#include "hub.h"
+#include "slirp.h"
+#include "util.h"
#include "monitor.h"
#include "qemu-common.h"
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 15/32] net: reorganize headers
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (13 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 14/32] net: move net.c to net/ Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-25 7:50 ` Stefan Hajnoczi
2012-10-24 12:58 ` [Qemu-devel] [PATCH 16/32] qemu-ga: move qemu-ga files to qga/ Paolo Bonzini
` (19 subsequent siblings)
34 siblings, 1 reply; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Move public headers to include/net, and leave private headers in net/.
Put the virtio headers in include/net/tap.h, removing the multiple copies
that existed. Leave include/net/tap.h as the interface for NICs, and
net/tap_int.h as the interface for OS-specific parts of the tap backend.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hmp.c | 2 +-
hw/axis_dev88.c | 2 +-
hw/cadence_gem.c | 2 +-
hw/dp8393x.c | 2 +-
hw/e1000.c | 2 +-
hw/eepro100.c | 2 +-
hw/etraxfs.h | 2 +-
hw/etraxfs_eth.c | 2 +-
hw/exynos4_boards.c | 2 +-
hw/gumstix.c | 2 +-
hw/highbank.c | 2 +-
hw/integratorcp.c | 2 +-
hw/kzm.c | 2 +-
hw/lan9118.c | 2 +-
hw/lance.c | 2 +-
hw/mainstone.c | 2 +-
hw/mcf5208.c | 2 +-
hw/mcf_fec.c | 2 +-
hw/milkymist-hw.h | 2 +-
hw/milkymist-minimac2.c | 2 +-
hw/mips_fulong2e.c | 2 +-
hw/mips_jazz.c | 2 +-
hw/mips_malta.c | 2 +-
hw/mips_mipssim.c | 2 +-
hw/mips_r4k.c | 2 +-
hw/mipsnet.c | 2 +-
hw/musicpal.c | 2 +-
hw/ne2000-isa.c | 2 +-
hw/ne2000.c | 2 +-
hw/opencores_eth.c | 2 +-
hw/openrisc_sim.c | 2 +-
hw/pc.h | 2 +-
hw/pc_piix.c | 2 +-
hw/pci-hotplug.c | 2 +-
hw/pci.c | 2 +-
hw/pcnet-pci.c | 2 +-
hw/pcnet.c | 2 +-
hw/petalogix_ml605_mmu.c | 2 +-
hw/petalogix_s3adsp1800_mmu.c | 2 +-
hw/ppc440_bamboo.c | 2 +-
hw/ppc_newworld.c | 2 +-
hw/ppc_oldworld.c | 2 +-
hw/ppc_prep.c | 2 +-
hw/qdev-properties.c | 3 +--
hw/qdev.c | 2 +-
hw/r2d.c | 2 +-
hw/realview.c | 2 +-
hw/rtl8139.c | 2 +-
hw/s390-virtio.c | 2 +-
hw/smc91c111.c | 2 +-
hw/spapr.c | 2 +-
hw/spapr_llan.c | 2 +-
hw/stellaris.c | 2 +-
hw/stellaris_enet.c | 2 +-
hw/sun4m.c | 2 +-
hw/sun4u.c | 2 +-
hw/usb/dev-network.c | 2 +-
hw/versatilepb.c | 2 +-
hw/vexpress.c | 2 +-
hw/vhost_net.c | 2 +-
hw/vhost_net.h | 2 +-
hw/virtio-net.c | 2 +-
hw/virtio-net.h | 27 ---------------------------
hw/virtio.h | 2 +-
hw/xen_backend.h | 2 +-
hw/xen_nic.c | 2 +-
hw/xgmac.c | 2 +-
hw/xilinx.h | 2 +-
hw/xilinx_axienet.c | 2 +-
hw/xilinx_ethlite.c | 2 +-
hw/xilinx_zynq.c | 2 +-
hw/xtensa_lx60.c | 2 +-
{net => include/net}/checksum.h | 0
net.h => include/net/net.h | 3 +++
{net => include/net}/queue.h | 0
{net => include/net}/slirp.h | 0
{net => include/net}/tap.h | 37 +++++++++++++++++++++++--------------
monitor.c | 2 +-
net/clients.h | 2 +-
net/hub.c | 2 +-
net/hub.h | 2 --
net/net.c | 4 ++--
net/queue.c | 2 +-
net/slirp.c | 2 +-
net/socket.c | 2 +-
net/tap-aix.c | 2 +-
net/tap-bsd.c | 2 +-
net/tap-haiku.c | 2 +-
net/tap-linux.c | 3 ++-
net/tap-linux.h | 20 ++------------------
net/tap-solaris.c | 2 +-
net/tap-win32.c | 4 ++--
net/tap.c | 6 +++---
net/{tap.h => tap_int.h} | 18 +++---------------
net/util.c | 2 +-
net/vde.c | 2 +-
savevm.c | 2 +-
vl.c | 2 +-
98 files changed, 125 insertions(+), 170 deletions(-)
rename {net => include/net}/checksum.h (100%)
rename net.h => include/net/net.h (98%)
rename {net => include/net}/queue.h (100%)
rename {net => include/net}/slirp.h (100%)
copy {net => include/net}/tap.h (69%)
rename net/{tap.h => tap_int.h} (77%)
diff --git a/hmp.c b/hmp.c
index 264f226..313233f 100644
--- a/hmp.c
+++ b/hmp.c
@@ -14,7 +14,7 @@
*/
#include "hmp.h"
-#include "net.h"
+#include "net/net.h"
#include "qemu-char.h"
#include "qemu-option.h"
#include "qemu-timer.h"
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index 2fd7356..b5d8882 100644
--- a/hw/axis_dev88.c
+++ b/hw/axis_dev88.c
@@ -23,7 +23,7 @@
*/
#include "sysbus.h"
-#include "net.h"
+#include "net/net.h"
#include "flash.h"
#include "boards.h"
#include "etraxfs.h"
diff --git a/hw/cadence_gem.c b/hw/cadence_gem.c
index 967f625..0460e37 100644
--- a/hw/cadence_gem.c
+++ b/hw/cadence_gem.c
@@ -25,7 +25,7 @@
#include <zlib.h> /* For crc32 */
#include "sysbus.h"
-#include "net.h"
+#include "net/net.h"
#include "net/checksum.h"
#ifdef CADENCE_GEM_ERR_DEBUG
diff --git a/hw/dp8393x.c b/hw/dp8393x.c
index 4fa6ecc..7ee3672 100644
--- a/hw/dp8393x.c
+++ b/hw/dp8393x.c
@@ -19,7 +19,7 @@
#include "hw.h"
#include "qemu-timer.h"
-#include "net.h"
+#include "net/net.h"
#include "mips.h"
//#define DEBUG_SONIC
diff --git a/hw/e1000.c b/hw/e1000.c
index 63fee10..071d077 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -27,7 +27,7 @@
#include "hw.h"
#include "pci.h"
-#include "net.h"
+#include "net/net.h"
#include "net/checksum.h"
#include "loader.h"
#include "sysemu.h"
diff --git a/hw/eepro100.c b/hw/eepro100.c
index 5b23116..0375fc8 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -43,7 +43,7 @@
#include <stddef.h> /* offsetof */
#include "hw.h"
#include "pci.h"
-#include "net.h"
+#include "net/net.h"
#include "eeprom93xx.h"
#include "sysemu.h"
#include "dma.h"
diff --git a/hw/etraxfs.h b/hw/etraxfs.h
index c62f94b..64f87a5 100644
--- a/hw/etraxfs.h
+++ b/hw/etraxfs.h
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "net.h"
+#include "net/net.h"
#include "etraxfs_dma.h"
qemu_irq *cris_pic_init_cpu(CPUCRISState *env);
diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c
index b124f5b..8a77c98 100644
--- a/hw/etraxfs_eth.c
+++ b/hw/etraxfs_eth.c
@@ -24,7 +24,7 @@
#include <stdio.h>
#include "sysbus.h"
-#include "net.h"
+#include "net/net.h"
#include "etraxfs.h"
#define D(x)
diff --git a/hw/exynos4_boards.c b/hw/exynos4_boards.c
index 4951064..7eb004f 100644
--- a/hw/exynos4_boards.c
+++ b/hw/exynos4_boards.c
@@ -23,7 +23,7 @@
#include "sysemu.h"
#include "sysbus.h"
-#include "net.h"
+#include "net/net.h"
#include "arm-misc.h"
#include "exec-memory.h"
#include "exynos4210.h"
diff --git a/hw/gumstix.c b/hw/gumstix.c
index 4103a88..545b92f 100644
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -36,7 +36,7 @@
#include "hw.h"
#include "pxa.h"
-#include "net.h"
+#include "net/net.h"
#include "flash.h"
#include "devices.h"
#include "boards.h"
diff --git a/hw/highbank.c b/hw/highbank.c
index 15036b6..7b97de0 100644
--- a/hw/highbank.c
+++ b/hw/highbank.c
@@ -21,7 +21,7 @@
#include "arm-misc.h"
#include "devices.h"
#include "loader.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include "boards.h"
#include "sysbus.h"
diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index ac0ea83..df68105 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -11,7 +11,7 @@
#include "devices.h"
#include "boards.h"
#include "arm-misc.h"
-#include "net.h"
+#include "net/net.h"
#include "exec-memory.h"
#include "sysemu.h"
diff --git a/hw/kzm.c b/hw/kzm.c
index 687daf3..a27ecbb 100644
--- a/hw/kzm.c
+++ b/hw/kzm.c
@@ -18,7 +18,7 @@
#include "hw.h"
#include "arm-misc.h"
#include "devices.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include "boards.h"
#include "serial.h"
diff --git a/hw/lan9118.c b/hw/lan9118.c
index ceaf96f..cf33af1 100644
--- a/hw/lan9118.c
+++ b/hw/lan9118.c
@@ -11,7 +11,7 @@
*/
#include "sysbus.h"
-#include "net.h"
+#include "net/net.h"
#include "devices.h"
#include "sysemu.h"
#include "ptimer.h"
diff --git a/hw/lance.c b/hw/lance.c
index 9b98bb8..d0e055c 100644
--- a/hw/lance.c
+++ b/hw/lance.c
@@ -36,7 +36,7 @@
*/
#include "sysbus.h"
-#include "net.h"
+#include "net/net.h"
#include "qemu-timer.h"
#include "qemu_socket.h"
#include "sun4m.h"
diff --git a/hw/mainstone.c b/hw/mainstone.c
index c0d6034..1315a29 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -14,7 +14,7 @@
#include "hw.h"
#include "pxa.h"
#include "arm-misc.h"
-#include "net.h"
+#include "net/net.h"
#include "devices.h"
#include "boards.h"
#include "flash.h"
diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index 688bc3c..60b311a 100644
--- a/hw/mcf5208.c
+++ b/hw/mcf5208.c
@@ -10,7 +10,7 @@
#include "qemu-timer.h"
#include "ptimer.h"
#include "sysemu.h"
-#include "net.h"
+#include "net/net.h"
#include "boards.h"
#include "loader.h"
#include "elf.h"
diff --git a/hw/mcf_fec.c b/hw/mcf_fec.c
index 2fec5bc..0e23f0a 100644
--- a/hw/mcf_fec.c
+++ b/hw/mcf_fec.c
@@ -6,7 +6,7 @@
* This code is licensed under the GPL
*/
#include "hw.h"
-#include "net.h"
+#include "net/net.h"
#include "mcf.h"
/* For crc32 */
#include <zlib.h>
diff --git a/hw/milkymist-hw.h b/hw/milkymist-hw.h
index b293152..9144379 100644
--- a/hw/milkymist-hw.h
+++ b/hw/milkymist-hw.h
@@ -3,7 +3,7 @@
#include "qdev.h"
#include "qdev-addr.h"
-#include "net.h"
+#include "net/net.h"
static inline DeviceState *milkymist_uart_create(target_phys_addr_t base,
qemu_irq irq)
diff --git a/hw/milkymist-minimac2.c b/hw/milkymist-minimac2.c
index b483a02..dbcbaa0 100644
--- a/hw/milkymist-minimac2.c
+++ b/hw/milkymist-minimac2.c
@@ -25,7 +25,7 @@
#include "hw.h"
#include "sysbus.h"
#include "trace.h"
-#include "net.h"
+#include "net/net.h"
#include "qemu-error.h"
#include "qdev-addr.h"
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index 5fcf900..cc31bb7 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -22,7 +22,7 @@
#include "pc.h"
#include "serial.h"
#include "fdc.h"
-#include "net.h"
+#include "net/net.h"
#include "boards.h"
#include "smbus.h"
#include "block.h"
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 6bd231d..4509cb4 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -32,7 +32,7 @@
#include "sysemu.h"
#include "arch_init.h"
#include "boards.h"
-#include "net.h"
+#include "net/net.h"
#include "esp.h"
#include "mips-bios.h"
#include "loader.h"
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 22ec8b9..e26caff 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -26,7 +26,7 @@
#include "pc.h"
#include "serial.h"
#include "fdc.h"
-#include "net.h"
+#include "net/net.h"
#include "boards.h"
#include "smbus.h"
#include "block.h"
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index a95a3c1..484e2f7 100644
--- a/hw/mips_mipssim.c
+++ b/hw/mips_mipssim.c
@@ -29,7 +29,7 @@
#include "mips_cpudevs.h"
#include "serial.h"
#include "isa.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include "boards.h"
#include "mips-bios.h"
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 539577b..b84ca64 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -13,7 +13,7 @@
#include "pc.h"
#include "serial.h"
#include "isa.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include "boards.h"
#include "flash.h"
diff --git a/hw/mipsnet.c b/hw/mipsnet.c
index 28063b1..19b562c 100644
--- a/hw/mipsnet.c
+++ b/hw/mipsnet.c
@@ -1,5 +1,5 @@
#include "hw.h"
-#include "net.h"
+#include "net/net.h"
#include "trace.h"
#include "sysbus.h"
diff --git a/hw/musicpal.c b/hw/musicpal.c
index 159d3c3..4551c25 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -12,7 +12,7 @@
#include "sysbus.h"
#include "arm-misc.h"
#include "devices.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include "boards.h"
#include "serial.h"
diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c
index 69982a9..99477a4 100644
--- a/hw/ne2000-isa.c
+++ b/hw/ne2000-isa.c
@@ -25,7 +25,7 @@
#include "pc.h"
#include "isa.h"
#include "qdev.h"
-#include "net.h"
+#include "net/net.h"
#include "ne2000.h"
#include "exec-memory.h"
diff --git a/hw/ne2000.c b/hw/ne2000.c
index 15605c4..72a2e32 100644
--- a/hw/ne2000.c
+++ b/hw/ne2000.c
@@ -23,7 +23,7 @@
*/
#include "hw.h"
#include "pci.h"
-#include "net.h"
+#include "net/net.h"
#include "ne2000.h"
#include "loader.h"
#include "sysemu.h"
diff --git a/hw/opencores_eth.c b/hw/opencores_eth.c
index 8c15969..2bb10e8 100644
--- a/hw/opencores_eth.c
+++ b/hw/opencores_eth.c
@@ -33,7 +33,7 @@
#include "hw.h"
#include "sysbus.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include "trace.h"
diff --git a/hw/openrisc_sim.c b/hw/openrisc_sim.c
index 7327740..e0e487c 100644
--- a/hw/openrisc_sim.c
+++ b/hw/openrisc_sim.c
@@ -22,7 +22,7 @@
#include "boards.h"
#include "elf.h"
#include "serial.h"
-#include "net.h"
+#include "net/net.h"
#include "loader.h"
#include "exec-memory.h"
#include "sysemu.h"
diff --git a/hw/pc.h b/hw/pc.h
index 6cba7ce..e9aa0ea 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -6,7 +6,7 @@
#include "ioport.h"
#include "isa.h"
#include "fdc.h"
-#include "net.h"
+#include "net/net.h"
#include "memory.h"
#include "ioapic.h"
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index bf04a42..ea63fa1 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -30,7 +30,7 @@
#include "pci.h"
#include "pci_ids.h"
#include "usb.h"
-#include "net.h"
+#include "net/net.h"
#include "boards.h"
#include "ide.h"
#include "kvm.h"
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index e7fb780..1be8263 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -25,7 +25,7 @@
#include "hw.h"
#include "boards.h"
#include "pci.h"
-#include "net.h"
+#include "net/net.h"
#include "pc.h"
#include "monitor.h"
#include "scsi.h"
diff --git a/hw/pci.c b/hw/pci.c
index 7eeaac0..f6ac1c4 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -26,7 +26,7 @@
#include "pci_bridge.h"
#include "pci_internals.h"
#include "monitor.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include "loader.h"
#include "range.h"
diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c
index 48fd447..ea4cabb 100644
--- a/hw/pcnet-pci.c
+++ b/hw/pcnet-pci.c
@@ -28,7 +28,7 @@
*/
#include "pci.h"
-#include "net.h"
+#include "net/net.h"
#include "loader.h"
#include "qemu-timer.h"
#include "dma.h"
diff --git a/hw/pcnet.c b/hw/pcnet.c
index 40820b3..7fedf13 100644
--- a/hw/pcnet.c
+++ b/hw/pcnet.c
@@ -36,7 +36,7 @@
*/
#include "qdev.h"
-#include "net.h"
+#include "net/net.h"
#include "qemu-timer.h"
#include "qemu_socket.h"
#include "sysemu.h"
diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c
index 5b45809..787abee 100644
--- a/hw/petalogix_ml605_mmu.c
+++ b/hw/petalogix_ml605_mmu.c
@@ -27,7 +27,7 @@
#include "sysbus.h"
#include "hw.h"
-#include "net.h"
+#include "net/net.h"
#include "flash.h"
#include "sysemu.h"
#include "devices.h"
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index 71c32ce..b2e2dd7 100644
--- a/hw/petalogix_s3adsp1800_mmu.c
+++ b/hw/petalogix_s3adsp1800_mmu.c
@@ -25,7 +25,7 @@
#include "sysbus.h"
#include "hw.h"
-#include "net.h"
+#include "net/net.h"
#include "flash.h"
#include "sysemu.h"
#include "devices.h"
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 5616a26..6a525c8 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -13,7 +13,7 @@
#include "config.h"
#include "qemu-common.h"
-#include "net.h"
+#include "net/net.h"
#include "hw.h"
#include "pci.h"
#include "boards.h"
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index a265445..bf309a7 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -53,7 +53,7 @@
#include "mac_dbdma.h"
#include "nvram.h"
#include "pci.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include "boards.h"
#include "fw_cfg.h"
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index de33408..f3b75cd 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -30,7 +30,7 @@
#include "mac_dbdma.h"
#include "nvram.h"
#include "sysemu.h"
-#include "net.h"
+#include "net/net.h"
#include "isa.h"
#include "pci.h"
#include "boards.h"
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index a0d1c3d..7ad3b17 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -26,7 +26,7 @@
#include "pc.h"
#include "serial.h"
#include "fdc.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include "isa.h"
#include "pci.h"
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index fab3888..877ee09 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -1,9 +1,8 @@
-#include "net.h"
+#include "net/net.h"
#include "qdev.h"
#include "qerror.h"
#include "blockdev.h"
#include "hw/block-common.h"
-#include "net/hub.h"
#include "qemu-char.h"
void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
diff --git a/hw/qdev.c b/hw/qdev.c
index 9b9aba3..bc20417 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -25,7 +25,7 @@
inherit from a particular bus (e.g. PCI or I2C) rather than
this API directly. */
-#include "net.h"
+#include "net/net.h"
#include "qdev.h"
#include "sysemu.h"
#include "error.h"
diff --git a/hw/r2d.c b/hw/r2d.c
index 3cb6942..d002f05 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -30,7 +30,7 @@
#include "sysemu.h"
#include "boards.h"
#include "pci.h"
-#include "net.h"
+#include "net/net.h"
#include "sh7750_regs.h"
#include "ide.h"
#include "loader.h"
diff --git a/hw/realview.c b/hw/realview.c
index 8dc4be6..68df94e 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -12,7 +12,7 @@
#include "primecell.h"
#include "devices.h"
#include "pci.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include "boards.h"
#include "i2c.h"
diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index 6b28fea..3ab9895 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -55,7 +55,7 @@
#include "pci.h"
#include "dma.h"
#include "qemu-timer.h"
-#include "net.h"
+#include "net/net.h"
#include "loader.h"
#include "sysemu.h"
#include "iov.h"
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 39ff178..9a145df 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -21,7 +21,7 @@
#include "block.h"
#include "blockdev.h"
#include "sysemu.h"
-#include "net.h"
+#include "net/net.h"
#include "boards.h"
#include "monitor.h"
#include "loader.h"
diff --git a/hw/smc91c111.c b/hw/smc91c111.c
index d6ef302..b5b041d 100644
--- a/hw/smc91c111.c
+++ b/hw/smc91c111.c
@@ -8,7 +8,7 @@
*/
#include "sysbus.h"
-#include "net.h"
+#include "net/net.h"
#include "devices.h"
/* For crc32 */
#include <zlib.h>
diff --git a/hw/spapr.c b/hw/spapr.c
index 637b3fb..5ebc542 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -27,7 +27,7 @@
#include "sysemu.h"
#include "hw.h"
#include "elf.h"
-#include "net.h"
+#include "net/net.h"
#include "blockdev.h"
#include "cpus.h"
#include "kvm.h"
diff --git a/hw/spapr_llan.c b/hw/spapr_llan.c
index bd3f131..0cadeac 100644
--- a/hw/spapr_llan.c
+++ b/hw/spapr_llan.c
@@ -25,7 +25,7 @@
*
*/
#include "hw.h"
-#include "net.h"
+#include "net/net.h"
#include "hw/qdev.h"
#include "hw/spapr.h"
#include "hw/spapr_vio.h"
diff --git a/hw/stellaris.c b/hw/stellaris.c
index bfb18b0..24a9b41 100644
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -13,7 +13,7 @@
#include "devices.h"
#include "qemu-timer.h"
#include "i2c.h"
-#include "net.h"
+#include "net/net.h"
#include "boards.h"
#include "exec-memory.h"
diff --git a/hw/stellaris_enet.c b/hw/stellaris_enet.c
index bc97280..4c7e31a 100644
--- a/hw/stellaris_enet.c
+++ b/hw/stellaris_enet.c
@@ -7,7 +7,7 @@
* This code is licensed under the GPL.
*/
#include "sysbus.h"
-#include "net.h"
+#include "net/net.h"
#include <zlib.h>
//#define DEBUG_STELLARIS_ENET 1
diff --git a/hw/sun4m.c b/hw/sun4m.c
index dbe93f9..980908d 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -28,7 +28,7 @@
#include "sparc32_dma.h"
#include "fdc.h"
#include "sysemu.h"
-#include "net.h"
+#include "net/net.h"
#include "boards.h"
#include "firmware_abi.h"
#include "esp.h"
diff --git a/hw/sun4u.c b/hw/sun4u.c
index eeb6496..a922046 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -28,7 +28,7 @@
#include "serial.h"
#include "nvram.h"
#include "fdc.h"
-#include "net.h"
+#include "net/net.h"
#include "qemu-timer.h"
#include "sysemu.h"
#include "boards.h"
diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index df8a3bb..81142b7 100644
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -26,7 +26,7 @@
#include "qemu-common.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
-#include "net.h"
+#include "net/net.h"
#include "qemu-queue.h"
#include "qemu-config.h"
#include "sysemu.h"
diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index 756ec29..ad1e730 100644
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -10,7 +10,7 @@
#include "sysbus.h"
#include "arm-misc.h"
#include "devices.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include "pci.h"
#include "i2c.h"
diff --git a/hw/vexpress.c b/hw/vexpress.c
index 36503d6..6f1f0c9 100644
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -25,7 +25,7 @@
#include "arm-misc.h"
#include "primecell.h"
#include "devices.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include "boards.h"
#include "exec-memory.h"
diff --git a/hw/vhost_net.c b/hw/vhost_net.c
index df2c4a3..2962b4d 100644
--- a/hw/vhost_net.c
+++ b/hw/vhost_net.c
@@ -13,7 +13,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include "net.h"
+#include "net/net.h"
#include "net/tap.h"
#include "virtio-net.h"
diff --git a/hw/vhost_net.h b/hw/vhost_net.h
index a9db234..012aba4 100644
--- a/hw/vhost_net.h
+++ b/hw/vhost_net.h
@@ -1,7 +1,7 @@
#ifndef VHOST_NET_H
#define VHOST_NET_H
-#include "net.h"
+#include "net/net.h"
struct vhost_net;
typedef struct vhost_net VHostNetState;
diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index 50ba728..b3dbe78 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -13,7 +13,7 @@
#include "iov.h"
#include "virtio.h"
-#include "net.h"
+#include "net/net.h"
#include "net/checksum.h"
#include "net/tap.h"
#include "qemu-error.h"
diff --git a/hw/virtio-net.h b/hw/virtio-net.h
index 58661d9..a25fca2 100644
--- a/hw/virtio-net.h
+++ b/hw/virtio-net.h
@@ -73,33 +73,6 @@ struct virtio_net_config
uint16_t status;
} QEMU_PACKED;
-/* This is the first element of the scatter-gather list. If you don't
- * specify GSO or CSUM features, you can simply ignore the header. */
-struct virtio_net_hdr
-{
-#define VIRTIO_NET_HDR_F_NEEDS_CSUM 1 // Use csum_start, csum_offset
-#define VIRTIO_NET_HDR_F_DATA_VALID 2 // Csum is valid
- uint8_t flags;
-#define VIRTIO_NET_HDR_GSO_NONE 0 // Not a GSO frame
-#define VIRTIO_NET_HDR_GSO_TCPV4 1 // GSO frame, IPv4 TCP (TSO)
-#define VIRTIO_NET_HDR_GSO_UDP 3 // GSO frame, IPv4 UDP (UFO)
-#define VIRTIO_NET_HDR_GSO_TCPV6 4 // GSO frame, IPv6 TCP
-#define VIRTIO_NET_HDR_GSO_ECN 0x80 // TCP has ECN set
- uint8_t gso_type;
- uint16_t hdr_len;
- uint16_t gso_size;
- uint16_t csum_start;
- uint16_t csum_offset;
-};
-
-/* This is the version of the header to use when the MRG_RXBUF
- * feature has been negotiated. */
-struct virtio_net_hdr_mrg_rxbuf
-{
- struct virtio_net_hdr hdr;
- uint16_t num_buffers; /* Number of merged rx buffers */
-};
-
/*
* Control virtqueue data structures
*
diff --git a/hw/virtio.h b/hw/virtio.h
index 80de375..257018a 100644
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -15,7 +15,7 @@
#define _QEMU_VIRTIO_H
#include "hw.h"
-#include "net.h"
+#include "net/net.h"
#include "qdev.h"
#include "sysemu.h"
#include "event_notifier.h"
diff --git a/hw/xen_backend.h b/hw/xen_backend.h
index 3305630..92ab501 100644
--- a/hw/xen_backend.h
+++ b/hw/xen_backend.h
@@ -3,7 +3,7 @@
#include "xen_common.h"
#include "sysemu.h"
-#include "net.h"
+#include "net/net.h"
/* ------------------------------------------------------------- */
diff --git a/hw/xen_nic.c b/hw/xen_nic.c
index dadacb1..dc12110 100644
--- a/hw/xen_nic.c
+++ b/hw/xen_nic.c
@@ -36,7 +36,7 @@
#include <sys/wait.h>
#include "hw.h"
-#include "net.h"
+#include "net/net.h"
#include "net/checksum.h"
#include "net/util.h"
#include "xen_backend.h"
diff --git a/hw/xgmac.c b/hw/xgmac.c
index a91ef60..55f0b4f 100644
--- a/hw/xgmac.c
+++ b/hw/xgmac.c
@@ -27,7 +27,7 @@
#include "sysbus.h"
#include "qemu-char.h"
#include "qemu-log.h"
-#include "net.h"
+#include "net/net.h"
#include "net/checksum.h"
#ifdef DEBUG_XGMAC
diff --git a/hw/xilinx.h b/hw/xilinx.h
index 9830047..2036abc 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -1,6 +1,6 @@
#include "stream.h"
#include "qemu-common.h"
-#include "net.h"
+#include "net/net.h"
static inline DeviceState *
xilinx_intc_create(target_phys_addr_t base, qemu_irq irq, int kind_of_intr)
diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c
index c680187..9282801 100644
--- a/hw/xilinx_axienet.c
+++ b/hw/xilinx_axienet.c
@@ -24,7 +24,7 @@
#include "sysbus.h"
#include "qemu-log.h"
-#include "net.h"
+#include "net/net.h"
#include "net/checksum.h"
#include "stream.h"
diff --git a/hw/xilinx_ethlite.c b/hw/xilinx_ethlite.c
index 56ca620..79682d4 100644
--- a/hw/xilinx_ethlite.c
+++ b/hw/xilinx_ethlite.c
@@ -24,7 +24,7 @@
#include "sysbus.h"
#include "hw.h"
-#include "net.h"
+#include "net/net.h"
#define D(x)
#define R_TX_BUF0 0
diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c
index c55dafb..491a9a9 100644
--- a/hw/xilinx_zynq.c
+++ b/hw/xilinx_zynq.c
@@ -17,7 +17,7 @@
#include "sysbus.h"
#include "arm-misc.h"
-#include "net.h"
+#include "net/net.h"
#include "exec-memory.h"
#include "sysemu.h"
#include "boards.h"
diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index dc2f7ce..ba0d3d7 100644
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -32,7 +32,7 @@
#include "memory.h"
#include "exec-memory.h"
#include "serial.h"
-#include "net.h"
+#include "net/net.h"
#include "sysbus.h"
#include "flash.h"
#include "blockdev.h"
diff --git a/net/checksum.h b/include/net/checksum.h
similarity index 100%
rename from net/checksum.h
rename to include/net/checksum.h
diff --git a/net.h b/include/net/net.h
similarity index 98%
rename from net.h
rename to include/net/net.h
index 1d0816b..9ff9305 100644
--- a/net.h
+++ b/include/net/net.h
@@ -147,6 +147,9 @@ void net_host_device_remove(Monitor *mon, const QDict *qdict);
void netdev_add(QemuOpts *opts, Error **errp);
int qmp_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret);
+int net_hub_id_for_client(NetClientState *nc, int *id);
+NetClientState *net_hub_port_find(int hub_id);
+
#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper"
diff --git a/net/queue.h b/include/net/queue.h
similarity index 100%
rename from net/queue.h
rename to include/net/queue.h
diff --git a/net/slirp.h b/include/net/slirp.h
similarity index 100%
rename from net/slirp.h
rename to include/net/slirp.h
diff --git a/net/tap.h b/include/net/tap.h
similarity index 69%
copy from net/tap.h
copy to include/net/tap.h
index d44d83a..bb7efb5 100644
--- a/net/tap.h
+++ b/include/net/tap.h
@@ -29,13 +29,6 @@
#include "qemu-common.h"
#include "qapi-types.h"
-#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
-#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
-
-int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required);
-
-ssize_t tap_read_packet(int tapfd, uint8_t *buf, int maxlen);
-
int tap_has_ufo(NetClientState *nc);
int tap_has_vnet_hdr(NetClientState *nc);
int tap_has_vnet_hdr_len(NetClientState *nc, int len);
@@ -43,16 +36,32 @@ void tap_using_vnet_hdr(NetClientState *nc, int using_vnet_hdr);
void tap_set_offload(NetClientState *nc, int csum, int tso4, int tso6, int ecn, int ufo);
void tap_set_vnet_hdr_len(NetClientState *nc, int len);
-int tap_set_sndbuf(int fd, const NetdevTapOptions *tap);
-int tap_probe_vnet_hdr(int fd);
-int tap_probe_vnet_hdr_len(int fd, int len);
-int tap_probe_has_ufo(int fd);
-void tap_fd_set_offload(int fd, int csum, int tso4, int tso6, int ecn, int ufo);
-void tap_fd_set_vnet_hdr_len(int fd, int len);
-
int tap_get_fd(NetClientState *nc);
struct vhost_net;
struct vhost_net *tap_get_vhost_net(NetClientState *nc);
+struct virtio_net_hdr
+{
+#define VIRTIO_NET_HDR_F_NEEDS_CSUM 1 // Use csum_start, csum_offset
+#define VIRTIO_NET_HDR_F_DATA_VALID 2 // Csum is valid
+ uint8_t flags;
+#define VIRTIO_NET_HDR_GSO_NONE 0 // Not a GSO frame
+#define VIRTIO_NET_HDR_GSO_TCPV4 1 // GSO frame, IPv4 TCP (TSO)
+#define VIRTIO_NET_HDR_GSO_UDP 3 // GSO frame, IPv4 UDP (UFO)
+#define VIRTIO_NET_HDR_GSO_TCPV6 4 // GSO frame, IPv6 TCP
+#define VIRTIO_NET_HDR_GSO_ECN 0x80 // TCP has ECN set
+ uint8_t gso_type;
+ uint16_t hdr_len;
+ uint16_t gso_size;
+ uint16_t csum_start;
+ uint16_t csum_offset;
+};
+
+struct virtio_net_hdr_mrg_rxbuf
+{
+ struct virtio_net_hdr hdr;
+ uint16_t num_buffers; /* Number of merged rx buffers */
+};
+
#endif /* QEMU_NET_TAP_H */
diff --git a/monitor.c b/monitor.c
index 5129bb1..cd8870b 100644
--- a/monitor.c
+++ b/monitor.c
@@ -31,7 +31,7 @@
#include "hw/watchdog.h"
#include "hw/loader.h"
#include "gdbstub.h"
-#include "net.h"
+#include "net/net.h"
#include "net/slirp.h"
#include "qemu-char.h"
#include "ui/qemu-spice.h"
diff --git a/net/clients.h b/net/clients.h
index c58cc60..7793294 100644
--- a/net/clients.h
+++ b/net/clients.h
@@ -24,7 +24,7 @@
#ifndef QEMU_NET_CLIENTS_H
#define QEMU_NET_CLIENTS_H
-#include "net.h"
+#include "net/net.h"
#include "qapi-types.h"
int net_init_dump(const NetClientOptions *opts, const char *name,
diff --git a/net/hub.c b/net/hub.c
index be41301..8508ecf 100644
--- a/net/hub.c
+++ b/net/hub.c
@@ -13,7 +13,7 @@
*/
#include "monitor.h"
-#include "net.h"
+#include "net/net.h"
#include "clients.h"
#include "hub.h"
#include "iov.h"
diff --git a/net/hub.h b/net/hub.h
index 4cbfdb1..583ada8 100644
--- a/net/hub.h
+++ b/net/hub.h
@@ -20,8 +20,6 @@
NetClientState *net_hub_add_port(int hub_id, const char *name);
NetClientState *net_hub_find_client_by_name(int hub_id, const char *name);
void net_hub_info(Monitor *mon);
-int net_hub_id_for_client(NetClientState *nc, int *id);
void net_hub_check_clients(void);
-NetClientState *net_hub_port_find(int hub_id);
#endif /* NET_HUB_H */
diff --git a/net/net.c b/net/net.c
index 317e258..8b8ba12 100644
--- a/net/net.c
+++ b/net/net.c
@@ -23,10 +23,10 @@
*/
#include "config-host.h"
-#include "net.h"
+#include "net/net.h"
#include "clients.h"
#include "hub.h"
-#include "slirp.h"
+#include "net/slirp.h"
#include "util.h"
#include "monitor.h"
diff --git a/net/queue.c b/net/queue.c
index 254f280..542c549 100644
--- a/net/queue.c
+++ b/net/queue.c
@@ -23,7 +23,7 @@
#include "net/queue.h"
#include "qemu-queue.h"
-#include "net.h"
+#include "net/net.h"
/* The delivery handler may only return zero if it will call
* qemu_net_queue_flush() when it determines that it is once again able
diff --git a/net/slirp.c b/net/slirp.c
index 422a3a4..27b6cc6 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -29,7 +29,7 @@
#include <pwd.h>
#include <sys/wait.h>
#endif
-#include "net.h"
+#include "net/net.h"
#include "clients.h"
#include "hub.h"
#include "monitor.h"
diff --git a/net/socket.c b/net/socket.c
index c9019eb..f7bc51b 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -23,7 +23,7 @@
*/
#include "config-host.h"
-#include "net.h"
+#include "net/net.h"
#include "clients.h"
#include "monitor.h"
#include "qemu-common.h"
diff --git a/net/tap-aix.c b/net/tap-aix.c
index f27c177..aff6c52 100644
--- a/net/tap-aix.c
+++ b/net/tap-aix.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "net/tap.h"
+#include "tap_int.h"
#include <stdio.h>
int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required)
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index a3b717d..a1c55ad 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "net/tap.h"
+#include "tap_int.h"
#include "qemu-common.h"
#include "sysemu.h"
#include "qemu-error.h"
diff --git a/net/tap-haiku.c b/net/tap-haiku.c
index 34739d1..08cc034 100644
--- a/net/tap-haiku.c
+++ b/net/tap-haiku.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "net/tap.h"
+#include "tap_int.h"
#include <stdio.h>
int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required)
diff --git a/net/tap-linux.c b/net/tap-linux.c
index c6521be..377df2e 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -23,8 +23,9 @@
* THE SOFTWARE.
*/
+#include "tap_int.h"
+#include "tap-linux.h"
#include "net/tap.h"
-#include "net/tap-linux.h"
#include <net/if.h>
#include <sys/ioctl.h>
diff --git a/net/tap-linux.h b/net/tap-linux.h
index 659e981..cb2a6d4 100644
--- a/net/tap-linux.h
+++ b/net/tap-linux.h
@@ -13,8 +13,8 @@
* GNU General Public License for more details.
*/
-#ifndef QEMU_TAP_H
-#define QEMU_TAP_H
+#ifndef QEMU_TAP_LINUX_H
+#define QEMU_TAP_LINUX_H
#include <stdint.h>
#ifdef __linux__
@@ -44,20 +44,4 @@
#define TUN_F_TSO_ECN 0x08 /* I can handle TSO with ECN bits. */
#define TUN_F_UFO 0x10 /* I can handle UFO packets */
-struct virtio_net_hdr
-{
- uint8_t flags;
- uint8_t gso_type;
- uint16_t hdr_len;
- uint16_t gso_size;
- uint16_t csum_start;
- uint16_t csum_offset;
-};
-
-struct virtio_net_hdr_mrg_rxbuf
-{
- struct virtio_net_hdr hdr;
- uint16_t num_buffers; /* Number of merged rx buffers */
-};
-
#endif /* QEMU_TAP_H */
diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index 5d6ac42..f228fff 100644
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "net/tap.h"
+#include "tap_int.h"
#include "sysemu.h"
#include <sys/stat.h>
diff --git a/net/tap-win32.c b/net/tap-win32.c
index 22dad3f..b2a6e73 100644
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -26,11 +26,11 @@
* distribution); if not, see <http://www.gnu.org/licenses/>.
*/
-#include "tap.h"
+#include "tap_int.h"
#include "qemu-common.h"
#include "clients.h" /* net_init_tap */
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include "qemu-error.h"
#include <stdio.h>
diff --git a/net/tap.c b/net/tap.c
index 0230ae5..cb35db6 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
-#include "tap.h"
+#include "tap_int.h"
#include "config-host.h"
@@ -33,14 +33,14 @@
#include <sys/socket.h>
#include <net/if.h>
-#include "net.h"
+#include "net/net.h"
#include "clients.h"
#include "monitor.h"
#include "sysemu.h"
#include "qemu-common.h"
#include "qemu-error.h"
-#include "net/tap-linux.h"
+#include "net/tap.h"
#include "hw/vhost_net.h"
diff --git a/net/tap.h b/net/tap_int.h
similarity index 77%
rename from net/tap.h
rename to net/tap_int.h
index d44d83a..1dffe12 100644
--- a/net/tap.h
+++ b/net/tap_int.h
@@ -23,8 +23,8 @@
* THE SOFTWARE.
*/
-#ifndef QEMU_NET_TAP_H
-#define QEMU_NET_TAP_H
+#ifndef QEMU_TAP_H
+#define QEMU_TAP_H
#include "qemu-common.h"
#include "qapi-types.h"
@@ -36,13 +36,6 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
ssize_t tap_read_packet(int tapfd, uint8_t *buf, int maxlen);
-int tap_has_ufo(NetClientState *nc);
-int tap_has_vnet_hdr(NetClientState *nc);
-int tap_has_vnet_hdr_len(NetClientState *nc, int len);
-void tap_using_vnet_hdr(NetClientState *nc, int using_vnet_hdr);
-void tap_set_offload(NetClientState *nc, int csum, int tso4, int tso6, int ecn, int ufo);
-void tap_set_vnet_hdr_len(NetClientState *nc, int len);
-
int tap_set_sndbuf(int fd, const NetdevTapOptions *tap);
int tap_probe_vnet_hdr(int fd);
int tap_probe_vnet_hdr_len(int fd, int len);
@@ -50,9 +43,4 @@ int tap_probe_has_ufo(int fd);
void tap_fd_set_offload(int fd, int csum, int tso4, int tso6, int ecn, int ufo);
void tap_fd_set_vnet_hdr_len(int fd, int len);
-int tap_get_fd(NetClientState *nc);
-
-struct vhost_net;
-struct vhost_net *tap_get_vhost_net(NetClientState *nc);
-
-#endif /* QEMU_NET_TAP_H */
+#endif /* QEMU_TAP_H */
diff --git a/net/util.c b/net/util.c
index 1e9afbc..7e95076 100644
--- a/net/util.c
+++ b/net/util.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "net/util.h"
+#include "util.h"
#include <errno.h>
#include <stdlib.h>
diff --git a/net/vde.c b/net/vde.c
index cc5a07d..52d4f19 100644
--- a/net/vde.c
+++ b/net/vde.c
@@ -25,7 +25,7 @@
#include <libvdeplug.h>
-#include "net.h"
+#include "net/net.h"
#include "clients.h"
#include "qemu-common.h"
#include "qemu-option.h"
diff --git a/savevm.c b/savevm.c
index 7176424..5e69585 100644
--- a/savevm.c
+++ b/savevm.c
@@ -72,7 +72,7 @@
#include "qemu-common.h"
#include "hw/hw.h"
#include "hw/qdev.h"
-#include "net.h"
+#include "net/net.h"
#include "monitor.h"
#include "sysemu.h"
#include "qemu-timer.h"
diff --git a/vl.c b/vl.c
index 5d73a55..88880f6 100644
--- a/vl.c
+++ b/vl.c
@@ -127,7 +127,7 @@ int main(int argc, char **argv)
#include "hw/qdev.h"
#include "hw/loader.h"
#include "bt-host.h"
-#include "net.h"
+#include "net/net.h"
#include "net/slirp.h"
#include "monitor.h"
#include "console.h"
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* Re: [Qemu-devel] [PATCH 15/32] net: reorganize headers
2012-10-24 12:58 ` [Qemu-devel] [PATCH 15/32] net: reorganize headers Paolo Bonzini
@ 2012-10-25 7:50 ` Stefan Hajnoczi
0 siblings, 0 replies; 40+ messages in thread
From: Stefan Hajnoczi @ 2012-10-25 7:50 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: peter.maydell, aliguori, qemu-devel
On Wed, Oct 24, 2012 at 02:58:45PM +0200, Paolo Bonzini wrote:
> +struct virtio_net_hdr
> +{
> +#define VIRTIO_NET_HDR_F_NEEDS_CSUM 1 // Use csum_start, csum_offset
> +#define VIRTIO_NET_HDR_F_DATA_VALID 2 // Csum is valid
> + uint8_t flags;
> +#define VIRTIO_NET_HDR_GSO_NONE 0 // Not a GSO frame
> +#define VIRTIO_NET_HDR_GSO_TCPV4 1 // GSO frame, IPv4 TCP (TSO)
> +#define VIRTIO_NET_HDR_GSO_UDP 3 // GSO frame, IPv4 UDP (UFO)
> +#define VIRTIO_NET_HDR_GSO_TCPV6 4 // GSO frame, IPv6 TCP
> +#define VIRTIO_NET_HDR_GSO_ECN 0x80 // TCP has ECN set
> + uint8_t gso_type;
> + uint16_t hdr_len;
> + uint16_t gso_size;
> + uint16_t csum_start;
> + uint16_t csum_offset;
> +};
Idea for a separate cleanup: net/tap.c doesn't need the definition of
struct virtio_net_hdr or virtio_net_hdr_mrg_rxbuf. It should simply
negotiate vnet_hdr_size between hw/virtio-net.c and the kernel tun
driver. The layout and contents of the struct are not needed by
net/tap.c itself.
Stefan
^ permalink raw reply [flat|nested] 40+ messages in thread
* [Qemu-devel] [PATCH 16/32] qemu-ga: move qemu-ga files to qga/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (14 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 15/32] net: reorganize headers Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 17/32] ui: move files to ui/ and include/ui/ Paolo Bonzini
` (18 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 9 +++++----
Makefile.objs | 2 +-
qga/Makefile.objs | 2 +-
qemu-ga.c => qga/main.c | 0
qapi-schema-guest.json => qga/qapi-schema.json | 0
5 files changed, 7 insertions(+), 6 deletions(-)
rename qemu-ga.c => qga/main.c (100%)
rename qapi-schema-guest.json => qga/qapi-schema.json (100%)
diff --git a/Makefile b/Makefile
index 3361d24..2f0811d 100644
--- a/Makefile
+++ b/Makefile
@@ -173,13 +173,13 @@ endif
qapi-py = $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py
qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h :\
-$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
+$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@")
qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h :\
-$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)
+$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@")
qga/qapi-generated/qga-qmp-commands.h qga/qapi-generated/qga-qmp-marshal.c :\
-$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
+$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@")
qapi-types.c qapi-types.h :\
@@ -195,7 +195,8 @@ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)
$(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
-qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(tools-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y)
+qemu-ga$(EXESUF): $(qga-obj-y) $(tools-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y)
+ $(call LINK, $^)
clean:
# avoid old build problems by removing potentially incorrect old files
diff --git a/Makefile.objs b/Makefile.objs
index 7bbe646..545b822 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -215,7 +215,7 @@ universal-obj-y += $(qapi-obj-y)
######################################################################
# guest agent
-qga-obj-y = qga/ qemu-ga.o module.o
+qga-obj-y = qga/ module.o
qga-obj-$(CONFIG_WIN32) += oslib-win32.o
qga-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-sockets.o qemu-option.o
diff --git a/qga/Makefile.objs b/qga/Makefile.objs
index cd3e135..b8d7cd0 100644
--- a/qga/Makefile.objs
+++ b/qga/Makefile.objs
@@ -1,4 +1,4 @@
-qga-obj-y = commands.o guest-agent-command-state.o
+qga-obj-y = commands.o guest-agent-command-state.o main.o
qga-obj-$(CONFIG_POSIX) += commands-posix.o channel-posix.o
qga-obj-$(CONFIG_WIN32) += commands-win32.o channel-win32.o service-win32.o
qga-obj-y += qapi-generated/qga-qapi-types.o qapi-generated/qga-qapi-visit.o
diff --git a/qemu-ga.c b/qga/main.c
similarity index 100%
rename from qemu-ga.c
rename to qga/main.c
diff --git a/qapi-schema-guest.json b/qga/qapi-schema.json
similarity index 100%
rename from qapi-schema-guest.json
rename to qga/qapi-schema.json
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 17/32] ui: move files to ui/ and include/ui/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (15 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 16/32] qemu-ga: move qemu-ga files to qga/ Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 18/32] audio: move public header file to include/audio/ Paolo Bonzini
` (17 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 4 +---
hmp.c | 2 +-
hw/adb.c | 2 +-
hw/ads7846.c | 2 +-
hw/applesmc.c | 2 +-
hw/blizzard.c | 2 +-
hw/bt-hid.c | 2 +-
hw/cirrus_vga.c | 2 +-
hw/escc.c | 2 +-
hw/exynos4210_fimd.c | 2 +-
hw/framebuffer.c | 2 +-
hw/g364fb.c | 2 +-
hw/hid.c | 2 +-
hw/hpet.c | 2 +-
hw/jazz_led.c | 2 +-
hw/kvm/pci-assign.c | 2 +-
hw/lm832x.c | 2 +-
hw/milkymist-softusb.c | 2 +-
hw/milkymist-vgafb.c | 2 +-
hw/msmouse.c | 6 +++---
hw/musicpal.c | 2 +-
hw/nseries.c | 2 +-
hw/omap_dss.c | 2 +-
hw/omap_lcdc.c | 2 +-
hw/omap_sx1.c | 2 +-
hw/palm.c | 2 +-
hw/pl110.c | 2 +-
hw/ps2.c | 2 +-
hw/puv3.c | 2 +-
hw/pxa2xx_keypad.c | 2 +-
hw/pxa2xx_lcd.c | 2 +-
hw/qxl.h | 2 +-
hw/sm501.c | 2 +-
hw/spitz.c | 2 +-
hw/ssd0303.c | 2 +-
hw/ssd0323.c | 2 +-
hw/stellaris_input.c | 2 +-
hw/tc6393xb.c | 2 +-
hw/tcx.c | 2 +-
hw/tsc2005.c | 2 +-
hw/tsc210x.c | 2 +-
hw/twl92230.c | 2 +-
hw/usb/dev-hid.c | 2 +-
hw/usb/dev-storage.c | 2 +-
hw/usb/dev-wacom.c | 2 +-
hw/usb/host-stub.c | 2 +-
hw/vga-isa-mm.c | 2 +-
hw/vga-isa.c | 2 +-
hw/vga-pci.c | 2 +-
hw/vga.c | 2 +-
hw/vmmouse.c | 2 +-
hw/vmware_vga.c | 2 +-
hw/xenfb.c | 2 +-
hw/z2.c | 2 +-
console.h => include/ui/console.h | 0
pflib.h => include/ui/pflib.h | 0
{ui => include/ui}/qemu-spice.h | 0
{ui => include/ui}/spice-display.h | 2 +-
monitor.c | 2 +-
qemu-char.c | 2 +-
qemu-timer.c | 2 +-
target-unicore32/helper.c | 2 +-
ui/Makefile.objs | 2 +-
ui/cocoa.m | 2 +-
console.c => ui/console.c | 2 +-
ui/curses.c | 2 +-
cursor.c => ui/cursor.c | 2 +-
cursor_hidden.xpm => ui/cursor_hidden.xpm | 0
cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm | 0
input.c => ui/input.c | 2 +-
pflib.c => ui/pflib.c | 4 ++--
qemu-x509.h => ui/qemu-x509.h | 0
ui/sdl.c | 2 +-
ui/spice-core.c | 4 ++--
ui/spice-display.c | 6 +++---
ui/spice-input.c | 4 ++--
vgafont.h => ui/vgafont.h | 0
ui/vnc.h | 2 +-
vl.c | 2 +-
79 files changed, 79 insertions(+), 81 deletions(-)
rename console.h => include/ui/console.h (100%)
rename pflib.h => include/ui/pflib.h (100%)
rename {ui => include/ui}/qemu-spice.h (100%)
rename {ui => include/ui}/spice-display.h (99%)
rename console.c => ui/console.c (99%)
rename cursor.c => ui/cursor.c (99%)
rename cursor_hidden.xpm => ui/cursor_hidden.xpm (100%)
rename cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm (100%)
rename input.c => ui/input.c (99%)
rename pflib.c => ui/pflib.c (99%)
rename qemu-x509.h => ui/qemu-x509.h (100%)
rename vgafont.h => ui/vgafont.h (100%)
diff --git a/Makefile.objs b/Makefile.objs
index 545b822..bd9534d 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -64,7 +64,7 @@ endif
common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/
common-obj-y += net/
common-obj-y += qom/
-common-obj-y += readline.o console.o cursor.o
+common-obj-y += readline.o
common-obj-y += $(oslib-obj-y)
common-obj-$(CONFIG_WIN32) += os-win32.o
common-obj-$(CONFIG_POSIX) += os-posix.o
@@ -73,11 +73,9 @@ common-obj-$(CONFIG_LINUX) += fsdev/
extra-obj-$(CONFIG_LINUX) += fsdev/
common-obj-y += tcg-runtime.o host-utils.o main-loop.o
-common-obj-y += input.o
common-obj-y += buffered_file.o migration.o migration-tcp.o
common-obj-y += qemu-char.o #aio.o
common-obj-y += block-migration.o iohandler.o
-common-obj-y += pflib.o
common-obj-y += bitmap.o bitops.o
common-obj-y += page_cache.o
diff --git a/hmp.c b/hmp.c
index 313233f..ea410ef 100644
--- a/hmp.c
+++ b/hmp.c
@@ -20,7 +20,7 @@
#include "qemu-timer.h"
#include "qmp-commands.h"
#include "monitor.h"
-#include "console.h"
+#include "ui/console.h"
static void hmp_handle_error(Monitor *mon, Error **errp)
{
diff --git a/hw/adb.c b/hw/adb.c
index aa15f55..e6b8022 100644
--- a/hw/adb.c
+++ b/hw/adb.c
@@ -23,7 +23,7 @@
*/
#include "hw.h"
#include "adb.h"
-#include "console.h"
+#include "ui/console.h"
/* debug ADB */
//#define DEBUG_ADB
diff --git a/hw/ads7846.c b/hw/ads7846.c
index 2ea9e55..fa137e6 100644
--- a/hw/ads7846.c
+++ b/hw/ads7846.c
@@ -11,7 +11,7 @@
*/
#include "ssi.h"
-#include "console.h"
+#include "ui/console.h"
typedef struct {
SSISlave ssidev;
diff --git a/hw/applesmc.c b/hw/applesmc.c
index 8bedaad..91e7cb3 100644
--- a/hw/applesmc.c
+++ b/hw/applesmc.c
@@ -32,7 +32,7 @@
#include "hw.h"
#include "isa.h"
-#include "console.h"
+#include "ui/console.h"
#include "qemu-timer.h"
/* #define DEBUG_SMC */
diff --git a/hw/blizzard.c b/hw/blizzard.c
index 06e19b3..b725d9b 100644
--- a/hw/blizzard.c
+++ b/hw/blizzard.c
@@ -19,7 +19,7 @@
*/
#include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
#include "devices.h"
#include "vga_int.h"
#include "pixel_ops.h"
diff --git a/hw/bt-hid.c b/hw/bt-hid.c
index 8d7a3da..0ec0c01 100644
--- a/hw/bt-hid.c
+++ b/hw/bt-hid.c
@@ -20,7 +20,7 @@
#include "qemu-common.h"
#include "qemu-timer.h"
-#include "console.h"
+#include "ui/console.h"
#include "hid.h"
#include "bt.h"
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index a101329..2559389 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -28,7 +28,7 @@
*/
#include "hw.h"
#include "pci.h"
-#include "console.h"
+#include "ui/console.h"
#include "vga_int.h"
#include "loader.h"
diff --git a/hw/escc.c b/hw/escc.c
index e1f5e73..ce5a082 100644
--- a/hw/escc.c
+++ b/hw/escc.c
@@ -26,7 +26,7 @@
#include "sysbus.h"
#include "escc.h"
#include "qemu-char.h"
-#include "console.h"
+#include "ui/console.h"
#include "trace.h"
/*
diff --git a/hw/exynos4210_fimd.c b/hw/exynos4210_fimd.c
index 3313f00..35ed48c 100644
--- a/hw/exynos4210_fimd.c
+++ b/hw/exynos4210_fimd.c
@@ -25,7 +25,7 @@
#include "qemu-common.h"
#include "cpu-all.h"
#include "sysbus.h"
-#include "console.h"
+#include "ui/console.h"
#include "pixel_ops.h"
#include "bswap.h"
diff --git a/hw/framebuffer.c b/hw/framebuffer.c
index 27fa6f5..3d529ff 100644
--- a/hw/framebuffer.c
+++ b/hw/framebuffer.c
@@ -18,7 +18,7 @@
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "framebuffer.h"
/* Render an image from a shared memory framebuffer. */
diff --git a/hw/g364fb.c b/hw/g364fb.c
index 059e622..6790600 100644
--- a/hw/g364fb.c
+++ b/hw/g364fb.c
@@ -18,7 +18,7 @@
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "pixel_ops.h"
#include "trace.h"
#include "sysbus.h"
diff --git a/hw/hid.c b/hw/hid.c
index 03761ab..7935998 100644
--- a/hw/hid.c
+++ b/hw/hid.c
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "qemu-timer.h"
#include "hid.h"
diff --git a/hw/hpet.c b/hw/hpet.c
index fd3ddca..6b5b198 100644
--- a/hw/hpet.c
+++ b/hw/hpet.c
@@ -26,7 +26,7 @@
#include "hw.h"
#include "pc.h"
-#include "console.h"
+#include "ui/console.h"
#include "qemu-timer.h"
#include "hpet_emul.h"
#include "sysbus.h"
diff --git a/hw/jazz_led.c b/hw/jazz_led.c
index 6486523..24754be 100644
--- a/hw/jazz_led.c
+++ b/hw/jazz_led.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "console.h"
+#include "ui/console.h"
#include "pixel_ops.h"
#include "trace.h"
#include "sysbus.h"
diff --git a/hw/kvm/pci-assign.c b/hw/kvm/pci-assign.c
index 7a0998c..1bfddb0 100644
--- a/hw/kvm/pci-assign.c
+++ b/hw/kvm/pci-assign.c
@@ -29,7 +29,7 @@
#include "hw/hw.h"
#include "hw/pc.h"
#include "qemu-error.h"
-#include "console.h"
+#include "ui/console.h"
#include "hw/loader.h"
#include "monitor.h"
#include "range.h"
diff --git a/hw/lm832x.c b/hw/lm832x.c
index 8e09f9b..b14a089 100644
--- a/hw/lm832x.c
+++ b/hw/lm832x.c
@@ -21,7 +21,7 @@
#include "hw.h"
#include "i2c.h"
#include "qemu-timer.h"
-#include "console.h"
+#include "ui/console.h"
typedef struct {
I2CSlave i2c;
diff --git a/hw/milkymist-softusb.c b/hw/milkymist-softusb.c
index ecc2be9..62585c4 100644
--- a/hw/milkymist-softusb.c
+++ b/hw/milkymist-softusb.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "sysbus.h"
#include "trace.h"
-#include "console.h"
+#include "ui/console.h"
#include "hid.h"
#include "qemu-error.h"
diff --git a/hw/milkymist-vgafb.c b/hw/milkymist-vgafb.c
index cd4365d..6a07bc6 100644
--- a/hw/milkymist-vgafb.c
+++ b/hw/milkymist-vgafb.c
@@ -25,7 +25,7 @@
#include "hw.h"
#include "sysbus.h"
#include "trace.h"
-#include "console.h"
+#include "ui/console.h"
#include "framebuffer.h"
#include "pixel_ops.h"
#include "qemu-error.h"
diff --git a/hw/msmouse.c b/hw/msmouse.c
index 9c492a4..decb1a3 100644
--- a/hw/msmouse.c
+++ b/hw/msmouse.c
@@ -22,9 +22,9 @@
* THE SOFTWARE.
*/
#include <stdlib.h>
-#include "../qemu-common.h"
-#include "../qemu-char.h"
-#include "../console.h"
+#include "qemu-common.h"
+#include "qemu-char.h"
+#include "ui/console.h"
#include "msmouse.h"
#define MSMOUSE_LO6(n) ((n) & 0x3f)
diff --git a/hw/musicpal.c b/hw/musicpal.c
index 4551c25..8389db6 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -20,7 +20,7 @@
#include "ptimer.h"
#include "block.h"
#include "flash.h"
-#include "console.h"
+#include "ui/console.h"
#include "i2c.h"
#include "blockdev.h"
#include "exec-memory.h"
diff --git a/hw/nseries.c b/hw/nseries.c
index 7ada90d..371f52e 100644
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -23,7 +23,7 @@
#include "omap.h"
#include "arm-misc.h"
#include "irq.h"
-#include "console.h"
+#include "ui/console.h"
#include "boards.h"
#include "i2c.h"
#include "devices.h"
diff --git a/hw/omap_dss.c b/hw/omap_dss.c
index 86ed6ea..d9036d5 100644
--- a/hw/omap_dss.c
+++ b/hw/omap_dss.c
@@ -18,7 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "omap.h"
struct omap_dss_s {
diff --git a/hw/omap_lcdc.c b/hw/omap_lcdc.c
index e2ba108..675625c 100644
--- a/hw/omap_lcdc.c
+++ b/hw/omap_lcdc.c
@@ -17,7 +17,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "omap.h"
#include "framebuffer.h"
diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index ad17487..30e02bb 100644
--- a/hw/omap_sx1.c
+++ b/hw/omap_sx1.c
@@ -26,7 +26,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "omap.h"
#include "boards.h"
#include "arm-misc.h"
diff --git a/hw/palm.c b/hw/palm.c
index 032b8d6..37dde1e 100644
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -19,7 +19,7 @@
#include "hw.h"
#include "audio/audio.h"
#include "sysemu.h"
-#include "console.h"
+#include "ui/console.h"
#include "omap.h"
#include "boards.h"
#include "arm-misc.h"
diff --git a/hw/pl110.c b/hw/pl110.c
index a582640..39f1333 100644
--- a/hw/pl110.c
+++ b/hw/pl110.c
@@ -8,7 +8,7 @@
*/
#include "sysbus.h"
-#include "console.h"
+#include "ui/console.h"
#include "framebuffer.h"
#define PL110_CR_EN 0x001
diff --git a/hw/ps2.c b/hw/ps2.c
index f93cd24..ba80089 100644
--- a/hw/ps2.c
+++ b/hw/ps2.c
@@ -23,7 +23,7 @@
*/
#include "hw.h"
#include "ps2.h"
-#include "console.h"
+#include "ui/console.h"
#include "sysemu.h"
/* debug PC keyboard */
diff --git a/hw/puv3.c b/hw/puv3.c
index 764799c..887a37a 100644
--- a/hw/puv3.c
+++ b/hw/puv3.c
@@ -8,7 +8,7 @@
* published by the Free Software Foundation, or any later version.
* See the COPYING file in the top-level directory.
*/
-#include "console.h"
+#include "ui/console.h"
#include "elf.h"
#include "exec-memory.h"
#include "sysbus.h"
diff --git a/hw/pxa2xx_keypad.c b/hw/pxa2xx_keypad.c
index 1a997c9..85ad251 100644
--- a/hw/pxa2xx_keypad.c
+++ b/hw/pxa2xx_keypad.c
@@ -13,7 +13,7 @@
#include "hw.h"
#include "pxa.h"
-#include "console.h"
+#include "ui/console.h"
/*
* Keypad
diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c
index ee8bf57..0b1ee9a 100644
--- a/hw/pxa2xx_lcd.c
+++ b/hw/pxa2xx_lcd.c
@@ -11,7 +11,7 @@
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "pxa.h"
#include "pixel_ops.h"
/* FIXME: For graphic_rotate. Should probably be done in common code. */
diff --git a/hw/qxl.h b/hw/qxl.h
index e583cfb..8202c08 100644
--- a/hw/qxl.h
+++ b/hw/qxl.h
@@ -1,6 +1,6 @@
#include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
#include "hw.h"
#include "pci.h"
#include "vga_int.h"
diff --git a/hw/sm501.c b/hw/sm501.c
index 050d096..c677f20 100644
--- a/hw/sm501.c
+++ b/hw/sm501.c
@@ -25,7 +25,7 @@
#include <stdio.h>
#include "hw.h"
#include "serial.h"
-#include "console.h"
+#include "ui/console.h"
#include "devices.h"
#include "sysbus.h"
#include "qdev-addr.h"
diff --git a/hw/spitz.c b/hw/spitz.c
index 2942626..5048b66 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -21,7 +21,7 @@
#include "qemu-timer.h"
#include "devices.h"
#include "sharpsl.h"
-#include "console.h"
+#include "ui/console.h"
#include "block.h"
#include "audio/audio.h"
#include "boards.h"
diff --git a/hw/ssd0303.c b/hw/ssd0303.c
index 4e1ee6e..0160ff9 100644
--- a/hw/ssd0303.c
+++ b/hw/ssd0303.c
@@ -11,7 +11,7 @@
implement one. Most of the commends relating to brightness and geometry
setup are ignored. */
#include "i2c.h"
-#include "console.h"
+#include "ui/console.h"
//#define DEBUG_SSD0303 1
diff --git a/hw/ssd0323.c b/hw/ssd0323.c
index 9c42d64..c1f8c89 100644
--- a/hw/ssd0323.c
+++ b/hw/ssd0323.c
@@ -11,7 +11,7 @@
implement one. Most of the commends relating to brightness and geometry
setup are ignored. */
#include "ssi.h"
-#include "console.h"
+#include "ui/console.h"
//#define DEBUG_SSD0323 1
diff --git a/hw/stellaris_input.c b/hw/stellaris_input.c
index 68c600c..7a95c3f 100644
--- a/hw/stellaris_input.c
+++ b/hw/stellaris_input.c
@@ -8,7 +8,7 @@
*/
#include "hw.h"
#include "devices.h"
-#include "console.h"
+#include "ui/console.h"
typedef struct {
qemu_irq irq;
diff --git a/hw/tc6393xb.c b/hw/tc6393xb.c
index 420925c..afb78bb 100644
--- a/hw/tc6393xb.c
+++ b/hw/tc6393xb.c
@@ -13,7 +13,7 @@
#include "hw.h"
#include "devices.h"
#include "flash.h"
-#include "console.h"
+#include "ui/console.h"
#include "pixel_ops.h"
#include "blockdev.h"
diff --git a/hw/tcx.c b/hw/tcx.c
index 2db2db1..72de9c2 100644
--- a/hw/tcx.c
+++ b/hw/tcx.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "console.h"
+#include "ui/console.h"
#include "pixel_ops.h"
#include "sysbus.h"
#include "qdev-addr.h"
diff --git a/hw/tsc2005.c b/hw/tsc2005.c
index 9a500eb..e232628 100644
--- a/hw/tsc2005.c
+++ b/hw/tsc2005.c
@@ -20,7 +20,7 @@
#include "hw.h"
#include "qemu-timer.h"
-#include "console.h"
+#include "ui/console.h"
#include "devices.h"
#define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10)))
diff --git a/hw/tsc210x.c b/hw/tsc210x.c
index 3c448a6..2b3535d 100644
--- a/hw/tsc210x.c
+++ b/hw/tsc210x.c
@@ -22,7 +22,7 @@
#include "hw.h"
#include "audio/audio.h"
#include "qemu-timer.h"
-#include "console.h"
+#include "ui/console.h"
#include "omap.h" /* For I2SCodec and uWireSlave */
#include "devices.h"
diff --git a/hw/twl92230.c b/hw/twl92230.c
index 0d70d84..ce699bd 100644
--- a/hw/twl92230.c
+++ b/hw/twl92230.c
@@ -23,7 +23,7 @@
#include "qemu-timer.h"
#include "i2c.h"
#include "sysemu.h"
-#include "console.h"
+#include "ui/console.h"
#define VERBOSE 1
diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index b3dcd23..58b7995 100644
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.c
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "hw/hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
#include "qemu-timer.h"
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index e732191..02fb051 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -13,7 +13,7 @@
#include "hw/usb.h"
#include "hw/usb/desc.h"
#include "hw/scsi.h"
-#include "console.h"
+#include "ui/console.h"
#include "monitor.h"
#include "sysemu.h"
#include "blockdev.h"
diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c
index ed9a5ee..0910e34 100644
--- a/hw/usb/dev-wacom.c
+++ b/hw/usb/dev-wacom.c
@@ -26,7 +26,7 @@
* THE SOFTWARE.
*/
#include "hw/hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
diff --git a/hw/usb/host-stub.c b/hw/usb/host-stub.c
index b4e10c1..e8da322 100644
--- a/hw/usb/host-stub.c
+++ b/hw/usb/host-stub.c
@@ -31,7 +31,7 @@
*/
#include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
#include "hw/usb.h"
#include "monitor.h"
diff --git a/hw/vga-isa-mm.c b/hw/vga-isa-mm.c
index 306e6ba..486d375 100644
--- a/hw/vga-isa-mm.c
+++ b/hw/vga-isa-mm.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "pc.h"
#include "vga_int.h"
#include "pixel_ops.h"
diff --git a/hw/vga-isa.c b/hw/vga-isa.c
index 046602b..c7cbded 100644
--- a/hw/vga-isa.c
+++ b/hw/vga-isa.c
@@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "pc.h"
#include "vga_int.h"
#include "pixel_ops.h"
diff --git a/hw/vga-pci.c b/hw/vga-pci.c
index 5c4daee..4609924 100644
--- a/hw/vga-pci.c
+++ b/hw/vga-pci.c
@@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "pci.h"
#include "vga_int.h"
#include "pixel_ops.h"
diff --git a/hw/vga.c b/hw/vga.c
index a07a6fb..ca07013 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -23,7 +23,7 @@
*/
#include "hw.h"
#include "vga.h"
-#include "console.h"
+#include "ui/console.h"
#include "pc.h"
#include "pci.h"
#include "vga_int.h"
diff --git a/hw/vmmouse.c b/hw/vmmouse.c
index 6338efa..d052f33 100644
--- a/hw/vmmouse.c
+++ b/hw/vmmouse.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "ps2.h"
#include "pc.h"
#include "qdev.h"
diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index 6f7074e..83dbc8b 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -23,7 +23,7 @@
*/
#include "hw.h"
#include "loader.h"
-#include "console.h"
+#include "ui/console.h"
#include "pci.h"
#undef VERBOSE
diff --git a/hw/xenfb.c b/hw/xenfb.c
index 338800a..5fbbc9e 100644
--- a/hw/xenfb.c
+++ b/hw/xenfb.c
@@ -36,7 +36,7 @@
#include <time.h>
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "qemu-char.h"
#include "xen_backend.h"
diff --git a/hw/z2.c b/hw/z2.c
index f62b806..d461864 100644
--- a/hw/z2.c
+++ b/hw/z2.c
@@ -21,7 +21,7 @@
#include "sysemu.h"
#include "flash.h"
#include "blockdev.h"
-#include "console.h"
+#include "ui/console.h"
#include "audio/audio.h"
#include "exec-memory.h"
diff --git a/console.h b/include/ui/console.h
similarity index 100%
rename from console.h
rename to include/ui/console.h
diff --git a/pflib.h b/include/ui/pflib.h
similarity index 100%
rename from pflib.h
rename to include/ui/pflib.h
diff --git a/ui/qemu-spice.h b/include/ui/qemu-spice.h
similarity index 100%
rename from ui/qemu-spice.h
rename to include/ui/qemu-spice.h
diff --git a/ui/spice-display.h b/include/ui/spice-display.h
similarity index 99%
rename from ui/spice-display.h
rename to include/ui/spice-display.h
index d766927..3e58380 100644
--- a/ui/spice-display.h
+++ b/include/ui/spice-display.h
@@ -20,7 +20,7 @@
#include <spice/qxl_dev.h>
#include "qemu-thread.h"
-#include "console.h"
+#include "ui/console.h"
#include "pflib.h"
#include "sysemu.h"
diff --git a/monitor.c b/monitor.c
index cd8870b..874c3ee 100644
--- a/monitor.c
+++ b/monitor.c
@@ -38,7 +38,7 @@
#include "sysemu.h"
#include "monitor.h"
#include "readline.h"
-#include "console.h"
+#include "ui/console.h"
#include "blockdev.h"
#include "audio/audio.h"
#include "disas/disas.h"
diff --git a/qemu-char.c b/qemu-char.c
index 255a3ae..ffaab2c 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "monitor.h"
-#include "console.h"
+#include "ui/console.h"
#include "sysemu.h"
#include "qemu-timer.h"
#include "qemu-char.h"
diff --git a/qemu-timer.c b/qemu-timer.c
index 204f13e..5948e54 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -24,7 +24,7 @@
#include "sysemu.h"
#include "monitor.h"
-#include "console.h"
+#include "ui/console.h"
#include "hw/hw.h"
diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
index a9e226b..4b68561 100644
--- a/target-unicore32/helper.c
+++ b/target-unicore32/helper.c
@@ -13,7 +13,7 @@
#include "gdbstub.h"
#include "helper.h"
#include "host-utils.h"
-#include "console.h"
+#include "ui/console.h"
#undef DEBUG_UC32
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index fd339d2..fa815c1 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -6,7 +6,7 @@ vnc-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o
vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o
vnc-obj-y += vnc-jobs.o
-common-obj-y += keymaps.o
+common-obj-y += keymaps.o console.o cursor.o input.o pflib.o
common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o
common-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o
common-obj-$(CONFIG_COCOA) += cocoa.o
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 2383646..611bb26 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -26,7 +26,7 @@
#include <crt_externs.h>
#include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
#include "sysemu.h"
#ifndef MAC_OS_X_VERSION_10_4
diff --git a/console.c b/ui/console.c
similarity index 99%
rename from console.c
rename to ui/console.c
index eb46d79..0d80e4e 100644
--- a/console.c
+++ b/ui/console.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
#include "qemu-timer.h"
#include "qmp-commands.h"
#include "qemu-char.h"
diff --git a/ui/curses.c b/ui/curses.c
index c2be2c6..d5dcb8d 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -33,7 +33,7 @@
#endif
#include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
#include "sysemu.h"
#define FONT_HEIGHT 16
diff --git a/cursor.c b/ui/cursor.c
similarity index 99%
rename from cursor.c
rename to ui/cursor.c
index 76e262c..2b8dd3f 100644
--- a/cursor.c
+++ b/ui/cursor.c
@@ -1,5 +1,5 @@
#include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
#include "cursor_hidden.xpm"
#include "cursor_left_ptr.xpm"
diff --git a/cursor_hidden.xpm b/ui/cursor_hidden.xpm
similarity index 100%
rename from cursor_hidden.xpm
rename to ui/cursor_hidden.xpm
diff --git a/cursor_left_ptr.xpm b/ui/cursor_left_ptr.xpm
similarity index 100%
rename from cursor_left_ptr.xpm
rename to ui/cursor_left_ptr.xpm
diff --git a/input.c b/ui/input.c
similarity index 99%
rename from input.c
rename to ui/input.c
index 123bb23..58d3b47 100644
--- a/input.c
+++ b/ui/input.c
@@ -24,7 +24,7 @@
#include "sysemu.h"
#include "monitor.h"
-#include "console.h"
+#include "ui/console.h"
#include "error.h"
#include "qmp-commands.h"
#include "qapi-types.h"
diff --git a/pflib.c b/ui/pflib.c
similarity index 99%
rename from pflib.c
rename to ui/pflib.c
index 987e110..6eefa58 100644
--- a/pflib.c
+++ b/ui/pflib.c
@@ -10,8 +10,8 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
-#include "console.h"
-#include "pflib.h"
+#include "ui/console.h"
+#include "ui/pflib.h"
typedef struct QemuPixel QemuPixel;
diff --git a/qemu-x509.h b/ui/qemu-x509.h
similarity index 100%
rename from qemu-x509.h
rename to ui/qemu-x509.h
diff --git a/ui/sdl.c b/ui/sdl.c
index f6f711c..485cb08 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -29,7 +29,7 @@
#include <SDL_syswm.h>
#include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
#include "sysemu.h"
#include "x_keymap.h"
#include "sdl_zoom.h"
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 5147365..27e9ba1 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -22,7 +22,7 @@
#include "sysemu.h"
#include "qemu-common.h"
-#include "qemu-spice.h"
+#include "ui/qemu-spice.h"
#include "qemu-thread.h"
#include "qemu-timer.h"
#include "qemu-queue.h"
@@ -37,7 +37,7 @@
#include "migration.h"
#include "monitor.h"
#include "hw/hw.h"
-#include "spice-display.h"
+#include "ui/spice-display.h"
/* core bits */
diff --git a/ui/spice-display.c b/ui/spice-display.c
index b61764f..1355cba 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -16,15 +16,15 @@
*/
#include "qemu-common.h"
-#include "qemu-spice.h"
+#include "ui/qemu-spice.h"
#include "qemu-timer.h"
#include "qemu-queue.h"
#include "monitor.h"
-#include "console.h"
+#include "ui/console.h"
#include "sysemu.h"
#include "trace.h"
-#include "spice-display.h"
+#include "ui/spice-display.h"
static int debug = 0;
diff --git a/ui/spice-input.c b/ui/spice-input.c
index af4223d..3beb8de 100644
--- a/ui/spice-input.c
+++ b/ui/spice-input.c
@@ -24,8 +24,8 @@
#include <spice/enums.h>
#include "qemu-common.h"
-#include "qemu-spice.h"
-#include "console.h"
+#include "ui/qemu-spice.h"
+#include "ui/console.h"
/* keyboard bits */
diff --git a/vgafont.h b/ui/vgafont.h
similarity index 100%
rename from vgafont.h
rename to ui/vgafont.h
diff --git a/ui/vnc.h b/ui/vnc.h
index 068c2fc..f86db6e 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -30,7 +30,7 @@
#include "qemu-common.h"
#include "qemu-queue.h"
#include "qemu-thread.h"
-#include "console.h"
+#include "ui/console.h"
#include "monitor.h"
#include "audio/audio.h"
#include "bitmap.h"
diff --git a/vl.c b/vl.c
index 88880f6..ab21a93 100644
--- a/vl.c
+++ b/vl.c
@@ -130,7 +130,7 @@ int main(int argc, char **argv)
#include "net/net.h"
#include "net/slirp.h"
#include "monitor.h"
-#include "console.h"
+#include "ui/console.h"
#include "sysemu.h"
#include "gdbstub.h"
#include "qemu-timer.h"
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 18/32] audio: move public header file to include/audio/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (16 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 17/32] ui: move files to ui/ and include/ui/ Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 19/32] slirp: move public header file to include/slirp/ Paolo Bonzini
` (16 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
audio/alsaaudio.c | 2 +-
audio/audio.c | 2 +-
audio/audio_pt_int.c | 2 +-
audio/audio_win_int.c | 3 +--
audio/coreaudio.c | 2 +-
audio/dsoundaudio.c | 2 +-
audio/esdaudio.c | 2 +-
audio/fmodaudio.c | 2 +-
audio/mixeng.c | 2 +-
audio/noaudio.c | 2 +-
audio/ossaudio.c | 2 +-
audio/paaudio.c | 2 +-
audio/sdlaudio.c | 2 +-
audio/spiceaudio.c | 2 +-
audio/wavaudio.c | 2 +-
audio/wavcapture.c | 2 +-
audio/winwaveaudio.c | 2 +-
{audio => include/audio}/audio.h | 0
18 files changed, 17 insertions(+), 18 deletions(-)
rename {audio => include/audio}/audio.h (100%)
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index cd553c2..2642d65 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -24,7 +24,7 @@
#include <alsa/asoundlib.h>
#include "qemu-common.h"
#include "main-loop.h"
-#include "audio.h"
+#include "audio/audio.h"
#if QEMU_GNUC_PREREQ(4, 3)
#pragma GCC diagnostic ignored "-Waddress"
diff --git a/audio/audio.c b/audio/audio.c
index 1c77389..f270ac0 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "hw/hw.h"
-#include "audio.h"
+#include "audio/audio.h"
#include "monitor.h"
#include "qemu-timer.h"
#include "sysemu.h"
diff --git a/audio/audio_pt_int.c b/audio/audio_pt_int.c
index 9a9c306..97e36ab 100644
--- a/audio/audio_pt_int.c
+++ b/audio/audio_pt_int.c
@@ -1,5 +1,5 @@
#include "qemu-common.h"
-#include "audio.h"
+#include "audio/audio.h"
#define AUDIO_CAP "audio-pt"
diff --git a/audio/audio_win_int.c b/audio/audio_win_int.c
index 5869052..071f52c 100644
--- a/audio/audio_win_int.c
+++ b/audio/audio_win_int.c
@@ -1,13 +1,12 @@
/* public domain */
#include "qemu-common.h"
-#include "audio.h"
+#include "audio/audio.h"
#define AUDIO_CAP "win-int"
#include <windows.h>
#include <mmsystem.h>
-#include "audio.h"
#include "audio_int.h"
#include "audio_win_int.h"
diff --git a/audio/coreaudio.c b/audio/coreaudio.c
index 5964c62..d0db2a2 100644
--- a/audio/coreaudio.c
+++ b/audio/coreaudio.c
@@ -27,7 +27,7 @@
#include <pthread.h> /* pthread_X */
#include "qemu-common.h"
-#include "audio.h"
+#include "audio/audio.h"
#define AUDIO_CAP "coreaudio"
#include "audio_int.h"
diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c
index e2d89fd..b26705d 100644
--- a/audio/dsoundaudio.c
+++ b/audio/dsoundaudio.c
@@ -27,7 +27,7 @@
*/
#include "qemu-common.h"
-#include "audio.h"
+#include "audio/audio.h"
#define AUDIO_CAP "dsound"
#include "audio_int.h"
diff --git a/audio/esdaudio.c b/audio/esdaudio.c
index eea9cce..c1d974f 100644
--- a/audio/esdaudio.c
+++ b/audio/esdaudio.c
@@ -23,7 +23,7 @@
*/
#include <esd.h>
#include "qemu-common.h"
-#include "audio.h"
+#include "audio/audio.h"
#define AUDIO_CAP "esd"
#include "audio_int.h"
diff --git a/audio/fmodaudio.c b/audio/fmodaudio.c
index fabf84d..43d17d5 100644
--- a/audio/fmodaudio.c
+++ b/audio/fmodaudio.c
@@ -24,7 +24,7 @@
#include <fmod.h>
#include <fmod_errors.h>
#include "qemu-common.h"
-#include "audio.h"
+#include "audio/audio.h"
#define AUDIO_CAP "fmod"
#include "audio_int.h"
diff --git a/audio/mixeng.c b/audio/mixeng.c
index 02a9d9f..47a4e51 100644
--- a/audio/mixeng.c
+++ b/audio/mixeng.c
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "audio.h"
+#include "audio/audio.h"
#define AUDIO_CAP "mixeng"
#include "audio_int.h"
diff --git a/audio/noaudio.c b/audio/noaudio.c
index 54958f8..fd40758 100644
--- a/audio/noaudio.c
+++ b/audio/noaudio.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "audio.h"
+#include "audio/audio.h"
#include "qemu-timer.h"
#define AUDIO_CAP "noaudio"
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index 8249a00..2c4a0db 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -33,7 +33,7 @@
#include "qemu-common.h"
#include "main-loop.h"
#include "host-utils.h"
-#include "audio.h"
+#include "audio/audio.h"
#define AUDIO_CAP "oss"
#include "audio_int.h"
diff --git a/audio/paaudio.c b/audio/paaudio.c
index 8b69778..050e076 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -1,6 +1,6 @@
/* public domain */
#include "qemu-common.h"
-#include "audio.h"
+#include "audio/audio.h"
#include <pulse/pulseaudio.h>
diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
index d24daa5..70fab41 100644
--- a/audio/sdlaudio.c
+++ b/audio/sdlaudio.c
@@ -24,7 +24,7 @@
#include <SDL.h>
#include <SDL_thread.h>
#include "qemu-common.h"
-#include "audio.h"
+#include "audio/audio.h"
#ifndef _WIN32
#ifdef __sun__
diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index 6f15591..4950e5b 100644
--- a/audio/spiceaudio.c
+++ b/audio/spiceaudio.c
@@ -22,7 +22,7 @@
#include "ui/qemu-spice.h"
#define AUDIO_CAP "spice"
-#include "audio.h"
+#include "audio/audio.h"
#include "audio_int.h"
#define LINE_IN_SAMPLES 1024
diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index a449b51..96c0a83 100644
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -23,7 +23,7 @@
*/
#include "hw/hw.h"
#include "qemu-timer.h"
-#include "audio.h"
+#include "audio/audio.h"
#define AUDIO_CAP "wav"
#include "audio_int.h"
diff --git a/audio/wavcapture.c b/audio/wavcapture.c
index 4f785f5..b897e26 100644
--- a/audio/wavcapture.c
+++ b/audio/wavcapture.c
@@ -1,6 +1,6 @@
#include "hw/hw.h"
#include "monitor.h"
-#include "audio.h"
+#include "audio/audio.h"
typedef struct {
FILE *f;
diff --git a/audio/winwaveaudio.c b/audio/winwaveaudio.c
index 72babbf..34bcd47 100644
--- a/audio/winwaveaudio.c
+++ b/audio/winwaveaudio.c
@@ -2,7 +2,7 @@
#include "qemu-common.h"
#include "sysemu.h"
-#include "audio.h"
+#include "audio/audio.h"
#define AUDIO_CAP "winwave"
#include "audio_int.h"
diff --git a/audio/audio.h b/include/audio/audio.h
similarity index 100%
rename from audio/audio.h
rename to include/audio/audio.h
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 19/32] slirp: move public header file to include/slirp/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (17 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 18/32] audio: move public header file to include/audio/ Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 20/32] qapi: move include files to include/qapi/ Paolo Bonzini
` (15 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
{slirp => include/slirp}/libslirp.h | 5 +++++
main-loop.c | 2 +-
slirp/misc.c | 1 -
slirp/slirp.h | 7 +------
4 files changed, 7 insertions(+), 8 deletions(-)
rename {slirp => include/slirp}/libslirp.h (96%)
diff --git a/slirp/libslirp.h b/include/slirp/libslirp.h
similarity index 96%
rename from slirp/libslirp.h
rename to include/slirp/libslirp.h
index 9b471b5..ee4ef7b 100644
--- a/slirp/libslirp.h
+++ b/include/slirp/libslirp.h
@@ -3,6 +3,11 @@
#include "qemu-common.h"
+#ifndef _WIN32
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+
struct Slirp;
typedef struct Slirp Slirp;
diff --git a/main-loop.c b/main-loop.c
index eb3b6e6..154aa5e 100644
--- a/main-loop.c
+++ b/main-loop.c
@@ -24,7 +24,7 @@
#include "qemu-common.h"
#include "qemu-timer.h"
-#include "slirp/slirp.h"
+#include "slirp/libslirp.h"
#include "main-loop.h"
#ifndef _WIN32
diff --git a/slirp/misc.c b/slirp/misc.c
index 0bee864..bb1e998 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -6,7 +6,6 @@
*/
#include <slirp.h>
-#include <libslirp.h>
#include "monitor.h"
diff --git a/slirp/slirp.h b/slirp/slirp.h
index f2c5eca..acd0276 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -66,11 +66,6 @@ typedef char *caddr_t;
#include <sys/uio.h>
#endif
-#ifndef _WIN32
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif
-
/* Systems lacking strdup() definition in <string.h>. */
#if defined(ultrix)
char *strdup(const char *);
@@ -136,7 +131,7 @@ void free(void *ptr);
#include "qemu-queue.h"
#include "qemu_socket.h"
-#include "libslirp.h"
+#include "slirp/libslirp.h"
#include "ip.h"
#include "tcp.h"
#include "tcp_timer.h"
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 20/32] qapi: move include files to include/qapi/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (18 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 19/32] slirp: move public header file to include/slirp/ Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 21/32] qapi: create qobject/ and include/qobject/ Paolo Bonzini
` (14 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
blockdev.h | 2 +-
dump.c | 2 +-
error.c | 2 +-
hw/pci-hotplug.c | 2 +-
hw/qdev.c | 2 +-
hw/qdev.h | 4 ++--
hw/vga_int.h | 2 +-
.../qapi/dealloc-visitor.h | 2 +-
error.h => include/qapi/error.h | 0
{qapi => include/qapi}/opts-visitor.h | 2 +-
{qapi => include/qapi}/qmp-core.h | 2 +-
{qapi => include/qapi}/qmp-input-visitor.h | 2 +-
{qapi => include/qapi}/qmp-output-visitor.h | 2 +-
{qapi => include/qapi}/string-input-visitor.h | 2 +-
{qapi => include/qapi}/string-output-visitor.h | 2 +-
.../qapi-types-core.h => include/qapi/types-core.h | 2 +-
.../qapi-visit-core.h => include/qapi/visit-core.h | 2 +-
.../qapi-visit-impl.h => include/qapi/visit-impl.h | 4 ++--
include/ui/console.h | 2 +-
json-parser.h | 2 +-
migration.h | 2 +-
net/net.c | 2 +-
qapi/opts-visitor.c | 4 ++--
qapi/qapi-dealloc-visitor.c | 2 +-
qapi/qapi-visit-core.c | 4 ++--
qapi/qmp-dispatch.c | 2 +-
qapi/qmp-input-visitor.c | 4 ++--
qapi/qmp-output-visitor.c | 4 ++--
qapi/string-input-visitor.c | 4 ++--
qapi/string-output-visitor.c | 4 ++--
qemu-config.c | 2 +-
qemu-config.h | 2 +-
qemu-option.c | 2 +-
qemu-option.h | 2 +-
qemu_socket.h | 2 +-
qerror.h | 2 +-
qom/object.c | 2 +-
qom/qom-qobject.c | 2 +-
scripts/qapi-commands.py | 6 +++---
scripts/qapi-types.py | 2 +-
scripts/qapi-visit.py | 2 +-
target-i386/cpu-qom.h | 2 +-
target-i386/cpu.c | 2 +-
target-openrisc/cpu.h | 2 +-
ui/input.c | 2 +-
45 files changed, 54 insertions(+), 54 deletions(-)
rename qapi/qapi-dealloc-visitor.h => include/qapi/dealloc-visitor.h (95%)
rename error.h => include/qapi/error.h (100%)
rename {qapi => include/qapi}/opts-visitor.h (96%)
rename {qapi => include/qapi}/qmp-core.h (98%)
rename {qapi => include/qapi}/qmp-input-visitor.h (95%)
rename {qapi => include/qapi}/qmp-output-visitor.h (95%)
rename {qapi => include/qapi}/string-input-visitor.h (95%)
rename {qapi => include/qapi}/string-output-visitor.h (95%)
rename qapi/qapi-types-core.h => include/qapi/types-core.h (94%)
rename qapi/qapi-visit-core.h => include/qapi/visit-core.h (99%)
rename qapi/qapi-visit-impl.h => include/qapi/visit-impl.h (90%)
diff --git a/blockdev.h b/blockdev.h
index 5f27b64..4be871e 100644
--- a/blockdev.h
+++ b/blockdev.h
@@ -11,7 +11,7 @@
#define BLOCKDEV_H
#include "block.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qemu-queue.h"
void blockdev_mark_auto_del(BlockDriverState *bs);
diff --git a/dump.c b/dump.c
index 6b7c127..8826e8e 100644
--- a/dump.c
+++ b/dump.c
@@ -21,7 +21,7 @@
#include "dump.h"
#include "sysemu.h"
#include "memory_mapping.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qmp-commands.h"
#include "gdbstub.h"
diff --git a/error.c b/error.c
index 128d88c..cd600af 100644
--- a/error.c
+++ b/error.c
@@ -11,7 +11,7 @@
*/
#include "qemu-common.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qjson.h"
#include "qdict.h"
#include "qapi-types.h"
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index 1be8263..62c7f9d 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -32,7 +32,7 @@
#include "virtio-blk.h"
#include "qemu-config.h"
#include "blockdev.h"
-#include "error.h"
+#include "qapi/error.h"
#if defined(TARGET_I386)
static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon,
diff --git a/hw/qdev.c b/hw/qdev.c
index bc20417..4498de0 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -28,7 +28,7 @@
#include "net/net.h"
#include "qdev.h"
#include "sysemu.h"
-#include "error.h"
+#include "qapi/error.h"
int qdev_hotplug = 0;
static bool qdev_hot_added = false;
diff --git a/hw/qdev.h b/hw/qdev.h
index 8ba1613..855e47b 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -4,9 +4,9 @@
#include "hw.h"
#include "qemu-queue.h"
#include "qemu-option.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visit-core.h"
#include "qemu/object.h"
-#include "error.h"
+#include "qapi/error.h"
typedef struct Property Property;
diff --git a/hw/vga_int.h b/hw/vga_int.h
index 144e7d3..6093867 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -23,7 +23,7 @@
*/
#include <hw/hw.h>
-#include "error.h"
+#include "qapi/error.h"
#include "memory.h"
#define ST01_V_RETRACE 0x08
diff --git a/qapi/qapi-dealloc-visitor.h b/include/qapi/dealloc-visitor.h
similarity index 95%
rename from qapi/qapi-dealloc-visitor.h
rename to include/qapi/dealloc-visitor.h
index 5842bc7..a8d3fcb 100644
--- a/qapi/qapi-dealloc-visitor.h
+++ b/include/qapi/dealloc-visitor.h
@@ -14,7 +14,7 @@
#ifndef QAPI_DEALLOC_VISITOR_H
#define QAPI_DEALLOC_VISITOR_H
-#include "qapi-visit-core.h"
+#include "qapi/visit-core.h"
typedef struct QapiDeallocVisitor QapiDeallocVisitor;
diff --git a/error.h b/include/qapi/error.h
similarity index 100%
rename from error.h
rename to include/qapi/error.h
diff --git a/qapi/opts-visitor.h b/include/qapi/opts-visitor.h
similarity index 96%
rename from qapi/opts-visitor.h
rename to include/qapi/opts-visitor.h
index ea1a395..5408e53 100644
--- a/qapi/opts-visitor.h
+++ b/include/qapi/opts-visitor.h
@@ -13,7 +13,7 @@
#ifndef OPTS_VISITOR_H
#define OPTS_VISITOR_H
-#include "qapi-visit-core.h"
+#include "qapi/visit-core.h"
#include "qemu-option.h"
typedef struct OptsVisitor OptsVisitor;
diff --git a/qapi/qmp-core.h b/include/qapi/qmp-core.h
similarity index 98%
rename from qapi/qmp-core.h
rename to include/qapi/qmp-core.h
index 00446cf..2a57a0c 100644
--- a/qapi/qmp-core.h
+++ b/include/qapi/qmp-core.h
@@ -16,7 +16,7 @@
#include "qobject.h"
#include "qdict.h"
-#include "error.h"
+#include "qapi/error.h"
typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);
diff --git a/qapi/qmp-input-visitor.h b/include/qapi/qmp-input-visitor.h
similarity index 95%
rename from qapi/qmp-input-visitor.h
rename to include/qapi/qmp-input-visitor.h
index e0a48a5..9071f9c 100644
--- a/qapi/qmp-input-visitor.h
+++ b/include/qapi/qmp-input-visitor.h
@@ -14,7 +14,7 @@
#ifndef QMP_INPUT_VISITOR_H
#define QMP_INPUT_VISITOR_H
-#include "qapi-visit-core.h"
+#include "qapi/visit-core.h"
#include "qobject.h"
typedef struct QmpInputVisitor QmpInputVisitor;
diff --git a/qapi/qmp-output-visitor.h b/include/qapi/qmp-output-visitor.h
similarity index 95%
rename from qapi/qmp-output-visitor.h
rename to include/qapi/qmp-output-visitor.h
index 4a649c2..39cb575 100644
--- a/qapi/qmp-output-visitor.h
+++ b/include/qapi/qmp-output-visitor.h
@@ -14,7 +14,7 @@
#ifndef QMP_OUTPUT_VISITOR_H
#define QMP_OUTPUT_VISITOR_H
-#include "qapi-visit-core.h"
+#include "qapi/visit-core.h"
#include "qobject.h"
typedef struct QmpOutputVisitor QmpOutputVisitor;
diff --git a/qapi/string-input-visitor.h b/include/qapi/string-input-visitor.h
similarity index 95%
rename from qapi/string-input-visitor.h
rename to include/qapi/string-input-visitor.h
index d269d42..15c9cd5 100644
--- a/qapi/string-input-visitor.h
+++ b/include/qapi/string-input-visitor.h
@@ -13,7 +13,7 @@
#ifndef STRING_INPUT_VISITOR_H
#define STRING_INPUT_VISITOR_H
-#include "qapi-visit-core.h"
+#include "qapi/visit-core.h"
typedef struct StringInputVisitor StringInputVisitor;
diff --git a/qapi/string-output-visitor.h b/include/qapi/string-output-visitor.h
similarity index 95%
rename from qapi/string-output-visitor.h
rename to include/qapi/string-output-visitor.h
index 8868454..daa8c9d 100644
--- a/qapi/string-output-visitor.h
+++ b/include/qapi/string-output-visitor.h
@@ -13,7 +13,7 @@
#ifndef STRING_OUTPUT_VISITOR_H
#define STRING_OUTPUT_VISITOR_H
-#include "qapi-visit-core.h"
+#include "qapi/visit-core.h"
typedef struct StringOutputVisitor StringOutputVisitor;
diff --git a/qapi/qapi-types-core.h b/include/qapi/types-core.h
similarity index 94%
rename from qapi/qapi-types-core.h
rename to include/qapi/types-core.h
index f781fc3..0080206 100644
--- a/qapi/qapi-types-core.h
+++ b/include/qapi/types-core.h
@@ -15,7 +15,7 @@
#define QAPI_TYPES_CORE_H
#include "qemu-common.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qerror.h"
#endif
diff --git a/qapi/qapi-visit-core.h b/include/qapi/visit-core.h
similarity index 99%
rename from qapi/qapi-visit-core.h
rename to include/qapi/visit-core.h
index 60aceda..ba666b9 100644
--- a/qapi/qapi-visit-core.h
+++ b/include/qapi/visit-core.h
@@ -13,7 +13,7 @@
#ifndef QAPI_VISITOR_CORE_H
#define QAPI_VISITOR_CORE_H
-#include "qapi/qapi-types-core.h"
+#include "qapi/types-core.h"
#include <stdlib.h>
typedef struct GenericList
diff --git a/qapi/qapi-visit-impl.h b/include/qapi/visit-impl.h
similarity index 90%
rename from qapi/qapi-visit-impl.h
rename to include/qapi/visit-impl.h
index 0f3a189..7910898 100644
--- a/qapi/qapi-visit-impl.h
+++ b/include/qapi/visit-impl.h
@@ -12,8 +12,8 @@
#ifndef QAPI_VISITOR_IMPL_H
#define QAPI_VISITOR_IMPL_H
-#include "qapi/qapi-types-core.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/types-core.h"
+#include "qapi/visit-core.h"
void input_type_enum(Visitor *v, int *obj, const char *strings[],
const char *kind, const char *name, Error **errp);
diff --git a/include/ui/console.h b/include/ui/console.h
index a9f8952..b9a8a65 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -6,7 +6,7 @@
#include "monitor.h"
#include "trace.h"
#include "qapi-types.h"
-#include "error.h"
+#include "qapi/error.h"
/* keyboard/mouse support */
diff --git a/json-parser.h b/json-parser.h
index 8f2b5ec..4e346ac 100644
--- a/json-parser.h
+++ b/json-parser.h
@@ -16,7 +16,7 @@
#include "qemu-common.h"
#include "qlist.h"
-#include "error.h"
+#include "qapi/error.h"
QObject *json_parser_parse(QList *tokens, va_list *ap);
QObject *json_parser_parse_err(QList *tokens, va_list *ap, Error **errp);
diff --git a/migration.h b/migration.h
index c3a23cc..86e4118 100644
--- a/migration.h
+++ b/migration.h
@@ -17,7 +17,7 @@
#include "qdict.h"
#include "qemu-common.h"
#include "notify.h"
-#include "error.h"
+#include "qapi/error.h"
#include "vmstate.h"
#include "qapi-types.h"
diff --git a/net/net.c b/net/net.c
index 8b8ba12..680113f 100644
--- a/net/net.c
+++ b/net/net.c
@@ -38,7 +38,7 @@
#include "iov.h"
#include "qapi-visit.h"
#include "qapi/opts-visitor.h"
-#include "qapi/qapi-dealloc-visitor.h"
+#include "qapi/dealloc-visitor.h"
/* Net bridge is currently not supported for W32. */
#if !defined(_WIN32)
diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index e048b6c..4af2468 100644
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -10,10 +10,10 @@
*
*/
-#include "opts-visitor.h"
+#include "qapi/opts-visitor.h"
#include "qemu-queue.h"
#include "qemu-option-internal.h"
-#include "qapi-visit-impl.h"
+#include "qapi/visit-impl.h"
struct OptsVisitor
diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c
index a154523..d6ae4a8 100644
--- a/qapi/qapi-dealloc-visitor.c
+++ b/qapi/qapi-dealloc-visitor.c
@@ -11,7 +11,7 @@
*
*/
-#include "qapi-dealloc-visitor.h"
+#include "qapi/dealloc-visitor.h"
#include "qemu-queue.h"
#include "qemu-common.h"
#include "qemu-objects.h"
diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
index 7a82b63..bce7868 100644
--- a/qapi/qapi-visit-core.c
+++ b/qapi/qapi-visit-core.c
@@ -11,8 +11,8 @@
*
*/
-#include "qapi/qapi-visit-core.h"
-#include "qapi/qapi-visit-impl.h"
+#include "qapi/visit-core.h"
+#include "qapi/visit-impl.h"
void visit_start_handle(Visitor *v, void **obj, const char *kind,
const char *name, Error **errp)
diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index 4085994..6b29e64 100644
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -15,7 +15,7 @@
#include "qapi/qmp-core.h"
#include "json-parser.h"
#include "qapi-types.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qerror.h"
static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)
diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index 107d8d3..9878ef6 100644
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@@ -11,8 +11,8 @@
*
*/
-#include "qmp-input-visitor.h"
-#include "qapi/qapi-visit-impl.h"
+#include "qapi/qmp-input-visitor.h"
+#include "qapi/visit-impl.h"
#include "qemu-queue.h"
#include "qemu-common.h"
#include "qemu-objects.h"
diff --git a/qapi/qmp-output-visitor.c b/qapi/qmp-output-visitor.c
index 2bce9d5..3a056ef 100644
--- a/qapi/qmp-output-visitor.c
+++ b/qapi/qmp-output-visitor.c
@@ -11,8 +11,8 @@
*
*/
-#include "qmp-output-visitor.h"
-#include "qapi/qapi-visit-impl.h"
+#include "qapi/qmp-output-visitor.h"
+#include "qapi/visit-impl.h"
#include "qemu-queue.h"
#include "qemu-common.h"
#include "qemu-objects.h"
diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c
index 497eb9a..eaf6b11 100644
--- a/qapi/string-input-visitor.c
+++ b/qapi/string-input-visitor.c
@@ -11,8 +11,8 @@
*/
#include "qemu-common.h"
-#include "string-input-visitor.h"
-#include "qapi/qapi-visit-impl.h"
+#include "qapi/string-input-visitor.h"
+#include "qapi/visit-impl.h"
#include "qerror.h"
struct StringInputVisitor
diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.c
index 34e525e..507ebf7 100644
--- a/qapi/string-output-visitor.c
+++ b/qapi/string-output-visitor.c
@@ -11,8 +11,8 @@
*/
#include "qemu-common.h"
-#include "string-output-visitor.h"
-#include "qapi/qapi-visit-impl.h"
+#include "qapi/string-output-visitor.h"
+#include "qapi/visit-impl.h"
#include "qerror.h"
struct StringOutputVisitor
diff --git a/qemu-config.c b/qemu-config.c
index cd1ec21..e53c444 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -3,7 +3,7 @@
#include "qemu-option.h"
#include "qemu-config.h"
#include "hw/qdev.h"
-#include "error.h"
+#include "qapi/error.h"
static QemuOptsList qemu_drive_opts = {
.name = "drive",
diff --git a/qemu-config.h b/qemu-config.h
index daf1539..f3c6276 100644
--- a/qemu-config.h
+++ b/qemu-config.h
@@ -1,7 +1,7 @@
#ifndef QEMU_CONFIG_H
#define QEMU_CONFIG_H
-#include "error.h"
+#include "qapi/error.h"
#include "qemu-option.h"
extern QemuOptsList qemu_fsdev_opts;
diff --git a/qemu-option.c b/qemu-option.c
index 27891e7..734b13c 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -29,7 +29,7 @@
#include "qemu-common.h"
#include "qemu-error.h"
#include "qemu-objects.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qerror.h"
#include "qemu-option-internal.h"
diff --git a/qemu-option.h b/qemu-option.h
index ca72986..53eca74 100644
--- a/qemu-option.h
+++ b/qemu-option.h
@@ -28,7 +28,7 @@
#include <stdint.h>
#include "qemu-queue.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qdict.h"
enum QEMUOptionParType {
diff --git a/qemu_socket.h b/qemu_socket.h
index 02490ad..c10d732 100644
--- a/qemu_socket.h
+++ b/qemu_socket.h
@@ -27,7 +27,7 @@ int inet_aton(const char *cp, struct in_addr *ia);
#endif /* !_WIN32 */
#include "qemu-option.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qerror.h"
/* misc helpers */
diff --git a/qerror.h b/qerror.h
index f23b978..cfdabba 100644
--- a/qerror.h
+++ b/qerror.h
@@ -15,7 +15,7 @@
#include "qdict.h"
#include "qstring.h"
#include "qemu-error.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qapi-types.h"
#include <stdarg.h>
diff --git a/qom/object.c b/qom/object.c
index e3e9242..d195890 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -12,7 +12,7 @@
#include "qemu/object.h"
#include "qemu-common.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visit-core.h"
#include "qapi/string-input-visitor.h"
#include "qapi/string-output-visitor.h"
diff --git a/qom/qom-qobject.c b/qom/qom-qobject.c
index 0689914..ee41346 100644
--- a/qom/qom-qobject.c
+++ b/qom/qom-qobject.c
@@ -12,7 +12,7 @@
#include "qemu-common.h"
#include "qemu/object.h"
#include "qemu/qom-qobject.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visit-core.h"
#include "qapi/qmp-input-visitor.h"
#include "qapi/qmp-output-visitor.h"
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 3c4678d..4d0847a 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -343,7 +343,7 @@ def gen_command_decl_prologue(header, guard, prefix=""):
#include "%(prefix)sqapi-types.h"
#include "qdict.h"
-#include "error.h"
+#include "qapi/error.h"
''',
header=basename(header), guard=guardname(header), prefix=prefix)
@@ -368,10 +368,10 @@ def gen_command_def_prologue(prefix="", proxy=False):
#include "qemu-objects.h"
#include "qapi/qmp-core.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visit-core.h"
#include "qapi/qmp-output-visitor.h"
#include "qapi/qmp-input-visitor.h"
-#include "qapi/qapi-dealloc-visitor.h"
+#include "qapi/dealloc-visitor.h"
#include "%(prefix)sqapi-types.h"
#include "%(prefix)sqapi-visit.h"
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 1b84834..69e3dd7 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -248,7 +248,7 @@ fdef.write(mcgen('''
*
*/
-#include "qapi/qapi-dealloc-visitor.h"
+#include "qapi/dealloc-visitor.h"
#include "%(prefix)sqapi-types.h"
#include "%(prefix)sqapi-visit.h"
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index a360de7..d292528 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -321,7 +321,7 @@ fdecl.write(mcgen('''
#ifndef %(guard)s
#define %(guard)s
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visit-core.h"
#include "%(prefix)sqapi-types.h"
''',
prefix=prefix, guard=guardname(h_file)))
diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h
index 5901140..3a7bc6a 100644
--- a/target-i386/cpu-qom.h
+++ b/target-i386/cpu-qom.h
@@ -22,7 +22,7 @@
#include "qemu/cpu.h"
#include "cpu.h"
-#include "error.h"
+#include "qapi/error.h"
#ifdef TARGET_X86_64
#define TYPE_X86_CPU "x86_64-cpu"
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index f3708e6..e847a22 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -27,7 +27,7 @@
#include "qemu-option.h"
#include "qemu-config.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visit-core.h"
#include "arch_init.h"
#include "hyperv.h"
diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h
index de21a87..f118718 100644
--- a/target-openrisc/cpu.h
+++ b/target-openrisc/cpu.h
@@ -33,7 +33,7 @@ struct OpenRISCCPU;
#include "cpu-defs.h"
#include "softfloat.h"
#include "qemu/cpu.h"
-#include "error.h"
+#include "qapi/error.h"
#define TYPE_OPENRISC_CPU "or32-cpu"
diff --git a/ui/input.c b/ui/input.c
index 58d3b47..65950af 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -25,7 +25,7 @@
#include "sysemu.h"
#include "monitor.h"
#include "ui/console.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qmp-commands.h"
#include "qapi-types.h"
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 21/32] qapi: create qobject/ and include/qobject/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (19 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 20/32] qapi: move include files to include/qapi/ Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 22/32] block: move include files to include/block/ Paolo Bonzini
` (13 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 5 ++---
balloon.c | 2 +-
block.c | 2 +-
block.h | 2 +-
block/qcow2.c | 2 +-
block/qed.c | 2 +-
block_int.h | 2 +-
blockdev-nbd.c | 2 +-
blockdev.c | 4 ++--
blockjob.c | 2 +-
dump-stub.c | 2 +-
error.c | 6 +++---
hmp.h | 2 +-
hw/ivshmem.c | 2 +-
hw/pcie_aer.c | 2 +-
hw/qdev-properties.c | 2 +-
hw/watchdog.c | 2 +-
include/net/net.h | 2 +-
include/net/slirp.h | 2 +-
include/qapi/qmp-core.h | 4 ++--
include/qapi/qmp-input-visitor.h | 2 +-
include/qapi/qmp-output-visitor.h | 2 +-
qemu-objects.h => include/qapi/qmp-types.h | 16 ++++++++--------
include/qapi/types-core.h | 2 +-
json-lexer.h => include/qobject/json-lexer.h | 4 ++--
json-parser.h => include/qobject/json-parser.h | 2 +-
json-streamer.h => include/qobject/json-streamer.h | 4 ++--
qbool.h => include/qobject/qbool.h | 2 +-
qdict.h => include/qobject/qdict.h | 4 ++--
qerror.h => include/qobject/qerror.h | 4 ++--
qfloat.h => include/qobject/qfloat.h | 2 +-
qint.h => include/qobject/qint.h | 2 +-
qjson.h => include/qobject/qjson.h | 4 ++--
qlist.h => include/qobject/qlist.h | 2 +-
qobject.h => include/qobject/qobject.h | 0
qstring.h => include/qobject/qstring.h | 2 +-
include/ui/console.h | 2 +-
migration.h | 2 +-
monitor.c | 16 ++++++++--------
monitor.h | 4 ++--
qapi/qapi-dealloc-visitor.c | 2 +-
qapi/qmp-dispatch.c | 6 +++---
qapi/qmp-input-visitor.c | 4 ++--
qapi/qmp-output-visitor.c | 4 ++--
qapi/string-input-visitor.c | 2 +-
qapi/string-output-visitor.c | 2 +-
qemu-char.h | 4 ++--
qemu-img.c | 2 +-
qemu-option.c | 4 ++--
qemu-option.h | 2 +-
qemu_socket.h | 2 +-
qga/commands-posix.c | 2 +-
qga/commands-win32.c | 2 +-
qga/commands.c | 2 +-
qga/main.c | 10 +++++-----
qobject/Makefile.objs | 4 ++++
json-lexer.c => qobject/json-lexer.c | 10 +++++-----
json-parser.c => qobject/json-parser.c | 18 +++++++++---------
json-streamer.c => qobject/json-streamer.c | 10 +++++-----
qbool.c => qobject/qbool.c | 4 ++--
qdict.c => qobject/qdict.c | 12 ++++++------
qerror.c => qobject/qerror.c | 4 ++--
qfloat.c => qobject/qfloat.c | 4 ++--
qint.c => qobject/qint.c | 4 ++--
qjson.c => qobject/qjson.c | 18 +++++++++---------
qlist.c => qobject/qlist.c | 4 ++--
qstring.c => qobject/qstring.c | 4 ++--
qom/object.c | 8 ++++----
scripts/qapi-commands.py | 4 ++--
tests/check-qdict.c | 6 +++---
tests/check-qfloat.c | 2 +-
tests/check-qint.c | 2 +-
tests/check-qjson.c | 14 +++++++-------
tests/check-qlist.c | 4 ++--
tests/check-qstring.c | 2 +-
tests/test-qmp-commands.c | 2 +-
tests/test-qmp-input-strict.c | 2 +-
tests/test-qmp-input-visitor.c | 2 +-
tests/test-qmp-output-visitor.c | 2 +-
tests/test-string-input-visitor.c | 2 +-
tests/test-string-output-visitor.c | 2 +-
tests/test-visitor-serialization.c | 2 +-
ui/spice-core.c | 8 ++++----
ui/vnc-enc-tight.c | 2 +-
ui/vnc-palette.h | 2 +-
ui/vnc.c | 2 +-
vl.c | 2 +-
87 files changed, 175 insertions(+), 172 deletions(-)
rename qemu-objects.h => include/qapi/qmp-types.h (61%)
rename json-lexer.h => include/qobject/json-lexer.h (94%)
rename json-parser.h => include/qobject/json-parser.h (94%)
rename json-streamer.h => include/qobject/json-streamer.h (94%)
rename qbool.h => include/qobject/qbool.h (94%)
rename qdict.h => include/qobject/qdict.h (97%)
rename qerror.h => include/qobject/qerror.h (99%)
rename qfloat.h => include/qobject/qfloat.h (94%)
rename qint.h => include/qobject/qint.h (94%)
rename qjson.h => include/qobject/qjson.h (92%)
rename qlist.h => include/qobject/qlist.h (98%)
rename qobject.h => include/qobject/qobject.h (100%)
rename qstring.h => include/qobject/qstring.h (96%)
create mode 100644 qobject/Makefile.objs
rename json-lexer.c => qobject/json-lexer.c (98%)
rename json-parser.c => qobject/json-parser.c (98%)
rename json-streamer.c => qobject/json-streamer.c (95%)
rename qbool.c => qobject/qbool.c (95%)
rename qdict.c => qobject/qdict.c (98%)
rename qerror.c => qobject/qerror.c (98%)
rename qfloat.c => qobject/qfloat.c (95%)
rename qint.c => qobject/qint.c (95%)
rename qjson.c => qobject/qjson.c (96%)
rename qlist.c => qobject/qlist.c (98%)
rename qstring.c => qobject/qstring.c (98%)
diff --git a/Makefile.objs b/Makefile.objs
index bd9534d..0c20ade 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -5,9 +5,7 @@ universal-obj-y += qemu-log.o
#######################################################################
# QObject
-qobject-obj-y = qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o
-qobject-obj-y += qjson.o json-lexer.o json-streamer.o json-parser.o
-qobject-obj-y += qerror.o error.o qemu-error.o
+qobject-obj-y = qobject/ error.o qemu-error.o
universal-obj-y += $(qobject-obj-y)
@@ -224,6 +222,7 @@ vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)
QEMU_CFLAGS+=$(GLIB_CFLAGS)
nested-vars += \
+ qobject-obj-y \
qga-obj-y \
qom-obj-y \
qapi-obj-y \
diff --git a/balloon.c b/balloon.c
index e02ab1c..211b93d 100644
--- a/balloon.c
+++ b/balloon.c
@@ -30,7 +30,7 @@
#include "balloon.h"
#include "trace.h"
#include "qmp-commands.h"
-#include "qjson.h"
+#include "qobject/qjson.h"
static QEMUBalloonEvent *balloon_event_fn;
static QEMUBalloonStatus *balloon_stat_fn;
diff --git a/block.c b/block.c
index 56426a9..7a67859 100644
--- a/block.c
+++ b/block.c
@@ -28,7 +28,7 @@
#include "block_int.h"
#include "blockjob.h"
#include "module.h"
-#include "qjson.h"
+#include "qobject/qjson.h"
#include "sysemu.h"
#include "notify.h"
#include "qemu-coroutine.h"
diff --git a/block.h b/block.h
index aa608a8..c41554b 100644
--- a/block.h
+++ b/block.h
@@ -5,7 +5,7 @@
#include "qemu-common.h"
#include "qemu-option.h"
#include "qemu-coroutine.h"
-#include "qobject.h"
+#include "qobject/qobject.h"
#include "qapi-types.h"
/* block.c */
diff --git a/block/qcow2.c b/block/qcow2.c
index c1ff31f..6e069c9 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -28,7 +28,7 @@
#include "aes.h"
#include "block/qcow2.h"
#include "qemu-error.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "trace.h"
/*
diff --git a/block/qed.c b/block/qed.c
index 6c182ca..9f7a3f2 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -15,7 +15,7 @@
#include "qemu-timer.h"
#include "trace.h"
#include "qed.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "migration.h"
static void qed_aio_cancel(BlockDriverAIOCB *blockacb)
diff --git a/block_int.h b/block_int.h
index cedabbd..cdf5ff1 100644
--- a/block_int.h
+++ b/block_int.h
@@ -30,7 +30,7 @@
#include "qemu-coroutine.h"
#include "qemu-timer.h"
#include "qapi-types.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "monitor.h"
#define BLOCK_FLAG_ENCRYPT 1
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index 8031813..35cd485 100644
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -12,7 +12,7 @@
#include "blockdev.h"
#include "hw/block-common.h"
#include "monitor.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "sysemu.h"
#include "qmp-commands.h"
#include "trace.h"
diff --git a/blockdev.c b/blockdev.c
index 99828ad..9d8d892 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -11,10 +11,10 @@
#include "hw/block-common.h"
#include "blockjob.h"
#include "monitor.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "qemu-option.h"
#include "qemu-config.h"
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
#include "sysemu.h"
#include "block_int.h"
#include "qmp-commands.h"
diff --git a/blockjob.c b/blockjob.c
index f55f55a..1d9e91f 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -30,7 +30,7 @@
#include "block.h"
#include "blockjob.h"
#include "block_int.h"
-#include "qjson.h"
+#include "qobject/qjson.h"
#include "qemu-coroutine.h"
#include "qmp-commands.h"
#include "qemu-timer.h"
diff --git a/dump-stub.c b/dump-stub.c
index 56d4564..aa2e8da 100644
--- a/dump-stub.c
+++ b/dump-stub.c
@@ -13,7 +13,7 @@
#include "qemu-common.h"
#include "dump.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "qmp-commands.h"
/* we need this function in hmp.c */
diff --git a/error.c b/error.c
index cd600af..160fef1 100644
--- a/error.c
+++ b/error.c
@@ -12,10 +12,10 @@
#include "qemu-common.h"
#include "qapi/error.h"
-#include "qjson.h"
-#include "qdict.h"
+#include "qobject/qjson.h"
+#include "qobject/qdict.h"
#include "qapi-types.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
struct Error
{
diff --git a/hmp.h b/hmp.h
index 71ea384..8ab5bdc 100644
--- a/hmp.h
+++ b/hmp.h
@@ -16,7 +16,7 @@
#include "qemu-common.h"
#include "qapi-types.h"
-#include "qdict.h"
+#include "qobject/qdict.h"
void hmp_info_name(Monitor *mon);
void hmp_info_version(Monitor *mon);
diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index 0c62d43..b4fdf49 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -22,7 +22,7 @@
#include "msix.h"
#include "kvm.h"
#include "migration.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "event_notifier.h"
#include "qemu-char.h"
diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c
index b04c164..c516cdc 100644
--- a/hw/pcie_aer.c
+++ b/hw/pcie_aer.c
@@ -19,7 +19,7 @@
*/
#include "sysemu.h"
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
#include "monitor.h"
#include "pci_bridge.h"
#include "pcie.h"
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 877ee09..583d603 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -1,6 +1,6 @@
#include "net/net.h"
#include "qdev.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "blockdev.h"
#include "hw/block-common.h"
#include "qemu-char.h"
diff --git a/hw/watchdog.c b/hw/watchdog.c
index b52aced..ddd6a9a 100644
--- a/hw/watchdog.c
+++ b/hw/watchdog.c
@@ -23,7 +23,7 @@
#include "qemu-option.h"
#include "qemu-config.h"
#include "qemu-queue.h"
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
#include "monitor.h"
#include "sysemu.h"
#include "hw/watchdog.h"
diff --git a/include/net/net.h b/include/net/net.h
index 9ff9305..1a0e952 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -3,7 +3,7 @@
#include "qemu-queue.h"
#include "qemu-common.h"
-#include "qdict.h"
+#include "qobject/qdict.h"
#include "qemu-option.h"
#include "net/queue.h"
#include "vmstate.h"
diff --git a/include/net/slirp.h b/include/net/slirp.h
index 2ca09b6..b6ab8ba 100644
--- a/include/net/slirp.h
+++ b/include/net/slirp.h
@@ -25,7 +25,7 @@
#define QEMU_NET_SLIRP_H
#include "qemu-common.h"
-#include "qdict.h"
+#include "qobject/qdict.h"
#include "qemu-option.h"
#include "qapi-types.h"
diff --git a/include/qapi/qmp-core.h b/include/qapi/qmp-core.h
index 2a57a0c..91c524e 100644
--- a/include/qapi/qmp-core.h
+++ b/include/qapi/qmp-core.h
@@ -14,8 +14,8 @@
#ifndef QMP_CORE_H
#define QMP_CORE_H
-#include "qobject.h"
-#include "qdict.h"
+#include "qobject/qobject.h"
+#include "qobject/qdict.h"
#include "qapi/error.h"
typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);
diff --git a/include/qapi/qmp-input-visitor.h b/include/qapi/qmp-input-visitor.h
index 9071f9c..8376a3a 100644
--- a/include/qapi/qmp-input-visitor.h
+++ b/include/qapi/qmp-input-visitor.h
@@ -15,7 +15,7 @@
#define QMP_INPUT_VISITOR_H
#include "qapi/visit-core.h"
-#include "qobject.h"
+#include "qobject/qobject.h"
typedef struct QmpInputVisitor QmpInputVisitor;
diff --git a/include/qapi/qmp-output-visitor.h b/include/qapi/qmp-output-visitor.h
index 39cb575..72361d6 100644
--- a/include/qapi/qmp-output-visitor.h
+++ b/include/qapi/qmp-output-visitor.h
@@ -15,7 +15,7 @@
#define QMP_OUTPUT_VISITOR_H
#include "qapi/visit-core.h"
-#include "qobject.h"
+#include "qobject/qobject.h"
typedef struct QmpOutputVisitor QmpOutputVisitor;
diff --git a/qemu-objects.h b/include/qapi/qmp-types.h
similarity index 61%
rename from qemu-objects.h
rename to include/qapi/qmp-types.h
index c53fbaa..ab4555d 100644
--- a/qemu-objects.h
+++ b/include/qapi/qmp-types.h
@@ -13,13 +13,13 @@
#ifndef QEMU_OBJECTS_H
#define QEMU_OBJECTS_H
-#include "qobject.h"
-#include "qint.h"
-#include "qfloat.h"
-#include "qbool.h"
-#include "qstring.h"
-#include "qdict.h"
-#include "qlist.h"
-#include "qjson.h"
+#include "qobject/qobject.h"
+#include "qobject/qint.h"
+#include "qobject/qfloat.h"
+#include "qobject/qbool.h"
+#include "qobject/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qjson.h"
#endif /* QEMU_OBJECTS_H */
diff --git a/include/qapi/types-core.h b/include/qapi/types-core.h
index 0080206..d49f455 100644
--- a/include/qapi/types-core.h
+++ b/include/qapi/types-core.h
@@ -16,6 +16,6 @@
#include "qemu-common.h"
#include "qapi/error.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#endif
diff --git a/json-lexer.h b/include/qobject/json-lexer.h
similarity index 94%
rename from json-lexer.h
rename to include/qobject/json-lexer.h
index 10bc0a7..e7cbdce 100644
--- a/json-lexer.h
+++ b/include/qobject/json-lexer.h
@@ -14,8 +14,8 @@
#ifndef QEMU_JSON_LEXER_H
#define QEMU_JSON_LEXER_H
-#include "qstring.h"
-#include "qlist.h"
+#include "qobject/qstring.h"
+#include "qobject/qlist.h"
typedef enum json_token_type {
JSON_OPERATOR = 100,
diff --git a/json-parser.h b/include/qobject/json-parser.h
similarity index 94%
rename from json-parser.h
rename to include/qobject/json-parser.h
index 4e346ac..0ee7372 100644
--- a/json-parser.h
+++ b/include/qobject/json-parser.h
@@ -15,7 +15,7 @@
#define QEMU_JSON_PARSER_H
#include "qemu-common.h"
-#include "qlist.h"
+#include "qobject/qlist.h"
#include "qapi/error.h"
QObject *json_parser_parse(QList *tokens, va_list *ap);
diff --git a/json-streamer.h b/include/qobject/json-streamer.h
similarity index 94%
rename from json-streamer.h
rename to include/qobject/json-streamer.h
index f09bc4d..dd2bfe5 100644
--- a/json-streamer.h
+++ b/include/qobject/json-streamer.h
@@ -14,8 +14,8 @@
#ifndef QEMU_JSON_STREAMER_H
#define QEMU_JSON_STREAMER_H
-#include "qlist.h"
-#include "json-lexer.h"
+#include "qobject/qlist.h"
+#include "qobject/json-lexer.h"
typedef struct JSONMessageParser
{
diff --git a/qbool.h b/include/qobject/qbool.h
similarity index 94%
rename from qbool.h
rename to include/qobject/qbool.h
index fe66fcd..689e4b3 100644
--- a/qbool.h
+++ b/include/qobject/qbool.h
@@ -15,7 +15,7 @@
#define QBOOL_H
#include <stdint.h>
-#include "qobject.h"
+#include "qobject/qobject.h"
typedef struct QBool {
QObject_HEAD;
diff --git a/qdict.h b/include/qobject/qdict.h
similarity index 97%
rename from qdict.h
rename to include/qobject/qdict.h
index 929d8d2..c3dc2db 100644
--- a/qdict.h
+++ b/include/qobject/qdict.h
@@ -13,8 +13,8 @@
#ifndef QDICT_H
#define QDICT_H
-#include "qobject.h"
-#include "qlist.h"
+#include "qobject/qobject.h"
+#include "qobject/qlist.h"
#include "qemu-queue.h"
#include <stdint.h>
diff --git a/qerror.h b/include/qobject/qerror.h
similarity index 99%
rename from qerror.h
rename to include/qobject/qerror.h
index cfdabba..26c5fca 100644
--- a/qerror.h
+++ b/include/qobject/qerror.h
@@ -12,8 +12,8 @@
#ifndef QERROR_H
#define QERROR_H
-#include "qdict.h"
-#include "qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "qemu-error.h"
#include "qapi/error.h"
#include "qapi-types.h"
diff --git a/qfloat.h b/include/qobject/qfloat.h
similarity index 94%
rename from qfloat.h
rename to include/qobject/qfloat.h
index 9d67876..72d4d15 100644
--- a/qfloat.h
+++ b/include/qobject/qfloat.h
@@ -15,7 +15,7 @@
#define QFLOAT_H
#include <stdint.h>
-#include "qobject.h"
+#include "qobject/qobject.h"
typedef struct QFloat {
QObject_HEAD;
diff --git a/qint.h b/include/qobject/qint.h
similarity index 94%
rename from qint.h
rename to include/qobject/qint.h
index 6b1a15c..b348928 100644
--- a/qint.h
+++ b/include/qobject/qint.h
@@ -14,7 +14,7 @@
#define QINT_H
#include <stdint.h>
-#include "qobject.h"
+#include "qobject/qobject.h"
typedef struct QInt {
QObject_HEAD;
diff --git a/qjson.h b/include/qobject/qjson.h
similarity index 92%
rename from qjson.h
rename to include/qobject/qjson.h
index 1190d8a..03faf50 100644
--- a/qjson.h
+++ b/include/qobject/qjson.h
@@ -16,8 +16,8 @@
#include <stdarg.h>
#include "compiler.h"
-#include "qobject.h"
-#include "qstring.h"
+#include "qobject/qobject.h"
+#include "qobject/qstring.h"
QObject *qobject_from_json(const char *string) GCC_FMT_ATTR(1, 0);
QObject *qobject_from_jsonf(const char *string, ...) GCC_FMT_ATTR(1, 2);
diff --git a/qlist.h b/include/qobject/qlist.h
similarity index 98%
rename from qlist.h
rename to include/qobject/qlist.h
index ae776f9..3f94780 100644
--- a/qlist.h
+++ b/include/qobject/qlist.h
@@ -13,7 +13,7 @@
#ifndef QLIST_H
#define QLIST_H
-#include "qobject.h"
+#include "qobject/qobject.h"
#include "qemu-queue.h"
#include "qemu-common.h"
#include "qemu-queue.h"
diff --git a/qobject.h b/include/qobject/qobject.h
similarity index 100%
rename from qobject.h
rename to include/qobject/qobject.h
diff --git a/qstring.h b/include/qobject/qstring.h
similarity index 96%
rename from qstring.h
rename to include/qobject/qstring.h
index 84ccd96..6c3f7b3 100644
--- a/qstring.h
+++ b/include/qobject/qstring.h
@@ -14,7 +14,7 @@
#define QSTRING_H
#include <stdint.h>
-#include "qobject.h"
+#include "qobject/qobject.h"
typedef struct QString {
QObject_HEAD;
diff --git a/include/ui/console.h b/include/ui/console.h
index b9a8a65..7b5aacd 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -1,7 +1,7 @@
#ifndef CONSOLE_H
#define CONSOLE_H
-#include "qdict.h"
+#include "qobject/qdict.h"
#include "notify.h"
#include "monitor.h"
#include "trace.h"
diff --git a/migration.h b/migration.h
index 86e4118..1d18c21 100644
--- a/migration.h
+++ b/migration.h
@@ -14,7 +14,7 @@
#ifndef QEMU_MIGRATION_H
#define QEMU_MIGRATION_H
-#include "qdict.h"
+#include "qobject/qdict.h"
#include "qemu-common.h"
#include "notify.h"
#include "qapi/error.h"
diff --git a/monitor.c b/monitor.c
index 874c3ee..9a29d10 100644
--- a/monitor.c
+++ b/monitor.c
@@ -47,14 +47,14 @@
#include "migration.h"
#include "kvm.h"
#include "acl.h"
-#include "qint.h"
-#include "qfloat.h"
-#include "qlist.h"
-#include "qbool.h"
-#include "qstring.h"
-#include "qjson.h"
-#include "json-streamer.h"
-#include "json-parser.h"
+#include "qobject/qint.h"
+#include "qobject/qfloat.h"
+#include "qobject/qlist.h"
+#include "qobject/qbool.h"
+#include "qobject/qstring.h"
+#include "qobject/qjson.h"
+#include "qobject/json-streamer.h"
+#include "qobject/json-parser.h"
#include "osdep.h"
#include "cpu.h"
#include "trace.h"
diff --git a/monitor.h b/monitor.h
index 76c59f7..4823837 100644
--- a/monitor.h
+++ b/monitor.h
@@ -2,8 +2,8 @@
#define MONITOR_H
#include "qemu-common.h"
-#include "qerror.h"
-#include "qdict.h"
+#include "qobject/qerror.h"
+#include "qobject/qdict.h"
#include "block.h"
#include "readline.h"
diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c
index d6ae4a8..1674783 100644
--- a/qapi/qapi-dealloc-visitor.c
+++ b/qapi/qapi-dealloc-visitor.c
@@ -14,7 +14,7 @@
#include "qapi/dealloc-visitor.h"
#include "qemu-queue.h"
#include "qemu-common.h"
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
typedef struct StackEntry
{
diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index 6b29e64..bb50c39 100644
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -11,12 +11,12 @@
*
*/
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
#include "qapi/qmp-core.h"
-#include "json-parser.h"
+#include "qobject/json-parser.h"
#include "qapi-types.h"
#include "qapi/error.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)
{
diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index 9878ef6..a4d92a6 100644
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@@ -15,8 +15,8 @@
#include "qapi/visit-impl.h"
#include "qemu-queue.h"
#include "qemu-common.h"
-#include "qemu-objects.h"
-#include "qerror.h"
+#include "qapi/qmp-types.h"
+#include "qobject/qerror.h"
#define QIV_STACK_SIZE 1024
diff --git a/qapi/qmp-output-visitor.c b/qapi/qmp-output-visitor.c
index 3a056ef..21192b5 100644
--- a/qapi/qmp-output-visitor.c
+++ b/qapi/qmp-output-visitor.c
@@ -15,8 +15,8 @@
#include "qapi/visit-impl.h"
#include "qemu-queue.h"
#include "qemu-common.h"
-#include "qemu-objects.h"
-#include "qerror.h"
+#include "qapi/qmp-types.h"
+#include "qobject/qerror.h"
typedef struct QStackEntry
{
diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c
index eaf6b11..f1e71de 100644
--- a/qapi/string-input-visitor.c
+++ b/qapi/string-input-visitor.c
@@ -13,7 +13,7 @@
#include "qemu-common.h"
#include "qapi/string-input-visitor.h"
#include "qapi/visit-impl.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
struct StringInputVisitor
{
diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.c
index 507ebf7..9930153 100644
--- a/qapi/string-output-visitor.c
+++ b/qapi/string-output-visitor.c
@@ -13,7 +13,7 @@
#include "qemu-common.h"
#include "qapi/string-output-visitor.h"
#include "qapi/visit-impl.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
struct StringOutputVisitor
{
diff --git a/qemu-char.h b/qemu-char.h
index 486644b..5d3f36c 100644
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -5,8 +5,8 @@
#include "qemu-queue.h"
#include "qemu-option.h"
#include "qemu-config.h"
-#include "qobject.h"
-#include "qstring.h"
+#include "qobject/qobject.h"
+#include "qobject/qstring.h"
#include "main-loop.h"
/* character device */
diff --git a/qemu-img.c b/qemu-img.c
index f17f187..1449708 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -23,7 +23,7 @@
*/
#include "qapi-visit.h"
#include "qapi/qmp-output-visitor.h"
-#include "qjson.h"
+#include "qobject/qjson.h"
#include "qemu-common.h"
#include "qemu-option.h"
#include "qemu-error.h"
diff --git a/qemu-option.c b/qemu-option.c
index 734b13c..235c734 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -28,9 +28,9 @@
#include "qemu-common.h"
#include "qemu-error.h"
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
#include "qapi/error.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "qemu-option-internal.h"
/*
diff --git a/qemu-option.h b/qemu-option.h
index 53eca74..a068cfb 100644
--- a/qemu-option.h
+++ b/qemu-option.h
@@ -29,7 +29,7 @@
#include <stdint.h>
#include "qemu-queue.h"
#include "qapi/error.h"
-#include "qdict.h"
+#include "qobject/qdict.h"
enum QEMUOptionParType {
OPT_FLAG,
diff --git a/qemu_socket.h b/qemu_socket.h
index c10d732..1f7eea1 100644
--- a/qemu_socket.h
+++ b/qemu_socket.h
@@ -28,7 +28,7 @@ int inet_aton(const char *cp, struct in_addr *ia);
#include "qemu-option.h"
#include "qapi/error.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
/* misc helpers */
int qemu_socket(int domain, int type, int protocol);
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 726930a..4381182 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -17,7 +17,7 @@
#include <sys/wait.h>
#include "qga/guest-agent-core.h"
#include "qga-qmp-commands.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "qemu-queue.h"
#include "host-utils.h"
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 5bd8fb2..5596171 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -16,7 +16,7 @@
#include <powrprof.h>
#include "qga/guest-agent-core.h"
#include "qga-qmp-commands.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#ifndef SHTDN_REASON_FLAG_PLANNED
#define SHTDN_REASON_FLAG_PLANNED 0x80000000
diff --git a/qga/commands.c b/qga/commands.c
index 46b0b08..b5703e1 100644
--- a/qga/commands.c
+++ b/qga/commands.c
@@ -13,7 +13,7 @@
#include <glib.h>
#include "qga/guest-agent-core.h"
#include "qga-qmp-commands.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
/* Note: in some situations, like with the fsfreeze, logging may be
* temporarilly disabled. if it is necessary that a command be able
diff --git a/qga/main.c b/qga/main.c
index 9b59a52..67fce71 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -20,14 +20,14 @@
#include <sys/wait.h>
#include <sys/stat.h>
#endif
-#include "json-streamer.h"
-#include "json-parser.h"
-#include "qint.h"
-#include "qjson.h"
+#include "qobject/json-streamer.h"
+#include "qobject/json-parser.h"
+#include "qobject/qint.h"
+#include "qobject/qjson.h"
#include "qga/guest-agent-core.h"
#include "module.h"
#include "signal.h"
-#include "qerror.h"
+#include "qobject/qerror.h"
#include "qapi/qmp-core.h"
#include "qga/channel.h"
#ifdef _WIN32
diff --git a/qobject/Makefile.objs b/qobject/Makefile.objs
new file mode 100644
index 0000000..c603aa9
--- /dev/null
+++ b/qobject/Makefile.objs
@@ -0,0 +1,4 @@
+qobject-obj-y = qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o
+qobject-obj-y += qjson.o json-lexer.o json-streamer.o json-parser.o
+qobject-obj-y += qerror.o
+
diff --git a/json-lexer.c b/qobject/json-lexer.c
similarity index 98%
rename from json-lexer.c
rename to qobject/json-lexer.c
index 3cd3285..e96ddc2 100644
--- a/json-lexer.c
+++ b/qobject/json-lexer.c
@@ -11,12 +11,12 @@
*
*/
-#include "qstring.h"
-#include "qlist.h"
-#include "qdict.h"
-#include "qint.h"
+#include "qobject/qstring.h"
+#include "qobject/qlist.h"
+#include "qobject/qdict.h"
+#include "qobject/qint.h"
#include "qemu-common.h"
-#include "json-lexer.h"
+#include "qobject/json-lexer.h"
#define MAX_TOKEN_SIZE (64ULL << 20)
diff --git a/json-parser.c b/qobject/json-parser.c
similarity index 98%
rename from json-parser.c
rename to qobject/json-parser.c
index 457291b..544d79f 100644
--- a/json-parser.c
+++ b/qobject/json-parser.c
@@ -14,15 +14,15 @@
#include <stdarg.h>
#include "qemu-common.h"
-#include "qstring.h"
-#include "qint.h"
-#include "qdict.h"
-#include "qlist.h"
-#include "qfloat.h"
-#include "qbool.h"
-#include "json-parser.h"
-#include "json-lexer.h"
-#include "qerror.h"
+#include "qobject/qstring.h"
+#include "qobject/qint.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qfloat.h"
+#include "qobject/qbool.h"
+#include "qobject/json-parser.h"
+#include "qobject/json-lexer.h"
+#include "qobject/qerror.h"
typedef struct JSONParserContext
{
diff --git a/json-streamer.c b/qobject/json-streamer.c
similarity index 95%
rename from json-streamer.c
rename to qobject/json-streamer.c
index c255c78..f0797b6 100644
--- a/json-streamer.c
+++ b/qobject/json-streamer.c
@@ -11,12 +11,12 @@
*
*/
-#include "qlist.h"
-#include "qint.h"
-#include "qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qint.h"
+#include "qobject/qdict.h"
#include "qemu-common.h"
-#include "json-lexer.h"
-#include "json-streamer.h"
+#include "qobject/json-lexer.h"
+#include "qobject/json-streamer.h"
#define MAX_TOKEN_SIZE (64ULL << 20)
#define MAX_NESTING (1ULL << 10)
diff --git a/qbool.c b/qobject/qbool.c
similarity index 95%
rename from qbool.c
rename to qobject/qbool.c
index 590cd71..01c26e7 100644
--- a/qbool.c
+++ b/qobject/qbool.c
@@ -11,8 +11,8 @@
*
*/
-#include "qbool.h"
-#include "qobject.h"
+#include "qobject/qbool.h"
+#include "qobject/qobject.h"
#include "qemu-common.h"
static void qbool_destroy_obj(QObject *obj);
diff --git a/qdict.c b/qobject/qdict.c
similarity index 98%
rename from qdict.c
rename to qobject/qdict.c
index 4bf308b..97a9972 100644
--- a/qdict.c
+++ b/qobject/qdict.c
@@ -10,12 +10,12 @@
* See the COPYING.LIB file in the top-level directory.
*/
-#include "qint.h"
-#include "qfloat.h"
-#include "qdict.h"
-#include "qbool.h"
-#include "qstring.h"
-#include "qobject.h"
+#include "qobject/qint.h"
+#include "qobject/qfloat.h"
+#include "qobject/qdict.h"
+#include "qobject/qbool.h"
+#include "qobject/qstring.h"
+#include "qobject/qobject.h"
#include "qemu-queue.h"
#include "qemu-common.h"
diff --git a/qerror.c b/qobject/qerror.c
similarity index 98%
rename from qerror.c
rename to qobject/qerror.c
index 0818504..4462cfb 100644
--- a/qerror.c
+++ b/qobject/qerror.c
@@ -11,8 +11,8 @@
*/
#include "monitor.h"
-#include "qjson.h"
-#include "qerror.h"
+#include "qobject/qjson.h"
+#include "qobject/qerror.h"
#include "qemu-common.h"
static void qerror_destroy_obj(QObject *obj);
diff --git a/qfloat.c b/qobject/qfloat.c
similarity index 95%
rename from qfloat.c
rename to qobject/qfloat.c
index 98338f3..8b3cb81 100644
--- a/qfloat.c
+++ b/qobject/qfloat.c
@@ -11,8 +11,8 @@
*
*/
-#include "qfloat.h"
-#include "qobject.h"
+#include "qobject/qfloat.h"
+#include "qobject/qobject.h"
#include "qemu-common.h"
static void qfloat_destroy_obj(QObject *obj);
diff --git a/qint.c b/qobject/qint.c
similarity index 95%
rename from qint.c
rename to qobject/qint.c
index ee51804..26d30b4 100644
--- a/qint.c
+++ b/qobject/qint.c
@@ -10,8 +10,8 @@
* See the COPYING.LIB file in the top-level directory.
*/
-#include "qint.h"
-#include "qobject.h"
+#include "qobject/qint.h"
+#include "qobject/qobject.h"
#include "qemu-common.h"
static void qint_destroy_obj(QObject *obj);
diff --git a/qjson.c b/qobject/qjson.c
similarity index 96%
rename from qjson.c
rename to qobject/qjson.c
index f9c8e77..a3a6375 100644
--- a/qjson.c
+++ b/qobject/qjson.c
@@ -11,15 +11,15 @@
*
*/
-#include "json-lexer.h"
-#include "json-parser.h"
-#include "json-streamer.h"
-#include "qjson.h"
-#include "qint.h"
-#include "qlist.h"
-#include "qbool.h"
-#include "qfloat.h"
-#include "qdict.h"
+#include "qobject/json-lexer.h"
+#include "qobject/json-parser.h"
+#include "qobject/json-streamer.h"
+#include "qobject/qjson.h"
+#include "qobject/qint.h"
+#include "qobject/qlist.h"
+#include "qobject/qbool.h"
+#include "qobject/qfloat.h"
+#include "qobject/qdict.h"
typedef struct JSONParsingState
{
diff --git a/qlist.c b/qobject/qlist.c
similarity index 98%
rename from qlist.c
rename to qobject/qlist.c
index b48ec5b..7300076 100644
--- a/qlist.c
+++ b/qobject/qlist.c
@@ -10,8 +10,8 @@
* See the COPYING.LIB file in the top-level directory.
*/
-#include "qlist.h"
-#include "qobject.h"
+#include "qobject/qlist.h"
+#include "qobject/qobject.h"
#include "qemu-queue.h"
#include "qemu-common.h"
diff --git a/qstring.c b/qobject/qstring.c
similarity index 98%
rename from qstring.c
rename to qobject/qstring.c
index b7e12e4..990046a 100644
--- a/qstring.c
+++ b/qobject/qstring.c
@@ -10,8 +10,8 @@
* See the COPYING.LIB file in the top-level directory.
*/
-#include "qobject.h"
-#include "qstring.h"
+#include "qobject/qobject.h"
+#include "qobject/qstring.h"
#include "qemu-common.h"
static void qstring_destroy_obj(QObject *obj);
diff --git a/qom/object.c b/qom/object.c
index d195890..72f34af 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -19,10 +19,10 @@
/* TODO: replace QObject with a simpler visitor to avoid a dependency
* of the QOM core on QObject? */
#include "qemu/qom-qobject.h"
-#include "qobject.h"
-#include "qbool.h"
-#include "qint.h"
-#include "qstring.h"
+#include "qobject/qobject.h"
+#include "qobject/qbool.h"
+#include "qobject/qint.h"
+#include "qobject/qstring.h"
#define MAX_INTERFACES 32
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 4d0847a..60adaa4 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -342,7 +342,7 @@ def gen_command_decl_prologue(header, guard, prefix=""):
#define %(guard)s
#include "%(prefix)sqapi-types.h"
-#include "qdict.h"
+#include "qobject/qdict.h"
#include "qapi/error.h"
''',
@@ -366,7 +366,7 @@ def gen_command_def_prologue(prefix="", proxy=False):
*
*/
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
#include "qapi/qmp-core.h"
#include "qapi/visit-core.h"
#include "qapi/qmp-output-visitor.h"
diff --git a/tests/check-qdict.c b/tests/check-qdict.c
index fc0d276..f26f4de 100644
--- a/tests/check-qdict.c
+++ b/tests/check-qdict.c
@@ -11,9 +11,9 @@
*/
#include <glib.h>
-#include "qint.h"
-#include "qdict.h"
-#include "qstring.h"
+#include "qobject/qint.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "qemu-common.h"
/*
diff --git a/tests/check-qfloat.c b/tests/check-qfloat.c
index cdc66ea..e3e2ec5 100644
--- a/tests/check-qfloat.c
+++ b/tests/check-qfloat.c
@@ -12,7 +12,7 @@
*/
#include <glib.h>
-#include "qfloat.h"
+#include "qobject/qfloat.h"
#include "qemu-common.h"
/*
diff --git a/tests/check-qint.c b/tests/check-qint.c
index 5a27119..57d740e 100644
--- a/tests/check-qint.c
+++ b/tests/check-qint.c
@@ -11,7 +11,7 @@
*/
#include <glib.h>
-#include "qint.h"
+#include "qobject/qint.h"
#include "qemu-common.h"
/*
diff --git a/tests/check-qjson.c b/tests/check-qjson.c
index 3b896f5..b3d556c 100644
--- a/tests/check-qjson.c
+++ b/tests/check-qjson.c
@@ -10,13 +10,13 @@
*/
#include <glib.h>
-#include "qstring.h"
-#include "qint.h"
-#include "qdict.h"
-#include "qlist.h"
-#include "qfloat.h"
-#include "qbool.h"
-#include "qjson.h"
+#include "qobject/qstring.h"
+#include "qobject/qint.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qfloat.h"
+#include "qobject/qbool.h"
+#include "qobject/qjson.h"
#include "qemu-common.h"
diff --git a/tests/check-qlist.c b/tests/check-qlist.c
index 501ba26..b3eda14 100644
--- a/tests/check-qlist.c
+++ b/tests/check-qlist.c
@@ -11,8 +11,8 @@
*/
#include <glib.h>
-#include "qint.h"
-#include "qlist.h"
+#include "qobject/qint.h"
+#include "qobject/qlist.h"
/*
* Public Interface test-cases
diff --git a/tests/check-qstring.c b/tests/check-qstring.c
index addad6c..5eee33c 100644
--- a/tests/check-qstring.c
+++ b/tests/check-qstring.c
@@ -11,7 +11,7 @@
*/
#include <glib.h>
-#include "qstring.h"
+#include "qobject/qstring.h"
#include "qemu-common.h"
/*
diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c
index dc3c507..2a68cba 100644
--- a/tests/test-qmp-commands.c
+++ b/tests/test-qmp-commands.c
@@ -1,5 +1,5 @@
#include <glib.h>
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
#include "test-qmp-commands.h"
#include "qapi/qmp-core.h"
#include "module.h"
diff --git a/tests/test-qmp-input-strict.c b/tests/test-qmp-input-strict.c
index f6df8cb..076e5e1 100644
--- a/tests/test-qmp-input-strict.c
+++ b/tests/test-qmp-input-strict.c
@@ -17,7 +17,7 @@
#include "qapi/qmp-input-visitor.h"
#include "test-qapi-types.h"
#include "test-qapi-visit.h"
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
typedef struct TestInputVisitorData {
QObject *obj;
diff --git a/tests/test-qmp-input-visitor.c b/tests/test-qmp-input-visitor.c
index 8f5a509..23b753f 100644
--- a/tests/test-qmp-input-visitor.c
+++ b/tests/test-qmp-input-visitor.c
@@ -16,7 +16,7 @@
#include "qapi/qmp-input-visitor.h"
#include "test-qapi-types.h"
#include "test-qapi-visit.h"
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
typedef struct TestInputVisitorData {
QObject *obj;
diff --git a/tests/test-qmp-output-visitor.c b/tests/test-qmp-output-visitor.c
index 24a6359..eb99add 100644
--- a/tests/test-qmp-output-visitor.c
+++ b/tests/test-qmp-output-visitor.c
@@ -15,7 +15,7 @@
#include "qapi/qmp-output-visitor.h"
#include "test-qapi-types.h"
#include "test-qapi-visit.h"
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
typedef struct TestOutputVisitorData {
QmpOutputVisitor *qov;
diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c
index 5370e32..16a358a 100644
--- a/tests/test-string-input-visitor.c
+++ b/tests/test-string-input-visitor.c
@@ -16,7 +16,7 @@
#include "qapi/string-input-visitor.h"
#include "test-qapi-types.h"
#include "test-qapi-visit.h"
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
typedef struct TestInputVisitorData {
StringInputVisitor *siv;
diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-visitor.c
index 608f14a..0096872 100644
--- a/tests/test-string-output-visitor.c
+++ b/tests/test-string-output-visitor.c
@@ -15,7 +15,7 @@
#include "qapi/string-output-visitor.h"
#include "test-qapi-types.h"
#include "test-qapi-visit.h"
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
typedef struct TestOutputVisitorData {
StringOutputVisitor *sov;
diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c
index b8ad16f..5e5a959 100644
--- a/tests/test-visitor-serialization.c
+++ b/tests/test-visitor-serialization.c
@@ -16,7 +16,7 @@
#include <float.h>
#include "test-qapi-types.h"
#include "test-qapi-visit.h"
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
#include "qapi/qmp-input-visitor.h"
#include "qapi/qmp-output-visitor.h"
#include "qapi/string-input-visitor.h"
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 27e9ba1..83a93fd 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -29,10 +29,10 @@
#include "qemu-x509.h"
#include "qemu_socket.h"
#include "qmp-commands.h"
-#include "qint.h"
-#include "qbool.h"
-#include "qstring.h"
-#include "qjson.h"
+#include "qobject/qint.h"
+#include "qobject/qbool.h"
+#include "qobject/qstring.h"
+#include "qobject/qjson.h"
#include "notify.h"
#include "migration.h"
#include "monitor.h"
diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index 5d492ab..2a6d90e 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -45,7 +45,7 @@
#endif
#include "bswap.h"
-#include "qint.h"
+#include "qobject/qint.h"
#include "vnc.h"
#include "vnc-enc-tight.h"
#include "vnc-palette.h"
diff --git a/ui/vnc-palette.h b/ui/vnc-palette.h
index 3260885..ecf44ad 100644
--- a/ui/vnc-palette.h
+++ b/ui/vnc-palette.h
@@ -29,7 +29,7 @@
#ifndef VNC_PALETTE_H
#define VNC_PALETTE_H
-#include "qlist.h"
+#include "qobject/qlist.h"
#include "qemu-queue.h"
#include <stdint.h>
diff --git a/ui/vnc.c b/ui/vnc.c
index d0ffcc5..9f7bd70 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -30,7 +30,7 @@
#include "qemu_socket.h"
#include "qemu-timer.h"
#include "acl.h"
-#include "qemu-objects.h"
+#include "qapi/qmp-types.h"
#include "qmp-commands.h"
#include "osdep.h"
diff --git a/vl.c b/vl.c
index ab21a93..04fa990 100644
--- a/vl.c
+++ b/vl.c
@@ -143,7 +143,7 @@ int main(int argc, char **argv)
#include "audio/audio.h"
#include "migration.h"
#include "kvm.h"
-#include "qjson.h"
+#include "qobject/qjson.h"
#include "qemu-option.h"
#include "qemu-config.h"
#include "qemu-options.h"
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 22/32] block: move include files to include/block/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (20 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 21/32] qapi: create qobject/ and include/qobject/ Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 23/32] exec: move include files to include/exec/ Paolo Bonzini
` (12 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
aes.c | 2 +-
aio.c | 2 +-
async.c | 2 +-
block-migration.c | 2 +-
block.c | 6 +++---
block/blkdebug.c | 2 +-
block/blkverify.c | 2 +-
block/bochs.c | 2 +-
block/cloop.c | 2 +-
block/commit.c | 4 ++--
block/cow.c | 2 +-
block/curl.c | 2 +-
block/dmg.c | 2 +-
block/gluster.c | 2 +-
block/iscsi.c | 2 +-
block/nbd.c | 4 ++--
block/parallels.c | 2 +-
block/qcow.c | 4 ++--
block/qcow2-cache.c | 2 +-
block/qcow2-cluster.c | 2 +-
block/qcow2-refcount.c | 2 +-
block/qcow2-snapshot.c | 2 +-
block/qcow2.c | 4 ++--
block/qcow2.h | 4 ++--
block/qed.h | 2 +-
block/raw-posix.c | 2 +-
block/raw-win32.c | 2 +-
block/raw.c | 2 +-
block/rbd.c | 2 +-
block/sheepdog.c | 2 +-
block/stream.c | 4 ++--
block/vdi.c | 2 +-
block/vmdk.c | 2 +-
block/vpc.c | 2 +-
block/vvfat.c | 2 +-
blockdev-nbd.c | 2 +-
blockdev.c | 4 ++--
blockdev.h | 2 +-
blockjob.c | 8 ++++----
cmd.c | 2 +-
coroutine-gthread.c | 2 +-
coroutine-sigaltstack.c | 2 +-
coroutine-ucontext.c | 2 +-
coroutine-win32.c | 2 +-
dma.h | 2 +-
hw/9pfs/codir.c | 2 +-
hw/9pfs/cofile.c | 2 +-
hw/9pfs/cofs.c | 2 +-
hw/9pfs/coxattr.c | 2 +-
hw/9pfs/virtio-9p-coth.c | 2 +-
hw/9pfs/virtio-9p-coth.h | 2 +-
hw/9pfs/virtio-9p.h | 2 +-
hw/hd-geometry.c | 2 +-
hw/ide/cmd646.c | 2 +-
hw/ide/ich.c | 2 +-
hw/ide/isa.c | 2 +-
hw/ide/macio.c | 2 +-
hw/ide/microdrive.c | 2 +-
hw/ide/mmio.c | 2 +-
hw/ide/pci.c | 2 +-
hw/ide/via.c | 2 +-
hw/megasas.c | 2 +-
hw/mips_fulong2e.c | 2 +-
hw/mips_malta.c | 2 +-
hw/musicpal.c | 2 +-
hw/pflash_cfi01.c | 2 +-
hw/pflash_cfi02.c | 2 +-
hw/ppc405_boards.c | 2 +-
hw/s390-virtio-bus.c | 2 +-
hw/s390-virtio.c | 2 +-
hw/scsi.h | 2 +-
hw/sd.c | 2 +-
hw/spitz.c | 2 +-
hw/tosa.c | 2 +-
aes.h => include/block/aes.h | 0
qemu-aio.h => include/block/aio.h | 0
block.h => include/block/block.h | 4 ++--
block_int.h => include/block/block_int.h | 4 ++--
blockjob.h => include/block/blockjob.h | 2 +-
qemu-coroutine.h => include/block/coroutine.h | 0
.../block/coroutine_int.h | 2 +-
nbd.h => include/block/nbd.h | 0
linux-aio.c | 2 +-
migration-exec.c | 2 +-
migration-fd.c | 2 +-
migration-tcp.c | 2 +-
migration-unix.c | 2 +-
migration.c | 2 +-
monitor.h | 2 +-
nbd.c | 6 +++---
posix-aio-compat.c | 2 +-
qemu-coroutine-io.c | 2 +-
qemu-coroutine-lock.c | 4 ++--
qemu-coroutine-sleep.c | 2 +-
qemu-coroutine.c | 4 ++--
qemu-img.c | 2 +-
qemu-io.c | 2 +-
qemu-nbd.c | 4 ++--
tests/test-coroutine.c | 2 +-
99 files changed, 114 insertions(+), 114 deletions(-)
rename aes.h => include/block/aes.h (100%)
rename qemu-aio.h => include/block/aio.h (100%)
rename block.h => include/block/block.h (99%)
rename block_int.h => include/block/block_int.h (99%)
rename blockjob.h => include/block/blockjob.h (99%)
rename qemu-coroutine.h => include/block/coroutine.h (100%)
rename qemu-coroutine-int.h => include/block/coroutine_int.h (98%)
rename nbd.h => include/block/nbd.h (100%)
diff --git a/aes.c b/aes.c
index eb37adb..1da7bff 100644
--- a/aes.c
+++ b/aes.c
@@ -28,7 +28,7 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "qemu-common.h"
-#include "aes.h"
+#include "block/aes.h"
#ifndef NDEBUG
#define NDEBUG
diff --git a/aio.c b/aio.c
index c738a4e..474377f 100644
--- a/aio.c
+++ b/aio.c
@@ -14,7 +14,7 @@
*/
#include "qemu-common.h"
-#include "block.h"
+#include "block/block.h"
#include "qemu-queue.h"
#include "qemu_socket.h"
diff --git a/async.c b/async.c
index 85cc641..f45069e 100644
--- a/async.c
+++ b/async.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
#include "main-loop.h"
/* Anchor of the list of Bottom Halves belonging to the context */
diff --git a/block-migration.c b/block-migration.c
index 71b9601..c15de9f 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -14,7 +14,7 @@
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "hw/hw.h"
#include "qemu-queue.h"
#include "qemu-timer.h"
diff --git a/block.c b/block.c
index 7a67859..09ba2af 100644
--- a/block.c
+++ b/block.c
@@ -25,13 +25,13 @@
#include "qemu-common.h"
#include "trace.h"
#include "monitor.h"
-#include "block_int.h"
-#include "blockjob.h"
+#include "block/block_int.h"
+#include "block/blockjob.h"
#include "module.h"
#include "qobject/qjson.h"
#include "sysemu.h"
#include "notify.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
#include "qmp-commands.h"
#include "qemu-timer.h"
diff --git a/block/blkdebug.c b/block/blkdebug.c
index 152c0a8..84ccc08 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -24,7 +24,7 @@
#include "qemu-common.h"
#include "qemu-config.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "module.h"
typedef struct BDRVBlkdebugState {
diff --git a/block/blkverify.c b/block/blkverify.c
index 9d5f1ec..73be004 100644
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -9,7 +9,7 @@
#include <stdarg.h>
#include "qemu_socket.h" /* for EINPROGRESS on Windows */
-#include "block_int.h"
+#include "block/block_int.h"
typedef struct {
BlockDriverState *test_file;
diff --git a/block/bochs.c b/block/bochs.c
index ab7944d..2cc7524 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "module.h"
/**************************************************************/
diff --git a/block/cloop.c b/block/cloop.c
index 7570eb8..da29ff3 100644
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "module.h"
#include <zlib.h>
diff --git a/block/commit.c b/block/commit.c
index 733c914..512800e 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -13,8 +13,8 @@
*/
#include "trace.h"
-#include "block_int.h"
-#include "blockjob.h"
+#include "block/block_int.h"
+#include "block/blockjob.h"
#include "qemu/ratelimit.h"
enum {
diff --git a/block/cow.c b/block/cow.c
index a5a00eb..1438ae1 100644
--- a/block/cow.c
+++ b/block/cow.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "module.h"
/**************************************************************/
diff --git a/block/curl.c b/block/curl.c
index c1074cd..7b1b688 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include <curl/curl.h>
// #define DEBUG
diff --git a/block/dmg.c b/block/dmg.c
index 37902a4..6ee505a 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "bswap.h"
#include "module.h"
#include <zlib.h>
diff --git a/block/gluster.c b/block/gluster.c
index 3588d73..5d86bc1 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -16,7 +16,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include <glusterfs/api/glfs.h>
-#include "block_int.h"
+#include "block/block_int.h"
#include "qemu_socket.h"
#include "uri.h"
diff --git a/block/iscsi.c b/block/iscsi.c
index 9f182ac..31e2e0c 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -29,7 +29,7 @@
#include "qemu-common.h"
#include "qemu-config.h"
#include "qemu-error.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "trace.h"
#include "hw/scsi-defs.h"
diff --git a/block/nbd.c b/block/nbd.c
index 2bce47b..9d3a3a2 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -27,8 +27,8 @@
*/
#include "qemu-common.h"
-#include "nbd.h"
-#include "block_int.h"
+#include "block/nbd.h"
+#include "block/block_int.h"
#include "module.h"
#include "qemu_socket.h"
diff --git a/block/parallels.c b/block/parallels.c
index d30f0ec..ae88cd6 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "module.h"
/**************************************************************/
diff --git a/block/qcow.c b/block/qcow.c
index b239c82..d13bd40 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -22,10 +22,10 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "module.h"
#include <zlib.h>
-#include "aes.h"
+#include "block/aes.h"
#include "migration.h"
/**************************************************************/
diff --git a/block/qcow2-cache.c b/block/qcow2-cache.c
index 2d4322a..2f3114e 100644
--- a/block/qcow2-cache.c
+++ b/block/qcow2-cache.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "block_int.h"
+#include "block/block_int.h"
#include "qemu-common.h"
#include "qcow2.h"
#include "trace.h"
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index e179211..939c632 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -25,7 +25,7 @@
#include <zlib.h>
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "block/qcow2.h"
#include "trace.h"
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 5e3f915..db41f96 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "block/qcow2.h"
static int64_t alloc_clusters_noref(BlockDriverState *bs, int64_t size);
diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index 4e7c93b..eb8fcd5 100644
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "block/qcow2.h"
typedef struct QEMU_PACKED QCowSnapshotHeader {
diff --git a/block/qcow2.c b/block/qcow2.c
index 6e069c9..29a9465 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -22,10 +22,10 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "module.h"
#include <zlib.h>
-#include "aes.h"
+#include "block/aes.h"
#include "block/qcow2.h"
#include "qemu-error.h"
#include "qobject/qerror.h"
diff --git a/block/qcow2.h b/block/qcow2.h
index b4eb654..6841ee2 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -25,8 +25,8 @@
#ifndef BLOCK_QCOW2_H
#define BLOCK_QCOW2_H
-#include "aes.h"
-#include "qemu-coroutine.h"
+#include "block/aes.h"
+#include "block/coroutine.h"
//#define DEBUG_ALLOC
//#define DEBUG_ALLOC2
diff --git a/block/qed.h b/block/qed.h
index a063bf7..2b4dded 100644
--- a/block/qed.h
+++ b/block/qed.h
@@ -15,7 +15,7 @@
#ifndef BLOCK_QED_H
#define BLOCK_QED_H
-#include "block_int.h"
+#include "block/block_int.h"
/* The layout of a QED file is as follows:
*
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 5f868bf..16eaad3 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -24,7 +24,7 @@
#include "qemu-common.h"
#include "qemu-timer.h"
#include "qemu-log.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "module.h"
#include "block/raw-posix-aio.h"
diff --git a/block/raw-win32.c b/block/raw-win32.c
index 78c8306..411235e 100644
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "qemu-timer.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "module.h"
#include <windows.h>
#include <winioctl.h>
diff --git a/block/raw.c b/block/raw.c
index 253e949..6aec93d 100644
--- a/block/raw.c
+++ b/block/raw.c
@@ -1,6 +1,6 @@
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "module.h"
static int raw_open(BlockDriverState *bs, int flags)
diff --git a/block/rbd.c b/block/rbd.c
index 015a9db..5aad5ec 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -15,7 +15,7 @@
#include "qemu-common.h"
#include "qemu-error.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include <rbd/librbd.h>
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 9306174..4ad0ca3 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -15,7 +15,7 @@
#include "qemu-common.h"
#include "qemu-error.h"
#include "qemu_socket.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "bitops.h"
#define SD_PROTO_VER 0x01
diff --git a/block/stream.c b/block/stream.c
index 7926652..2c4d72c 100644
--- a/block/stream.c
+++ b/block/stream.c
@@ -12,8 +12,8 @@
*/
#include "trace.h"
-#include "block_int.h"
-#include "blockjob.h"
+#include "block/block_int.h"
+#include "block/blockjob.h"
#include "qemu/ratelimit.h"
enum {
diff --git a/block/vdi.c b/block/vdi.c
index f35b12e..73e3253 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -50,7 +50,7 @@
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "module.h"
#include "migration.h"
diff --git a/block/vmdk.c b/block/vmdk.c
index 1a80e5a..c7fc07a 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -24,7 +24,7 @@
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "module.h"
#include "migration.h"
#include <zlib.h>
diff --git a/block/vpc.c b/block/vpc.c
index b6bf52f..caa50db 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "module.h"
#include "migration.h"
diff --git a/block/vvfat.c b/block/vvfat.c
index 59d3c5b..fbabafc 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -25,7 +25,7 @@
#include <sys/stat.h>
#include <dirent.h>
#include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "module.h"
#include "migration.h"
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index 35cd485..b48a7fc 100644
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -16,7 +16,7 @@
#include "sysemu.h"
#include "qmp-commands.h"
#include "trace.h"
-#include "nbd.h"
+#include "block/nbd.h"
#include "qemu_socket.h"
static int server_fd = -1;
diff --git a/blockdev.c b/blockdev.c
index 9d8d892..67125e5 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -9,14 +9,14 @@
#include "blockdev.h"
#include "hw/block-common.h"
-#include "blockjob.h"
+#include "block/blockjob.h"
#include "monitor.h"
#include "qobject/qerror.h"
#include "qemu-option.h"
#include "qemu-config.h"
#include "qapi/qmp-types.h"
#include "sysemu.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "qmp-commands.h"
#include "trace.h"
#include "arch_init.h"
diff --git a/blockdev.h b/blockdev.h
index 4be871e..17974c4 100644
--- a/blockdev.h
+++ b/blockdev.h
@@ -10,7 +10,7 @@
#ifndef BLOCKDEV_H
#define BLOCKDEV_H
-#include "block.h"
+#include "block/block.h"
#include "qapi/error.h"
#include "qemu-queue.h"
diff --git a/blockjob.c b/blockjob.c
index 1d9e91f..16d5053 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -27,11 +27,11 @@
#include "qemu-common.h"
#include "trace.h"
#include "monitor.h"
-#include "block.h"
-#include "blockjob.h"
-#include "block_int.h"
+#include "block/block.h"
+#include "block/blockjob.h"
+#include "block/block_int.h"
#include "qobject/qjson.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
#include "qmp-commands.h"
#include "qemu-timer.h"
diff --git a/cmd.c b/cmd.c
index f40f09b..01a8c3a 100644
--- a/cmd.c
+++ b/cmd.c
@@ -24,7 +24,7 @@
#include <getopt.h>
#include "cmd.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
#include "main-loop.h"
#define _(x) x /* not gettext support yet */
diff --git a/coroutine-gthread.c b/coroutine-gthread.c
index 30c24c9..d3e5b99 100644
--- a/coroutine-gthread.c
+++ b/coroutine-gthread.c
@@ -20,7 +20,7 @@
#include <glib.h>
#include "qemu-common.h"
-#include "qemu-coroutine-int.h"
+#include "block/coroutine_int.h"
typedef struct {
Coroutine base;
diff --git a/coroutine-sigaltstack.c b/coroutine-sigaltstack.c
index 861e878..c2f3ecc 100644
--- a/coroutine-sigaltstack.c
+++ b/coroutine-sigaltstack.c
@@ -31,7 +31,7 @@
#include <pthread.h>
#include <signal.h>
#include "qemu-common.h"
-#include "qemu-coroutine-int.h"
+#include "block/coroutine_int.h"
enum {
/* Maximum free pool size prevents holding too many freed coroutines */
diff --git a/coroutine-ucontext.c b/coroutine-ucontext.c
index 784081a..2ed703a 100644
--- a/coroutine-ucontext.c
+++ b/coroutine-ucontext.c
@@ -28,7 +28,7 @@
#include <pthread.h>
#include <ucontext.h>
#include "qemu-common.h"
-#include "qemu-coroutine-int.h"
+#include "block/coroutine_int.h"
#ifdef CONFIG_VALGRIND_H
#include <valgrind/valgrind.h>
diff --git a/coroutine-win32.c b/coroutine-win32.c
index 4179609..edc1f72 100644
--- a/coroutine-win32.c
+++ b/coroutine-win32.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
-#include "qemu-coroutine-int.h"
+#include "block/coroutine_int.h"
typedef struct
{
diff --git a/dma.h b/dma.h
index 1bd6f4a..89c4161 100644
--- a/dma.h
+++ b/dma.h
@@ -13,7 +13,7 @@
#include <stdio.h>
#include "memory.h"
#include "hw/hw.h"
-#include "block.h"
+#include "block/block.h"
#include "kvm.h"
typedef struct DMAContext DMAContext;
diff --git a/hw/9pfs/codir.c b/hw/9pfs/codir.c
index 3d18828..cd13733 100644
--- a/hw/9pfs/codir.c
+++ b/hw/9pfs/codir.c
@@ -14,7 +14,7 @@
#include "fsdev/qemu-fsdev.h"
#include "qemu-thread.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
#include "virtio-9p-coth.h"
int v9fs_co_readdir_r(V9fsPDU *pdu, V9fsFidState *fidp, struct dirent *dent,
diff --git a/hw/9pfs/cofile.c b/hw/9pfs/cofile.c
index 9345aae..6d6dac7 100644
--- a/hw/9pfs/cofile.c
+++ b/hw/9pfs/cofile.c
@@ -14,7 +14,7 @@
#include "fsdev/qemu-fsdev.h"
#include "qemu-thread.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
#include "virtio-9p-coth.h"
int v9fs_co_st_gen(V9fsPDU *pdu, V9fsPath *path, mode_t st_mode,
diff --git a/hw/9pfs/cofs.c b/hw/9pfs/cofs.c
index 83f125b..4b9ba30 100644
--- a/hw/9pfs/cofs.c
+++ b/hw/9pfs/cofs.c
@@ -14,7 +14,7 @@
#include "fsdev/qemu-fsdev.h"
#include "qemu-thread.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
#include "virtio-9p-coth.h"
int v9fs_co_readlink(V9fsPDU *pdu, V9fsPath *path, V9fsString *buf)
diff --git a/hw/9pfs/coxattr.c b/hw/9pfs/coxattr.c
index 8a48228..08365a6 100644
--- a/hw/9pfs/coxattr.c
+++ b/hw/9pfs/coxattr.c
@@ -14,7 +14,7 @@
#include "fsdev/qemu-fsdev.h"
#include "qemu-thread.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
#include "virtio-9p-coth.h"
int v9fs_co_llistxattr(V9fsPDU *pdu, V9fsPath *path, void *value, size_t size)
diff --git a/hw/9pfs/virtio-9p-coth.c b/hw/9pfs/virtio-9p-coth.c
index 9368df7..958725e 100644
--- a/hw/9pfs/virtio-9p-coth.c
+++ b/hw/9pfs/virtio-9p-coth.c
@@ -14,7 +14,7 @@
#include "fsdev/qemu-fsdev.h"
#include "qemu-thread.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
#include "virtio-9p-coth.h"
/* v9fs glib thread pool */
diff --git a/hw/9pfs/virtio-9p-coth.h b/hw/9pfs/virtio-9p-coth.h
index c31c965..8c48a16 100644
--- a/hw/9pfs/virtio-9p-coth.h
+++ b/hw/9pfs/virtio-9p-coth.h
@@ -16,7 +16,7 @@
#define _QEMU_VIRTIO_9P_COTH_H
#include "qemu-thread.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
#include "virtio-9p.h"
#include <glib.h>
diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
index 5797944..2c0c3ba 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -10,7 +10,7 @@
#include "fsdev/file-op-9p.h"
#include "fsdev/virtio-9p-marshal.h"
#include "qemu-thread.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
/* The feature bitmap for virtio 9P */
diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c
index 1cdb9fb..c305143 100644
--- a/hw/hd-geometry.c
+++ b/hw/hd-geometry.c
@@ -30,7 +30,7 @@
* THE SOFTWARE.
*/
-#include "block.h"
+#include "block/block.h"
#include "hw/block-common.h"
#include "trace.h"
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index e0b9443..94a612f 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -26,7 +26,7 @@
#include <hw/pc.h>
#include <hw/pci.h>
#include <hw/isa.h>
-#include "block.h"
+#include "block/block.h"
#include "sysemu.h"
#include "dma.h"
diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 272b773..6f0632c 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -65,7 +65,7 @@
#include <hw/pc.h>
#include <hw/pci.h>
#include <hw/isa.h>
-#include "block.h"
+#include "block/block.h"
#include "dma.h"
#include <hw/ide/pci.h>
diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 8ab2718..39df87c 100644
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -25,7 +25,7 @@
#include <hw/hw.h>
#include <hw/pc.h>
#include <hw/isa.h>
-#include "block.h"
+#include "block/block.h"
#include "dma.h"
#include <hw/ide/internal.h>
diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index f228725..90fdb83 100644
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -25,7 +25,7 @@
#include <hw/hw.h>
#include <hw/ppc_mac.h>
#include <hw/mac_dbdma.h>
-#include "block.h"
+#include "block/block.h"
#include "dma.h"
#include <hw/ide/internal.h>
diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index 9eee5b5..6cce523 100644
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -25,7 +25,7 @@
#include <hw/hw.h>
#include <hw/pc.h>
#include <hw/pcmcia.h>
-#include "block.h"
+#include "block/block.h"
#include "dma.h"
#include <hw/ide/internal.h>
diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c
index fcfb09e..28fd939 100644
--- a/hw/ide/mmio.c
+++ b/hw/ide/mmio.c
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include <hw/hw.h>
-#include "block.h"
+#include "block/block.h"
#include "dma.h"
#include <hw/ide/internal.h>
diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 644533f..ce66b15 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -26,7 +26,7 @@
#include <hw/pc.h>
#include <hw/pci.h>
#include <hw/isa.h>
-#include "block.h"
+#include "block/block.h"
#include "dma.h"
#include <hw/ide/pci.h>
diff --git a/hw/ide/via.c b/hw/ide/via.c
index b20e4f0..fba8c6b 100644
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -27,7 +27,7 @@
#include <hw/pc.h>
#include <hw/pci.h>
#include <hw/isa.h>
-#include "block.h"
+#include "block/block.h"
#include "sysemu.h"
#include "dma.h"
diff --git a/hw/megasas.c b/hw/megasas.c
index 0e57740..2b062c3 100644
--- a/hw/megasas.c
+++ b/hw/megasas.c
@@ -25,7 +25,7 @@
#include "iov.h"
#include "scsi.h"
#include "scsi-defs.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "trace.h"
#include "mfi.h"
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index cc31bb7..a47e1e4 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -25,7 +25,7 @@
#include "net/net.h"
#include "boards.h"
#include "smbus.h"
-#include "block.h"
+#include "block/block.h"
#include "flash.h"
#include "mips.h"
#include "mips_cpudevs.h"
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index e26caff..5b6064e 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -29,7 +29,7 @@
#include "net/net.h"
#include "boards.h"
#include "smbus.h"
-#include "block.h"
+#include "block/block.h"
#include "flash.h"
#include "mips.h"
#include "mips_cpudevs.h"
diff --git a/hw/musicpal.c b/hw/musicpal.c
index 8389db6..924dd11 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -18,7 +18,7 @@
#include "serial.h"
#include "qemu-timer.h"
#include "ptimer.h"
-#include "block.h"
+#include "block/block.h"
#include "flash.h"
#include "ui/console.h"
#include "i2c.h"
diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index 3b437da..4751fc2 100644
--- a/hw/pflash_cfi01.c
+++ b/hw/pflash_cfi01.c
@@ -38,7 +38,7 @@
#include "hw.h"
#include "flash.h"
-#include "block.h"
+#include "block/block.h"
#include "qemu-timer.h"
#include "exec-memory.h"
#include "host-utils.h"
diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c
index 39337ec..962f78b 100644
--- a/hw/pflash_cfi02.c
+++ b/hw/pflash_cfi02.c
@@ -38,7 +38,7 @@
#include "hw.h"
#include "flash.h"
#include "qemu-timer.h"
-#include "block.h"
+#include "block/block.h"
#include "exec-memory.h"
#include "host-utils.h"
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index e848cb0..686dbce 100644
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -27,7 +27,7 @@
#include "nvram.h"
#include "flash.h"
#include "sysemu.h"
-#include "block.h"
+#include "block/block.h"
#include "boards.h"
#include "qemu-log.h"
#include "loader.h"
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index b28bd75..a9e7ae6 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -18,7 +18,7 @@
*/
#include "hw.h"
-#include "block.h"
+#include "block/block.h"
#include "sysemu.h"
#include "boards.h"
#include "monitor.h"
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 9a145df..f295925 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -18,7 +18,7 @@
*/
#include "hw.h"
-#include "block.h"
+#include "block/block.h"
#include "blockdev.h"
#include "sysemu.h"
#include "net/net.h"
diff --git a/hw/scsi.h b/hw/scsi.h
index b8f7357..24ed522 100644
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -2,7 +2,7 @@
#define QEMU_HW_SCSI_H
#include "qdev.h"
-#include "block.h"
+#include "block/block.h"
#include "hw/block-common.h"
#include "sysemu.h"
diff --git a/hw/sd.c b/hw/sd.c
index 297580a..b3945f7 100644
--- a/hw/sd.c
+++ b/hw/sd.c
@@ -30,7 +30,7 @@
*/
#include "hw.h"
-#include "block.h"
+#include "block/block.h"
#include "sd.h"
#include "bitmap.h"
diff --git a/hw/spitz.c b/hw/spitz.c
index 5048b66..dd430c9 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -22,7 +22,7 @@
#include "devices.h"
#include "sharpsl.h"
#include "ui/console.h"
-#include "block.h"
+#include "block/block.h"
#include "audio/audio.h"
#include "boards.h"
#include "blockdev.h"
diff --git a/hw/tosa.c b/hw/tosa.c
index 512278c..3991a90 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -17,7 +17,7 @@
#include "devices.h"
#include "sharpsl.h"
#include "pcmcia.h"
-#include "block.h"
+#include "block/block.h"
#include "boards.h"
#include "i2c.h"
#include "ssi.h"
diff --git a/aes.h b/include/block/aes.h
similarity index 100%
rename from aes.h
rename to include/block/aes.h
diff --git a/qemu-aio.h b/include/block/aio.h
similarity index 100%
rename from qemu-aio.h
rename to include/block/aio.h
diff --git a/block.h b/include/block/block.h
similarity index 99%
rename from block.h
rename to include/block/block.h
index c41554b..574ba62 100644
--- a/block.h
+++ b/include/block/block.h
@@ -1,10 +1,10 @@
#ifndef BLOCK_H
#define BLOCK_H
-#include "qemu-aio.h"
+#include "block/aio.h"
#include "qemu-common.h"
#include "qemu-option.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
#include "qobject/qobject.h"
#include "qapi-types.h"
diff --git a/block_int.h b/include/block/block_int.h
similarity index 99%
rename from block_int.h
rename to include/block/block_int.h
index cdf5ff1..a667a66 100644
--- a/block_int.h
+++ b/include/block/block_int.h
@@ -24,10 +24,10 @@
#ifndef BLOCK_INT_H
#define BLOCK_INT_H
-#include "block.h"
+#include "block/block.h"
#include "qemu-option.h"
#include "qemu-queue.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
#include "qemu-timer.h"
#include "qapi-types.h"
#include "qobject/qerror.h"
diff --git a/blockjob.h b/include/block/blockjob.h
similarity index 99%
rename from blockjob.h
rename to include/block/blockjob.h
index 930cc3c..2de9e48 100644
--- a/blockjob.h
+++ b/include/block/blockjob.h
@@ -25,7 +25,7 @@
#ifndef BLOCKJOB_H
#define BLOCKJOB_H 1
-#include "block.h"
+#include "block/block.h"
/**
* BlockJobType:
diff --git a/qemu-coroutine.h b/include/block/coroutine.h
similarity index 100%
rename from qemu-coroutine.h
rename to include/block/coroutine.h
diff --git a/qemu-coroutine-int.h b/include/block/coroutine_int.h
similarity index 98%
rename from qemu-coroutine-int.h
rename to include/block/coroutine_int.h
index 0f1bd80..282a3ce 100644
--- a/qemu-coroutine-int.h
+++ b/include/block/coroutine_int.h
@@ -26,7 +26,7 @@
#define QEMU_COROUTINE_INT_H
#include "qemu-queue.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
typedef enum {
COROUTINE_YIELD = 1,
diff --git a/nbd.h b/include/block/nbd.h
similarity index 100%
rename from nbd.h
rename to include/block/nbd.h
diff --git a/linux-aio.c b/linux-aio.c
index f3d8ef3..cc995fb 100644
--- a/linux-aio.c
+++ b/linux-aio.c
@@ -8,7 +8,7 @@
* See the COPYING file in the top-level directory.
*/
#include "qemu-common.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
#include "qemu-queue.h"
#include "block/raw-posix-aio.h"
diff --git a/migration-exec.c b/migration-exec.c
index ed63187..b3d9964 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -19,7 +19,7 @@
#include "qemu_socket.h"
#include "migration.h"
#include "buffered_file.h"
-#include "block.h"
+#include "block/block.h"
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/migration-fd.c b/migration-fd.c
index b1e3cca..7c97685 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -18,7 +18,7 @@
#include "migration.h"
#include "monitor.h"
#include "buffered_file.h"
-#include "block.h"
+#include "block/block.h"
#include "qemu_socket.h"
//#define DEBUG_MIGRATION_FD
diff --git a/migration-tcp.c b/migration-tcp.c
index 7006fdb..7b764de 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -17,7 +17,7 @@
#include "qemu_socket.h"
#include "migration.h"
#include "buffered_file.h"
-#include "block.h"
+#include "block/block.h"
//#define DEBUG_MIGRATION_TCP
diff --git a/migration-unix.c b/migration-unix.c
index 570bc94..8a2c804 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -17,7 +17,7 @@
#include "qemu_socket.h"
#include "migration.h"
#include "buffered_file.h"
-#include "block.h"
+#include "block/block.h"
//#define DEBUG_MIGRATION_UNIX
diff --git a/migration.c b/migration.c
index bd55a15..53ee0e7 100644
--- a/migration.c
+++ b/migration.c
@@ -18,7 +18,7 @@
#include "monitor.h"
#include "buffered_file.h"
#include "sysemu.h"
-#include "block.h"
+#include "block/block.h"
#include "qemu_socket.h"
#include "block-migration.h"
#include "qmp-commands.h"
diff --git a/monitor.h b/monitor.h
index 4823837..338052d 100644
--- a/monitor.h
+++ b/monitor.h
@@ -4,7 +4,7 @@
#include "qemu-common.h"
#include "qobject/qerror.h"
#include "qobject/qdict.h"
-#include "block.h"
+#include "block/block.h"
#include "readline.h"
extern Monitor *cur_mon;
diff --git a/nbd.c b/nbd.c
index cec5a94..cf88b1c 100644
--- a/nbd.c
+++ b/nbd.c
@@ -16,10 +16,10 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "nbd.h"
-#include "block.h"
+#include "block/nbd.h"
+#include "block/block.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
#include <errno.h>
#include <string.h>
diff --git a/posix-aio-compat.c b/posix-aio-compat.c
index 96e4daf..5529515 100644
--- a/posix-aio-compat.c
+++ b/posix-aio-compat.c
@@ -28,7 +28,7 @@
#include "sysemu.h"
#include "qemu-common.h"
#include "trace.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "iov.h"
#include "block/raw-posix-aio.h"
diff --git a/qemu-coroutine-io.c b/qemu-coroutine-io.c
index 5734965..5fae9c7 100644
--- a/qemu-coroutine-io.c
+++ b/qemu-coroutine-io.c
@@ -24,7 +24,7 @@
*/
#include "qemu-common.h"
#include "qemu_socket.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
#include "iov.h"
ssize_t coroutine_fn
diff --git a/qemu-coroutine-lock.c b/qemu-coroutine-lock.c
index 26ad76b..1feb186 100644
--- a/qemu-coroutine-lock.c
+++ b/qemu-coroutine-lock.c
@@ -23,8 +23,8 @@
*/
#include "qemu-common.h"
-#include "qemu-coroutine.h"
-#include "qemu-coroutine-int.h"
+#include "block/coroutine.h"
+#include "block/coroutine_int.h"
#include "qemu-queue.h"
#include "main-loop.h"
#include "trace.h"
diff --git a/qemu-coroutine-sleep.c b/qemu-coroutine-sleep.c
index d7083ee..26e6dac 100644
--- a/qemu-coroutine-sleep.c
+++ b/qemu-coroutine-sleep.c
@@ -11,7 +11,7 @@
*
*/
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
#include "qemu-timer.h"
typedef struct CoSleepCB {
diff --git a/qemu-coroutine.c b/qemu-coroutine.c
index 600be26..0f6e268 100644
--- a/qemu-coroutine.c
+++ b/qemu-coroutine.c
@@ -14,8 +14,8 @@
#include "trace.h"
#include "qemu-common.h"
-#include "qemu-coroutine.h"
-#include "qemu-coroutine-int.h"
+#include "block/coroutine.h"
+#include "block/coroutine_int.h"
Coroutine *qemu_coroutine_create(CoroutineEntry *entry)
{
diff --git a/qemu-img.c b/qemu-img.c
index 1449708..51373e0 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -29,7 +29,7 @@
#include "qemu-error.h"
#include "osdep.h"
#include "sysemu.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include <getopt.h>
#include <stdio.h>
diff --git a/qemu-io.c b/qemu-io.c
index d0f4fb7..c725e37 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -16,7 +16,7 @@
#include "qemu-common.h"
#include "main-loop.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "cmd.h"
#include "trace/control.h"
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 15bcd08..6f9b9d1 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -17,8 +17,8 @@
*/
#include "qemu-common.h"
-#include "block.h"
-#include "nbd.h"
+#include "block/block.h"
+#include "block/nbd.h"
#include <stdarg.h>
#include <stdio.h>
diff --git a/tests/test-coroutine.c b/tests/test-coroutine.c
index e5d14eb..4c6cc81 100644
--- a/tests/test-coroutine.c
+++ b/tests/test-coroutine.c
@@ -12,7 +12,7 @@
*/
#include <glib.h>
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
/*
* Check that qemu_in_coroutine() works
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 23/32] exec: move include files to include/exec/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (21 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 22/32] block: move include files to include/block/ Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 24/32] monitor: move include files to include/monitor/ Paolo Bonzini
` (11 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch_init.c | 4 +-
balloon.c | 2 +-
bsd-user/qemu.h | 2 +-
cpus.c | 2 +-
cputlb.c | 12 ++--
dump.c | 6 +-
exec.c | 2 +-
gdbstub.c | 2 +-
hw/alpha_typhoon.c | 4 +-
hw/an5206.c | 2 +-
hw/apb_pci.c | 2 +-
hw/armv7m_nvic.c | 2 +-
hw/axis_dev88.c | 2 +-
hw/bonito.c | 2 +-
hw/collie.c | 2 +-
hw/dummy_m68k.c | 2 +-
hw/etraxfs_dma.c | 2 +-
hw/exynos4210_fimd.c | 2 +-
hw/exynos4_boards.c | 2 +-
hw/gt64xxx.c | 2 +-
hw/gumstix.c | 2 +-
hw/highbank.c | 2 +-
hw/hw.h | 2 +-
hw/ide/ahci.c | 2 +-
hw/integratorcp.c | 2 +-
hw/isa-bus.c | 2 +-
hw/isa_mmio.c | 2 +-
hw/kzm.c | 2 +-
hw/leon3.c | 2 +-
hw/lm32_boards.c | 2 +-
hw/loader.c | 2 +-
hw/mainstone.c | 2 +-
hw/mcf5206.c | 2 +-
hw/mcf5208.c | 2 +-
hw/mcf_fec.c | 2 +-
hw/mcf_intc.c | 2 +-
hw/mcf_uart.c | 2 +-
hw/milkymist.c | 2 +-
hw/mips_fulong2e.c | 2 +-
hw/mips_jazz.c | 2 +-
hw/mips_malta.c | 2 +-
hw/mips_mipssim.c | 2 +-
hw/mips_r4k.c | 2 +-
hw/musicpal.c | 2 +-
hw/ne2000-isa.c | 2 +-
hw/nseries.c | 2 +-
hw/omap_gpmc.c | 2 +-
hw/omap_sx1.c | 2 +-
hw/omap_uart.c | 2 +-
hw/onenand.c | 2 +-
hw/openrisc_sim.c | 2 +-
hw/palm.c | 2 +-
hw/pc.c | 2 +-
hw/pc_piix.c | 2 +-
hw/pci.c | 2 +-
hw/pcie_host.c | 2 +-
hw/petalogix_ml605_mmu.c | 2 +-
hw/petalogix_s3adsp1800_mmu.c | 2 +-
hw/pflash_cfi01.c | 2 +-
hw/pflash_cfi02.c | 2 +-
hw/ppc/e500.c | 2 +-
hw/ppc405_boards.c | 2 +-
hw/ppc405_uc.c | 2 +-
hw/ppc440_bamboo.c | 2 +-
hw/ppc4xx_devs.c | 2 +-
hw/ppc4xx_pci.c | 2 +-
hw/ppc_newworld.c | 2 +-
hw/ppc_oldworld.c | 2 +-
hw/ppc_prep.c | 2 +-
hw/ppce500_pci.c | 2 +-
hw/prep_pci.c | 2 +-
hw/puv3.c | 2 +-
hw/qdev-addr.c | 2 +-
hw/r2d.c | 2 +-
hw/realview.c | 2 +-
hw/s390-virtio.c | 2 +-
hw/sh7750.c | 2 +-
hw/sh_intc.h | 2 +-
hw/sh_pci.c | 2 +-
hw/sh_serial.c | 2 +-
hw/sh_timer.c | 2 +-
hw/shix.c | 2 +-
hw/spapr.c | 2 +-
hw/spapr_iommu.c | 2 +-
hw/spapr_pci.c | 2 +-
hw/spitz.c | 2 +-
hw/stellaris.c | 2 +-
hw/sun4u.c | 2 +-
hw/sysbus.c | 2 +-
hw/tosa.c | 2 +-
hw/usb/libhw.c | 2 +-
hw/versatile_pci.c | 2 +-
hw/versatilepb.c | 2 +-
hw/vexpress.c | 2 +-
hw/vfio_pci.c | 2 +-
hw/vhost.c | 2 +-
hw/virtex_ml507.c | 2 +-
hw/virtio-balloon.c | 2 +-
hw/xen_platform.c | 2 +-
hw/xen_pt.c | 2 +-
hw/xilinx_zynq.c | 2 +-
hw/xtensa_lx60.c | 2 +-
hw/xtensa_sim.c | 2 +-
hw/z2.c | 2 +-
cpu-all.h => include/exec/cpu-all.h | 2 +-
cpu-common.h => include/exec/cpu-common.h | 4 +-
cpu-defs.h => include/exec/cpu-defs.h | 2 +-
def-helper.h => include/exec/def-helper.h | 0
exec-all.h => include/exec/exec-all.h | 12 ++--
exec-memory.h => include/exec/exec-memory.h | 0
gdbstub.h => include/exec/gdbstub.h | 0
gen-icount.h => include/exec/gen-icount.h | 0
poison.h => include/exec/poison.h | 0
softmmu-semi.h => include/exec/softmmu-semi.h | 0
softmmu_defs.h => include/exec/softmmu_defs.h | 0
softmmu_exec.h => include/exec/softmmu_exec.h | 58 ++++++++++----------
| 0
.../exec/softmmu_template.h | 0
qemu-lock.h => include/exec/spinlock.h | 0
targphys.h => include/exec/targphys.h | 0
kvm-all.c | 4 +-
kvm-stub.c | 2 +-
linux-user/qemu.h | 2 +-
memory.c | 2 +-
memory.h | 4 +-
memory_mapping-stub.c | 2 +-
memory_mapping.c | 2 +-
monitor.c | 2 +-
scripts/feature_to_c.sh | 2 +-
target-alpha/cpu.h | 6 +-
target-alpha/helper.h | 4 +-
target-alpha/mem_helper.c | 10 ++--
target-alpha/translate.c | 2 +-
target-arm/arm-semi.c | 4 +-
target-arm/cpu.h | 6 +-
target-arm/helper.c | 2 +-
target-arm/helper.h | 4 +-
target-arm/iwmmxt_helper.c | 2 +-
target-arm/neon_helper.c | 2 +-
target-arm/op_helper.c | 10 ++--
target-arm/translate.c | 2 +-
target-cris/cpu.h | 6 +-
target-cris/helper.h | 4 +-
target-cris/op_helper.c | 10 ++--
target-cris/translate.c | 2 +-
target-i386/arch_dump.c | 2 +-
target-i386/arch_memory_mapping.c | 2 +-
target-i386/cpu.h | 6 +-
target-i386/fpu_helper.c | 2 +-
target-i386/helper.h | 4 +-
target-i386/kvm.c | 2 +-
target-i386/mem_helper.c | 10 ++--
target-i386/misc_helper.c | 2 +-
target-i386/seg_helper.c | 2 +-
target-i386/svm_helper.c | 4 +-
target-i386/translate.c | 2 +-
target-lm32/cpu.h | 6 +-
target-lm32/helper.h | 4 +-
target-lm32/op_helper.c | 8 ++--
target-lm32/translate.c | 2 +-
target-m68k/cpu.h | 6 +-
target-m68k/helper.c | 2 +-
target-m68k/helpers.h | 4 +-
target-m68k/m68k-semi.c | 4 +-
target-m68k/op_helper.c | 10 ++--
target-m68k/translate.c | 2 +-
target-microblaze/cpu.h | 6 +-
target-microblaze/helper.h | 4 +-
target-microblaze/op_helper.c | 10 ++--
target-microblaze/translate.c | 2 +-
target-mips/cpu.h | 6 +-
target-mips/helper.h | 4 +-
target-mips/op_helper.c | 10 ++--
target-mips/translate.c | 2 +-
target-openrisc/cpu.h | 6 +-
target-openrisc/helper.h | 4 +-
target-openrisc/interrupt.c | 2 +-
target-openrisc/mmu.c | 2 +-
target-openrisc/mmu_helper.c | 10 ++--
target-openrisc/translate.c | 4 +-
target-ppc/cpu.h | 6 +-
target-ppc/helper.h | 4 +-
target-ppc/mem_helper.c | 10 ++--
target-ppc/translate.c | 2 +-
target-ppc/translate_init.c | 2 +-
target-s390x/cpu.h | 6 +-
target-s390x/fpu_helper.c | 2 +-
target-s390x/helper.c | 2 +-
target-s390x/helper.h | 4 +-
target-s390x/mem_helper.c | 10 ++--
target-s390x/misc_helper.c | 2 +-
target-s390x/translate.c | 2 +-
target-sh4/cpu.h | 6 +-
target-sh4/helper.h | 4 +-
target-sh4/op_helper.c | 10 ++--
target-sh4/translate.c | 2 +-
target-sparc/cpu.h | 6 +-
target-sparc/helper.h | 4 +-
target-sparc/ldst_helper.c | 10 ++--
target-sparc/mmu_helper.c | 2 +-
target-sparc/translate.c | 2 +-
target-unicore32/cpu.h | 6 +-
target-unicore32/helper.c | 2 +-
target-unicore32/helper.h | 4 +-
target-unicore32/op_helper.c | 8 ++--
target-unicore32/translate.c | 2 +-
target-xtensa/core-dc232b.c | 4 +-
target-xtensa/core-dc233c.c | 4 +-
target-xtensa/core-fsf.c | 4 +-
target-xtensa/cpu.h | 6 +-
target-xtensa/helper.c | 4 +-
target-xtensa/helper.h | 4 +-
target-xtensa/op_helper.c | 8 ++--
target-xtensa/translate.c | 4 +-
tcg/arm/tcg-target.c | 2 +-
tcg/hppa/tcg-target.c | 2 +-
tcg/i386/tcg-target.c | 2 +-
tcg/ia64/tcg-target.c | 2 +-
tcg/mips/tcg-target.c | 2 +-
tcg/ppc/tcg-target.c | 2 +-
tcg/ppc64/tcg-target.c | 2 +-
tcg/s390/tcg-target.c | 2 +-
tcg/sparc/tcg-target.c | 2 +-
tci.c | 2 +-
vl.c | 2 +-
xen-all.c | 2 +-
226 files changed, 371 insertions(+), 371 deletions(-)
rename cpu-all.h => include/exec/cpu-all.h (99%)
rename cpu-common.h => include/exec/cpu-common.h (98%)
rename cpu-defs.h => include/exec/cpu-defs.h (99%)
rename def-helper.h => include/exec/def-helper.h (100%)
rename exec-all.h => include/exec/exec-all.h (98%)
rename exec-memory.h => include/exec/exec-memory.h (100%)
rename gdbstub.h => include/exec/gdbstub.h (100%)
rename gen-icount.h => include/exec/gen-icount.h (100%)
rename poison.h => include/exec/poison.h (100%)
rename softmmu-semi.h => include/exec/softmmu-semi.h (100%)
rename softmmu_defs.h => include/exec/softmmu_defs.h (100%)
rename softmmu_exec.h => include/exec/softmmu_exec.h (72%)
rename softmmu_header.h => include/exec/softmmu_header.h (100%)
rename softmmu_template.h => include/exec/softmmu_template.h (100%)
rename qemu-lock.h => include/exec/spinlock.h (100%)
rename targphys.h => include/exec/targphys.h (100%)
diff --git a/arch_init.c b/arch_init.c
index 1973037..212c90a 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -40,9 +40,9 @@
#include "hw/audiodev.h"
#include "kvm.h"
#include "migration.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "hw/smbios.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "hw/pcspk.h"
#include "qemu/page_cache.h"
#include "qemu-config.h"
diff --git a/balloon.c b/balloon.c
index 211b93d..a8d2c46 100644
--- a/balloon.c
+++ b/balloon.c
@@ -25,7 +25,7 @@
*/
#include "monitor.h"
-#include "cpu-common.h"
+#include "exec/cpu-common.h"
#include "kvm.h"
#include "balloon.h"
#include "trace.h"
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 8a5ee3d..ef53e68 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -23,7 +23,7 @@ extern enum BSDType bsd_type;
#include "syscall_defs.h"
#include "syscall.h"
#include "target_signal.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#if defined(CONFIG_USE_NPTL)
#define THREAD __thread
diff --git a/cpus.c b/cpus.c
index 191cbf5..866cb28 100644
--- a/cpus.c
+++ b/cpus.c
@@ -27,7 +27,7 @@
#include "monitor.h"
#include "sysemu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "dma.h"
#include "kvm.h"
#include "qmp-commands.h"
diff --git a/cputlb.c b/cputlb.c
index 9027557..e9d1c89 100644
--- a/cputlb.c
+++ b/cputlb.c
@@ -19,9 +19,9 @@
#include "config.h"
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "memory.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "cputlb.h"
@@ -347,15 +347,15 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr)
#define SOFTMMU_CODE_ACCESS
#define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#undef env
diff --git a/dump.c b/dump.c
index 8826e8e..8f5a36f 100644
--- a/dump.c
+++ b/dump.c
@@ -14,8 +14,8 @@
#include "qemu-common.h"
#include "elf.h"
#include "cpu.h"
-#include "cpu-all.h"
-#include "targphys.h"
+#include "exec/cpu-all.h"
+#include "exec/targphys.h"
#include "monitor.h"
#include "kvm.h"
#include "dump.h"
@@ -23,7 +23,7 @@
#include "memory_mapping.h"
#include "qapi/error.h"
#include "qmp-commands.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
static uint16_t cpu_convert_to_target16(uint16_t val, int endian)
{
diff --git a/exec.c b/exec.c
index 1821aef..8c17728 100644
--- a/exec.c
+++ b/exec.c
@@ -35,7 +35,7 @@
#include "qemu-timer.h"
#include "qemu-config.h"
#include "memory.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#if defined(CONFIG_USER_ONLY)
#include <qemu.h>
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
diff --git a/gdbstub.c b/gdbstub.c
index d02ec75..70ad79a 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -32,7 +32,7 @@
#include "monitor.h"
#include "qemu-char.h"
#include "sysemu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#endif
#define MAX_PACKET_LENGTH 4096
diff --git a/hw/alpha_typhoon.c b/hw/alpha_typhoon.c
index b7cf4e2..87c4588 100644
--- a/hw/alpha_typhoon.c
+++ b/hw/alpha_typhoon.c
@@ -7,12 +7,12 @@
*/
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "hw.h"
#include "devices.h"
#include "sysemu.h"
#include "alpha_sys.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define TYPE_TYPHOON_PCI_HOST_BRIDGE "typhoon-pcihost"
diff --git a/hw/an5206.c b/hw/an5206.c
index 042c5fc..5eb31f5 100644
--- a/hw/an5206.c
+++ b/hw/an5206.c
@@ -11,7 +11,7 @@
#include "boards.h"
#include "loader.h"
#include "elf.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define KERNEL_LOAD_ADDR 0x10000
#define AN5206_MBAR_ADDR 0x10000000
diff --git a/hw/apb_pci.c b/hw/apb_pci.c
index c28411a..e4d2c3e 100644
--- a/hw/apb_pci.c
+++ b/hw/apb_pci.c
@@ -33,7 +33,7 @@
#include "pci_internals.h"
#include "apb_pci.h"
#include "sysemu.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
/* debug APB */
//#define DEBUG_APB
diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c
index c449e08..154cc5e 100644
--- a/hw/armv7m_nvic.c
+++ b/hw/armv7m_nvic.c
@@ -13,7 +13,7 @@
#include "sysbus.h"
#include "qemu-timer.h"
#include "arm-misc.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "arm_gic_internal.h"
typedef struct {
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index b5d8882..c666d0b 100644
--- a/hw/axis_dev88.c
+++ b/hw/axis_dev88.c
@@ -31,7 +31,7 @@
#include "elf.h"
#include "cris-boot.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define D(x)
#define DNAND(x)
diff --git a/hw/bonito.c b/hw/bonito.c
index 6084ac4..76a0a32 100644
--- a/hw/bonito.c
+++ b/hw/bonito.c
@@ -45,7 +45,7 @@
#include "mips.h"
#include "pci_host.h"
#include "sysemu.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
//#define DEBUG_BONITO
diff --git a/hw/collie.c b/hw/collie.c
index 695982a..70f8cbf 100644
--- a/hw/collie.c
+++ b/hw/collie.c
@@ -16,7 +16,7 @@
#include "arm-misc.h"
#include "flash.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
static struct arm_boot_info collie_binfo = {
.loader_start = SA_SDCS0,
diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c
index f436a0c..2137efd 100644
--- a/hw/dummy_m68k.c
+++ b/hw/dummy_m68k.c
@@ -10,7 +10,7 @@
#include "boards.h"
#include "loader.h"
#include "elf.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define KERNEL_LOAD_ADDR 0x10000
diff --git a/hw/etraxfs_dma.c b/hw/etraxfs_dma.c
index 332525c..ad30390 100644
--- a/hw/etraxfs_dma.c
+++ b/hw/etraxfs_dma.c
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <sys/time.h>
#include "hw.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "qemu-common.h"
#include "sysemu.h"
diff --git a/hw/exynos4210_fimd.c b/hw/exynos4210_fimd.c
index 35ed48c..1ec80ae 100644
--- a/hw/exynos4210_fimd.c
+++ b/hw/exynos4210_fimd.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
#include "sysbus.h"
#include "ui/console.h"
#include "pixel_ops.h"
diff --git a/hw/exynos4_boards.c b/hw/exynos4_boards.c
index 7eb004f..7a4f950 100644
--- a/hw/exynos4_boards.c
+++ b/hw/exynos4_boards.c
@@ -25,7 +25,7 @@
#include "sysbus.h"
#include "net/net.h"
#include "arm-misc.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "exynos4210.h"
#include "boards.h"
diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c
index e95e664..f8da353 100644
--- a/hw/gt64xxx.c
+++ b/hw/gt64xxx.c
@@ -27,7 +27,7 @@
#include "pci.h"
#include "pci_host.h"
#include "pc.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
//#define DEBUG
diff --git a/hw/gumstix.c b/hw/gumstix.c
index 545b92f..b250bb5 100644
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -41,7 +41,7 @@
#include "devices.h"
#include "boards.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
static const int sector_len = 128 * 1024;
diff --git a/hw/highbank.c b/hw/highbank.c
index 7b97de0..6210ef6 100644
--- a/hw/highbank.c
+++ b/hw/highbank.c
@@ -26,7 +26,7 @@
#include "boards.h"
#include "sysbus.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define SMP_BOOT_ADDR 0x100
#define SMP_BOOT_REG 0x40
diff --git a/hw/hw.h b/hw/hw.h
index b337ee3..cf93e93 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -5,7 +5,7 @@
#include "qemu-common.h"
#if !defined(CONFIG_USER_ONLY) && !defined(NEED_CPU_H)
-#include "cpu-common.h"
+#include "exec/cpu-common.h"
#endif
#include "ioport.h"
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 68671bc..6c068ad 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -29,7 +29,7 @@
#include "monitor.h"
#include "dma.h"
-#include "cpu-common.h"
+#include "exec/cpu-common.h"
#include "internal.h"
#include <hw/ide/pci.h>
#include <hw/ide/ahci.h>
diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index df68105..866075e 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -12,7 +12,7 @@
#include "boards.h"
#include "arm-misc.h"
#include "net/net.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "sysemu.h"
typedef struct {
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 214f194..a54456d 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -21,7 +21,7 @@
#include "sysbus.h"
#include "sysemu.h"
#include "isa.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
static ISABus *isabus;
target_phys_addr_t isa_mem_base = 0;
diff --git a/hw/isa_mmio.c b/hw/isa_mmio.c
index fd755ab..aa626fd 100644
--- a/hw/isa_mmio.c
+++ b/hw/isa_mmio.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "isa.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
static void isa_mmio_writeb (void *opaque, target_phys_addr_t addr,
uint32_t val)
diff --git a/hw/kzm.c b/hw/kzm.c
index a27ecbb..d3c1fb3 100644
--- a/hw/kzm.c
+++ b/hw/kzm.c
@@ -14,7 +14,7 @@
*/
#include "sysbus.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "hw.h"
#include "arm-misc.h"
#include "devices.h"
diff --git a/hw/leon3.c b/hw/leon3.c
index 7742738..449b9b5 100644
--- a/hw/leon3.c
+++ b/hw/leon3.c
@@ -30,7 +30,7 @@
#include "loader.h"
#include "elf.h"
#include "trace.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "grlib.h"
diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c
index 8417ed3..fe92592 100644
--- a/hw/lm32_boards.c
+++ b/hw/lm32_boards.c
@@ -27,7 +27,7 @@
#include "elf.h"
#include "lm32_hwsetup.h"
#include "lm32.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
typedef struct {
LM32CPU *cpu;
diff --git a/hw/loader.c b/hw/loader.c
index 172fdd1..2800f3e 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -50,7 +50,7 @@
#include "loader.h"
#include "fw_cfg.h"
#include "memory.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include <zlib.h>
diff --git a/hw/mainstone.c b/hw/mainstone.c
index 1315a29..178bf7a 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -20,7 +20,7 @@
#include "flash.h"
#include "blockdev.h"
#include "sysbus.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
/* Device addresses */
#define MST_FPGA_PHYS 0x08000000
diff --git a/hw/mcf5206.c b/hw/mcf5206.c
index 27753e2..42575e4 100644
--- a/hw/mcf5206.c
+++ b/hw/mcf5206.c
@@ -10,7 +10,7 @@
#include "qemu-timer.h"
#include "ptimer.h"
#include "sysemu.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
/* General purpose timer module. */
typedef struct {
diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index 60b311a..4e73c50 100644
--- a/hw/mcf5208.c
+++ b/hw/mcf5208.c
@@ -14,7 +14,7 @@
#include "boards.h"
#include "loader.h"
#include "elf.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define SYS_FREQ 66000000
diff --git a/hw/mcf_fec.c b/hw/mcf_fec.c
index 0e23f0a..a21aa81 100644
--- a/hw/mcf_fec.c
+++ b/hw/mcf_fec.c
@@ -10,7 +10,7 @@
#include "mcf.h"
/* For crc32 */
#include <zlib.h>
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
//#define DEBUG_FEC 1
diff --git a/hw/mcf_intc.c b/hw/mcf_intc.c
index cc1a5f3..f50dcad 100644
--- a/hw/mcf_intc.c
+++ b/hw/mcf_intc.c
@@ -7,7 +7,7 @@
*/
#include "hw.h"
#include "mcf.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
typedef struct {
MemoryRegion iomem;
diff --git a/hw/mcf_uart.c b/hw/mcf_uart.c
index ec6a87f..afdb3be 100644
--- a/hw/mcf_uart.c
+++ b/hw/mcf_uart.c
@@ -8,7 +8,7 @@
#include "hw.h"
#include "mcf.h"
#include "qemu-char.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
typedef struct {
MemoryRegion iomem;
diff --git a/hw/milkymist.c b/hw/milkymist.c
index 1cf7f05..7cb9989 100644
--- a/hw/milkymist.c
+++ b/hw/milkymist.c
@@ -28,7 +28,7 @@
#include "blockdev.h"
#include "milkymist-hw.h"
#include "lm32.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define BIOS_FILENAME "mmone-bios.bin"
#define BIOS_OFFSET 0x00860000
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index a47e1e4..5a2e3b3 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -42,7 +42,7 @@
#include "mc146818rtc.h"
#include "i8254.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define DEBUG_FULONG2E_INIT
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 4509cb4..4cc233e 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -41,7 +41,7 @@
#include "pcspk.h"
#include "blockdev.h"
#include "sysbus.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
enum jazz_model_e
{
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 5b6064e..c6dd7e2 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -46,7 +46,7 @@
#include "mc146818rtc.h"
#include "i8254.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "sysbus.h" /* SysBusDevice */
//#define DEBUG_BOARD_INIT
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index 484e2f7..51705f9 100644
--- a/hw/mips_mipssim.c
+++ b/hw/mips_mipssim.c
@@ -36,7 +36,7 @@
#include "loader.h"
#include "elf.h"
#include "sysbus.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
static struct _loaderparams {
int ram_size;
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index b84ca64..4fff980 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -25,7 +25,7 @@
#include "mc146818rtc.h"
#include "i8254.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define MAX_IDE_BUS 2
diff --git a/hw/musicpal.c b/hw/musicpal.c
index 924dd11..6e7990a 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -23,7 +23,7 @@
#include "ui/console.h"
#include "i2c.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define MP_MISC_BASE 0x80002000
#define MP_MISC_SIZE 0x00001000
diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c
index 99477a4..b092450 100644
--- a/hw/ne2000-isa.c
+++ b/hw/ne2000-isa.c
@@ -27,7 +27,7 @@
#include "qdev.h"
#include "net/net.h"
#include "ne2000.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
typedef struct ISANE2000State {
ISADevice dev;
diff --git a/hw/nseries.c b/hw/nseries.c
index 371f52e..76db6ce 100644
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -33,7 +33,7 @@
#include "loader.h"
#include "blockdev.h"
#include "sysbus.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
/* Nokia N8x0 support */
struct n800_s {
diff --git a/hw/omap_gpmc.c b/hw/omap_gpmc.c
index 2fc4137..6625ffe 100644
--- a/hw/omap_gpmc.c
+++ b/hw/omap_gpmc.c
@@ -22,7 +22,7 @@
#include "flash.h"
#include "omap.h"
#include "memory.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
/* General-Purpose Memory Controller */
struct omap_gpmc_s {
diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index 30e02bb..8012a90 100644
--- a/hw/omap_sx1.c
+++ b/hw/omap_sx1.c
@@ -32,7 +32,7 @@
#include "arm-misc.h"
#include "flash.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
/*****************************************************************************/
/* Siemens SX1 Cellphone V1 */
diff --git a/hw/omap_uart.c b/hw/omap_uart.c
index 1c16a54..1a47836 100644
--- a/hw/omap_uart.c
+++ b/hw/omap_uart.c
@@ -21,7 +21,7 @@
#include "hw.h"
#include "omap.h"
#include "serial.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
/* UARTs */
struct omap_uart_s {
diff --git a/hw/onenand.c b/hw/onenand.c
index 0f7b755..0b93690 100644
--- a/hw/onenand.c
+++ b/hw/onenand.c
@@ -24,7 +24,7 @@
#include "irq.h"
#include "blockdev.h"
#include "memory.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "sysbus.h"
#include "qemu-error.h"
diff --git a/hw/openrisc_sim.c b/hw/openrisc_sim.c
index e0e487c..b146fb5 100644
--- a/hw/openrisc_sim.c
+++ b/hw/openrisc_sim.c
@@ -24,7 +24,7 @@
#include "serial.h"
#include "net/net.h"
#include "loader.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "sysemu.h"
#include "sysbus.h"
#include "qtest.h"
diff --git a/hw/palm.c b/hw/palm.c
index 37dde1e..e388cb0 100644
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -25,7 +25,7 @@
#include "arm-misc.h"
#include "devices.h"
#include "loader.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
static uint32_t static_readb(void *opaque, target_phys_addr_t offset)
{
diff --git a/hw/pc.c b/hw/pc.c
index 805e8ca..c88d2c5 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -48,7 +48,7 @@
#include "hw/block-common.h"
#include "ui/qemu-spice.h"
#include "memory.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "arch_init.h"
#include "bitmap.h"
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index ea63fa1..a3f8ae3 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -42,7 +42,7 @@
#include "smbus.h"
#include "xen.h"
#include "memory.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#ifdef CONFIG_XEN
# include <xen/hvm/hvm_info_table.h>
#endif
diff --git a/hw/pci.c b/hw/pci.c
index f6ac1c4..40d29c9 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -33,7 +33,7 @@
#include "qmp-commands.h"
#include "msi.h"
#include "msix.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
//#define DEBUG_PCI
#ifdef DEBUG_PCI
diff --git a/hw/pcie_host.c b/hw/pcie_host.c
index 28bbe72..185b770 100644
--- a/hw/pcie_host.c
+++ b/hw/pcie_host.c
@@ -22,7 +22,7 @@
#include "hw.h"
#include "pci.h"
#include "pcie_host.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
/*
* PCI express mmcfig address
diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c
index 787abee..2fa9152 100644
--- a/hw/petalogix_ml605_mmu.c
+++ b/hw/petalogix_ml605_mmu.c
@@ -35,7 +35,7 @@
#include "xilinx.h"
#include "blockdev.h"
#include "serial.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "ssi.h"
#include "microblaze_boot.h"
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index b2e2dd7..4d81c82 100644
--- a/hw/petalogix_s3adsp1800_mmu.c
+++ b/hw/petalogix_s3adsp1800_mmu.c
@@ -32,7 +32,7 @@
#include "boards.h"
#include "xilinx.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "microblaze_boot.h"
#include "microblaze_pic_cpu.h"
diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index 4751fc2..78e1e24 100644
--- a/hw/pflash_cfi01.c
+++ b/hw/pflash_cfi01.c
@@ -40,7 +40,7 @@
#include "flash.h"
#include "block/block.h"
#include "qemu-timer.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "host-utils.h"
#define PFLASH_BUG(fmt, ...) \
diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c
index 962f78b..9387901 100644
--- a/hw/pflash_cfi02.c
+++ b/hw/pflash_cfi02.c
@@ -39,7 +39,7 @@
#include "flash.h"
#include "qemu-timer.h"
#include "block/block.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "host-utils.h"
//#define PFLASH_DEBUG
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 846f53a..470f7c3 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -31,7 +31,7 @@
#include "hw/loader.h"
#include "elf.h"
#include "hw/sysbus.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "host-utils.h"
#define BINARY_DEVICE_TREE_FILE "mpc8544ds.dtb"
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index 686dbce..a691139 100644
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -32,7 +32,7 @@
#include "qemu-log.h"
#include "loader.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define BIOS_FILENAME "ppc405_rom.bin"
#define BIOS_SIZE (2048 * 1024)
diff --git a/hw/ppc405_uc.c b/hw/ppc405_uc.c
index e81409d..544192d 100644
--- a/hw/ppc405_uc.c
+++ b/hw/ppc405_uc.c
@@ -28,7 +28,7 @@
#include "qemu-timer.h"
#include "sysemu.h"
#include "qemu-log.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define DEBUG_OPBA
#define DEBUG_SDRAM
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 6a525c8..762d40f 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -22,7 +22,7 @@
#include "device_tree.h"
#include "loader.h"
#include "elf.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "serial.h"
#include "ppc.h"
#include "ppc405.h"
diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c
index 41163e6..e9e334b 100644
--- a/hw/ppc4xx_devs.c
+++ b/hw/ppc4xx_devs.c
@@ -25,7 +25,7 @@
#include "ppc.h"
#include "ppc4xx.h"
#include "qemu-log.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
//#define DEBUG_MMIO
//#define DEBUG_UNASSIGNED
diff --git a/hw/ppc4xx_pci.c b/hw/ppc4xx_pci.c
index a14fd42..cf03426 100644
--- a/hw/ppc4xx_pci.c
+++ b/hw/ppc4xx_pci.c
@@ -24,7 +24,7 @@
#include "ppc4xx.h"
#include "pci.h"
#include "pci_host.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#undef DEBUG
#ifdef DEBUG
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index bf309a7..1080e33 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -66,7 +66,7 @@
#include "kvm_ppc.h"
#include "hw/usb.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define MAX_IDE_BUS 2
#define CFG_ADDR 0xf0000510
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index f3b75cd..3011143 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -42,7 +42,7 @@
#include "kvm.h"
#include "kvm_ppc.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define MAX_IDE_BUS 2
#define CFG_ADDR 0xf0000510
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 7ad3b17..d431395 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -39,7 +39,7 @@
#include "mc146818rtc.h"
#include "blockdev.h"
#include "arch_init.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
//#define HARD_DEBUG_PPC_IO
//#define DEBUG_PPC_IO
diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c
index 92b1dc0..ab1fe4b 100644
--- a/hw/ppce500_pci.c
+++ b/hw/ppce500_pci.c
@@ -305,7 +305,7 @@ static const VMStateDescription vmstate_ppce500_pci = {
}
};
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
static int e500_pcihost_initfn(SysBusDevice *dev)
{
diff --git a/hw/prep_pci.c b/hw/prep_pci.c
index cc44e61..f04fab8 100644
--- a/hw/prep_pci.c
+++ b/hw/prep_pci.c
@@ -26,7 +26,7 @@
#include "pci.h"
#include "pci_host.h"
#include "pc.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define TYPE_RAVEN_PCI_HOST_BRIDGE "raven-pcihost"
diff --git a/hw/puv3.c b/hw/puv3.c
index 887a37a..57eab89 100644
--- a/hw/puv3.c
+++ b/hw/puv3.c
@@ -10,7 +10,7 @@
*/
#include "ui/console.h"
#include "elf.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "sysbus.h"
#include "boards.h"
#include "loader.h"
diff --git a/hw/qdev-addr.c b/hw/qdev-addr.c
index b711b6b..6c3fb82 100644
--- a/hw/qdev-addr.c
+++ b/hw/qdev-addr.c
@@ -1,6 +1,6 @@
#include "qdev.h"
#include "qdev-addr.h"
-#include "targphys.h"
+#include "exec/targphys.h"
/* --- target physical address --- */
diff --git a/hw/r2d.c b/hw/r2d.c
index d002f05..e0831d1 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -37,7 +37,7 @@
#include "usb.h"
#include "flash.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define FLASH_BASE 0x00000000
#define FLASH_SIZE 0x02000000
diff --git a/hw/realview.c b/hw/realview.c
index 68df94e..21633e5 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -17,7 +17,7 @@
#include "boards.h"
#include "i2c.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define SMP_BOOT_ADDR 0xe0000000
#define SMP_BOOTREG_ADDR 0x10000030
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index f295925..9d879d4 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -29,7 +29,7 @@
#include "hw/virtio.h"
#include "hw/sysbus.h"
#include "kvm.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "hw/s390-virtio-bus.h"
diff --git a/hw/sh7750.c b/hw/sh7750.c
index e712928..8ace676 100644
--- a/hw/sh7750.c
+++ b/hw/sh7750.c
@@ -30,7 +30,7 @@
#include "sh7750_regnames.h"
#include "sh_intc.h"
#include "cpu.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define NB_DEVICES 4
diff --git a/hw/sh_intc.h b/hw/sh_intc.h
index 80c9430..43973b8 100644
--- a/hw/sh_intc.h
+++ b/hw/sh_intc.h
@@ -3,7 +3,7 @@
#include "qemu-common.h"
#include "irq.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
typedef unsigned char intc_enum;
diff --git a/hw/sh_pci.c b/hw/sh_pci.c
index 0cfac46..c0e4e7f 100644
--- a/hw/sh_pci.c
+++ b/hw/sh_pci.c
@@ -26,7 +26,7 @@
#include "pci.h"
#include "pci_host.h"
#include "bswap.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
typedef struct SHPCIState {
SysBusDevice busdev;
diff --git a/hw/sh_serial.c b/hw/sh_serial.c
index 1d1883d..e918da0 100644
--- a/hw/sh_serial.c
+++ b/hw/sh_serial.c
@@ -27,7 +27,7 @@
#include "hw.h"
#include "sh.h"
#include "qemu-char.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
//#define DEBUG_SERIAL
diff --git a/hw/sh_timer.c b/hw/sh_timer.c
index 64bf604..d9d7bf2 100644
--- a/hw/sh_timer.c
+++ b/hw/sh_timer.c
@@ -11,7 +11,7 @@
#include "hw.h"
#include "sh.h"
#include "qemu-timer.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "ptimer.h"
//#define DEBUG_TIMER
diff --git a/hw/shix.c b/hw/shix.c
index b56dd54..9cc4512 100644
--- a/hw/shix.c
+++ b/hw/shix.c
@@ -32,7 +32,7 @@
#include "sysemu.h"
#include "boards.h"
#include "loader.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define BIOS_FILENAME "shix_bios.bin"
#define BIOS_ADDRESS 0xA0000000
diff --git a/hw/spapr.c b/hw/spapr.c
index 5ebc542..ef486f7 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -47,7 +47,7 @@
#include "kvm_ppc.h"
#include "pci.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "hw/usb.h"
#include <libfdt.h>
diff --git a/hw/spapr_iommu.c b/hw/spapr_iommu.c
index 33f84e2..eae1f64 100644
--- a/hw/spapr_iommu.c
+++ b/hw/spapr_iommu.c
@@ -21,7 +21,7 @@
#include "qdev.h"
#include "kvm_ppc.h"
#include "dma.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "hw/spapr.h"
diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c
index b628f89..360ca63 100644
--- a/hw/spapr_pci.c
+++ b/hw/spapr_pci.c
@@ -29,7 +29,7 @@
#include "pci_host.h"
#include "hw/spapr.h"
#include "hw/spapr_pci.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include <libfdt.h>
#include "trace.h"
diff --git a/hw/spitz.c b/hw/spitz.c
index dd430c9..7e1b258 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -27,7 +27,7 @@
#include "boards.h"
#include "blockdev.h"
#include "sysbus.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#undef REG_FMT
#define REG_FMT "0x%02lx"
diff --git a/hw/stellaris.c b/hw/stellaris.c
index 24a9b41..8662566 100644
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -15,7 +15,7 @@
#include "i2c.h"
#include "net/net.h"
#include "boards.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define GPIO_A 0
#define GPIO_B 1
diff --git a/hw/sun4u.c b/hw/sun4u.c
index a922046..1d20b37 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -39,7 +39,7 @@
#include "loader.h"
#include "elf.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
//#define DEBUG_IRQ
//#define DEBUG_EBUS
diff --git a/hw/sysbus.c b/hw/sysbus.c
index c173840..7b16eac 100644
--- a/hw/sysbus.c
+++ b/hw/sysbus.c
@@ -19,7 +19,7 @@
#include "sysbus.h"
#include "monitor.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.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/tosa.c b/hw/tosa.c
index 3991a90..25370fd 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -23,7 +23,7 @@
#include "ssi.h"
#include "blockdev.h"
#include "sysbus.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define TOSA_RAM 0x04000000
#define TOSA_ROM 0x00800000
diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c
index 703e2d2..f826a42 100644
--- a/hw/usb/libhw.c
+++ b/hw/usb/libhw.c
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "cpu-common.h"
+#include "exec/cpu-common.h"
#include "hw/usb.h"
#include "dma.h"
diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c
index ae53a8b..507febc 100644
--- a/hw/versatile_pci.c
+++ b/hw/versatile_pci.c
@@ -10,7 +10,7 @@
#include "sysbus.h"
#include "pci.h"
#include "pci_host.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
typedef struct {
SysBusDevice busdev;
diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index ad1e730..55a9a1f 100644
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -16,7 +16,7 @@
#include "i2c.h"
#include "boards.h"
#include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "flash.h"
#define VERSATILE_FLASH_ADDR 0x34000000
diff --git a/hw/vexpress.c b/hw/vexpress.c
index 6f1f0c9..1090db6 100644
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -28,7 +28,7 @@
#include "net/net.h"
#include "sysemu.h"
#include "boards.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "blockdev.h"
#include "flash.h"
diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c
index f5db4a8..3dd09b8 100644
--- a/hw/vfio_pci.c
+++ b/hw/vfio_pci.c
@@ -28,7 +28,7 @@
#include "config.h"
#include "event_notifier.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "kvm.h"
#include "memory.h"
#include "msi.h"
diff --git a/hw/vhost.c b/hw/vhost.c
index 0b4ac3f..c431990 100644
--- a/hw/vhost.c
+++ b/hw/vhost.c
@@ -18,7 +18,7 @@
#include "hw/hw.h"
#include "range.h"
#include <linux/vhost.h>
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
static void vhost_dev_sync_region(struct vhost_dev *dev,
MemoryRegionSection *section,
diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index c7b446c..62d3f99 100644
--- a/hw/virtex_ml507.c
+++ b/hw/virtex_ml507.c
@@ -33,7 +33,7 @@
#include "loader.h"
#include "elf.h"
#include "qemu-log.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "ppc.h"
#include "ppc4xx.h"
diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c
index dd1a650..996f3ca 100644
--- a/hw/virtio-balloon.c
+++ b/hw/virtio-balloon.c
@@ -21,7 +21,7 @@
#include "balloon.h"
#include "virtio-balloon.h"
#include "kvm.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#if defined(__linux__)
#include <sys/mman.h>
diff --git a/hw/xen_platform.c b/hw/xen_platform.c
index c0f0caa..3b8ed70 100644
--- a/hw/xen_platform.c
+++ b/hw/xen_platform.c
@@ -32,7 +32,7 @@
#include "xen_common.h"
#include "xen_backend.h"
#include "trace.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include <xenguest.h>
diff --git a/hw/xen_pt.c b/hw/xen_pt.c
index d3d7c8b..42c643d 100644
--- a/hw/xen_pt.c
+++ b/hw/xen_pt.c
@@ -59,7 +59,7 @@
#include "xen_backend.h"
#include "xen_pt.h"
#include "range.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#define XEN_PT_NR_IRQS (256)
static uint8_t xen_pt_mapped_machine_irq[XEN_PT_NR_IRQS] = {0};
diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c
index 491a9a9..c650404 100644
--- a/hw/xilinx_zynq.c
+++ b/hw/xilinx_zynq.c
@@ -18,7 +18,7 @@
#include "sysbus.h"
#include "arm-misc.h"
#include "net/net.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "sysemu.h"
#include "boards.h"
#include "flash.h"
diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index ba0d3d7..a775979 100644
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -30,7 +30,7 @@
#include "loader.h"
#include "elf.h"
#include "memory.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "serial.h"
#include "net/net.h"
#include "sysbus.h"
diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c
index 2e846d8..569141e 100644
--- a/hw/xtensa_sim.c
+++ b/hw/xtensa_sim.c
@@ -30,7 +30,7 @@
#include "loader.h"
#include "elf.h"
#include "memory.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
static uint64_t translate_phys_addr(void *env, uint64_t addr)
{
diff --git a/hw/z2.c b/hw/z2.c
index d461864..316922e 100644
--- a/hw/z2.c
+++ b/hw/z2.c
@@ -23,7 +23,7 @@
#include "blockdev.h"
#include "ui/console.h"
#include "audio/audio.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#ifdef DEBUG_Z2
#define DPRINTF(fmt, ...) \
diff --git a/cpu-all.h b/include/exec/cpu-all.h
similarity index 99%
rename from cpu-all.h
rename to include/exec/cpu-all.h
index 6aa7e58..45b044f 100644
--- a/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -21,7 +21,7 @@
#include "qemu-common.h"
#include "qemu-tls.h"
-#include "cpu-common.h"
+#include "exec/cpu-common.h"
/* some important defines:
*
diff --git a/cpu-common.h b/include/exec/cpu-common.h
similarity index 98%
rename from cpu-common.h
rename to include/exec/cpu-common.h
index c0d27af..922d2c4 100644
--- a/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -3,10 +3,10 @@
/* CPU interfaces that are target independent. */
-#include "targphys.h"
+#include "exec/targphys.h"
#ifndef NEED_CPU_H
-#include "poison.h"
+#include "exec/poison.h"
#endif
#include "bswap.h"
diff --git a/cpu-defs.h b/include/exec/cpu-defs.h
similarity index 99%
rename from cpu-defs.h
rename to include/exec/cpu-defs.h
index 4018b88..47702dd 100644
--- a/cpu-defs.h
+++ b/include/exec/cpu-defs.h
@@ -29,7 +29,7 @@
#include <signal.h>
#include "osdep.h"
#include "qemu-queue.h"
-#include "targphys.h"
+#include "exec/targphys.h"
#ifndef TARGET_LONG_BITS
#error TARGET_LONG_BITS must be defined before including this header
diff --git a/def-helper.h b/include/exec/def-helper.h
similarity index 100%
rename from def-helper.h
rename to include/exec/def-helper.h
diff --git a/exec-all.h b/include/exec/exec-all.h
similarity index 98%
rename from exec-all.h
rename to include/exec/exec-all.h
index 16caf49..d377925 100644
--- a/exec-all.h
+++ b/include/exec/exec-all.h
@@ -283,7 +283,7 @@ static inline void tb_add_jump(TranslationBlock *tb, int n,
TranslationBlock *tb_find_pc(uintptr_t pc_ptr);
-#include "qemu-lock.h"
+#include "exec/spinlock.h"
extern spinlock_t tb_lock;
@@ -321,22 +321,22 @@ void io_mem_write(struct MemoryRegion *mr, target_phys_addr_t addr,
void tlb_fill(CPUArchState *env1, target_ulong addr, int is_write, int mmu_idx,
uintptr_t retaddr);
-#include "softmmu_defs.h"
+#include "exec/softmmu_defs.h"
#define ACCESS_TYPE (NB_MMU_MODES + 1)
#define MEMSUFFIX _code
#define DATA_SIZE 1
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 2
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 4
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 8
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#undef ACCESS_TYPE
#undef MEMSUFFIX
diff --git a/exec-memory.h b/include/exec/exec-memory.h
similarity index 100%
rename from exec-memory.h
rename to include/exec/exec-memory.h
diff --git a/gdbstub.h b/include/exec/gdbstub.h
similarity index 100%
rename from gdbstub.h
rename to include/exec/gdbstub.h
diff --git a/gen-icount.h b/include/exec/gen-icount.h
similarity index 100%
rename from gen-icount.h
rename to include/exec/gen-icount.h
diff --git a/poison.h b/include/exec/poison.h
similarity index 100%
rename from poison.h
rename to include/exec/poison.h
diff --git a/softmmu-semi.h b/include/exec/softmmu-semi.h
similarity index 100%
rename from softmmu-semi.h
rename to include/exec/softmmu-semi.h
diff --git a/softmmu_defs.h b/include/exec/softmmu_defs.h
similarity index 100%
rename from softmmu_defs.h
rename to include/exec/softmmu_defs.h
diff --git a/softmmu_exec.h b/include/exec/softmmu_exec.h
similarity index 72%
rename from softmmu_exec.h
rename to include/exec/softmmu_exec.h
index 8c73985..3e4e886 100644
--- a/softmmu_exec.h
+++ b/include/exec/softmmu_exec.h
@@ -19,37 +19,37 @@
#define ldul_executive ldl_executive
#define ldul_supervisor ldl_supervisor
-#include "softmmu_defs.h"
+#include "exec/softmmu_defs.h"
#define ACCESS_TYPE 0
#define MEMSUFFIX MMU_MODE0_SUFFIX
#define DATA_SIZE 1
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 2
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 4
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 8
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#undef ACCESS_TYPE
#undef MEMSUFFIX
#define ACCESS_TYPE 1
#define MEMSUFFIX MMU_MODE1_SUFFIX
#define DATA_SIZE 1
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 2
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 4
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 8
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#undef ACCESS_TYPE
#undef MEMSUFFIX
@@ -58,16 +58,16 @@
#define ACCESS_TYPE 2
#define MEMSUFFIX MMU_MODE2_SUFFIX
#define DATA_SIZE 1
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 2
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 4
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 8
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#undef ACCESS_TYPE
#undef MEMSUFFIX
#endif /* (NB_MMU_MODES >= 3) */
@@ -77,16 +77,16 @@
#define ACCESS_TYPE 3
#define MEMSUFFIX MMU_MODE3_SUFFIX
#define DATA_SIZE 1
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 2
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 4
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 8
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#undef ACCESS_TYPE
#undef MEMSUFFIX
#endif /* (NB_MMU_MODES >= 4) */
@@ -96,16 +96,16 @@
#define ACCESS_TYPE 4
#define MEMSUFFIX MMU_MODE4_SUFFIX
#define DATA_SIZE 1
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 2
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 4
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 8
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#undef ACCESS_TYPE
#undef MEMSUFFIX
#endif /* (NB_MMU_MODES >= 5) */
@@ -115,16 +115,16 @@
#define ACCESS_TYPE 5
#define MEMSUFFIX MMU_MODE5_SUFFIX
#define DATA_SIZE 1
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 2
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 4
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 8
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#undef ACCESS_TYPE
#undef MEMSUFFIX
#endif /* (NB_MMU_MODES >= 6) */
@@ -137,16 +137,16 @@
#define ACCESS_TYPE (NB_MMU_MODES)
#define MEMSUFFIX _data
#define DATA_SIZE 1
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 2
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 4
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#define DATA_SIZE 8
-#include "softmmu_header.h"
+#include "exec/softmmu_header.h"
#undef ACCESS_TYPE
#undef MEMSUFFIX
diff --git a/softmmu_header.h b/include/exec/softmmu_header.h
similarity index 100%
rename from softmmu_header.h
rename to include/exec/softmmu_header.h
diff --git a/softmmu_template.h b/include/exec/softmmu_template.h
similarity index 100%
rename from softmmu_template.h
rename to include/exec/softmmu_template.h
diff --git a/qemu-lock.h b/include/exec/spinlock.h
similarity index 100%
rename from qemu-lock.h
rename to include/exec/spinlock.h
diff --git a/targphys.h b/include/exec/targphys.h
similarity index 100%
rename from targphys.h
rename to include/exec/targphys.h
diff --git a/kvm-all.c b/kvm-all.c
index c2c6909..0aeb5f1 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -27,11 +27,11 @@
#include "sysemu.h"
#include "hw/hw.h"
#include "hw/msi.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "kvm.h"
#include "bswap.h"
#include "memory.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "event_notifier.h"
/* This check must be after config-host.h is included */
diff --git a/kvm-stub.c b/kvm-stub.c
index a3455e2..4184fb4 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -14,7 +14,7 @@
#include "hw/hw.h"
#include "hw/msi.h"
#include "cpu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "kvm.h"
KVMState *kvm_state;
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 5e53dca..2cf7937 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -17,7 +17,7 @@
#include "syscall_defs.h"
#include "syscall.h"
#include "target_signal.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "qemu-queue.h"
#if defined(CONFIG_USE_NPTL)
diff --git a/memory.c b/memory.c
index 2f68d67..7e9b90e 100644
--- a/memory.c
+++ b/memory.c
@@ -14,7 +14,7 @@
*/
#include "memory.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include "ioport.h"
#include "bitops.h"
#include "kvm.h"
diff --git a/memory.h b/memory.h
index 79393f1..6adcc40 100644
--- a/memory.h
+++ b/memory.h
@@ -19,8 +19,8 @@
#include <stdint.h>
#include <stdbool.h>
#include "qemu-common.h"
-#include "cpu-common.h"
-#include "targphys.h"
+#include "exec/cpu-common.h"
+#include "exec/targphys.h"
#include "qemu-queue.h"
#include "iorange.h"
#include "ioport.h"
diff --git a/memory_mapping-stub.c b/memory_mapping-stub.c
index 76be34d..5f5fb99 100644
--- a/memory_mapping-stub.c
+++ b/memory_mapping-stub.c
@@ -12,7 +12,7 @@
*/
#include "cpu.h"
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
#include "memory_mapping.h"
int qemu_get_guest_memory_mapping(MemoryMappingList *list)
diff --git a/memory_mapping.c b/memory_mapping.c
index 6f5a2e3..bcf02ca 100644
--- a/memory_mapping.c
+++ b/memory_mapping.c
@@ -12,7 +12,7 @@
*/
#include "cpu.h"
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
#include "memory_mapping.h"
static void memory_mapping_list_add_mapping_sorted(MemoryMappingList *list,
diff --git a/monitor.c b/monitor.c
index 9a29d10..81a58c2 100644
--- a/monitor.c
+++ b/monitor.c
@@ -30,7 +30,7 @@
#include "hw/pci.h"
#include "hw/watchdog.h"
#include "hw/loader.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "net/net.h"
#include "net/slirp.h"
#include "qemu-char.h"
diff --git a/scripts/feature_to_c.sh b/scripts/feature_to_c.sh
index b62da8a..888548e 100644
--- a/scripts/feature_to_c.sh
+++ b/scripts/feature_to_c.sh
@@ -38,7 +38,7 @@ for input; do
${AWK:-awk} 'BEGIN { n = 0
printf "#include \"config.h\"\n"
printf "#include \"qemu-common.h\"\n"
- printf "#include \"gdbstub.h\"\n"
+ printf "#include \"exec/gdbstub.h\"\n"
print "static const char '$arrayname'[] = {"
for (i = 0; i < 255; i++)
_ord_[sprintf("%c", i)] = i
diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h
index 5689760..ac61fe4 100644
--- a/target-alpha/cpu.h
+++ b/target-alpha/cpu.h
@@ -27,7 +27,7 @@
#define CPUArchState struct CPUAlphaState
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
#include "softfloat.h"
@@ -302,7 +302,7 @@ struct CPUAlphaState {
#define cpu_gen_code cpu_alpha_gen_code
#define cpu_signal_handler cpu_alpha_signal_handler
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
#include "cpu-qom.h"
enum {
@@ -525,7 +525,7 @@ static inline bool cpu_has_work(CPUAlphaState *env)
| CPU_INTERRUPT_MCHK);
}
-#include "exec-all.h"
+#include "exec/exec-all.h"
static inline void cpu_pc_from_tb(CPUAlphaState *env, TranslationBlock *tb)
{
diff --git a/target-alpha/helper.h b/target-alpha/helper.h
index a184def..db385ef 100644
--- a/target-alpha/helper.h
+++ b/target-alpha/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
DEF_HELPER_3(excp, noreturn, env, int, int)
DEF_HELPER_FLAGS_1(load_pcc, TCG_CALL_CONST | TCG_CALL_PURE, i64, env)
@@ -119,4 +119,4 @@ DEF_HELPER_FLAGS_0(get_time, TCG_CALL_CONST, i64)
DEF_HELPER_FLAGS_2(set_alarm, TCG_CALL_CONST, void, env, i64)
#endif
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-alpha/mem_helper.c b/target-alpha/mem_helper.c
index 87cada4..a05f0c2 100644
--- a/target-alpha/mem_helper.c
+++ b/target-alpha/mem_helper.c
@@ -115,22 +115,22 @@ void cpu_unassigned_access(CPUAlphaState *env, target_phys_addr_t addr,
dynamic_excp(env, 0, EXCP_MCHK, 0);
}
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#define MMUSUFFIX _mmu
#define ALIGNED_ONLY
#define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
/* try to fill the TLB and return an exception if error. If retaddr is
NULL, it means that the function was called in C code (i.e. not
diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 17d6458..8d73b4b 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -88,7 +88,7 @@ static TCGv cpu_usp;
/* register names */
static char cpu_reg_names[10*4+21*5 + 10*5+21*6];
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
static void alpha_translate_init(void)
{
diff --git a/target-arm/arm-semi.c b/target-arm/arm-semi.c
index 73bde58..43803c3 100644
--- a/target-arm/arm-semi.c
+++ b/target-arm/arm-semi.c
@@ -33,7 +33,7 @@
#define ARM_ANGEL_HEAP_SIZE (128 * 1024 * 1024)
#else
#include "qemu-common.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "hw/arm-misc.h"
#endif
@@ -113,7 +113,7 @@ static inline uint32_t set_swi_errno(CPUARMState *env, uint32_t code)
return code;
}
-#include "softmmu-semi.h"
+#include "exec/softmmu-semi.h"
#endif
static target_ulong arm_semi_syscall_len;
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index ff4de10..e0bda5f 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -27,7 +27,7 @@
#include "config.h"
#include "qemu-common.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
#include "softfloat.h"
@@ -659,7 +659,7 @@ static inline void cpu_clone_regs(CPUARMState *env, target_ulong newsp)
}
#endif
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
/* Bit usage in the TB flags field: */
#define ARM_TBFLAG_THUMB_SHIFT 0
@@ -724,7 +724,7 @@ static inline bool cpu_has_work(CPUARMState *env)
(CPU_INTERRUPT_FIQ | CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB);
}
-#include "exec-all.h"
+#include "exec/exec-all.h"
static inline void cpu_pc_from_tb(CPUARMState *env, TranslationBlock *tb)
{
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 58340bd..138f817 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -1,5 +1,5 @@
#include "cpu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "helper.h"
#include "host-utils.h"
#include "sysemu.h"
diff --git a/target-arm/helper.h b/target-arm/helper.h
index 8b9adf1..aef8ca2 100644
--- a/target-arm/helper.h
+++ b/target-arm/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
DEF_HELPER_FLAGS_1(clz, TCG_CALL_CONST | TCG_CALL_PURE, i32, i32)
DEF_HELPER_FLAGS_1(sxtb16, TCG_CALL_CONST | TCG_CALL_PURE, i32, i32)
@@ -465,4 +465,4 @@ DEF_HELPER_3(neon_qzip8, void, env, i32, i32)
DEF_HELPER_3(neon_qzip16, void, env, i32, i32)
DEF_HELPER_3(neon_qzip32, void, env, i32, i32)
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-arm/iwmmxt_helper.c b/target-arm/iwmmxt_helper.c
index 1dd8d1a..7953b53 100644
--- a/target-arm/iwmmxt_helper.c
+++ b/target-arm/iwmmxt_helper.c
@@ -23,7 +23,7 @@
#include <stdio.h>
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "helper.h"
/* iwMMXt macros extracted from GNU gdb. */
diff --git a/target-arm/neon_helper.c b/target-arm/neon_helper.c
index 9aa920d..1d48e30 100644
--- a/target-arm/neon_helper.c
+++ b/target-arm/neon_helper.c
@@ -10,7 +10,7 @@
#include <stdio.h>
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "helper.h"
#define SIGNBIT (uint32_t)0x80000000
diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index aef592a..b3eeb3b 100644
--- a/target-arm/op_helper.c
+++ b/target-arm/op_helper.c
@@ -52,21 +52,21 @@ uint32_t HELPER(neon_tbl)(CPUARMState *env, uint32_t ireg, uint32_t def,
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#define MMUSUFFIX _mmu
#define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
/* try to fill the TLB and return an exception if error. If retaddr is
NULL, it means that the function was called in C code (i.e. not
diff --git a/target-arm/translate.c b/target-arm/translate.c
index 6f2914d..a11f245 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -98,7 +98,7 @@ static TCGv_i32 cpu_exclusive_info;
static TCGv cpu_F0s, cpu_F1s;
static TCGv_i64 cpu_F0d, cpu_F1d;
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
static const char *regnames[] =
{ "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
diff --git a/target-cris/cpu.h b/target-cris/cpu.h
index 4f4df6d..bea6756 100644
--- a/target-cris/cpu.h
+++ b/target-cris/cpu.h
@@ -27,7 +27,7 @@
#define CPUArchState struct CPUCRISState
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
#define TARGET_HAS_ICE 1
@@ -270,7 +270,7 @@ static inline void cpu_set_tls(CPUCRISState *env, target_ulong newtls)
#define SFR_RW_MM_TLB_LO env->pregs[PR_SRS]][5
#define SFR_RW_MM_TLB_HI env->pregs[PR_SRS]][6
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
static inline void cpu_get_tb_cpu_state(CPUCRISState *env, target_ulong *pc,
target_ulong *cs_base, int *flags)
@@ -290,7 +290,7 @@ static inline bool cpu_has_work(CPUCRISState *env)
return env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI);
}
-#include "exec-all.h"
+#include "exec/exec-all.h"
static inline void cpu_pc_from_tb(CPUCRISState *env, TranslationBlock *tb)
{
diff --git a/target-cris/helper.h b/target-cris/helper.h
index 99fb326..a762c08 100644
--- a/target-cris/helper.h
+++ b/target-cris/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
DEF_HELPER_2(raise_exception, void, env, i32)
DEF_HELPER_2(tlb_flush_pid, void, env, i32)
@@ -26,4 +26,4 @@ DEF_HELPER_FLAGS_3(evaluate_flags_move_2, TCG_CALL_PURE, i32, env, i32, i32)
DEF_HELPER_1(evaluate_flags, void, env)
DEF_HELPER_1(top_evaluate_flags, void, env)
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
index a7468d4..dc9aad9 100644
--- a/target-cris/op_helper.c
+++ b/target-cris/op_helper.c
@@ -35,21 +35,21 @@
#endif
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#define MMUSUFFIX _mmu
#define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
/* Try to fill the TLB and return an exception if error. If retaddr is
NULL, it means that the function was called in C code (i.e. not
diff --git a/target-cris/translate.c b/target-cris/translate.c
index 4a4224d..efce6d4 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -70,7 +70,7 @@ static TCGv env_btaken;
static TCGv env_btarget;
static TCGv env_pc;
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
/* This is the state at translation time. */
typedef struct DisasContext {
diff --git a/target-i386/arch_dump.c b/target-i386/arch_dump.c
index 4240278..50d866f 100644
--- a/target-i386/arch_dump.c
+++ b/target-i386/arch_dump.c
@@ -12,7 +12,7 @@
*/
#include "cpu.h"
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
#include "dump.h"
#include "elf.h"
diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c
index 8e5a56a..217e09d 100644
--- a/target-i386/arch_memory_mapping.c
+++ b/target-i386/arch_memory_mapping.c
@@ -12,7 +12,7 @@
*/
#include "cpu.h"
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
#include "memory_mapping.h"
/* PAE Paging or IA-32e Paging */
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 871c270..470d426 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -44,7 +44,7 @@
#define CPUArchState struct CPUX86State
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
#include "softfloat.h"
@@ -1091,7 +1091,7 @@ static inline void cpu_clone_regs(CPUX86State *env, target_ulong newsp)
}
#endif
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
#include "svm.h"
#if !defined(CONFIG_USER_ONLY)
@@ -1109,7 +1109,7 @@ static inline bool cpu_has_work(CPUX86State *env)
CPU_INTERRUPT_MCE));
}
-#include "exec-all.h"
+#include "exec/exec-all.h"
static inline void cpu_pc_from_tb(CPUX86State *env, TranslationBlock *tb)
{
diff --git a/target-i386/fpu_helper.c b/target-i386/fpu_helper.c
index dfc34a6..44f3d27 100644
--- a/target-i386/fpu_helper.c
+++ b/target-i386/fpu_helper.c
@@ -22,7 +22,7 @@
#include "helper.h"
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#endif /* !defined(CONFIG_USER_ONLY) */
#define FPU_RC_MASK 0xc00
diff --git a/target-i386/helper.h b/target-i386/helper.h
index 93850ce..72ef6b1 100644
--- a/target-i386/helper.h
+++ b/target-i386/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
DEF_HELPER_FLAGS_2(cc_compute_all, TCG_CALL_PURE, i32, env, int)
DEF_HELPER_FLAGS_2(cc_compute_c, TCG_CALL_PURE, i32, env, int)
@@ -220,4 +220,4 @@ DEF_HELPER_3(rclq, tl, env, tl, tl)
DEF_HELPER_3(rcrq, tl, env, tl, tl)
#endif
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index c918276..3a24153 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -25,7 +25,7 @@
#include "kvm.h"
#include "kvm_i386.h"
#include "cpu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "host-utils.h"
#include "qemu-config.h"
#include "hw/pc.h"
diff --git a/target-i386/mem_helper.c b/target-i386/mem_helper.c
index 7f99c7c..554ea52 100644
--- a/target-i386/mem_helper.c
+++ b/target-i386/mem_helper.c
@@ -21,7 +21,7 @@
#include "helper.h"
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#endif /* !defined(CONFIG_USER_ONLY) */
/* broken thread support */
@@ -114,16 +114,16 @@ void helper_boundl(CPUX86State *env, target_ulong a0, int v)
#define MMUSUFFIX _mmu
#define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#endif
diff --git a/target-i386/misc_helper.c b/target-i386/misc_helper.c
index a020379..3aac1e5 100644
--- a/target-i386/misc_helper.c
+++ b/target-i386/misc_helper.c
@@ -22,7 +22,7 @@
#include "helper.h"
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#endif /* !defined(CONFIG_USER_ONLY) */
/* check if Port I/O is allowed in TSS */
diff --git a/target-i386/seg_helper.c b/target-i386/seg_helper.c
index ff93374..be795d7 100644
--- a/target-i386/seg_helper.c
+++ b/target-i386/seg_helper.c
@@ -25,7 +25,7 @@
//#define DEBUG_PCALL
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#endif /* !defined(CONFIG_USER_ONLY) */
#ifdef DEBUG_PCALL
diff --git a/target-i386/svm_helper.c b/target-i386/svm_helper.c
index 4943c37..0834608 100644
--- a/target-i386/svm_helper.c
+++ b/target-i386/svm_helper.c
@@ -18,11 +18,11 @@
*/
#include "cpu.h"
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
#include "helper.h"
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#endif /* !defined(CONFIG_USER_ONLY) */
/* Secure Virtual Machine helpers */
diff --git a/target-i386/translate.c b/target-i386/translate.c
index eac1c17..5b6d71a 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -65,7 +65,7 @@ static TCGv cpu_tmp5;
static uint8_t gen_opc_cc_op[OPC_BUF_SIZE];
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
#ifdef TARGET_X86_64
static int x86_64_hregs;
diff --git a/target-lm32/cpu.h b/target-lm32/cpu.h
index da80469..67abaed 100644
--- a/target-lm32/cpu.h
+++ b/target-lm32/cpu.h
@@ -26,7 +26,7 @@
#include "config.h"
#include "qemu-common.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
struct CPULM32State;
typedef struct CPULM32State CPULM32State;
@@ -238,7 +238,7 @@ static inline int cpu_interrupts_enabled(CPULM32State *env)
return env->ie & IE_IE;
}
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
static inline target_ulong cpu_get_pc(CPULM32State *env)
{
@@ -258,7 +258,7 @@ static inline bool cpu_has_work(CPULM32State *env)
return env->interrupt_request & CPU_INTERRUPT_HARD;
}
-#include "exec-all.h"
+#include "exec/exec-all.h"
static inline void cpu_pc_from_tb(CPULM32State *env, TranslationBlock *tb)
{
diff --git a/target-lm32/helper.h b/target-lm32/helper.h
index 07f5670..3ea15a6 100644
--- a/target-lm32/helper.h
+++ b/target-lm32/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
DEF_HELPER_2(raise_exception, void, env, i32)
DEF_HELPER_1(hlt, void, env)
@@ -11,4 +11,4 @@ DEF_HELPER_1(rcsr_ip, i32, env)
DEF_HELPER_1(rcsr_jtx, i32, env)
DEF_HELPER_1(rcsr_jrx, i32, env)
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-lm32/op_helper.c b/target-lm32/op_helper.c
index 7b91d8c..d5ff156 100644
--- a/target-lm32/op_helper.c
+++ b/target-lm32/op_helper.c
@@ -9,13 +9,13 @@
#if !defined(CONFIG_USER_ONLY)
#define MMUSUFFIX _mmu
#define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
void helper_raise_exception(CPULM32State *env, uint32_t index)
{
diff --git a/target-lm32/translate.c b/target-lm32/translate.c
index 8df04de..f39696c 100644
--- a/target-lm32/translate.c
+++ b/target-lm32/translate.c
@@ -53,7 +53,7 @@ static TCGv cpu_deba;
static TCGv cpu_bp[4];
static TCGv cpu_wp[4];
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
enum {
OP_FMT_RI,
diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h
index 5e6ee50..7e5523f 100644
--- a/target-m68k/cpu.h
+++ b/target-m68k/cpu.h
@@ -26,7 +26,7 @@
#include "config.h"
#include "qemu-common.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
#include "softfloat.h"
@@ -245,7 +245,7 @@ static inline void cpu_clone_regs(CPUM68KState *env, target_ulong newsp)
}
#endif
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
static inline void cpu_get_tb_cpu_state(CPUM68KState *env, target_ulong *pc,
target_ulong *cs_base, int *flags)
@@ -262,7 +262,7 @@ static inline bool cpu_has_work(CPUM68KState *env)
return env->interrupt_request & CPU_INTERRUPT_HARD;
}
-#include "exec-all.h"
+#include "exec/exec-all.h"
static inline void cpu_pc_from_tb(CPUM68KState *env, TranslationBlock *tb)
{
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index eac0053..f7d7a32 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -19,7 +19,7 @@
*/
#include "cpu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "helpers.h"
diff --git a/target-m68k/helpers.h b/target-m68k/helpers.h
index 8112b44..2b02450 100644
--- a/target-m68k/helpers.h
+++ b/target-m68k/helpers.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
DEF_HELPER_1(bitrev, i32, i32)
DEF_HELPER_1(ff1, i32, i32)
@@ -51,4 +51,4 @@ DEF_HELPER_3(set_mac_extu, void, env, i32, i32)
DEF_HELPER_2(flush_flags, void, env, i32)
DEF_HELPER_2(raise_exception, void, env, i32)
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-m68k/m68k-semi.c b/target-m68k/m68k-semi.c
index 3bb30cd..17e649f 100644
--- a/target-m68k/m68k-semi.c
+++ b/target-m68k/m68k-semi.c
@@ -33,8 +33,8 @@
#define SEMIHOSTING_HEAP_SIZE (128 * 1024 * 1024)
#else
#include "qemu-common.h"
-#include "gdbstub.h"
-#include "softmmu-semi.h"
+#include "exec/gdbstub.h"
+#include "exec/softmmu-semi.h"
#endif
#include "sysemu.h"
diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c
index aa00504..70735ae 100644
--- a/target-m68k/op_helper.c
+++ b/target-m68k/op_helper.c
@@ -34,21 +34,21 @@ void do_interrupt_m68k_hardirq(CPUM68KState *env)
extern int semihosting_enabled;
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#define MMUSUFFIX _mmu
#define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
/* Try to fill the TLB and return an exception if error. If retaddr is
NULL, it means that the function was called in C code (i.e. not
diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index d60cd6e..71fb762 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -61,7 +61,7 @@ static TCGv NULL_QREG;
/* Used to distinguish stores from bad addressing modes. */
static TCGv store_dummy;
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
void m68k_tcg_init(void)
{
diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h
index 88430b5..2ee2318 100644
--- a/target-microblaze/cpu.h
+++ b/target-microblaze/cpu.h
@@ -26,7 +26,7 @@
#define CPUArchState struct CPUMBState
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
#include "softfloat.h"
struct CPUMBState;
typedef struct CPUMBState CPUMBState;
@@ -353,7 +353,7 @@ static inline int cpu_interrupts_enabled(CPUMBState *env)
return env->sregs[SR_MSR] & MSR_IE;
}
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
static inline target_ulong cpu_get_pc(CPUMBState *env)
{
@@ -379,7 +379,7 @@ static inline bool cpu_has_work(CPUMBState *env)
return env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI);
}
-#include "exec-all.h"
+#include "exec/exec-all.h"
static inline void cpu_pc_from_tb(CPUMBState *env, TranslationBlock *tb)
{
diff --git a/target-microblaze/helper.h b/target-microblaze/helper.h
index a1a732c..469cf9e 100644
--- a/target-microblaze/helper.h
+++ b/target-microblaze/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
DEF_HELPER_2(raise_exception, void, env, i32)
DEF_HELPER_1(debug, void, env)
@@ -38,4 +38,4 @@ DEF_HELPER_2(stackprot, void, env, i32)
DEF_HELPER_2(get, i32, i32, i32)
DEF_HELPER_3(put, void, i32, i32, i32)
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-microblaze/op_helper.c b/target-microblaze/op_helper.c
index c9789f4..52755e0 100644
--- a/target-microblaze/op_helper.c
+++ b/target-microblaze/op_helper.c
@@ -26,17 +26,17 @@
#define D(x)
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#define MMUSUFFIX _mmu
#define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
/* Try to fill the TLB and return an exception if error. If retaddr is
NULL, it means that the function was called in C code (i.e. not
diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c
index e9a5d32..bd65854 100644
--- a/target-microblaze/translate.c
+++ b/target-microblaze/translate.c
@@ -50,7 +50,7 @@ static TCGv env_btaken;
static TCGv env_btarget;
static TCGv env_iflags;
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
/* This is the state at translation time. */
typedef struct DisasContext {
diff --git a/target-mips/cpu.h b/target-mips/cpu.h
index b7a5112..13fdd83 100644
--- a/target-mips/cpu.h
+++ b/target-mips/cpu.h
@@ -12,7 +12,7 @@
#include "config.h"
#include "qemu-common.h"
#include "mips-defs.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
#include "softfloat.h"
struct CPUMIPSState;
@@ -557,7 +557,7 @@ static inline int cpu_mips_hw_interrupts_pending(CPUMIPSState *env)
return r;
}
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
/* Memory access type :
* may be needed for precise access rights control and precise exceptions.
@@ -733,7 +733,7 @@ static inline int cpu_has_work(CPUMIPSState *env)
return has_work;
}
-#include "exec-all.h"
+#include "exec/exec-all.h"
static inline void cpu_pc_from_tb(CPUMIPSState *env, TranslationBlock *tb)
{
diff --git a/target-mips/helper.h b/target-mips/helper.h
index f35ed78..b43d996 100644
--- a/target-mips/helper.h
+++ b/target-mips/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
DEF_HELPER_3(raise_exception_err, noreturn, env, i32, int)
DEF_HELPER_2(raise_exception, noreturn, env, i32)
@@ -362,4 +362,4 @@ DEF_HELPER_FLAGS_2(pasubub, TCG_CALL_CONST | TCG_CALL_PURE, i64, i64, i64)
DEF_HELPER_FLAGS_1(biadd, TCG_CALL_CONST | TCG_CALL_PURE, i64, i64)
DEF_HELPER_FLAGS_1(pmovmskb, TCG_CALL_CONST | TCG_CALL_PURE, i64, i64)
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index 05b7730..044eb7d 100644
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -23,7 +23,7 @@
#include "helper.h"
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#endif /* !defined(CONFIG_USER_ONLY) */
#ifndef CONFIG_USER_ONLY
@@ -2280,16 +2280,16 @@ static void QEMU_NORETURN do_unaligned_access(CPUMIPSState *env,
#define ALIGNED_ONLY
#define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
static void do_unaligned_access(CPUMIPSState *env, target_ulong addr,
int is_write, int is_user, uintptr_t retaddr)
diff --git a/target-mips/translate.c b/target-mips/translate.c
index bd1ad10..f36f351 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -578,7 +578,7 @@ static TCGv_i32 fpu_fcr0, fpu_fcr31;
static uint32_t gen_opc_hflags[OPC_BUF_SIZE];
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
#define gen_helper_0e0i(name, arg) do { \
TCGv_i32 helper_tmp = tcg_const_i32(arg); \
diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h
index f118718..2b280c8 100644
--- a/target-openrisc/cpu.h
+++ b/target-openrisc/cpu.h
@@ -30,7 +30,7 @@ struct OpenRISCCPU;
#include "config.h"
#include "qemu-common.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
#include "softfloat.h"
#include "qemu/cpu.h"
#include "qapi/error.h"
@@ -416,7 +416,7 @@ static inline void cpu_clone_regs(CPUOpenRISCState *env, target_ulong newsp)
}
#endif
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
static inline void cpu_get_tb_cpu_state(CPUOpenRISCState *env,
target_ulong *pc,
@@ -443,7 +443,7 @@ static inline bool cpu_has_work(CPUOpenRISCState *env)
CPU_INTERRUPT_TIMER);
}
-#include "exec-all.h"
+#include "exec/exec-all.h"
static inline target_ulong cpu_get_pc(CPUOpenRISCState *env)
{
diff --git a/target-openrisc/helper.h b/target-openrisc/helper.h
index 404d464..2af9790 100644
--- a/target-openrisc/helper.h
+++ b/target-openrisc/helper.h
@@ -17,7 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "def-helper.h"
+#include "exec/def-helper.h"
/* exception */
DEF_HELPER_FLAGS_2(exception, 0, void, env, i32)
@@ -67,4 +67,4 @@ DEF_HELPER_FLAGS_1(rfe, 0, void, env)
DEF_HELPER_FLAGS_4(mtspr, 0, void, env, tl, tl, tl)
DEF_HELPER_FLAGS_4(mfspr, 0, tl, env, tl, tl, tl)
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-openrisc/interrupt.c b/target-openrisc/interrupt.c
index 642da7d..226ce43 100644
--- a/target-openrisc/interrupt.c
+++ b/target-openrisc/interrupt.c
@@ -19,7 +19,7 @@
#include "cpu.h"
#include "qemu-common.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "host-utils.h"
#ifndef CONFIG_USER_ONLY
#include "hw/loader.h"
diff --git a/target-openrisc/mmu.c b/target-openrisc/mmu.c
index 0be1d41..f507c7f 100644
--- a/target-openrisc/mmu.c
+++ b/target-openrisc/mmu.c
@@ -20,7 +20,7 @@
#include "cpu.h"
#include "qemu-common.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "host-utils.h"
#ifndef CONFIG_USER_ONLY
#include "hw/loader.h"
diff --git a/target-openrisc/mmu_helper.c b/target-openrisc/mmu_helper.c
index 59ed371..b197182 100644
--- a/target-openrisc/mmu_helper.c
+++ b/target-openrisc/mmu_helper.c
@@ -21,20 +21,20 @@
#include "cpu.h"
#ifndef CONFIG_USER_ONLY
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#define MMUSUFFIX _mmu
#define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
void tlb_fill(CPUOpenRISCState *env, target_ulong addr, int is_write,
int mmu_idx, uintptr_t retaddr)
diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c
index ba2efd4..15f1629 100644
--- a/target-openrisc/translate.c
+++ b/target-openrisc/translate.c
@@ -19,7 +19,7 @@
*/
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "disas/disas.h"
#include "tcg-op.h"
#include "qemu-common.h"
@@ -61,7 +61,7 @@ static TCGv_i32 fpcsr;
static TCGv machi, maclo;
static TCGv fpmaddhi, fpmaddlo;
static TCGv_i32 env_flags;
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
void openrisc_translate_init(void)
{
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index faf4404..1e746b6 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -73,7 +73,7 @@
#define CPUArchState struct CPUPPCState
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
#include "softfloat.h"
@@ -1257,7 +1257,7 @@ static inline void cpu_clone_regs(CPUPPCState *env, target_ulong newsp)
}
#endif
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
/*****************************************************************************/
/* CRF definitions */
@@ -2228,7 +2228,7 @@ static inline bool cpu_has_work(CPUPPCState *env)
return msr_ee && (env->interrupt_request & CPU_INTERRUPT_HARD);
}
-#include "exec-all.h"
+#include "exec/exec-all.h"
static inline void cpu_pc_from_tb(CPUPPCState *env, TranslationBlock *tb)
{
diff --git a/target-ppc/helper.h b/target-ppc/helper.h
index fd04c06..5a68df6 100644
--- a/target-ppc/helper.h
+++ b/target-ppc/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
DEF_HELPER_3(raise_exception_err, void, env, i32, i32)
DEF_HELPER_2(raise_exception, void, env, i32)
@@ -414,4 +414,4 @@ DEF_HELPER_3(store_601_batl, void, env, i32, tl)
DEF_HELPER_3(store_601_batu, void, env, i32, tl)
#endif
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-ppc/mem_helper.c b/target-ppc/mem_helper.c
index 5b5f1bd..215d5fe 100644
--- a/target-ppc/mem_helper.c
+++ b/target-ppc/mem_helper.c
@@ -23,7 +23,7 @@
#include "helper_regs.h"
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#endif /* !defined(CONFIG_USER_ONLY) */
//#define DEBUG_OP
@@ -257,16 +257,16 @@ STVE(stvewx, cpu_stl_data, bswap32, u32)
#define MMUSUFFIX _mmu
#define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
/* try to fill the TLB and return an exception if error. If retaddr is
NULL, it means that the function was called in C code (i.e. not
diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index 4f5ecff..33d12bc 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -71,7 +71,7 @@ static TCGv cpu_reserve;
static TCGv_i32 cpu_fpscr;
static TCGv_i32 cpu_access_type;
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
void ppc_translate_init(void)
{
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index bc9a21e..67b021f 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -24,7 +24,7 @@
*/
#include "disas/bfd.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include <kvm.h>
#include "kvm_ppc.h"
#include "arch_init.h"
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index ed81af3..ffc2c51 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -28,13 +28,13 @@
#define CPUArchState struct CPUS390XState
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
#define TARGET_PAGE_BITS 12
#define TARGET_PHYS_ADDR_SPACE_BITS 64
#define TARGET_VIRT_ADDR_SPACE_BITS 64
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
#include "softfloat.h"
@@ -350,7 +350,7 @@ static inline void cpu_set_tls(CPUS390XState *env, target_ulong newtls)
#define cpu_gen_code cpu_s390x_gen_code
#define cpu_signal_handler cpu_s390x_signal_handler
-#include "exec-all.h"
+#include "exec/exec-all.h"
#ifdef CONFIG_USER_ONLY
diff --git a/target-s390x/fpu_helper.c b/target-s390x/fpu_helper.c
index ee9420d..173f820 100644
--- a/target-s390x/fpu_helper.c
+++ b/target-s390x/fpu_helper.c
@@ -22,7 +22,7 @@
#include "helper.h"
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#endif
/* #define DEBUG_HELPER */
diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index 22256b0..c40ab47 100644
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -19,7 +19,7 @@
*/
#include "cpu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "qemu-timer.h"
#ifndef CONFIG_USER_ONLY
#include "sysemu.h"
diff --git a/target-s390x/helper.h b/target-s390x/helper.h
index 5419f37..fe0937c 100644
--- a/target-s390x/helper.h
+++ b/target-s390x/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
DEF_HELPER_2(exception, void, env, i32)
DEF_HELPER_4(nc, i32, env, i32, i64, i64)
@@ -149,4 +149,4 @@ DEF_HELPER_3(cksm, void, env, i32, i32)
DEF_HELPER_FLAGS_5(calc_cc, TCG_CALL_PURE|TCG_CALL_CONST,
i32, env, i32, i64, i64, i64)
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c
index b21b37c..b8fb5fd 100644
--- a/target-s390x/mem_helper.c
+++ b/target-s390x/mem_helper.c
@@ -24,21 +24,21 @@
/*****************************************************************************/
/* Softmmu support */
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#define MMUSUFFIX _mmu
#define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
/* try to fill the TLB and return an exception if error. If retaddr is
NULL, it means that the function was called in C code (i.e. not
diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
index fdccd58..e542e0c 100644
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -30,7 +30,7 @@
#endif
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#include "sysemu.h"
#endif
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index 443912e..17932ac 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -37,7 +37,7 @@
/* global register indexes */
static TCGv_ptr cpu_env;
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
#include "helper.h"
#define GEN_HELPER 1
#include "helper.h"
diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h
index bf59222..756e9f1 100644
--- a/target-sh4/cpu.h
+++ b/target-sh4/cpu.h
@@ -39,7 +39,7 @@
#define CPUArchState struct CPUSH4State
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
#include "softfloat.h"
@@ -264,7 +264,7 @@ static inline void cpu_clone_regs(CPUSH4State *env, target_ulong newsp)
}
#endif
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
/* Memory access type */
enum {
@@ -376,7 +376,7 @@ static inline bool cpu_has_work(CPUSH4State *env)
return env->interrupt_request & CPU_INTERRUPT_HARD;
}
-#include "exec-all.h"
+#include "exec/exec-all.h"
static inline void cpu_pc_from_tb(CPUSH4State *env, TranslationBlock *tb)
{
diff --git a/target-sh4/helper.h b/target-sh4/helper.h
index 6c1a47d..0e46dac 100644
--- a/target-sh4/helper.h
+++ b/target-sh4/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
DEF_HELPER_1(ldtlb, void, env)
DEF_HELPER_1(raise_illegal_instruction, noreturn, env)
@@ -47,4 +47,4 @@ DEF_HELPER_2(ftrc_DT, i32, env, f64)
DEF_HELPER_3(fipr, void, env, i32, i32)
DEF_HELPER_2(ftrv, void, env, i32)
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c
index 60ec4cb..55e2b25 100644
--- a/target-sh4/op_helper.c
+++ b/target-sh4/op_helper.c
@@ -37,21 +37,21 @@ static inline void cpu_restore_state_from_retaddr(CPUSH4State *env,
}
#ifndef CONFIG_USER_ONLY
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#define MMUSUFFIX _mmu
#define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
void tlb_fill(CPUSH4State *env, target_ulong addr, int is_write, int mmu_idx,
uintptr_t retaddr)
diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index ba6b127..979ff3e 100644
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -69,7 +69,7 @@ static TCGv cpu_flags, cpu_delayed_pc;
static uint32_t gen_opc_hflags[OPC_BUF_SIZE];
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
static void sh4_translate_init(void)
{
diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h
index 214d01d..9e7bce3 100644
--- a/target-sparc/cpu.h
+++ b/target-sparc/cpu.h
@@ -25,7 +25,7 @@
#define CPUArchState struct CPUSPARCState
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
#include "softfloat.h"
@@ -702,7 +702,7 @@ static inline void cpu_clone_regs(CPUSPARCState *env, target_ulong newsp)
}
#endif
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
#ifdef TARGET_SPARC64
/* sun4u.c */
@@ -770,7 +770,7 @@ static inline bool cpu_has_work(CPUSPARCState *env1)
cpu_interrupts_enabled(env1);
}
-#include "exec-all.h"
+#include "exec/exec-all.h"
static inline void cpu_pc_from_tb(CPUSPARCState *env, TranslationBlock *tb)
{
diff --git a/target-sparc/helper.h b/target-sparc/helper.h
index e1ae3c7..50c13cf 100644
--- a/target-sparc/helper.h
+++ b/target-sparc/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
#ifndef TARGET_SPARC64
DEF_HELPER_1(rett, void, env)
@@ -173,4 +173,4 @@ VIS_CMPHELPER(cmpne);
DEF_HELPER_1(compute_psr, void, env);
DEF_HELPER_1(compute_C_icc, i32, env);
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c
index 2ca9a5c..101deec 100644
--- a/target-sparc/ldst_helper.c
+++ b/target-sparc/ldst_helper.c
@@ -65,21 +65,21 @@
#define QT1 (env->qt1)
#if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
#define MMUSUFFIX _mmu
#define ALIGNED_ONLY
#define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#endif
#if defined(TARGET_SPARC64) && !defined(CONFIG_USER_ONLY)
diff --git a/target-sparc/mmu_helper.c b/target-sparc/mmu_helper.c
index cb73c44..7fcac3f 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-memory.h"
+#include "exec/exec-memory.h"
/* Sparc MMU emulation */
diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index 705ab6e..c24b5c3 100644
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -64,7 +64,7 @@ static TCGv_i64 cpu_fpr[TARGET_DPREGS];
static target_ulong gen_opc_npc[OPC_BUF_SIZE];
static target_ulong gen_opc_jump_pc[2];
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
typedef struct DisasContext {
target_ulong pc; /* current Program Counter: integer or DYNAMIC_PC */
diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h
index 06508a1..c8abef1 100644
--- a/target-unicore32/cpu.h
+++ b/target-unicore32/cpu.h
@@ -23,7 +23,7 @@
#include "config.h"
#include "qemu-common.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
#include "softfloat.h"
#define NB_MMU_MODES 2
@@ -157,9 +157,9 @@ static inline void cpu_set_tls(CPUUniCore32State *env, target_ulong newtls)
env->regs[16] = newtls;
}
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
#include "cpu-qom.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
static inline void cpu_pc_from_tb(CPUUniCore32State *env, TranslationBlock *tb)
{
diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
index 4b68561..2adbd16 100644
--- a/target-unicore32/helper.c
+++ b/target-unicore32/helper.c
@@ -10,7 +10,7 @@
*/
#include "cpu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "helper.h"
#include "host-utils.h"
#include "ui/console.h"
diff --git a/target-unicore32/helper.h b/target-unicore32/helper.h
index a4b8149..e85ce6c 100644
--- a/target-unicore32/helper.h
+++ b/target-unicore32/helper.h
@@ -6,7 +6,7 @@
* published by the Free Software Foundation, or (at your option) any
* later version. See the COPYING file in the top-level directory.
*/
-#include "def-helper.h"
+#include "exec/def-helper.h"
#ifndef CONFIG_USER_ONLY
DEF_HELPER_4(cp0_set, void, env, i32, i32, i32)
@@ -65,4 +65,4 @@ DEF_HELPER_2(ucf64_si2df, f64, f32, env)
DEF_HELPER_2(ucf64_sf2si, f32, f32, env)
DEF_HELPER_2(ucf64_df2si, f32, f64, env)
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-unicore32/op_helper.c b/target-unicore32/op_helper.c
index f474d1b..cc4aa37 100644
--- a/target-unicore32/op_helper.c
+++ b/target-unicore32/op_helper.c
@@ -242,16 +242,16 @@ uint32_t HELPER(ror_cc)(CPUUniCore32State *env, uint32_t x, uint32_t i)
#define MMUSUFFIX _mmu
#define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
void tlb_fill(CPUUniCore32State *env, target_ulong addr, int is_write,
int mmu_idx, uintptr_t retaddr)
diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c
index 03c28f1..93583b1 100644
--- a/target-unicore32/translate.c
+++ b/target-unicore32/translate.c
@@ -55,7 +55,7 @@ static TCGv_i32 cpu_R[32];
static TCGv cpu_F0s, cpu_F1s;
static TCGv_i64 cpu_F0d, cpu_F1d;
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
static const char *regnames[] = {
"r00", "r01", "r02", "r03", "r04", "r05", "r06", "r07",
diff --git a/target-xtensa/core-dc232b.c b/target-xtensa/core-dc232b.c
index 804fdef..d1a594c 100644
--- a/target-xtensa/core-dc232b.c
+++ b/target-xtensa/core-dc232b.c
@@ -26,8 +26,8 @@
*/
#include "cpu.h"
-#include "exec-all.h"
-#include "gdbstub.h"
+#include "exec/exec-all.h"
+#include "exec/gdbstub.h"
#include "host-utils.h"
#include "core-dc232b/core-isa.h"
diff --git a/target-xtensa/core-dc233c.c b/target-xtensa/core-dc233c.c
index d643f41..ead6b3b 100644
--- a/target-xtensa/core-dc233c.c
+++ b/target-xtensa/core-dc233c.c
@@ -26,8 +26,8 @@
*/
#include "cpu.h"
-#include "exec-all.h"
-#include "gdbstub.h"
+#include "exec/exec-all.h"
+#include "exec/gdbstub.h"
#include "qemu-common.h"
#include "host-utils.h"
diff --git a/target-xtensa/core-fsf.c b/target-xtensa/core-fsf.c
index e36b0de..a387aee 100644
--- a/target-xtensa/core-fsf.c
+++ b/target-xtensa/core-fsf.c
@@ -26,8 +26,8 @@
*/
#include "cpu.h"
-#include "exec-all.h"
-#include "gdbstub.h"
+#include "exec/exec-all.h"
+#include "exec/gdbstub.h"
#include "host-utils.h"
#include "core-fsf/core-isa.h"
diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h
index 7348277..f355ca3 100644
--- a/target-xtensa/cpu.h
+++ b/target-xtensa/cpu.h
@@ -35,7 +35,7 @@
#include "config.h"
#include "qemu-common.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
#include "fpu/softfloat.h"
#define TARGET_HAS_ICE 1
@@ -498,8 +498,8 @@ static inline void cpu_get_tb_cpu_state(CPUXtensaState *env, target_ulong *pc,
}
}
-#include "cpu-all.h"
-#include "exec-all.h"
+#include "exec/cpu-all.h"
+#include "exec/exec-all.h"
static inline int cpu_has_work(CPUXtensaState *env)
{
diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c
index d5bb171..8a3783a 100644
--- a/target-xtensa/helper.c
+++ b/target-xtensa/helper.c
@@ -26,8 +26,8 @@
*/
#include "cpu.h"
-#include "exec-all.h"
-#include "gdbstub.h"
+#include "exec/exec-all.h"
+#include "exec/gdbstub.h"
#include "host-utils.h"
#if !defined(CONFIG_USER_ONLY)
#include "hw/loader.h"
diff --git a/target-xtensa/helper.h b/target-xtensa/helper.h
index 4cc0088..93859cb 100644
--- a/target-xtensa/helper.h
+++ b/target-xtensa/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
DEF_HELPER_2(exception, noreturn, env, i32)
DEF_HELPER_3(exception_cause, noreturn, env, i32, i32)
@@ -57,4 +57,4 @@ DEF_HELPER_4(ult_s, void, env, i32, f32, f32)
DEF_HELPER_4(ole_s, void, env, i32, f32, f32)
DEF_HELPER_4(ule_s, void, env, i32, f32, f32)
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c
index ae0c099..c5ad4d0 100644
--- a/target-xtensa/op_helper.c
+++ b/target-xtensa/op_helper.c
@@ -36,16 +36,16 @@ static void do_unaligned_access(CPUXtensaState *env,
#define MMUSUFFIX _mmu
#define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
#define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
static void do_restore_state(CPUXtensaState *env, uintptr_t pc)
{
diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c
index 03e5451..15d5203 100644
--- a/target-xtensa/translate.c
+++ b/target-xtensa/translate.c
@@ -31,7 +31,7 @@
#include <stdio.h>
#include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
#include "disas/disas.h"
#include "tcg-op.h"
#include "qemu-log.h"
@@ -76,7 +76,7 @@ static TCGv_i32 cpu_FR[16];
static TCGv_i32 cpu_SR[256];
static TCGv_i32 cpu_UR[256];
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
static const char * const sregnames[256] = {
[LBEG] = "LBEG",
diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c
index e790bf0..51b147b 100644
--- a/tcg/arm/tcg-target.c
+++ b/tcg/arm/tcg-target.c
@@ -960,7 +960,7 @@ static inline void tcg_out_goto_label(TCGContext *s, int cond, int label_index)
#ifdef CONFIG_SOFTMMU
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
/* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
int mmu_idx) */
diff --git a/tcg/hppa/tcg-target.c b/tcg/hppa/tcg-target.c
index de500ae..5b27cf6 100644
--- a/tcg/hppa/tcg-target.c
+++ b/tcg/hppa/tcg-target.c
@@ -906,7 +906,7 @@ static void tcg_out_movcond(TCGContext *s, int cond, TCGArg ret,
}
#if defined(CONFIG_SOFTMMU)
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
/* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
int mmu_idx) */
diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c
index 4952c05..927a30a 100644
--- a/tcg/i386/tcg-target.c
+++ b/tcg/i386/tcg-target.c
@@ -981,7 +981,7 @@ static void tcg_out_jmp(TCGContext *s, tcg_target_long dest)
#if defined(CONFIG_SOFTMMU)
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
/* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
int mmu_idx) */
diff --git a/tcg/ia64/tcg-target.c b/tcg/ia64/tcg-target.c
index 06570be..2373d9e 100644
--- a/tcg/ia64/tcg-target.c
+++ b/tcg/ia64/tcg-target.c
@@ -1491,7 +1491,7 @@ static inline void tcg_out_movcond(TCGContext *s, TCGCond cond, TCGArg ret,
#if defined(CONFIG_SOFTMMU)
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
/* Load and compare a TLB entry, and return the result in (p6, p7).
R2 is loaded with the address of the addend TLB entry.
diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c
index 7e4013e..b8f89ed 100644
--- a/tcg/mips/tcg-target.c
+++ b/tcg/mips/tcg-target.c
@@ -917,7 +917,7 @@ static void tcg_out_setcond2(TCGContext *s, TCGCond cond, TCGReg ret,
#if defined(CONFIG_SOFTMMU)
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
/* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
int mmu_idx) */
diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c
index 60b7b92..a7e48ec 100644
--- a/tcg/ppc/tcg-target.c
+++ b/tcg/ppc/tcg-target.c
@@ -520,7 +520,7 @@ static void tcg_out_call (TCGContext *s, tcg_target_long arg, int const_arg)
#if defined(CONFIG_SOFTMMU)
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
/* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
int mmu_idx) */
diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c
index 5403fc1..833fe0c 100644
--- a/tcg/ppc64/tcg-target.c
+++ b/tcg/ppc64/tcg-target.c
@@ -546,7 +546,7 @@ static void tcg_out_ldsta (TCGContext *s, int ret, int addr,
#if defined (CONFIG_SOFTMMU)
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
/* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
int mmu_idx) */
diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c
index fd9286f..e12a152 100644
--- a/tcg/s390/tcg-target.c
+++ b/tcg/s390/tcg-target.c
@@ -299,7 +299,7 @@ static const uint8_t tcg_cond_to_ltr_cond[] = {
#ifdef CONFIG_SOFTMMU
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
/* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
int mmu_idx) */
diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c
index f146647..03db514 100644
--- a/tcg/sparc/tcg-target.c
+++ b/tcg/sparc/tcg-target.c
@@ -831,7 +831,7 @@ static void tcg_target_qemu_prologue(TCGContext *s)
#if defined(CONFIG_SOFTMMU)
-#include "../../softmmu_defs.h"
+#include "exec/softmmu_defs.h"
/* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr,
int mmu_idx) */
diff --git a/tci.c b/tci.c
index 98f5f71..0038ea9 100644
--- a/tci.c
+++ b/tci.c
@@ -25,7 +25,7 @@
#endif
#include "qemu-common.h"
-#include "exec-all.h" /* MAX_OPC_PARAM_IARGS */
+#include "exec/exec-all.h" /* MAX_OPC_PARAM_IARGS */
#include "tcg-op.h"
/* Marker for missing code. */
diff --git a/vl.c b/vl.c
index 04fa990..9597912 100644
--- a/vl.c
+++ b/vl.c
@@ -132,7 +132,7 @@ int main(int argc, char **argv)
#include "monitor.h"
#include "ui/console.h"
#include "sysemu.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "qemu-timer.h"
#include "qemu-char.h"
#include "cache-utils.h"
diff --git a/xen-all.c b/xen-all.c
index 9d1e168..11485db 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -19,7 +19,7 @@
#include "range.h"
#include "xen-mapcache.h"
#include "trace.h"
-#include "exec-memory.h"
+#include "exec/exec-memory.h"
#include <xen/hvm/ioreq.h>
#include <xen/hvm/params.h>
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 24/32] monitor: move include files to include/monitor/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (22 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 23/32] exec: move include files to include/exec/ Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 25/32] migration: move include files to include/migration/ Paolo Bonzini
` (10 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch_init.c | 2 +-
audio/audio.c | 2 +-
audio/wavcapture.c | 2 +-
balloon.c | 2 +-
balloon.h | 2 +-
block.c | 2 +-
blockdev-nbd.c | 2 +-
blockdev.c | 2 +-
blockjob.c | 2 +-
cpus.c | 2 +-
disas.c | 2 +-
dump.c | 2 +-
gdbstub.c | 2 +-
hmp.c | 2 +-
hw/acpi.c | 2 +-
hw/ccid-card-emulated.c | 2 +-
hw/ccid-card-passthru.c | 2 +-
hw/device-hotplug.c | 2 +-
hw/i8259.c | 2 +-
hw/ide/ahci.c | 2 +-
hw/isa-bus.c | 2 +-
hw/kvm/pci-assign.c | 2 +-
hw/lm32_pic.c | 2 +-
hw/loader.c | 2 +-
hw/pc.c | 2 +-
hw/pci-hotplug.c | 2 +-
hw/pci-stub.c | 2 +-
hw/pci.c | 2 +-
hw/pcie_aer.c | 2 +-
hw/qdev-monitor.c | 2 +-
hw/qxl.c | 2 +-
hw/s390-virtio-bus.c | 2 +-
hw/s390-virtio.c | 2 +-
hw/slavio_intctl.c | 2 +-
hw/spapr_vio.c | 2 +-
hw/sun4c_intctl.c | 2 +-
hw/sysbus.c | 2 +-
hw/usb/bus.c | 2 +-
hw/usb/dev-smartcard-reader.c | 2 +-
hw/usb/dev-storage.c | 2 +-
hw/usb/hcd-ehci.c | 2 +-
hw/usb/host-bsd.c | 2 +-
hw/usb/host-linux.c | 2 +-
hw/usb/host-stub.c | 2 +-
hw/usb/redirect.c | 2 +-
hw/virtio-serial-bus.c | 2 +-
hw/watchdog.c | 2 +-
include/block/block_int.h | 2 +-
monitor.h => include/monitor/monitor.h | 2 +-
readline.h => include/monitor/readline.h | 0
include/ui/console.h | 2 +-
include/ui/qemu-spice.h | 4 ++--
migration-fd.c | 2 +-
migration.c | 2 +-
monitor.c | 4 ++--
net/hub.c | 2 +-
net/net.c | 2 +-
net/slirp.c | 2 +-
net/socket.c | 2 +-
net/tap.c | 2 +-
osdep.c | 2 +-
qemu-char.c | 2 +-
qemu-error.c | 2 +-
qemu-sockets.c | 2 +-
qemu-timer.c | 2 +-
qemu-tool.c | 2 +-
qemu-user.c | 2 +-
qobject/qerror.c | 2 +-
readline.c | 4 ++--
savevm.c | 2 +-
slirp/misc.c | 4 ++--
target-i386/helper.c | 2 +-
ui/input.c | 2 +-
ui/spice-core.c | 2 +-
ui/spice-display.c | 2 +-
ui/vnc.h | 2 +-
vl.c | 2 +-
77 files changed, 80 insertions(+), 80 deletions(-)
rename monitor.h => include/monitor/monitor.h (99%)
rename readline.h => include/monitor/readline.h (100%)
diff --git a/arch_init.c b/arch_init.c
index 212c90a..4d3271b 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -29,7 +29,7 @@
#include <sys/mman.h>
#endif
#include "config.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "sysemu.h"
#include "bitops.h"
#include "bitmap.h"
diff --git a/audio/audio.c b/audio/audio.c
index f270ac0..b942ffd 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -23,7 +23,7 @@
*/
#include "hw/hw.h"
#include "audio/audio.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "qemu-timer.h"
#include "sysemu.h"
diff --git a/audio/wavcapture.c b/audio/wavcapture.c
index b897e26..9cd3c83 100644
--- a/audio/wavcapture.c
+++ b/audio/wavcapture.c
@@ -1,5 +1,5 @@
#include "hw/hw.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "audio/audio.h"
typedef struct {
diff --git a/balloon.c b/balloon.c
index a8d2c46..06a6010 100644
--- a/balloon.c
+++ b/balloon.c
@@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "exec/cpu-common.h"
#include "kvm.h"
#include "balloon.h"
diff --git a/balloon.h b/balloon.h
index b803a00..bd9d395 100644
--- a/balloon.h
+++ b/balloon.h
@@ -14,7 +14,7 @@
#ifndef _QEMU_BALLOON_H
#define _QEMU_BALLOON_H
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "qapi-types.h"
typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target);
diff --git a/block.c b/block.c
index 09ba2af..6712188 100644
--- a/block.c
+++ b/block.c
@@ -24,7 +24,7 @@
#include "config-host.h"
#include "qemu-common.h"
#include "trace.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "block/block_int.h"
#include "block/blockjob.h"
#include "module.h"
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index b48a7fc..69695ba 100644
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -11,7 +11,7 @@
#include "blockdev.h"
#include "hw/block-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "qobject/qerror.h"
#include "sysemu.h"
#include "qmp-commands.h"
diff --git a/blockdev.c b/blockdev.c
index 67125e5..e83963f 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -10,7 +10,7 @@
#include "blockdev.h"
#include "hw/block-common.h"
#include "block/blockjob.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "qobject/qerror.h"
#include "qemu-option.h"
#include "qemu-config.h"
diff --git a/blockjob.c b/blockjob.c
index 16d5053..83febba 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -26,7 +26,7 @@
#include "config-host.h"
#include "qemu-common.h"
#include "trace.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "block/block.h"
#include "block/blockjob.h"
#include "block/block_int.h"
diff --git a/cpus.c b/cpus.c
index 866cb28..c4ca93a 100644
--- a/cpus.c
+++ b/cpus.c
@@ -25,7 +25,7 @@
/* Needed early for CONFIG_BSD etc. */
#include "config-host.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "sysemu.h"
#include "exec/gdbstub.h"
#include "dma.h"
diff --git a/disas.c b/disas.c
index 57906f1..3c4744e 100644
--- a/disas.c
+++ b/disas.c
@@ -363,7 +363,7 @@ const char *lookup_symbol(target_ulong orig_addr)
#if !defined(CONFIG_USER_ONLY)
-#include "monitor.h"
+#include "monitor/monitor.h"
static int monitor_disas_is_physical;
static CPUArchState *monitor_disas_env;
diff --git a/dump.c b/dump.c
index 8f5a36f..77781c2 100644
--- a/dump.c
+++ b/dump.c
@@ -16,7 +16,7 @@
#include "cpu.h"
#include "exec/cpu-all.h"
#include "exec/targphys.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "kvm.h"
#include "dump.h"
#include "sysemu.h"
diff --git a/gdbstub.c b/gdbstub.c
index 70ad79a..9395c82 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -29,7 +29,7 @@
#include "qemu.h"
#else
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "qemu-char.h"
#include "sysemu.h"
#include "exec/gdbstub.h"
diff --git a/hmp.c b/hmp.c
index ea410ef..ce665e5 100644
--- a/hmp.c
+++ b/hmp.c
@@ -19,7 +19,7 @@
#include "qemu-option.h"
#include "qemu-timer.h"
#include "qmp-commands.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "ui/console.h"
static void hmp_handle_error(Monitor *mon, Error **errp)
diff --git a/hw/acpi.c b/hw/acpi.c
index f4aca49..773eb6d 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -22,7 +22,7 @@
#include "hw.h"
#include "pc.h"
#include "acpi.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
struct acpi_table_header {
uint16_t _length; /* our length, not actual part of the hdr */
diff --git a/hw/ccid-card-emulated.c b/hw/ccid-card-emulated.c
index f4a6da4..845a764 100644
--- a/hw/ccid-card-emulated.c
+++ b/hw/ccid-card-emulated.c
@@ -33,7 +33,7 @@
#include "qemu-thread.h"
#include "qemu-char.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "hw/ccid.h"
#define DPRINTF(card, lvl, fmt, ...) \
diff --git a/hw/ccid-card-passthru.c b/hw/ccid-card-passthru.c
index bd6c777..f5b4794 100644
--- a/hw/ccid-card-passthru.c
+++ b/hw/ccid-card-passthru.c
@@ -10,7 +10,7 @@
#include "qemu-char.h"
#include "qemu_socket.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "hw/ccid.h"
#include "libcacard/vscard_common.h"
diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c
index f896cb4..dbd6148 100644
--- a/hw/device-hotplug.c
+++ b/hw/device-hotplug.c
@@ -27,7 +27,7 @@
#include "blockdev.h"
#include "qemu-config.h"
#include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
DriveInfo *add_init_drive(const char *optstr)
{
diff --git a/hw/i8259.c b/hw/i8259.c
index 53daf78..46fe358 100644
--- a/hw/i8259.c
+++ b/hw/i8259.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "pc.h"
#include "isa.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "qemu-timer.h"
#include "i8259_internal.h"
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 6c068ad..0376aa3 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -27,7 +27,7 @@
#include <hw/pci.h>
#include <hw/sysbus.h>
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "dma.h"
#include "exec/cpu-common.h"
#include "internal.h"
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index a54456d..8932637 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -17,7 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "sysbus.h"
#include "sysemu.h"
#include "isa.h"
diff --git a/hw/kvm/pci-assign.c b/hw/kvm/pci-assign.c
index 1bfddb0..a7652dc 100644
--- a/hw/kvm/pci-assign.c
+++ b/hw/kvm/pci-assign.c
@@ -31,7 +31,7 @@
#include "qemu-error.h"
#include "ui/console.h"
#include "hw/loader.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "range.h"
#include "sysemu.h"
#include "hw/pci.h"
diff --git a/hw/lm32_pic.c b/hw/lm32_pic.c
index 32f65db..42d5602 100644
--- a/hw/lm32_pic.c
+++ b/hw/lm32_pic.c
@@ -21,7 +21,7 @@
#include "hw.h"
#include "pc.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "sysbus.h"
#include "trace.h"
#include "lm32_pic.h"
diff --git a/hw/loader.c b/hw/loader.c
index 2800f3e..5d8ca2e 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -44,7 +44,7 @@
#include "hw.h"
#include "disas/disas.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "sysemu.h"
#include "uboot_image.h"
#include "loader.h"
diff --git a/hw/pc.c b/hw/pc.c
index c88d2c5..07c1b56 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -28,7 +28,7 @@
#include "fdc.h"
#include "ide.h"
#include "pci.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "fw_cfg.h"
#include "hpet_emul.h"
#include "smbios.h"
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index 62c7f9d..0ece4c2 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -27,7 +27,7 @@
#include "pci.h"
#include "net/net.h"
#include "pc.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "scsi.h"
#include "virtio-blk.h"
#include "qemu-config.h"
diff --git a/hw/pci-stub.c b/hw/pci-stub.c
index 134c448..4cea395 100644
--- a/hw/pci-stub.c
+++ b/hw/pci-stub.c
@@ -19,7 +19,7 @@
*/
#include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "pci.h"
#include "qmp-commands.h"
diff --git a/hw/pci.c b/hw/pci.c
index 40d29c9..7fe848d 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -25,7 +25,7 @@
#include "pci.h"
#include "pci_bridge.h"
#include "pci_internals.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "net/net.h"
#include "sysemu.h"
#include "loader.h"
diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c
index c516cdc..3ca071e 100644
--- a/hw/pcie_aer.c
+++ b/hw/pcie_aer.c
@@ -20,7 +20,7 @@
#include "sysemu.h"
#include "qapi/qmp-types.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "pci_bridge.h"
#include "pcie.h"
#include "msix.h"
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
index 6e5eb45..3def428 100644
--- a/hw/qdev-monitor.c
+++ b/hw/qdev-monitor.c
@@ -18,7 +18,7 @@
*/
#include "qdev.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "qmp-commands.h"
#include "arch_init.h"
#include "qemu-config.h"
diff --git a/hw/qxl.c b/hw/qxl.c
index 1d16863..67c40cb 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -23,7 +23,7 @@
#include "qemu-common.h"
#include "qemu-timer.h"
#include "qemu-queue.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "sysemu.h"
#include "trace.h"
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index a9e7ae6..ff9b68e 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -21,7 +21,7 @@
#include "block/block.h"
#include "sysemu.h"
#include "boards.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "loader.h"
#include "elf.h"
#include "hw/virtio.h"
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 9d879d4..c62e1b1 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -23,7 +23,7 @@
#include "sysemu.h"
#include "net/net.h"
#include "boards.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "loader.h"
#include "elf.h"
#include "hw/virtio.h"
diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c
index 7fdc3be..c2ca113 100644
--- a/hw/slavio_intctl.c
+++ b/hw/slavio_intctl.c
@@ -23,7 +23,7 @@
*/
#include "sun4m.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "sysbus.h"
#include "trace.h"
diff --git a/hw/spapr_vio.c b/hw/spapr_vio.c
index 848806d..0d0f496 100644
--- a/hw/spapr_vio.c
+++ b/hw/spapr_vio.c
@@ -22,7 +22,7 @@
#include "hw.h"
#include "sysemu.h"
#include "boards.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "loader.h"
#include "elf.h"
#include "hw/sysbus.h"
diff --git a/hw/sun4c_intctl.c b/hw/sun4c_intctl.c
index 8dfa5ec..4d04c38 100644
--- a/hw/sun4c_intctl.c
+++ b/hw/sun4c_intctl.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "sun4m.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "sysbus.h"
//#define DEBUG_IRQ_COUNT
diff --git a/hw/sysbus.c b/hw/sysbus.c
index 7b16eac..ecedd85 100644
--- a/hw/sysbus.c
+++ b/hw/sysbus.c
@@ -18,7 +18,7 @@
*/
#include "sysbus.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "exec/exec-memory.h"
static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent);
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index b649360..dbf4d80 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -2,7 +2,7 @@
#include "hw/usb.h"
#include "hw/qdev.h"
#include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "trace.h"
static void usb_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent);
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index 1ea0791..99be794 100644
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -38,7 +38,7 @@
#include "qemu-error.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "hw/ccid.h"
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 02fb051..c1c7bea 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -14,7 +14,7 @@
#include "hw/usb/desc.h"
#include "hw/scsi.h"
#include "ui/console.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "sysemu.h"
#include "blockdev.h"
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index 8bdb806..1944c2d 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -31,7 +31,7 @@
#include "qemu-timer.h"
#include "hw/usb.h"
#include "hw/pci.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "trace.h"
#include "dma.h"
#include "sysemu.h"
diff --git a/hw/usb/host-bsd.c b/hw/usb/host-bsd.c
index ec26266..86093c6 100644
--- a/hw/usb/host-bsd.c
+++ b/hw/usb/host-bsd.c
@@ -25,7 +25,7 @@
*/
#include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "hw/usb.h"
/* usb.h declares these */
diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c
index 44f1a64..1d2ff26 100644
--- a/hw/usb/host-linux.c
+++ b/hw/usb/host-linux.c
@@ -32,7 +32,7 @@
#include "qemu-common.h"
#include "qemu-timer.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "sysemu.h"
#include "trace.h"
diff --git a/hw/usb/host-stub.c b/hw/usb/host-stub.c
index e8da322..58423a0 100644
--- a/hw/usb/host-stub.c
+++ b/hw/usb/host-stub.c
@@ -33,7 +33,7 @@
#include "qemu-common.h"
#include "ui/console.h"
#include "hw/usb.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
void usb_host_info(Monitor *mon)
{
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 2283565..04dfd5b 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -27,7 +27,7 @@
#include "qemu-common.h"
#include "qemu-timer.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "sysemu.h"
#include <dirent.h>
diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index d20bd8b..318bdbd 100644
--- a/hw/virtio-serial-bus.c
+++ b/hw/virtio-serial-bus.c
@@ -19,7 +19,7 @@
*/
#include "iov.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "qemu-queue.h"
#include "sysbus.h"
#include "trace.h"
diff --git a/hw/watchdog.c b/hw/watchdog.c
index ddd6a9a..daa8936 100644
--- a/hw/watchdog.c
+++ b/hw/watchdog.c
@@ -24,7 +24,7 @@
#include "qemu-config.h"
#include "qemu-queue.h"
#include "qapi/qmp-types.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "sysemu.h"
#include "hw/watchdog.h"
diff --git a/include/block/block_int.h b/include/block/block_int.h
index a667a66..71dee00 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -31,7 +31,7 @@
#include "qemu-timer.h"
#include "qapi-types.h"
#include "qobject/qerror.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#define BLOCK_FLAG_ENCRYPT 1
#define BLOCK_FLAG_COMPAT6 4
diff --git a/monitor.h b/include/monitor/monitor.h
similarity index 99%
rename from monitor.h
rename to include/monitor/monitor.h
index 338052d..791cca3 100644
--- a/monitor.h
+++ b/include/monitor/monitor.h
@@ -5,7 +5,7 @@
#include "qobject/qerror.h"
#include "qobject/qdict.h"
#include "block/block.h"
-#include "readline.h"
+#include "monitor/readline.h"
extern Monitor *cur_mon;
extern Monitor *default_mon;
diff --git a/readline.h b/include/monitor/readline.h
similarity index 100%
rename from readline.h
rename to include/monitor/readline.h
diff --git a/include/ui/console.h b/include/ui/console.h
index 7b5aacd..77f7314 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -3,7 +3,7 @@
#include "qobject/qdict.h"
#include "notify.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "trace.h"
#include "qapi-types.h"
#include "qapi/error.h"
diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index 5857b8a..3e08be0 100644
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -24,7 +24,7 @@
#include "qemu-option.h"
#include "qemu-config.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
extern int using_spice;
@@ -47,7 +47,7 @@ void do_info_spice(Monitor *mon, QObject **ret_data);
CharDriverState *qemu_chr_open_spice(QemuOpts *opts);
#else /* CONFIG_SPICE */
-#include "monitor.h"
+#include "monitor/monitor.h"
#define using_spice 0
static inline int qemu_spice_set_passwd(const char *passwd,
diff --git a/migration-fd.c b/migration-fd.c
index 7c97685..7d293e8 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -16,7 +16,7 @@
#include "qemu-common.h"
#include "qemu_socket.h"
#include "migration.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "buffered_file.h"
#include "block/block.h"
#include "qemu_socket.h"
diff --git a/migration.c b/migration.c
index 53ee0e7..fb968ae 100644
--- a/migration.c
+++ b/migration.c
@@ -15,7 +15,7 @@
#include "qemu-common.h"
#include "migration.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "buffered_file.h"
#include "sysemu.h"
#include "block/block.h"
diff --git a/monitor.c b/monitor.c
index 81a58c2..d2cfa99 100644
--- a/monitor.c
+++ b/monitor.c
@@ -36,8 +36,8 @@
#include "qemu-char.h"
#include "ui/qemu-spice.h"
#include "sysemu.h"
-#include "monitor.h"
-#include "readline.h"
+#include "monitor/monitor.h"
+#include "monitor/readline.h"
#include "ui/console.h"
#include "blockdev.h"
#include "audio/audio.h"
diff --git a/net/hub.c b/net/hub.c
index 8508ecf..81a73b5 100644
--- a/net/hub.c
+++ b/net/hub.c
@@ -12,7 +12,7 @@
*
*/
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "net/net.h"
#include "clients.h"
#include "hub.h"
diff --git a/net/net.c b/net/net.c
index 680113f..6a58bab 100644
--- a/net/net.c
+++ b/net/net.c
@@ -29,7 +29,7 @@
#include "net/slirp.h"
#include "util.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "qemu-common.h"
#include "qemu_socket.h"
#include "qemu-config.h"
diff --git a/net/slirp.c b/net/slirp.c
index 27b6cc6..11ea751 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -32,7 +32,7 @@
#include "net/net.h"
#include "clients.h"
#include "hub.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "qemu_socket.h"
#include "slirp/libslirp.h"
#include "qemu-char.h"
diff --git a/net/socket.c b/net/socket.c
index f7bc51b..590452b 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -25,7 +25,7 @@
#include "net/net.h"
#include "clients.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "qemu-common.h"
#include "qemu-error.h"
#include "qemu-option.h"
diff --git a/net/tap.c b/net/tap.c
index cb35db6..3b2e311 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -35,7 +35,7 @@
#include "net/net.h"
#include "clients.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "sysemu.h"
#include "qemu-common.h"
#include "qemu-error.h"
diff --git a/osdep.c b/osdep.c
index 3b25297..2af734b 100644
--- a/osdep.c
+++ b/osdep.c
@@ -48,7 +48,7 @@ extern int madvise(caddr_t, size_t, int);
#include "qemu-common.h"
#include "trace.h"
#include "qemu_socket.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
static bool fips_enabled = false;
diff --git a/qemu-char.c b/qemu-char.c
index ffaab2c..7f2b4ac 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "ui/console.h"
#include "sysemu.h"
#include "qemu-timer.h"
diff --git a/qemu-error.c b/qemu-error.c
index 7cd5ffe..08a36f4 100644
--- a/qemu-error.c
+++ b/qemu-error.c
@@ -11,7 +11,7 @@
*/
#include <stdio.h>
-#include "monitor.h"
+#include "monitor/monitor.h"
/*
* Print to current monitor if we have one, else to stderr.
diff --git a/qemu-sockets.c b/qemu-sockets.c
index cfed9c5..4a0c0e5 100644
--- a/qemu-sockets.c
+++ b/qemu-sockets.c
@@ -22,7 +22,7 @@
#include <errno.h>
#include <unistd.h>
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "qemu_socket.h"
#include "qemu-common.h" /* for qemu_isdigit */
#include "main-loop.h"
diff --git a/qemu-timer.c b/qemu-timer.c
index 5948e54..86cc0a1 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -23,7 +23,7 @@
*/
#include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "ui/console.h"
#include "hw/hw.h"
diff --git a/qemu-tool.c b/qemu-tool.c
index da4c05a..7870d9f 100644
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -14,7 +14,7 @@
*/
#include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "qemu-timer.h"
#include "qemu-log.h"
#include "migration.h"
diff --git a/qemu-user.c b/qemu-user.c
index 13fb9ae..0856b6a 100644
--- a/qemu-user.c
+++ b/qemu-user.c
@@ -19,7 +19,7 @@
*/
#include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
Monitor *cur_mon;
diff --git a/qobject/qerror.c b/qobject/qerror.c
index 4462cfb..f41f437 100644
--- a/qobject/qerror.c
+++ b/qobject/qerror.c
@@ -10,7 +10,7 @@
* See the COPYING.LIB file in the top-level directory.
*/
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "qobject/qjson.h"
#include "qobject/qerror.h"
#include "qemu-common.h"
diff --git a/readline.c b/readline.c
index 540cd8a..5fc9643 100644
--- a/readline.c
+++ b/readline.c
@@ -21,8 +21,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include "readline.h"
-#include "monitor.h"
+#include "monitor/readline.h"
+#include "monitor/monitor.h"
#define IS_NORM 0
#define IS_ESC 1
diff --git a/savevm.c b/savevm.c
index 5e69585..01bdd8e 100644
--- a/savevm.c
+++ b/savevm.c
@@ -73,7 +73,7 @@
#include "hw/hw.h"
#include "hw/qdev.h"
#include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "sysemu.h"
#include "qemu-timer.h"
#include "audio/audio.h"
diff --git a/slirp/misc.c b/slirp/misc.c
index bb1e998..201d844 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -7,7 +7,7 @@
#include <slirp.h>
-#include "monitor.h"
+#include "monitor/monitor.h"
#ifdef DEBUG
int slirp_debug = DBG_CALL|DBG_MISC|DBG_ERROR;
@@ -241,7 +241,7 @@ strdup(str)
}
#endif
-#include "monitor.h"
+#include "monitor/monitor.h"
void lprint(const char *format, ...)
{
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 2ee7c6d..08500b2 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -21,7 +21,7 @@
#include "kvm.h"
#ifndef CONFIG_USER_ONLY
#include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#endif
//#define DEBUG_MMU
diff --git a/ui/input.c b/ui/input.c
index 65950af..05f6c0c 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -23,7 +23,7 @@
*/
#include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "ui/console.h"
#include "qapi/error.h"
#include "qmp-commands.h"
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 83a93fd..c5c58ef 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -35,7 +35,7 @@
#include "qobject/qjson.h"
#include "notify.h"
#include "migration.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "hw/hw.h"
#include "ui/spice-display.h"
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 1355cba..443ffa8 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -19,7 +19,7 @@
#include "ui/qemu-spice.h"
#include "qemu-timer.h"
#include "qemu-queue.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "ui/console.h"
#include "sysemu.h"
#include "trace.h"
diff --git a/ui/vnc.h b/ui/vnc.h
index f86db6e..47d788f 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -31,7 +31,7 @@
#include "qemu-queue.h"
#include "qemu-thread.h"
#include "ui/console.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "audio/audio.h"
#include "bitmap.h"
#include <zlib.h>
diff --git a/vl.c b/vl.c
index 9597912..c3dcaff 100644
--- a/vl.c
+++ b/vl.c
@@ -129,7 +129,7 @@ int main(int argc, char **argv)
#include "bt-host.h"
#include "net/net.h"
#include "net/slirp.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "ui/console.h"
#include "sysemu.h"
#include "exec/gdbstub.h"
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 25/32] migration: move include files to include/migration/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (23 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 24/32] monitor: move include files to include/monitor/ Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 26/32] qom: move include files to include/qom/ Paolo Bonzini
` (9 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch_init.c | 4 ++--
block-migration.c | 4 ++--
block/qcow.c | 2 +-
block/qed.c | 2 +-
block/vdi.c | 2 +-
block/vmdk.c | 2 +-
block/vpc.c | 2 +-
block/vvfat.c | 2 +-
buffered_file.h | 2 +-
hw/9pfs/virtio-9p.c | 2 +-
hw/hid.h | 2 +-
hw/hw.h | 4 ++--
hw/ivshmem.c | 2 +-
hw/ptimer.h | 2 +-
hw/shpc.h | 2 +-
block-migration.h => include/migration/block.h | 0
qemu-file.h => include/migration/file.h | 0
migration.h => include/migration/migration.h | 2 +-
include/{qemu => migration}/page_cache.h | 0
vmstate.h => include/migration/vmstate.h | 0
include/net/net.h | 2 +-
migration-exec.c | 2 +-
migration-fd.c | 2 +-
migration-tcp.c | 2 +-
migration-unix.c | 2 +-
migration.c | 4 ++--
monitor.c | 2 +-
page_cache.c | 2 +-
qemu-tool.c | 2 +-
savevm.c | 2 +-
ui/spice-core.c | 2 +-
vl.c | 4 ++--
32 files changed, 33 insertions(+), 33 deletions(-)
rename block-migration.h => include/migration/block.h (100%)
rename qemu-file.h => include/migration/file.h (100%)
rename migration.h => include/migration/migration.h (99%)
rename include/{qemu => migration}/page_cache.h (100%)
rename vmstate.h => include/migration/vmstate.h (100%)
diff --git a/arch_init.c b/arch_init.c
index 4d3271b..d9aa752 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -39,12 +39,12 @@
#include "hw/pci.h"
#include "hw/audiodev.h"
#include "kvm.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "exec/gdbstub.h"
#include "hw/smbios.h"
#include "exec/exec-memory.h"
#include "hw/pcspk.h"
-#include "qemu/page_cache.h"
+#include "migration/page_cache.h"
#include "qemu-config.h"
#include "qmp-commands.h"
#include "trace.h"
diff --git a/block-migration.c b/block-migration.c
index c15de9f..2d2dcbd 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -18,8 +18,8 @@
#include "hw/hw.h"
#include "qemu-queue.h"
#include "qemu-timer.h"
-#include "block-migration.h"
-#include "migration.h"
+#include "migration/block.h"
+#include "migration/migration.h"
#include "blockdev.h"
#include <assert.h>
diff --git a/block/qcow.c b/block/qcow.c
index d13bd40..f366711 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -26,7 +26,7 @@
#include "module.h"
#include <zlib.h>
#include "block/aes.h"
-#include "migration.h"
+#include "migration/migration.h"
/**************************************************************/
/* QEMU COW block driver with compression and encryption support */
diff --git a/block/qed.c b/block/qed.c
index 9f7a3f2..80c0748 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -16,7 +16,7 @@
#include "trace.h"
#include "qed.h"
#include "qobject/qerror.h"
-#include "migration.h"
+#include "migration/migration.h"
static void qed_aio_cancel(BlockDriverAIOCB *blockacb)
{
diff --git a/block/vdi.c b/block/vdi.c
index 73e3253..afedb5d 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -52,7 +52,7 @@
#include "qemu-common.h"
#include "block/block_int.h"
#include "module.h"
-#include "migration.h"
+#include "migration/migration.h"
#if defined(CONFIG_UUID)
#include <uuid/uuid.h>
diff --git a/block/vmdk.c b/block/vmdk.c
index c7fc07a..800f554 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -26,7 +26,7 @@
#include "qemu-common.h"
#include "block/block_int.h"
#include "module.h"
-#include "migration.h"
+#include "migration/migration.h"
#include <zlib.h>
#define VMDK3_MAGIC (('C' << 24) | ('O' << 16) | ('W' << 8) | 'D')
diff --git a/block/vpc.c b/block/vpc.c
index caa50db..499b237 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -25,7 +25,7 @@
#include "qemu-common.h"
#include "block/block_int.h"
#include "module.h"
-#include "migration.h"
+#include "migration/migration.h"
/**************************************************************/
diff --git a/block/vvfat.c b/block/vvfat.c
index fbabafc..a63c3ea 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -27,7 +27,7 @@
#include "qemu-common.h"
#include "block/block_int.h"
#include "module.h"
-#include "migration.h"
+#include "migration/migration.h"
#ifndef S_IWGRP
#define S_IWGRP 0
diff --git a/buffered_file.h b/buffered_file.h
index ef010fe..86a7075 100644
--- a/buffered_file.h
+++ b/buffered_file.h
@@ -15,7 +15,7 @@
#define QEMU_BUFFERED_FILE_H
#include "hw/hw.h"
-#include "migration.h"
+#include "migration/migration.h"
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state);
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 8b9cdc9..ede20ce 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -20,7 +20,7 @@
#include "virtio-9p-xattr.h"
#include "virtio-9p-coth.h"
#include "trace.h"
-#include "migration.h"
+#include "migration/migration.h"
int open_fd_hw;
int total_open_fd;
diff --git a/hw/hid.h b/hw/hid.h
index 5315cf7..100b121 100644
--- a/hw/hid.h
+++ b/hw/hid.h
@@ -1,7 +1,7 @@
#ifndef QEMU_HID_H
#define QEMU_HID_H
-#include "vmstate.h"
+#include "migration/vmstate.h"
#define HID_MOUSE 1
#define HID_TABLET 2
diff --git a/hw/hw.h b/hw/hw.h
index cf93e93..1163673 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -10,8 +10,8 @@
#include "ioport.h"
#include "irq.h"
-#include "qemu-file.h"
-#include "vmstate.h"
+#include "migration/file.h"
+#include "migration/vmstate.h"
#include "qemu-log.h"
#ifdef NEED_CPU_H
diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index b4fdf49..16fec0c 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -21,7 +21,7 @@
#include "pci.h"
#include "msix.h"
#include "kvm.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "qobject/qerror.h"
#include "event_notifier.h"
#include "qemu-char.h"
diff --git a/hw/ptimer.h b/hw/ptimer.h
index 6638f61..9d172f7 100644
--- a/hw/ptimer.h
+++ b/hw/ptimer.h
@@ -10,7 +10,7 @@
#include "qemu-common.h"
#include "qemu-timer.h"
-#include "vmstate.h"
+#include "migration/vmstate.h"
/* ptimer.c */
typedef struct ptimer_state ptimer_state;
diff --git a/hw/shpc.h b/hw/shpc.h
index 130b71d..946c779 100644
--- a/hw/shpc.h
+++ b/hw/shpc.h
@@ -3,7 +3,7 @@
#include "qemu-common.h"
#include "memory.h"
-#include "vmstate.h"
+#include "migration/vmstate.h"
struct SHPCDevice {
/* Capability offset in device's config space */
diff --git a/block-migration.h b/include/migration/block.h
similarity index 100%
rename from block-migration.h
rename to include/migration/block.h
diff --git a/qemu-file.h b/include/migration/file.h
similarity index 100%
rename from qemu-file.h
rename to include/migration/file.h
diff --git a/migration.h b/include/migration/migration.h
similarity index 99%
rename from migration.h
rename to include/migration/migration.h
index 1d18c21..900b09d 100644
--- a/migration.h
+++ b/include/migration/migration.h
@@ -18,7 +18,7 @@
#include "qemu-common.h"
#include "notify.h"
#include "qapi/error.h"
-#include "vmstate.h"
+#include "migration/vmstate.h"
#include "qapi-types.h"
struct MigrationParams {
diff --git a/include/qemu/page_cache.h b/include/migration/page_cache.h
similarity index 100%
rename from include/qemu/page_cache.h
rename to include/migration/page_cache.h
diff --git a/vmstate.h b/include/migration/vmstate.h
similarity index 100%
rename from vmstate.h
rename to include/migration/vmstate.h
diff --git a/include/net/net.h b/include/net/net.h
index 1a0e952..dd2f344 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -6,7 +6,7 @@
#include "qobject/qdict.h"
#include "qemu-option.h"
#include "net/queue.h"
-#include "vmstate.h"
+#include "migration/vmstate.h"
#include "qapi-types.h"
struct MACAddr {
diff --git a/migration-exec.c b/migration-exec.c
index b3d9964..8cbde63 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -17,7 +17,7 @@
#include "qemu-common.h"
#include "qemu_socket.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "buffered_file.h"
#include "block/block.h"
#include <sys/types.h>
diff --git a/migration-fd.c b/migration-fd.c
index 7d293e8..6b501b4 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -15,7 +15,7 @@
#include "qemu-common.h"
#include "qemu_socket.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "monitor/monitor.h"
#include "buffered_file.h"
#include "block/block.h"
diff --git a/migration-tcp.c b/migration-tcp.c
index 7b764de..1bc0aab 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -15,7 +15,7 @@
#include "qemu-common.h"
#include "qemu_socket.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "buffered_file.h"
#include "block/block.h"
diff --git a/migration-unix.c b/migration-unix.c
index 8a2c804..eadc1dc 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -15,7 +15,7 @@
#include "qemu-common.h"
#include "qemu_socket.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "buffered_file.h"
#include "block/block.h"
diff --git a/migration.c b/migration.c
index fb968ae..cfcf547 100644
--- a/migration.c
+++ b/migration.c
@@ -14,13 +14,13 @@
*/
#include "qemu-common.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "monitor/monitor.h"
#include "buffered_file.h"
#include "sysemu.h"
#include "block/block.h"
#include "qemu_socket.h"
-#include "block-migration.h"
+#include "migration/block.h"
#include "qmp-commands.h"
//#define DEBUG_MIGRATION
diff --git a/monitor.c b/monitor.c
index d2cfa99..68d0a7c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -44,7 +44,7 @@
#include "disas/disas.h"
#include "balloon.h"
#include "qemu-timer.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "kvm.h"
#include "acl.h"
#include "qobject/qint.h"
diff --git a/page_cache.c b/page_cache.c
index 0294f7e..ba5640b 100644
--- a/page_cache.c
+++ b/page_cache.c
@@ -24,7 +24,7 @@
#include <strings.h>
#include "qemu-common.h"
-#include "qemu/page_cache.h"
+#include "migration/page_cache.h"
#ifdef DEBUG_CACHE
#define DPRINTF(fmt, ...) \
diff --git a/qemu-tool.c b/qemu-tool.c
index 7870d9f..c9840c6 100644
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -17,7 +17,7 @@
#include "monitor/monitor.h"
#include "qemu-timer.h"
#include "qemu-log.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "main-loop.h"
#include "sysemu.h"
#include "qemu_socket.h"
diff --git a/savevm.c b/savevm.c
index 01bdd8e..27ad7a5 100644
--- a/savevm.c
+++ b/savevm.c
@@ -77,7 +77,7 @@
#include "sysemu.h"
#include "qemu-timer.h"
#include "audio/audio.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "qemu_socket.h"
#include "qemu-queue.h"
#include "qemu-timer.h"
diff --git a/ui/spice-core.c b/ui/spice-core.c
index c5c58ef..dd3057b 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -34,7 +34,7 @@
#include "qobject/qstring.h"
#include "qobject/qjson.h"
#include "notify.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "monitor/monitor.h"
#include "hw/hw.h"
#include "ui/spice-display.h"
diff --git a/vl.c b/vl.c
index c3dcaff..ba2f312 100644
--- a/vl.c
+++ b/vl.c
@@ -138,10 +138,10 @@ int main(int argc, char **argv)
#include "cache-utils.h"
#include "blockdev.h"
#include "hw/block-common.h"
-#include "block-migration.h"
+#include "migration/block.h"
#include "dma.h"
#include "audio/audio.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "kvm.h"
#include "qobject/qjson.h"
#include "qemu-option.h"
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 26/32] qom: move include files to include/qom/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (24 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 25/32] migration: move include files to include/migration/ Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 27/32] misc: move include files to include/qemu/ Paolo Bonzini
` (8 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/qdev.h | 2 +-
hw/stream.h | 2 +-
include/{qemu => qom}/cpu.h | 2 +-
include/{qemu => qom}/object.h | 0
include/{qemu => qom}/qom-qobject.h | 2 +-
qmp.c | 2 +-
qom/container.c | 2 +-
qom/cpu.c | 2 +-
qom/object.c | 4 ++--
qom/qom-qobject.c | 4 ++--
target-alpha/cpu-qom.h | 2 +-
target-arm/cpu-qom.h | 2 +-
target-cris/cpu-qom.h | 2 +-
target-i386/cpu-qom.h | 2 +-
target-lm32/cpu-qom.h | 2 +-
target-m68k/cpu-qom.h | 2 +-
target-microblaze/cpu-qom.h | 2 +-
target-mips/cpu-qom.h | 2 +-
target-openrisc/cpu.h | 2 +-
target-ppc/cpu-qom.h | 2 +-
target-s390x/cpu-qom.h | 2 +-
target-sh4/cpu-qom.h | 2 +-
target-sparc/cpu-qom.h | 2 +-
target-unicore32/cpu-qom.h | 2 +-
target-xtensa/cpu-qom.h | 2 +-
25 files changed, 26 insertions(+), 26 deletions(-)
rename include/{qemu => qom}/cpu.h (98%)
rename include/{qemu => qom}/object.h (100%)
rename include/{qemu => qom}/qom-qobject.h (97%)
diff --git a/hw/qdev.h b/hw/qdev.h
index 855e47b..69a8855 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -5,7 +5,7 @@
#include "qemu-queue.h"
#include "qemu-option.h"
#include "qapi/visit-core.h"
-#include "qemu/object.h"
+#include "qom/object.h"
#include "qapi/error.h"
typedef struct Property Property;
diff --git a/hw/stream.h b/hw/stream.h
index 21123a9..f6137d6 100644
--- a/hw/stream.h
+++ b/hw/stream.h
@@ -2,7 +2,7 @@
#define STREAM_H 1
#include "qemu-common.h"
-#include "qemu/object.h"
+#include "qom/object.h"
/* stream slave. Used until qdev provides a generic way. */
#define TYPE_STREAM_SLAVE "stream-slave"
diff --git a/include/qemu/cpu.h b/include/qom/cpu.h
similarity index 98%
rename from include/qemu/cpu.h
rename to include/qom/cpu.h
index ad706a6..48ee709 100644
--- a/include/qemu/cpu.h
+++ b/include/qom/cpu.h
@@ -20,7 +20,7 @@
#ifndef QEMU_CPU_H
#define QEMU_CPU_H
-#include "qemu/object.h"
+#include "qom/object.h"
#include "qemu-thread.h"
/**
diff --git a/include/qemu/object.h b/include/qom/object.h
similarity index 100%
rename from include/qemu/object.h
rename to include/qom/object.h
diff --git a/include/qemu/qom-qobject.h b/include/qom/qom-qobject.h
similarity index 97%
rename from include/qemu/qom-qobject.h
rename to include/qom/qom-qobject.h
index f9dff12..77cd717 100644
--- a/include/qemu/qom-qobject.h
+++ b/include/qom/qom-qobject.h
@@ -13,7 +13,7 @@
#ifndef QEMU_QOM_QOBJECT_H
#define QEMU_QOM_QOBJECT_H
-#include "qemu/object.h"
+#include "qom/object.h"
/*
* object_property_get_qobject:
diff --git a/qmp.c b/qmp.c
index 1d3f7d7..8d1ebe4 100644
--- a/qmp.c
+++ b/qmp.c
@@ -23,7 +23,7 @@
#include "arch_init.h"
#include "hw/qdev.h"
#include "blockdev.h"
-#include "qemu/qom-qobject.h"
+#include "qom/qom-qobject.h"
NameInfo *qmp_query_name(Error **errp)
{
diff --git a/qom/container.c b/qom/container.c
index 4ca8b5c..ceb0f01 100644
--- a/qom/container.c
+++ b/qom/container.c
@@ -10,7 +10,7 @@
* See the COPYING file in the top-level directory.
*/
-#include "qemu/object.h"
+#include "qom/object.h"
#include "module.h"
#include <assert.h>
diff --git a/qom/cpu.c b/qom/cpu.c
index 5b36046..d4d436f 100644
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -18,7 +18,7 @@
* <http://www.gnu.org/licenses/gpl-2.0.html>
*/
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
#include "qemu-common.h"
void cpu_reset(CPUState *cpu)
diff --git a/qom/object.c b/qom/object.c
index 72f34af..fc76583 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -10,7 +10,7 @@
* See the COPYING file in the top-level directory.
*/
-#include "qemu/object.h"
+#include "qom/object.h"
#include "qemu-common.h"
#include "qapi/visit-core.h"
#include "qapi/string-input-visitor.h"
@@ -18,7 +18,7 @@
/* TODO: replace QObject with a simpler visitor to avoid a dependency
* of the QOM core on QObject? */
-#include "qemu/qom-qobject.h"
+#include "qom/qom-qobject.h"
#include "qobject/qobject.h"
#include "qobject/qbool.h"
#include "qobject/qint.h"
diff --git a/qom/qom-qobject.c b/qom/qom-qobject.c
index ee41346..67fe08c 100644
--- a/qom/qom-qobject.c
+++ b/qom/qom-qobject.c
@@ -10,8 +10,8 @@
*/
#include "qemu-common.h"
-#include "qemu/object.h"
-#include "qemu/qom-qobject.h"
+#include "qom/object.h"
+#include "qom/qom-qobject.h"
#include "qapi/visit-core.h"
#include "qapi/qmp-input-visitor.h"
#include "qapi/qmp-output-visitor.h"
diff --git a/target-alpha/cpu-qom.h b/target-alpha/cpu-qom.h
index 6b4ca6d..f2414f7 100644
--- a/target-alpha/cpu-qom.h
+++ b/target-alpha/cpu-qom.h
@@ -20,7 +20,7 @@
#ifndef QEMU_ALPHA_CPU_QOM_H
#define QEMU_ALPHA_CPU_QOM_H
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
#include "cpu.h"
#define TYPE_ALPHA_CPU "alpha-cpu"
diff --git a/target-arm/cpu-qom.h b/target-arm/cpu-qom.h
index beabf9a..0f455c4 100644
--- a/target-arm/cpu-qom.h
+++ b/target-arm/cpu-qom.h
@@ -20,7 +20,7 @@
#ifndef QEMU_ARM_CPU_QOM_H
#define QEMU_ARM_CPU_QOM_H
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
#define TYPE_ARM_CPU "arm-cpu"
diff --git a/target-cris/cpu-qom.h b/target-cris/cpu-qom.h
index d0e5f04..41ab9b2 100644
--- a/target-cris/cpu-qom.h
+++ b/target-cris/cpu-qom.h
@@ -20,7 +20,7 @@
#ifndef QEMU_CRIS_CPU_QOM_H
#define QEMU_CRIS_CPU_QOM_H
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
#define TYPE_CRIS_CPU "cris-cpu"
diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h
index 3a7bc6a..332916a 100644
--- a/target-i386/cpu-qom.h
+++ b/target-i386/cpu-qom.h
@@ -20,7 +20,7 @@
#ifndef QEMU_I386_CPU_QOM_H
#define QEMU_I386_CPU_QOM_H
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
#include "cpu.h"
#include "qapi/error.h"
diff --git a/target-lm32/cpu-qom.h b/target-lm32/cpu-qom.h
index 4ae2edd..400cdbd 100644
--- a/target-lm32/cpu-qom.h
+++ b/target-lm32/cpu-qom.h
@@ -20,7 +20,7 @@
#ifndef QEMU_LM32_CPU_QOM_H
#define QEMU_LM32_CPU_QOM_H
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
#include "cpu.h"
#define TYPE_LM32_CPU "lm32-cpu"
diff --git a/target-m68k/cpu-qom.h b/target-m68k/cpu-qom.h
index 805786b..170daa7 100644
--- a/target-m68k/cpu-qom.h
+++ b/target-m68k/cpu-qom.h
@@ -20,7 +20,7 @@
#ifndef QEMU_M68K_CPU_QOM_H
#define QEMU_M68K_CPU_QOM_H
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
#define TYPE_M68K_CPU "m68k-cpu"
diff --git a/target-microblaze/cpu-qom.h b/target-microblaze/cpu-qom.h
index 4b23303..f75549d 100644
--- a/target-microblaze/cpu-qom.h
+++ b/target-microblaze/cpu-qom.h
@@ -20,7 +20,7 @@
#ifndef QEMU_MICROBLAZE_CPU_QOM_H
#define QEMU_MICROBLAZE_CPU_QOM_H
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
#define TYPE_MICROBLAZE_CPU "microblaze-cpu"
diff --git a/target-mips/cpu-qom.h b/target-mips/cpu-qom.h
index 6e22371..2a4b812 100644
--- a/target-mips/cpu-qom.h
+++ b/target-mips/cpu-qom.h
@@ -20,7 +20,7 @@
#ifndef QEMU_MIPS_CPU_QOM_H
#define QEMU_MIPS_CPU_QOM_H
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
#ifdef TARGET_MIPS64
#define TYPE_MIPS_CPU "mips64-cpu"
diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h
index 2b280c8..bb447e7 100644
--- a/target-openrisc/cpu.h
+++ b/target-openrisc/cpu.h
@@ -32,7 +32,7 @@ struct OpenRISCCPU;
#include "qemu-common.h"
#include "exec/cpu-defs.h"
#include "softfloat.h"
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
#include "qapi/error.h"
#define TYPE_OPENRISC_CPU "or32-cpu"
diff --git a/target-ppc/cpu-qom.h b/target-ppc/cpu-qom.h
index fef6f95..fb6b5a4 100644
--- a/target-ppc/cpu-qom.h
+++ b/target-ppc/cpu-qom.h
@@ -20,7 +20,7 @@
#ifndef QEMU_PPC_CPU_QOM_H
#define QEMU_PPC_CPU_QOM_H
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
#include "cpu.h"
#ifdef TARGET_PPC64
diff --git a/target-s390x/cpu-qom.h b/target-s390x/cpu-qom.h
index 6fa55a8..d54e4a2 100644
--- a/target-s390x/cpu-qom.h
+++ b/target-s390x/cpu-qom.h
@@ -20,7 +20,7 @@
#ifndef QEMU_S390_CPU_QOM_H
#define QEMU_S390_CPU_QOM_H
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
#include "cpu.h"
#define TYPE_S390_CPU "s390-cpu"
diff --git a/target-sh4/cpu-qom.h b/target-sh4/cpu-qom.h
index c41164a..09573c9 100644
--- a/target-sh4/cpu-qom.h
+++ b/target-sh4/cpu-qom.h
@@ -20,7 +20,7 @@
#ifndef QEMU_SUPERH_CPU_QOM_H
#define QEMU_SUPERH_CPU_QOM_H
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
#define TYPE_SUPERH_CPU "superh-cpu"
diff --git a/target-sparc/cpu-qom.h b/target-sparc/cpu-qom.h
index 3d3ac0f..2a738ae 100644
--- a/target-sparc/cpu-qom.h
+++ b/target-sparc/cpu-qom.h
@@ -20,7 +20,7 @@
#ifndef QEMU_SPARC_CPU_QOM_H
#define QEMU_SPARC_CPU_QOM_H
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
#include "cpu.h"
#ifdef TARGET_SPARC64
diff --git a/target-unicore32/cpu-qom.h b/target-unicore32/cpu-qom.h
index 342d85e..fe40b2d 100644
--- a/target-unicore32/cpu-qom.h
+++ b/target-unicore32/cpu-qom.h
@@ -11,7 +11,7 @@
#ifndef QEMU_UC32_CPU_QOM_H
#define QEMU_UC32_CPU_QOM_H
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
#include "cpu.h"
#define TYPE_UNICORE32_CPU "unicore32-cpu"
diff --git a/target-xtensa/cpu-qom.h b/target-xtensa/cpu-qom.h
index 1fd2f27..e344a9a 100644
--- a/target-xtensa/cpu-qom.h
+++ b/target-xtensa/cpu-qom.h
@@ -29,7 +29,7 @@
#ifndef QEMU_XTENSA_CPU_QOM_H
#define QEMU_XTENSA_CPU_QOM_H
-#include "qemu/cpu.h"
+#include "qom/cpu.h"
#include "cpu.h"
#define TYPE_XTENSA_CPU "xtensa-cpu"
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 27/32] misc: move include files to include/qemu/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (25 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 26/32] qom: move include files to include/qom/ Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 28/32] softmmu: move include files to include/sysemu/ Paolo Bonzini
` (7 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
acl.c | 2 +-
aio.c | 4 ++--
arch_init.c | 6 +++---
async.c | 2 +-
audio/alsaaudio.c | 2 +-
audio/audio.c | 2 +-
audio/noaudio.c | 2 +-
audio/ossaudio.c | 4 ++--
audio/spiceaudio.c | 2 +-
audio/wavaudio.c | 2 +-
bitmap.c | 4 ++--
bitops.c | 2 +-
block-migration.c | 4 ++--
block.c | 6 +++---
block/blkdebug.c | 4 ++--
block/blkverify.c | 2 +-
block/bochs.c | 2 +-
block/cloop.c | 2 +-
block/cow.c | 2 +-
block/dmg.c | 4 ++--
block/gluster.c | 4 ++--
block/iscsi.c | 4 ++--
block/nbd.c | 4 ++--
block/parallels.c | 2 +-
block/qcow.c | 2 +-
block/qcow2.c | 4 ++--
block/qed-table.c | 2 +-
block/qed.c | 2 +-
block/raw-posix.c | 6 +++---
block/raw-win32.c | 4 ++--
block/raw.c | 2 +-
block/rbd.c | 2 +-
block/sheepdog.c | 6 +++---
block/vdi.c | 2 +-
block/vmdk.c | 2 +-
block/vpc.c | 2 +-
block/vvfat.c | 2 +-
blockdev-nbd.c | 2 +-
blockdev.c | 4 ++--
blockdev.h | 2 +-
blockjob.c | 2 +-
bsd-user/main.c | 4 ++--
bsd-user/qemu.h | 2 +-
bt-host.c | 2 +-
bt-vhci.c | 2 +-
buffered_file.c | 2 +-
cache-utils.c | 2 +-
cmd.c | 2 +-
compatfd.c | 2 +-
cpu-exec.c | 2 +-
cpus.c | 8 ++++----
cutils.c | 6 +++---
device_tree.c | 4 ++--
dma-helpers.c | 4 ++--
envlist.c | 4 ++--
event_notifier.c | 4 ++--
exec.c | 6 +++---
fpu/softfloat.h | 2 +-
fsdev/qemu-fsdev-dummy.c | 2 +-
fsdev/qemu-fsdev.c | 6 +++---
fsdev/qemu-fsdev.h | 2 +-
fsdev/virtfs-proxy-helper.c | 4 ++--
fsdev/virtio-9p-marshal.c | 4 ++--
gdbstub.c | 2 +-
hmp.c | 4 ++--
host-utils.c | 2 +-
hw/9pfs/codir.c | 2 +-
hw/9pfs/cofile.c | 2 +-
hw/9pfs/cofs.c | 2 +-
hw/9pfs/coxattr.c | 2 +-
hw/9pfs/virtio-9p-coth.c | 2 +-
hw/9pfs/virtio-9p-coth.h | 2 +-
hw/9pfs/virtio-9p-device.c | 2 +-
hw/9pfs/virtio-9p-handle.c | 2 +-
hw/9pfs/virtio-9p-local.c | 2 +-
hw/9pfs/virtio-9p-posix-acl.c | 2 +-
hw/9pfs/virtio-9p-xattr.h | 2 +-
hw/9pfs/virtio-9p.c | 2 +-
hw/9pfs/virtio-9p.h | 2 +-
hw/acpi.h | 2 +-
hw/acpi_piix4.c | 2 +-
hw/adlib.c | 2 +-
hw/alpha_pci.c | 2 +-
hw/apic.c | 4 ++--
hw/apic_internal.h | 2 +-
hw/applesmc.c | 2 +-
hw/arm11mpcore.c | 2 +-
hw/arm_boot.c | 2 +-
hw/arm_mptimer.c | 2 +-
hw/arm_sysctl.c | 2 +-
hw/arm_timer.c | 2 +-
hw/armv7m_nvic.c | 2 +-
hw/baum.c | 2 +-
hw/block-common.c | 2 +-
hw/bt-hci-csr.c | 2 +-
hw/bt-hci.c | 2 +-
hw/bt-hid.c | 2 +-
hw/bt-l2cap.c | 2 +-
hw/cadence_ttc.c | 2 +-
hw/cadence_uart.c | 2 +-
hw/ccid-card-emulated.c | 2 +-
hw/ccid-card-passthru.c | 2 +-
hw/cs4231a.c | 2 +-
hw/cuda.c | 2 +-
hw/device-hotplug.c | 2 +-
hw/dma.c | 2 +-
hw/dp8393x.c | 2 +-
hw/esp-pci.c | 2 +-
hw/esp.c | 2 +-
hw/etraxfs_ser.c | 2 +-
hw/etraxfs_timer.c | 2 +-
hw/exynos4210_fimd.c | 2 +-
hw/exynos4210_i2c.c | 2 +-
hw/exynos4210_mct.c | 2 +-
hw/exynos4210_pwm.c | 2 +-
hw/exynos4210_rtc.c | 4 ++--
hw/fdc.c | 6 +++---
hw/fw_cfg.c | 4 ++--
hw/grlib_gptimer.c | 2 +-
hw/hid.c | 2 +-
hw/hpet.c | 2 +-
hw/hw.h | 2 +-
hw/i8254.c | 2 +-
hw/i8254_common.c | 2 +-
hw/i8259.c | 2 +-
hw/ide/core.c | 4 ++--
hw/ide/qdev.c | 2 +-
hw/imx_avic.c | 2 +-
hw/imx_timer.c | 2 +-
hw/intel-hda.c | 2 +-
hw/ivshmem.c | 2 +-
hw/kvm/i8254.c | 2 +-
hw/kvm/pci-assign.c | 4 ++--
hw/lance.c | 4 ++--
hw/leon3.c | 2 +-
hw/lm32_sys.c | 6 +++---
hw/lm32_timer.c | 4 ++--
hw/lm32_uart.c | 2 +-
hw/lm832x.c | 2 +-
hw/m48t59.c | 2 +-
hw/mac_dbdma.c | 2 +-
hw/mc146818rtc.c | 2 +-
hw/mcf5206.c | 2 +-
hw/mcf5208.c | 2 +-
hw/megasas.c | 2 +-
hw/microblaze_boot.c | 4 ++--
hw/milkymist-ac97.c | 2 +-
hw/milkymist-hpdmc.c | 2 +-
hw/milkymist-memcard.c | 2 +-
hw/milkymist-minimac2.c | 2 +-
hw/milkymist-pfpu.c | 4 ++--
hw/milkymist-softusb.c | 2 +-
hw/milkymist-sysctl.c | 4 ++--
hw/milkymist-tmu2.c | 2 +-
hw/milkymist-uart.c | 2 +-
hw/milkymist-vgafb.c | 2 +-
hw/mips_fulong2e.c | 2 +-
hw/mips_malta.c | 2 +-
hw/mips_r4k.c | 2 +-
hw/mips_timer.c | 2 +-
hw/msi.c | 2 +-
hw/msix.c | 2 +-
hw/musicpal.c | 2 +-
hw/nand.c | 2 +-
hw/omap1.c | 2 +-
hw/omap2.c | 2 +-
hw/omap_dma.c | 2 +-
hw/omap_gptimer.c | 2 +-
hw/omap_synctimer.c | 2 +-
hw/onenand.c | 2 +-
hw/openrisc_timer.c | 2 +-
hw/pc.c | 2 +-
hw/pci-hotplug.c | 2 +-
hw/pci.c | 2 +-
hw/pci_bridge.c | 2 +-
hw/pcie.c | 2 +-
hw/pcnet-pci.c | 2 +-
hw/pcnet.c | 4 ++--
hw/pcspk.c | 2 +-
hw/pflash_cfi01.c | 4 ++--
hw/pflash_cfi02.c | 4 ++--
hw/piix_pci.c | 2 +-
hw/pl031.c | 2 +-
hw/ppc.c | 4 ++--
hw/ppc/e500.c | 2 +-
hw/ppc405_boards.c | 2 +-
hw/ppc405_uc.c | 4 ++--
hw/ppc4xx_devs.c | 2 +-
hw/ppc_booke.c | 4 ++--
hw/ppc_prep.c | 2 +-
hw/ppce500_pci.c | 2 +-
hw/ptimer.c | 4 ++--
hw/ptimer.h | 2 +-
hw/pxa2xx_timer.c | 2 +-
hw/qdev-monitor.c | 2 +-
hw/qdev.h | 4 ++--
hw/qxl-logger.c | 2 +-
hw/qxl.c | 4 ++--
hw/qxl.h | 2 +-
hw/rc4030.c | 2 +-
hw/rtl8139.c | 4 ++--
hw/sb16.c | 4 ++--
hw/scsi-bus.c | 2 +-
hw/scsi-disk.c | 2 +-
hw/scsi-generic.c | 2 +-
hw/sd.c | 2 +-
hw/serial.c | 2 +-
hw/sh_pci.c | 2 +-
hw/sh_timer.c | 2 +-
hw/shpc.c | 4 ++--
hw/slavio_timer.c | 2 +-
hw/sm501.c | 2 +-
hw/soc_dma.c | 2 +-
hw/spitz.c | 2 +-
hw/stellaris.c | 2 +-
hw/strongarm.c | 2 +-
hw/sun4m.c | 2 +-
hw/sun4u.c | 2 +-
hw/tsc2005.c | 2 +-
hw/tsc210x.c | 2 +-
hw/tusb6010.c | 2 +-
hw/twl92230.c | 2 +-
hw/usb.h | 2 +-
hw/usb/core.c | 2 +-
hw/usb/dev-hid.c | 2 +-
hw/usb/dev-network.c | 6 +++---
hw/usb/dev-serial.c | 2 +-
hw/usb/dev-smartcard-reader.c | 2 +-
hw/usb/dev-storage.c | 4 ++--
hw/usb/dev-uas.c | 4 ++--
hw/usb/hcd-ehci.c | 2 +-
hw/usb/hcd-musb.c | 2 +-
hw/usb/hcd-ohci.c | 2 +-
hw/usb/hcd-uhci.c | 4 ++--
hw/usb/hcd-xhci.c | 2 +-
hw/usb/host-linux.c | 2 +-
hw/usb/redirect.c | 2 +-
hw/vfio_pci.c | 8 ++++----
hw/vga-isa-mm.c | 2 +-
hw/vga-isa.c | 2 +-
hw/vga-pci.c | 2 +-
hw/vga.c | 2 +-
hw/vhost.c | 2 +-
hw/vhost_net.c | 2 +-
hw/virtex_ml507.c | 2 +-
hw/virtio-balloon.c | 2 +-
hw/virtio-blk.c | 2 +-
hw/virtio-console.c | 2 +-
hw/virtio-net.c | 6 +++---
hw/virtio-pci.c | 4 ++--
hw/virtio-serial-bus.c | 4 ++--
hw/virtio.c | 4 ++--
hw/virtio.h | 2 +-
hw/vt82c686.c | 2 +-
hw/watchdog.c | 6 +++---
hw/watchdog.h | 2 +-
hw/wdt_i6300esb.c | 2 +-
hw/wdt_ib700.c | 2 +-
hw/xen_backend.c | 2 +-
hw/xen_common.h | 2 +-
hw/xen_domainbuild.c | 4 ++--
hw/xen_pt.c | 2 +-
hw/xen_pt_config_init.c | 2 +-
hw/xgmac.c | 2 +-
hw/xilinx_axidma.c | 4 ++--
hw/xilinx_axienet.c | 2 +-
hw/xilinx_spi.c | 2 +-
hw/xilinx_spips.c | 2 +-
hw/xilinx_timer.c | 2 +-
hw/xtensa_pic.c | 4 ++--
hw/zynq_slcr.c | 2 +-
include/audio/audio.h | 2 +-
include/block/aio.h | 2 +-
include/block/block.h | 2 +-
include/block/block_int.h | 6 +++---
include/block/coroutine.h | 4 ++--
include/block/coroutine_int.h | 2 +-
include/exec/cpu-all.h | 2 +-
include/exec/cpu-common.h | 4 ++--
include/exec/cpu-defs.h | 4 ++--
include/exec/exec-all.h | 2 +-
include/exec/gen-icount.h | 2 +-
include/exec/softmmu_template.h | 2 +-
include/migration/migration.h | 2 +-
include/net/net.h | 4 ++--
include/net/slirp.h | 2 +-
include/qapi/error.h | 2 +-
include/qapi/opts-visitor.h | 2 +-
acl.h => include/qemu/acl.h | 2 +-
qemu-barrier.h => include/qemu/atomic.h | 2 +-
bitmap.h => include/qemu/bitmap.h | 2 +-
bitops.h => include/qemu/bitops.h | 0
bswap.h => include/qemu/bswap.h | 0
cache-utils.h => include/qemu/cache-utils.h | 0
compatfd.h => include/qemu/compatfd.h | 0
compiler.h => include/qemu/compiler.h | 0
qemu-config.h => include/qemu/config-file.h | 2 +-
envlist.h => include/qemu/envlist.h | 0
qemu-error.h => include/qemu/error.h | 0
event_notifier.h => include/qemu/event_notifier.h | 0
host-utils.h => include/qemu/host-utils.h | 2 +-
int128.h => include/qemu/int128.h | 0
iov.h => include/qemu/iov.h | 0
qemu-log.h => include/qemu/log.h | 0
main-loop.h => include/qemu/main-loop.h | 0
module.h => include/qemu/module.h | 0
notify.h => include/qemu/notify.h | 2 +-
qemu-option.h => include/qemu/option.h | 2 +-
.../qemu/option_int.h | 2 +-
osdep.h => include/qemu/osdep.h | 0
qemu-queue.h => include/qemu/queue.h | 2 +-
range.h => include/qemu/range.h | 0
qemu_socket.h => include/qemu/sockets.h | 2 +-
qemu-thread-posix.h => include/qemu/thread-posix.h | 0
qemu-thread-win32.h => include/qemu/thread-win32.h | 0
qemu-thread.h => include/qemu/thread.h | 4 ++--
qemu-timer.h => include/qemu/timer.h | 4 ++--
qemu-tls.h => include/qemu/tls.h | 0
uri.h => include/qemu/uri.h | 0
qemu-xattr.h => include/qemu/xattr.h | 0
include/qobject/qdict.h | 2 +-
include/qobject/qerror.h | 2 +-
include/qobject/qjson.h | 2 +-
include/qobject/qlist.h | 4 ++--
include/qom/cpu.h | 2 +-
include/qom/object.h | 2 +-
include/ui/console.h | 2 +-
include/ui/qemu-spice.h | 4 ++--
include/ui/spice-display.h | 2 +-
iohandler.c | 4 ++--
iov.c | 2 +-
kvm-all.c | 10 +++++-----
kvm.h | 2 +-
libcacard/event.c | 2 +-
libcacard/vreader.c | 2 +-
libcacard/vscclient.c | 4 ++--
libfdt_env.h | 2 +-
linux-aio.c | 2 +-
linux-user/main.c | 6 +++---
linux-user/qemu.h | 4 ++--
linux-user/syscall.c | 2 +-
main-loop.c | 6 +++---
memory.c | 2 +-
memory.h | 4 ++--
memory_mapping.h | 2 +-
migration-exec.c | 2 +-
migration-fd.c | 4 ++--
migration-tcp.c | 2 +-
migration-unix.c | 2 +-
migration.c | 2 +-
module.c | 4 ++--
monitor.c | 8 ++++----
nbd.c | 4 ++--
net/dump.c | 6 +++---
net/hub.c | 2 +-
net/net.c | 6 +++---
net/queue.c | 2 +-
net/slirp.c | 2 +-
net/socket.c | 8 ++++----
net/tap-bsd.c | 2 +-
net/tap-linux.c | 2 +-
net/tap-solaris.c | 2 +-
net/tap-win32.c | 2 +-
net/tap.c | 2 +-
net/vde.c | 2 +-
notify.c | 2 +-
osdep.c | 2 +-
oslib-posix.c | 2 +-
oslib-win32.c | 4 ++--
posix-aio-compat.c | 6 +++---
qapi/opts-visitor.c | 4 ++--
qapi/qapi-dealloc-visitor.c | 2 +-
qapi/qmp-input-visitor.c | 2 +-
qapi/qmp-output-visitor.c | 2 +-
qemu-bridge-helper.c | 2 +-
qemu-char.c | 4 ++--
qemu-char.h | 8 ++++----
qemu-common.h | 8 ++++----
qemu-config.c | 6 +++---
qemu-coroutine-io.c | 4 ++--
qemu-coroutine-lock.c | 4 ++--
qemu-coroutine-sleep.c | 2 +-
qemu-img.c | 6 +++---
qemu-io.c | 2 +-
qemu-log.c | 2 +-
qemu-option.c | 4 ++--
qemu-os-win32.h | 2 +-
qemu-progress.c | 2 +-
qemu-seccomp.h | 2 +-
qemu-sockets.c | 4 ++--
qemu-thread-posix.c | 2 +-
qemu-thread-win32.c | 2 +-
qemu-timer-common.c | 2 +-
qemu-timer.c | 4 ++--
qemu-tool.c | 8 ++++----
qga/channel-posix.c | 2 +-
qga/commands-posix.c | 4 ++--
qga/main.c | 2 +-
qobject/qdict.c | 2 +-
qobject/qlist.c | 2 +-
qom/container.c | 2 +-
savevm.c | 8 ++++----
slirp/if.c | 2 +-
slirp/ip_input.c | 2 +-
slirp/sbuf.c | 2 +-
slirp/slirp.c | 2 +-
slirp/slirp.h | 4 ++--
spice-qemu-char.c | 2 +-
sysemu.h | 10 +++++-----
target-alpha/int_helper.c | 2 +-
target-alpha/sys_helper.c | 2 +-
target-alpha/translate.c | 2 +-
target-arm/helper.c | 4 ++--
target-arm/translate.c | 2 +-
target-cris/helper.c | 2 +-
target-cris/op_helper.c | 2 +-
target-i386/cpu.c | 4 ++--
target-i386/excp_helper.c | 2 +-
target-i386/int_helper.c | 2 +-
target-i386/kvm.c | 4 ++--
target-i386/seg_helper.c | 2 +-
target-lm32/helper.c | 2 +-
target-lm32/op_helper.c | 2 +-
target-m68k/translate.c | 2 +-
target-microblaze/helper.c | 2 +-
target-microblaze/op_helper.c | 2 +-
target-mips/op_helper.c | 2 +-
target-openrisc/int_helper.c | 2 +-
target-openrisc/interrupt.c | 2 +-
target-openrisc/mmu.c | 2 +-
target-openrisc/translate.c | 4 ++--
target-ppc/int_helper.c | 2 +-
target-ppc/kvm.c | 2 +-
target-ppc/kvm_ppc.c | 2 +-
target-ppc/mem_helper.c | 2 +-
target-ppc/translate.c | 2 +-
target-s390x/cpu.c | 2 +-
target-s390x/helper.c | 2 +-
target-s390x/int_helper.c | 2 +-
target-s390x/kvm.c | 2 +-
target-s390x/misc_helper.c | 4 ++--
target-s390x/translate.c | 2 +-
target-sparc/cpu.h | 2 +-
target-sparc/helper.c | 2 +-
target-sparc/machine.c | 2 +-
target-unicore32/helper.c | 2 +-
target-unicore32/translate.c | 2 +-
target-xtensa/core-dc232b.c | 2 +-
target-xtensa/core-dc233c.c | 2 +-
target-xtensa/core-fsf.c | 2 +-
target-xtensa/helper.c | 2 +-
target-xtensa/op_helper.c | 2 +-
target-xtensa/translate.c | 2 +-
target-xtensa/xtensa-semi.c | 2 +-
tcg/tcg.c | 6 +++---
tests/libqtest.c | 4 ++--
tests/tcg/test-i386.c | 2 +-
tests/test-iov.c | 4 ++--
tests/test-qmp-commands.c | 2 +-
trace/simple.c | 2 +-
translate-all.c | 2 +-
ui/console.c | 2 +-
ui/sdl_zoom.c | 2 +-
ui/spice-core.c | 10 +++++-----
ui/spice-display.c | 4 ++--
ui/vnc-auth-sasl.h | 2 +-
ui/vnc-enc-tight.c | 2 +-
ui/vnc-jobs.c | 2 +-
ui/vnc-palette.h | 2 +-
ui/vnc-tls.c | 2 +-
ui/vnc-tls.h | 2 +-
ui/vnc.c | 8 ++++----
ui/vnc.h | 6 +++---
uri.c | 2 +-
vl.c | 18 +++++++++---------
xen-all.c | 2 +-
xen-mapcache.c | 2 +-
477 files changed, 632 insertions(+), 632 deletions(-)
rename acl.h => include/qemu/acl.h (98%)
rename qemu-barrier.h => include/qemu/atomic.h (96%)
rename bitmap.h => include/qemu/bitmap.h (99%)
rename bitops.h => include/qemu/bitops.h (100%)
rename bswap.h => include/qemu/bswap.h (100%)
rename cache-utils.h => include/qemu/cache-utils.h (100%)
rename compatfd.h => include/qemu/compatfd.h (100%)
rename compiler.h => include/qemu/compiler.h (100%)
rename qemu-config.h => include/qemu/config-file.h (96%)
rename envlist.h => include/qemu/envlist.h (100%)
rename qemu-error.h => include/qemu/error.h (100%)
rename event_notifier.h => include/qemu/event_notifier.h (100%)
rename host-utils.h => include/qemu/host-utils.h (99%)
rename int128.h => include/qemu/int128.h (100%)
rename iov.h => include/qemu/iov.h (100%)
rename qemu-log.h => include/qemu/log.h (100%)
rename main-loop.h => include/qemu/main-loop.h (100%)
rename module.h => include/qemu/module.h (100%)
rename notify.h => include/qemu/notify.h (97%)
rename qemu-option.h => include/qemu/option.h (99%)
rename qemu-option-internal.h => include/qemu/option_int.h (98%)
rename osdep.h => include/qemu/osdep.h (100%)
rename qemu-queue.h => include/qemu/queue.h (99%)
rename range.h => include/qemu/range.h (100%)
rename qemu_socket.h => include/qemu/sockets.h (99%)
rename qemu-thread-posix.h => include/qemu/thread-posix.h (100%)
rename qemu-thread-win32.h => include/qemu/thread-win32.h (100%)
rename qemu-thread.h => include/qemu/thread.h (95%)
rename qemu-timer.h => include/qemu/timer.h (99%)
rename qemu-tls.h => include/qemu/tls.h (100%)
rename uri.h => include/qemu/uri.h (100%)
rename qemu-xattr.h => include/qemu/xattr.h (100%)
diff --git a/acl.c b/acl.c
index e840b9b..81ac255 100644
--- a/acl.c
+++ b/acl.c
@@ -24,7 +24,7 @@
#include "qemu-common.h"
-#include "acl.h"
+#include "qemu/acl.h"
#ifdef CONFIG_FNMATCH
#include <fnmatch.h>
diff --git a/aio.c b/aio.c
index 474377f..ff2d600 100644
--- a/aio.c
+++ b/aio.c
@@ -15,8 +15,8 @@
#include "qemu-common.h"
#include "block/block.h"
-#include "qemu-queue.h"
-#include "qemu_socket.h"
+#include "qemu/queue.h"
+#include "qemu/sockets.h"
typedef struct AioHandler AioHandler;
diff --git a/arch_init.c b/arch_init.c
index d9aa752..2feabd5 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -31,8 +31,8 @@
#include "config.h"
#include "monitor/monitor.h"
#include "sysemu.h"
-#include "bitops.h"
-#include "bitmap.h"
+#include "qemu/bitops.h"
+#include "qemu/bitmap.h"
#include "arch_init.h"
#include "audio/audio.h"
#include "hw/pc.h"
@@ -45,7 +45,7 @@
#include "exec/exec-memory.h"
#include "hw/pcspk.h"
#include "migration/page_cache.h"
-#include "qemu-config.h"
+#include "qemu/config-file.h"
#include "qmp-commands.h"
#include "trace.h"
diff --git a/async.c b/async.c
index f45069e..3cb1d3f 100644
--- a/async.c
+++ b/async.c
@@ -24,7 +24,7 @@
#include "qemu-common.h"
#include "block/aio.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
/* Anchor of the list of Bottom Halves belonging to the context */
static struct QEMUBH *first_bh;
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 2642d65..293895e 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -23,7 +23,7 @@
*/
#include <alsa/asoundlib.h>
#include "qemu-common.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
#include "audio/audio.h"
#if QEMU_GNUC_PREREQ(4, 3)
diff --git a/audio/audio.c b/audio/audio.c
index b942ffd..0e12069 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "audio/audio.h"
#include "monitor/monitor.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
#define AUDIO_CAP "audio"
diff --git a/audio/noaudio.c b/audio/noaudio.c
index fd40758..244fb08 100644
--- a/audio/noaudio.c
+++ b/audio/noaudio.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "audio/audio.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#define AUDIO_CAP "noaudio"
#include "audio_int.h"
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index 2c4a0db..6cb82bb 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -31,8 +31,8 @@
#include <sys/soundcard.h>
#endif
#include "qemu-common.h"
-#include "main-loop.h"
-#include "host-utils.h"
+#include "qemu/main-loop.h"
+#include "qemu/host-utils.h"
#include "audio/audio.h"
#define AUDIO_CAP "oss"
diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index 4950e5b..c7f0eb1 100644
--- a/audio/spiceaudio.c
+++ b/audio/spiceaudio.c
@@ -18,7 +18,7 @@
*/
#include "hw/hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ui/qemu-spice.h"
#define AUDIO_CAP "spice"
diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index 96c0a83..ba8fda8 100644
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "hw/hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "audio/audio.h"
#define AUDIO_CAP "wav"
diff --git a/bitmap.c b/bitmap.c
index a62c8ba..687841d 100644
--- a/bitmap.c
+++ b/bitmap.c
@@ -9,8 +9,8 @@
* Version 2.
*/
-#include "bitops.h"
-#include "bitmap.h"
+#include "qemu/bitops.h"
+#include "qemu/bitmap.h"
/*
* bitmaps provide an array of bits, implemented using an an
diff --git a/bitops.c b/bitops.c
index d9de71f..4c3a836 100644
--- a/bitops.c
+++ b/bitops.c
@@ -11,7 +11,7 @@
* 2 of the License, or (at your option) any later version.
*/
-#include "bitops.h"
+#include "qemu/bitops.h"
#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG)
diff --git a/block-migration.c b/block-migration.c
index 2d2dcbd..4e865a6 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -16,8 +16,8 @@
#include "qemu-common.h"
#include "block/block_int.h"
#include "hw/hw.h"
-#include "qemu-queue.h"
-#include "qemu-timer.h"
+#include "qemu/queue.h"
+#include "qemu/timer.h"
#include "migration/block.h"
#include "migration/migration.h"
#include "blockdev.h"
diff --git a/block.c b/block.c
index 6712188..3019139 100644
--- a/block.c
+++ b/block.c
@@ -27,13 +27,13 @@
#include "monitor/monitor.h"
#include "block/block_int.h"
#include "block/blockjob.h"
-#include "module.h"
+#include "qemu/module.h"
#include "qobject/qjson.h"
#include "sysemu.h"
-#include "notify.h"
+#include "qemu/notify.h"
#include "block/coroutine.h"
#include "qmp-commands.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#ifdef CONFIG_BSD
#include <sys/types.h>
diff --git a/block/blkdebug.c b/block/blkdebug.c
index 84ccc08..9772e0e 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -23,9 +23,9 @@
*/
#include "qemu-common.h"
-#include "qemu-config.h"
+#include "qemu/config-file.h"
#include "block/block_int.h"
-#include "module.h"
+#include "qemu/module.h"
typedef struct BDRVBlkdebugState {
int state;
diff --git a/block/blkverify.c b/block/blkverify.c
index 73be004..648d466 100644
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -8,7 +8,7 @@
*/
#include <stdarg.h>
-#include "qemu_socket.h" /* for EINPROGRESS on Windows */
+#include "qemu/sockets.h" /* for EINPROGRESS on Windows */
#include "block/block_int.h"
typedef struct {
diff --git a/block/bochs.c b/block/bochs.c
index 2cc7524..1b1d9cd 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -24,7 +24,7 @@
*/
#include "qemu-common.h"
#include "block/block_int.h"
-#include "module.h"
+#include "qemu/module.h"
/**************************************************************/
diff --git a/block/cloop.c b/block/cloop.c
index da29ff3..5a0d0d8 100644
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "block/block_int.h"
-#include "module.h"
+#include "qemu/module.h"
#include <zlib.h>
typedef struct BDRVCloopState {
diff --git a/block/cow.c b/block/cow.c
index 1438ae1..a33ce95 100644
--- a/block/cow.c
+++ b/block/cow.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "block/block_int.h"
-#include "module.h"
+#include "qemu/module.h"
/**************************************************************/
/* COW block driver using file system holes */
diff --git a/block/dmg.c b/block/dmg.c
index 6ee505a..ac397dc 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -23,8 +23,8 @@
*/
#include "qemu-common.h"
#include "block/block_int.h"
-#include "bswap.h"
-#include "module.h"
+#include "qemu/bswap.h"
+#include "qemu/module.h"
#include <zlib.h>
typedef struct BDRVDMGState {
diff --git a/block/gluster.c b/block/gluster.c
index 5d86bc1..2afd772 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -17,8 +17,8 @@
*/
#include <glusterfs/api/glfs.h>
#include "block/block_int.h"
-#include "qemu_socket.h"
-#include "uri.h"
+#include "qemu/sockets.h"
+#include "qemu/uri.h"
typedef struct GlusterAIOCB {
BlockDriverAIOCB common;
diff --git a/block/iscsi.c b/block/iscsi.c
index 31e2e0c..2c1940b 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -27,8 +27,8 @@
#include <poll.h>
#include <arpa/inet.h>
#include "qemu-common.h"
-#include "qemu-config.h"
-#include "qemu-error.h"
+#include "qemu/config-file.h"
+#include "qemu/error.h"
#include "block/block_int.h"
#include "trace.h"
#include "hw/scsi-defs.h"
diff --git a/block/nbd.c b/block/nbd.c
index 9d3a3a2..c718d38 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -29,8 +29,8 @@
#include "qemu-common.h"
#include "block/nbd.h"
#include "block/block_int.h"
-#include "module.h"
-#include "qemu_socket.h"
+#include "qemu/module.h"
+#include "qemu/sockets.h"
#include <sys/types.h>
#include <unistd.h>
diff --git a/block/parallels.c b/block/parallels.c
index ae88cd6..3773750 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -25,7 +25,7 @@
*/
#include "qemu-common.h"
#include "block/block_int.h"
-#include "module.h"
+#include "qemu/module.h"
/**************************************************************/
diff --git a/block/qcow.c b/block/qcow.c
index f366711..4276610 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "block/block_int.h"
-#include "module.h"
+#include "qemu/module.h"
#include <zlib.h>
#include "block/aes.h"
#include "migration/migration.h"
diff --git a/block/qcow2.c b/block/qcow2.c
index 29a9465..d368d89 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -23,11 +23,11 @@
*/
#include "qemu-common.h"
#include "block/block_int.h"
-#include "module.h"
+#include "qemu/module.h"
#include <zlib.h>
#include "block/aes.h"
#include "block/qcow2.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "qobject/qerror.h"
#include "trace.h"
diff --git a/block/qed-table.c b/block/qed-table.c
index de845ec..76d2dcc 100644
--- a/block/qed-table.c
+++ b/block/qed-table.c
@@ -13,7 +13,7 @@
*/
#include "trace.h"
-#include "qemu_socket.h" /* for EINPROGRESS on Windows */
+#include "qemu/sockets.h" /* for EINPROGRESS on Windows */
#include "qed.h"
typedef struct {
diff --git a/block/qed.c b/block/qed.c
index 80c0748..c70b120 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -12,7 +12,7 @@
*
*/
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "trace.h"
#include "qed.h"
#include "qobject/qerror.h"
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 16eaad3..023b69f 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -22,10 +22,10 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
-#include "qemu-log.h"
+#include "qemu/timer.h"
+#include "qemu/log.h"
#include "block/block_int.h"
-#include "module.h"
+#include "qemu/module.h"
#include "block/raw-posix-aio.h"
#if defined(__APPLE__) && (__MACH__)
diff --git a/block/raw-win32.c b/block/raw-win32.c
index 411235e..c01621e 100644
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -22,9 +22,9 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "block/block_int.h"
-#include "module.h"
+#include "qemu/module.h"
#include <windows.h>
#include <winioctl.h>
diff --git a/block/raw.c b/block/raw.c
index 6aec93d..75812db 100644
--- a/block/raw.c
+++ b/block/raw.c
@@ -1,7 +1,7 @@
#include "qemu-common.h"
#include "block/block_int.h"
-#include "module.h"
+#include "qemu/module.h"
static int raw_open(BlockDriverState *bs, int flags)
{
diff --git a/block/rbd.c b/block/rbd.c
index 5aad5ec..e3a49b4 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -14,7 +14,7 @@
#include <inttypes.h>
#include "qemu-common.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "block/block_int.h"
#include <rbd/librbd.h>
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 4ad0ca3..626f2d1 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -13,10 +13,10 @@
*/
#include "qemu-common.h"
-#include "qemu-error.h"
-#include "qemu_socket.h"
+#include "qemu/error.h"
+#include "qemu/sockets.h"
#include "block/block_int.h"
-#include "bitops.h"
+#include "qemu/bitops.h"
#define SD_PROTO_VER 0x01
diff --git a/block/vdi.c b/block/vdi.c
index afedb5d..be35268 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -51,7 +51,7 @@
#include "qemu-common.h"
#include "block/block_int.h"
-#include "module.h"
+#include "qemu/module.h"
#include "migration/migration.h"
#if defined(CONFIG_UUID)
diff --git a/block/vmdk.c b/block/vmdk.c
index 800f554..13b8f2d 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -25,7 +25,7 @@
#include "qemu-common.h"
#include "block/block_int.h"
-#include "module.h"
+#include "qemu/module.h"
#include "migration/migration.h"
#include <zlib.h>
diff --git a/block/vpc.c b/block/vpc.c
index 499b237..305697c 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -24,7 +24,7 @@
*/
#include "qemu-common.h"
#include "block/block_int.h"
-#include "module.h"
+#include "qemu/module.h"
#include "migration/migration.h"
/**************************************************************/
diff --git a/block/vvfat.c b/block/vvfat.c
index a63c3ea..83706ce 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -26,7 +26,7 @@
#include <dirent.h>
#include "qemu-common.h"
#include "block/block_int.h"
-#include "module.h"
+#include "qemu/module.h"
#include "migration/migration.h"
#ifndef S_IWGRP
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index 69695ba..bb06e97 100644
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -17,7 +17,7 @@
#include "qmp-commands.h"
#include "trace.h"
#include "block/nbd.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
static int server_fd = -1;
diff --git a/blockdev.c b/blockdev.c
index e83963f..3278eb3 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -12,8 +12,8 @@
#include "block/blockjob.h"
#include "monitor/monitor.h"
#include "qobject/qerror.h"
-#include "qemu-option.h"
-#include "qemu-config.h"
+#include "qemu/option.h"
+#include "qemu/config-file.h"
#include "qapi/qmp-types.h"
#include "sysemu.h"
#include "block/block_int.h"
diff --git a/blockdev.h b/blockdev.h
index 17974c4..94df6d5 100644
--- a/blockdev.h
+++ b/blockdev.h
@@ -12,7 +12,7 @@
#include "block/block.h"
#include "qapi/error.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
void blockdev_mark_auto_del(BlockDriverState *bs);
void blockdev_auto_del(BlockDriverState *bs);
diff --git a/blockjob.c b/blockjob.c
index 83febba..d77e51a 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -33,7 +33,7 @@
#include "qobject/qjson.h"
#include "block/coroutine.h"
#include "qmp-commands.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
void *block_job_create(const BlockJobType *job_type, BlockDriverState *bs,
int64_t speed, BlockDriverCompletionFunc *cb,
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 095ae8e..1dc0330 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -31,8 +31,8 @@
/* For tb_lock */
#include "cpu.h"
#include "tcg.h"
-#include "qemu-timer.h"
-#include "envlist.h"
+#include "qemu/timer.h"
+#include "qemu/envlist.h"
#define DEBUG_LOGFILE "/tmp/qemu.log"
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index ef53e68..233bea0 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -146,7 +146,7 @@ int get_osversion(void);
void fork_start(void);
void fork_end(int child);
-#include "qemu-log.h"
+#include "qemu/log.h"
/* strace.c */
void
diff --git a/bt-host.c b/bt-host.c
index 65aaca3..4f5f9f9 100644
--- a/bt-host.c
+++ b/bt-host.c
@@ -19,7 +19,7 @@
#include "qemu-common.h"
#include "bt-host.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
#ifndef _WIN32
# include <errno.h>
diff --git a/bt-vhci.c b/bt-vhci.c
index 13c0e53..f5d856a 100644
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -20,7 +20,7 @@
#include "qemu-common.h"
#include "bt-host.h"
#include "hw/bt.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
#define VHCI_DEV "/dev/vhci"
#define VHCI_UDEV "/dev/hci_vhci"
diff --git a/buffered_file.c b/buffered_file.c
index 068c0d7..b549163 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -15,7 +15,7 @@
#include "qemu-common.h"
#include "hw/hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "buffered_file.h"
//#define DEBUG_BUFFERED_FILE
diff --git a/cache-utils.c b/cache-utils.c
index 2db5af2..b94013a 100644
--- a/cache-utils.c
+++ b/cache-utils.c
@@ -1,4 +1,4 @@
-#include "cache-utils.h"
+#include "qemu/cache-utils.h"
#if defined(_ARCH_PPC)
struct qemu_cache_conf qemu_cache_conf = {
diff --git a/cmd.c b/cmd.c
index 01a8c3a..10a8688 100644
--- a/cmd.c
+++ b/cmd.c
@@ -25,7 +25,7 @@
#include "cmd.h"
#include "block/aio.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
#define _(x) x /* not gettext support yet */
diff --git a/compatfd.c b/compatfd.c
index 42f81ca..9cf3f28 100644
--- a/compatfd.c
+++ b/compatfd.c
@@ -14,7 +14,7 @@
*/
#include "qemu-common.h"
-#include "compatfd.h"
+#include "qemu/compatfd.h"
#include <sys/syscall.h>
#include <pthread.h>
diff --git a/cpu-exec.c b/cpu-exec.c
index 4bc8918..654cfc7 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -20,7 +20,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "tcg.h"
-#include "qemu-barrier.h"
+#include "qemu/atomic.h"
#include "qtest.h"
int tb_invalidated_flag;
diff --git a/cpus.c b/cpus.c
index c4ca93a..16f14f3 100644
--- a/cpus.c
+++ b/cpus.c
@@ -32,14 +32,14 @@
#include "kvm.h"
#include "qmp-commands.h"
-#include "qemu-thread.h"
+#include "qemu/thread.h"
#include "cpus.h"
#include "qtest.h"
-#include "main-loop.h"
-#include "bitmap.h"
+#include "qemu/main-loop.h"
+#include "qemu/bitmap.h"
#ifndef _WIN32
-#include "compatfd.h"
+#include "qemu/compatfd.h"
#endif
#ifdef CONFIG_LINUX
diff --git a/cutils.c b/cutils.c
index 6f9f799..512f7fa 100644
--- a/cutils.c
+++ b/cutils.c
@@ -22,11 +22,11 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include <math.h>
-#include "qemu_socket.h"
-#include "iov.h"
+#include "qemu/sockets.h"
+#include "qemu/iov.h"
void strpadcpy(char *buf, int buf_size, const char *str, char pad)
{
diff --git a/device_tree.c b/device_tree.c
index a923613..c3e1ba4 100644
--- a/device_tree.c
+++ b/device_tree.c
@@ -22,8 +22,8 @@
#include "qemu-common.h"
#include "device_tree.h"
#include "hw/loader.h"
-#include "qemu-option.h"
-#include "qemu-config.h"
+#include "qemu/option.h"
+#include "qemu/config-file.h"
#include <libfdt.h>
diff --git a/dma-helpers.c b/dma-helpers.c
index 3f09dcb..402b0d4 100644
--- a/dma-helpers.c
+++ b/dma-helpers.c
@@ -9,8 +9,8 @@
#include "dma.h"
#include "trace.h"
-#include "range.h"
-#include "qemu-thread.h"
+#include "qemu/range.h"
+#include "qemu/thread.h"
/* #define DEBUG_IOMMU */
diff --git a/envlist.c b/envlist.c
index f2303cd..ff99fc4 100644
--- a/envlist.c
+++ b/envlist.c
@@ -4,8 +4,8 @@
#include <string.h>
#include <unistd.h>
-#include "qemu-queue.h"
-#include "envlist.h"
+#include "qemu/queue.h"
+#include "qemu/envlist.h"
struct envlist_entry {
const char *ev_var; /* actual env value */
diff --git a/event_notifier.c b/event_notifier.c
index f0d10bb..96adcd0 100644
--- a/event_notifier.c
+++ b/event_notifier.c
@@ -11,8 +11,8 @@
*/
#include "qemu-common.h"
-#include "event_notifier.h"
-#include "main-loop.h"
+#include "qemu/event_notifier.h"
+#include "qemu/main-loop.h"
#ifdef CONFIG_EVENTFD
#include <sys/eventfd.h>
diff --git a/exec.c b/exec.c
index 8c17728..acd7a2f 100644
--- a/exec.c
+++ b/exec.c
@@ -29,11 +29,11 @@
#include "tcg.h"
#include "hw/hw.h"
#include "hw/qdev.h"
-#include "osdep.h"
+#include "qemu/osdep.h"
#include "kvm.h"
#include "hw/xen.h"
-#include "qemu-timer.h"
-#include "qemu-config.h"
+#include "qemu/timer.h"
+#include "qemu/config-file.h"
#include "memory.h"
#include "exec/exec-memory.h"
#if defined(CONFIG_USER_ONLY)
diff --git a/fpu/softfloat.h b/fpu/softfloat.h
index d8999b3..0946f07 100644
--- a/fpu/softfloat.h
+++ b/fpu/softfloat.h
@@ -44,7 +44,7 @@ these four paragraphs for those parts of this code that are retained.
#include <inttypes.h>
#include "config-host.h"
-#include "osdep.h"
+#include "qemu/osdep.h"
/*----------------------------------------------------------------------------
| Each of the following `typedef's defines the most convenient type that holds
diff --git a/fsdev/qemu-fsdev-dummy.c b/fsdev/qemu-fsdev-dummy.c
index 4e700dd..cc7eebe 100644
--- a/fsdev/qemu-fsdev-dummy.c
+++ b/fsdev/qemu-fsdev-dummy.c
@@ -13,7 +13,7 @@
#include <stdio.h>
#include <string.h>
#include "qemu-fsdev.h"
-#include "qemu-config.h"
+#include "qemu/config-file.h"
int qemu_fsdev_add(QemuOpts *opts)
{
diff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c
index e20202a..4cc04d4 100644
--- a/fsdev/qemu-fsdev.c
+++ b/fsdev/qemu-fsdev.c
@@ -13,10 +13,10 @@
#include <stdio.h>
#include <string.h>
#include "qemu-fsdev.h"
-#include "qemu-queue.h"
-#include "osdep.h"
+#include "qemu/queue.h"
+#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "qemu-config.h"
+#include "qemu/config-file.h"
static QTAILQ_HEAD(FsDriverEntry_head, FsDriverListEntry) fsdriver_entries =
QTAILQ_HEAD_INITIALIZER(fsdriver_entries);
diff --git a/fsdev/qemu-fsdev.h b/fsdev/qemu-fsdev.h
index 1af1f54..9fa45bf 100644
--- a/fsdev/qemu-fsdev.h
+++ b/fsdev/qemu-fsdev.h
@@ -12,7 +12,7 @@
*/
#ifndef QEMU_FSDEV_H
#define QEMU_FSDEV_H
-#include "qemu-option.h"
+#include "qemu/option.h"
#include "file-op-9p.h"
diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
index f9a8270..215db1f 100644
--- a/fsdev/virtfs-proxy-helper.c
+++ b/fsdev/virtfs-proxy-helper.c
@@ -21,8 +21,8 @@
#include <linux/magic.h>
#endif
#include "qemu-common.h"
-#include "qemu_socket.h"
-#include "qemu-xattr.h"
+#include "qemu/sockets.h"
+#include "qemu/xattr.h"
#include "virtio-9p-marshal.h"
#include "hw/9pfs/virtio-9p-proxy.h"
#include "fsdev/virtio-9p-marshal.h"
diff --git a/fsdev/virtio-9p-marshal.c b/fsdev/virtio-9p-marshal.c
index bf980bf..20f308b 100644
--- a/fsdev/virtio-9p-marshal.c
+++ b/fsdev/virtio-9p-marshal.c
@@ -22,9 +22,9 @@
#include <stdint.h>
#include <errno.h>
-#include "compiler.h"
+#include "qemu/compiler.h"
#include "virtio-9p-marshal.h"
-#include "bswap.h"
+#include "qemu/bswap.h"
void v9fs_string_free(V9fsString *str)
{
diff --git a/gdbstub.c b/gdbstub.c
index 9395c82..4b178a6 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -38,7 +38,7 @@
#define MAX_PACKET_LENGTH 4096
#include "cpu.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "kvm.h"
#ifndef TARGET_CPU_MEMORY_RW_DEBUG
diff --git a/hmp.c b/hmp.c
index ce665e5..cc25a41 100644
--- a/hmp.c
+++ b/hmp.c
@@ -16,8 +16,8 @@
#include "hmp.h"
#include "net/net.h"
#include "qemu-char.h"
-#include "qemu-option.h"
-#include "qemu-timer.h"
+#include "qemu/option.h"
+#include "qemu/timer.h"
#include "qmp-commands.h"
#include "monitor/monitor.h"
#include "ui/console.h"
diff --git a/host-utils.c b/host-utils.c
index dc96123..5e3915a 100644
--- a/host-utils.c
+++ b/host-utils.c
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <stdint.h>
-#include "host-utils.h"
+#include "qemu/host-utils.h"
//#define DEBUG_MULDIV
diff --git a/hw/9pfs/codir.c b/hw/9pfs/codir.c
index cd13733..65ad329 100644
--- a/hw/9pfs/codir.c
+++ b/hw/9pfs/codir.c
@@ -13,7 +13,7 @@
*/
#include "fsdev/qemu-fsdev.h"
-#include "qemu-thread.h"
+#include "qemu/thread.h"
#include "block/coroutine.h"
#include "virtio-9p-coth.h"
diff --git a/hw/9pfs/cofile.c b/hw/9pfs/cofile.c
index 6d6dac7..2efebf3 100644
--- a/hw/9pfs/cofile.c
+++ b/hw/9pfs/cofile.c
@@ -13,7 +13,7 @@
*/
#include "fsdev/qemu-fsdev.h"
-#include "qemu-thread.h"
+#include "qemu/thread.h"
#include "block/coroutine.h"
#include "virtio-9p-coth.h"
diff --git a/hw/9pfs/cofs.c b/hw/9pfs/cofs.c
index 4b9ba30..3891050 100644
--- a/hw/9pfs/cofs.c
+++ b/hw/9pfs/cofs.c
@@ -13,7 +13,7 @@
*/
#include "fsdev/qemu-fsdev.h"
-#include "qemu-thread.h"
+#include "qemu/thread.h"
#include "block/coroutine.h"
#include "virtio-9p-coth.h"
diff --git a/hw/9pfs/coxattr.c b/hw/9pfs/coxattr.c
index 08365a6..18ee08d 100644
--- a/hw/9pfs/coxattr.c
+++ b/hw/9pfs/coxattr.c
@@ -13,7 +13,7 @@
*/
#include "fsdev/qemu-fsdev.h"
-#include "qemu-thread.h"
+#include "qemu/thread.h"
#include "block/coroutine.h"
#include "virtio-9p-coth.h"
diff --git a/hw/9pfs/virtio-9p-coth.c b/hw/9pfs/virtio-9p-coth.c
index 958725e..ae6cde8 100644
--- a/hw/9pfs/virtio-9p-coth.c
+++ b/hw/9pfs/virtio-9p-coth.c
@@ -13,7 +13,7 @@
*/
#include "fsdev/qemu-fsdev.h"
-#include "qemu-thread.h"
+#include "qemu/thread.h"
#include "block/coroutine.h"
#include "virtio-9p-coth.h"
diff --git a/hw/9pfs/virtio-9p-coth.h b/hw/9pfs/virtio-9p-coth.h
index 8c48a16..86d5ed4 100644
--- a/hw/9pfs/virtio-9p-coth.h
+++ b/hw/9pfs/virtio-9p-coth.h
@@ -15,7 +15,7 @@
#ifndef _QEMU_VIRTIO_9P_COTH_H
#define _QEMU_VIRTIO_9P_COTH_H
-#include "qemu-thread.h"
+#include "qemu/thread.h"
#include "block/coroutine.h"
#include "virtio-9p.h"
#include <glib.h>
diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index b8220ab..6761bce 100644
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -13,7 +13,7 @@
#include "hw/virtio.h"
#include "hw/pc.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "hw/virtio-pci.h"
#include "virtio-9p.h"
#include "fsdev/qemu-fsdev.h"
diff --git a/hw/9pfs/virtio-9p-handle.c b/hw/9pfs/virtio-9p-handle.c
index f96d17a..e30fdb6 100644
--- a/hw/9pfs/virtio-9p-handle.c
+++ b/hw/9pfs/virtio-9p-handle.c
@@ -19,7 +19,7 @@
#include <grp.h>
#include <sys/socket.h>
#include <sys/un.h>
-#include "qemu-xattr.h"
+#include "qemu/xattr.h"
#include <unistd.h>
#include <linux/fs.h>
#ifdef CONFIG_LINUX_MAGIC_H
diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c
index 33a41d2..1136021 100644
--- a/hw/9pfs/virtio-9p-local.c
+++ b/hw/9pfs/virtio-9p-local.c
@@ -19,7 +19,7 @@
#include <grp.h>
#include <sys/socket.h>
#include <sys/un.h>
-#include "qemu-xattr.h"
+#include "qemu/xattr.h"
#include <libgen.h>
#include <linux/fs.h>
#ifdef CONFIG_LINUX_MAGIC_H
diff --git a/hw/9pfs/virtio-9p-posix-acl.c b/hw/9pfs/virtio-9p-posix-acl.c
index c064017..08bb0e8 100644
--- a/hw/9pfs/virtio-9p-posix-acl.c
+++ b/hw/9pfs/virtio-9p-posix-acl.c
@@ -12,7 +12,7 @@
*/
#include <sys/types.h>
-#include "qemu-xattr.h"
+#include "qemu/xattr.h"
#include "hw/virtio.h"
#include "virtio-9p.h"
#include "fsdev/file-op-9p.h"
diff --git a/hw/9pfs/virtio-9p-xattr.h b/hw/9pfs/virtio-9p-xattr.h
index 9437280..41cc6cb 100644
--- a/hw/9pfs/virtio-9p-xattr.h
+++ b/hw/9pfs/virtio-9p-xattr.h
@@ -13,7 +13,7 @@
#ifndef _QEMU_VIRTIO_9P_XATTR_H
#define _QEMU_VIRTIO_9P_XATTR_H
-#include "qemu-xattr.h"
+#include "qemu/xattr.h"
typedef struct xattr_operations
{
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index ede20ce..0aaf0d2 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -13,7 +13,7 @@
#include "hw/virtio.h"
#include "hw/pc.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "hw/virtio-pci.h"
#include "virtio-9p.h"
#include "fsdev/qemu-fsdev.h"
diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
index 2c0c3ba..406fe52 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -9,7 +9,7 @@
#include "hw/virtio.h"
#include "fsdev/file-op-9p.h"
#include "fsdev/virtio-9p-marshal.h"
-#include "qemu-thread.h"
+#include "qemu/thread.h"
#include "block/coroutine.h"
diff --git a/hw/acpi.h b/hw/acpi.h
index 7337f41..ebb47f7 100644
--- a/hw/acpi.h
+++ b/hw/acpi.h
@@ -123,7 +123,7 @@ uint32_t acpi_pm_tmr_get(ACPIREGS *ar);
void acpi_pm_tmr_init(ACPIREGS *ar, acpi_update_sci_fn update_sci);
void acpi_pm_tmr_reset(ACPIREGS *ar);
-#include "qemu-timer.h"
+#include "qemu/timer.h"
static inline int64_t acpi_pm_tmr_get_clock(void)
{
return muldiv64(qemu_get_clock_ns(vm_clock), PM_TIMER_FREQUENCY,
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 15275cf..cc90476 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -25,7 +25,7 @@
#include "pci.h"
#include "acpi.h"
#include "sysemu.h"
-#include "range.h"
+#include "qemu/range.h"
#include "ioport.h"
#include "fw_cfg.h"
diff --git a/hw/adlib.c b/hw/adlib.c
index d39cd97..07c69fc 100644
--- a/hw/adlib.c
+++ b/hw/adlib.c
@@ -32,7 +32,7 @@
#define ADLIB_KILL_TIMERS 1
#ifdef DEBUG
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#endif
#define dolog(...) AUD_log ("adlib", __VA_ARGS__)
diff --git a/hw/alpha_pci.c b/hw/alpha_pci.c
index 8079a46..08be842 100644
--- a/hw/alpha_pci.c
+++ b/hw/alpha_pci.c
@@ -8,7 +8,7 @@
#include "config.h"
#include "alpha_sys.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "sysemu.h"
diff --git a/hw/apic.c b/hw/apic.c
index 385555e..fa6297b 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -16,12 +16,12 @@
* 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 "qemu-thread.h"
+#include "qemu/thread.h"
#include "apic_internal.h"
#include "apic.h"
#include "ioapic.h"
#include "msi.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "trace.h"
#include "pc.h"
#include "apic-msidef.h"
diff --git a/hw/apic_internal.h b/hw/apic_internal.h
index 4d8ff49..906f053 100644
--- a/hw/apic_internal.h
+++ b/hw/apic_internal.h
@@ -22,7 +22,7 @@
#include "memory.h"
#include "sysbus.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
/* APIC Local Vector Table */
#define APIC_LVT_TIMER 0
diff --git a/hw/applesmc.c b/hw/applesmc.c
index 91e7cb3..c564b60 100644
--- a/hw/applesmc.c
+++ b/hw/applesmc.c
@@ -33,7 +33,7 @@
#include "hw.h"
#include "isa.h"
#include "ui/console.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
/* #define DEBUG_SMC */
diff --git a/hw/arm11mpcore.c b/hw/arm11mpcore.c
index 1bff3d3..0090d40 100644
--- a/hw/arm11mpcore.c
+++ b/hw/arm11mpcore.c
@@ -8,7 +8,7 @@
*/
#include "sysbus.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
/* MPCore private memory region. */
diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index 740ecfb..e7a1678 100644
--- a/hw/arm_boot.c
+++ b/hw/arm_boot.c
@@ -15,7 +15,7 @@
#include "loader.h"
#include "elf.h"
#include "device_tree.h"
-#include "qemu-config.h"
+#include "qemu/config-file.h"
#define KERNEL_ARGS_ADDR 0x100
#define KERNEL_LOAD_ADDR 0x00010000
diff --git a/hw/arm_mptimer.c b/hw/arm_mptimer.c
index fe43cbb..1e7e301 100644
--- a/hw/arm_mptimer.c
+++ b/hw/arm_mptimer.c
@@ -20,7 +20,7 @@
*/
#include "sysbus.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
/* This device implements the per-cpu private timer and watchdog block
* which is used in both the ARM11MPCore and Cortex-A9MP.
diff --git a/hw/arm_sysctl.c b/hw/arm_sysctl.c
index 5f1237b..f17de3a 100644
--- a/hw/arm_sysctl.c
+++ b/hw/arm_sysctl.c
@@ -8,7 +8,7 @@
*/
#include "hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysbus.h"
#include "primecell.h"
#include "sysemu.h"
diff --git a/hw/arm_timer.c b/hw/arm_timer.c
index e3ecce2..b83bd1c 100644
--- a/hw/arm_timer.c
+++ b/hw/arm_timer.c
@@ -8,7 +8,7 @@
*/
#include "sysbus.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-common.h"
#include "qdev.h"
#include "ptimer.h"
diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c
index 154cc5e..3366dad 100644
--- a/hw/armv7m_nvic.c
+++ b/hw/armv7m_nvic.c
@@ -11,7 +11,7 @@
*/
#include "sysbus.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "arm-misc.h"
#include "exec/exec-memory.h"
#include "arm_gic_internal.h"
diff --git a/hw/baum.c b/hw/baum.c
index 3e94f84..97d13ea 100644
--- a/hw/baum.c
+++ b/hw/baum.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "qemu-char.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "usb.h"
#include "baum.h"
#include <brlapi.h>
diff --git a/hw/block-common.c b/hw/block-common.c
index f0196d7..f082d55 100644
--- a/hw/block-common.c
+++ b/hw/block-common.c
@@ -9,7 +9,7 @@
#include "blockdev.h"
#include "hw/block-common.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
void blkconf_serial(BlockConf *conf, char **serial)
{
diff --git a/hw/bt-hci-csr.c b/hw/bt-hci-csr.c
index 0faabbb..e1dcb6d 100644
--- a/hw/bt-hci-csr.c
+++ b/hw/bt-hci-csr.c
@@ -20,7 +20,7 @@
#include "qemu-common.h"
#include "qemu-char.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "irq.h"
#include "bt-host.h"
#include "bt.h"
diff --git a/hw/bt-hci.c b/hw/bt-hci.c
index d2ad57f..da096d8 100644
--- a/hw/bt-hci.c
+++ b/hw/bt-hci.c
@@ -19,7 +19,7 @@
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "usb.h"
#include "bt-host.h"
#include "bt.h"
diff --git a/hw/bt-hid.c b/hw/bt-hid.c
index 0ec0c01..cfa7c14 100644
--- a/hw/bt-hid.c
+++ b/hw/bt-hid.c
@@ -19,7 +19,7 @@
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ui/console.h"
#include "hid.h"
#include "bt.h"
diff --git a/hw/bt-l2cap.c b/hw/bt-l2cap.c
index cb43ee7..ba061c0 100644
--- a/hw/bt-l2cap.c
+++ b/hw/bt-l2cap.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "bt.h"
#define L2CAP_CID_MAX 0x100 /* Between 0x40 and 0x10000 */
diff --git a/hw/cadence_ttc.c b/hw/cadence_ttc.c
index 77b6976..0386677 100644
--- a/hw/cadence_ttc.c
+++ b/hw/cadence_ttc.c
@@ -17,7 +17,7 @@
*/
#include "sysbus.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#ifdef CADENCE_TTC_ERR_DEBUG
#define DB_PRINT(...) do { \
diff --git a/hw/cadence_uart.c b/hw/cadence_uart.c
index f8afc4e..764a185 100644
--- a/hw/cadence_uart.c
+++ b/hw/cadence_uart.c
@@ -18,7 +18,7 @@
#include "sysbus.h"
#include "qemu-char.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#ifdef CADENCE_UART_ERR_DEBUG
#define DB_PRINT(...) do { \
diff --git a/hw/ccid-card-emulated.c b/hw/ccid-card-emulated.c
index 845a764..e508380 100644
--- a/hw/ccid-card-emulated.c
+++ b/hw/ccid-card-emulated.c
@@ -31,7 +31,7 @@
#include <vreader.h>
#include <vcard_emul.h>
-#include "qemu-thread.h"
+#include "qemu/thread.h"
#include "qemu-char.h"
#include "monitor/monitor.h"
#include "hw/ccid.h"
diff --git a/hw/ccid-card-passthru.c b/hw/ccid-card-passthru.c
index f5b4794..48e4228 100644
--- a/hw/ccid-card-passthru.c
+++ b/hw/ccid-card-passthru.c
@@ -9,7 +9,7 @@
*/
#include "qemu-char.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "monitor/monitor.h"
#include "hw/ccid.h"
#include "libcacard/vscard_common.h"
diff --git a/hw/cs4231a.c b/hw/cs4231a.c
index e07b9d6..26d81f8 100644
--- a/hw/cs4231a.c
+++ b/hw/cs4231a.c
@@ -26,7 +26,7 @@
#include "audio/audio.h"
#include "isa.h"
#include "qdev.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
/*
Missing features:
diff --git a/hw/cuda.c b/hw/cuda.c
index 233ab66..e57f387 100644
--- a/hw/cuda.c
+++ b/hw/cuda.c
@@ -25,7 +25,7 @@
#include "hw.h"
#include "ppc_mac.h"
#include "adb.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
/* XXX: implement all timer modes */
diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c
index dbd6148..32f2984 100644
--- a/hw/device-hotplug.c
+++ b/hw/device-hotplug.c
@@ -25,7 +25,7 @@
#include "hw.h"
#include "boards.h"
#include "blockdev.h"
-#include "qemu-config.h"
+#include "qemu/config-file.h"
#include "sysemu.h"
#include "monitor/monitor.h"
diff --git a/hw/dma.c b/hw/dma.c
index 8053ded..abef817 100644
--- a/hw/dma.c
+++ b/hw/dma.c
@@ -23,7 +23,7 @@
*/
#include "hw.h"
#include "isa.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
/* #define DEBUG_DMA */
diff --git a/hw/dp8393x.c b/hw/dp8393x.c
index 7ee3672..96a4b5a 100644
--- a/hw/dp8393x.c
+++ b/hw/dp8393x.c
@@ -18,7 +18,7 @@
*/
#include "hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "net/net.h"
#include "mips.h"
diff --git a/hw/esp-pci.c b/hw/esp-pci.c
index 170e007..5f89683 100644
--- a/hw/esp-pci.c
+++ b/hw/esp-pci.c
@@ -27,7 +27,7 @@
#include "eeprom93xx.h"
#include "esp.h"
#include "trace.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#define TYPE_AM53C974_DEVICE "am53c974"
diff --git a/hw/esp.c b/hw/esp.c
index 84a4e74..b23707d 100644
--- a/hw/esp.c
+++ b/hw/esp.c
@@ -26,7 +26,7 @@
#include "sysbus.h"
#include "esp.h"
#include "trace.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
/*
* On Sparc32, this is the ESP (NCR53C90) part of chip STP2000 (Master I/O),
diff --git a/hw/etraxfs_ser.c b/hw/etraxfs_ser.c
index 5f16b17..50a4a34 100644
--- a/hw/etraxfs_ser.c
+++ b/hw/etraxfs_ser.c
@@ -24,7 +24,7 @@
#include "sysbus.h"
#include "qemu-char.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#define D(x)
diff --git a/hw/etraxfs_timer.c b/hw/etraxfs_timer.c
index 9076a49..01d1ff0 100644
--- a/hw/etraxfs_timer.c
+++ b/hw/etraxfs_timer.c
@@ -23,7 +23,7 @@
*/
#include "sysbus.h"
#include "sysemu.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ptimer.h"
#define D(x)
diff --git a/hw/exynos4210_fimd.c b/hw/exynos4210_fimd.c
index 1ec80ae..d88ea49 100644
--- a/hw/exynos4210_fimd.c
+++ b/hw/exynos4210_fimd.c
@@ -27,7 +27,7 @@
#include "sysbus.h"
#include "ui/console.h"
#include "pixel_ops.h"
-#include "bswap.h"
+#include "qemu/bswap.h"
/* Debug messages configuration */
#define EXYNOS4210_FIMD_DEBUG 0
diff --git a/hw/exynos4210_i2c.c b/hw/exynos4210_i2c.c
index 3f72a5c..7d120a9 100644
--- a/hw/exynos4210_i2c.c
+++ b/hw/exynos4210_i2c.c
@@ -20,7 +20,7 @@
*
*/
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysbus.h"
#include "i2c.h"
diff --git a/hw/exynos4210_mct.c b/hw/exynos4210_mct.c
index 6f94ce2..74efd2b 100644
--- a/hw/exynos4210_mct.c
+++ b/hw/exynos4210_mct.c
@@ -53,7 +53,7 @@
*/
#include "sysbus.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-common.h"
#include "ptimer.h"
diff --git a/hw/exynos4210_pwm.c b/hw/exynos4210_pwm.c
index 0c22828..872ea83 100644
--- a/hw/exynos4210_pwm.c
+++ b/hw/exynos4210_pwm.c
@@ -21,7 +21,7 @@
*/
#include "sysbus.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-common.h"
#include "ptimer.h"
diff --git a/hw/exynos4210_rtc.c b/hw/exynos4210_rtc.c
index 42a4ddc..a93a1c5 100644
--- a/hw/exynos4210_rtc.c
+++ b/hw/exynos4210_rtc.c
@@ -26,12 +26,12 @@
*/
#include "sysbus.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-common.h"
#include "ptimer.h"
#include "hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
#include "exynos4210.h"
diff --git a/hw/fdc.c b/hw/fdc.c
index 25a49e3..b375c64 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -29,14 +29,14 @@
#include "hw.h"
#include "fdc.h"
-#include "qemu-error.h"
-#include "qemu-timer.h"
+#include "qemu/error.h"
+#include "qemu/timer.h"
#include "isa.h"
#include "sysbus.h"
#include "qdev-addr.h"
#include "blockdev.h"
#include "sysemu.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
/********************************************************/
/* debug Floppy devices */
diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c
index 2e54a43..2714fbe 100644
--- a/hw/fw_cfg.c
+++ b/hw/fw_cfg.c
@@ -26,8 +26,8 @@
#include "isa.h"
#include "fw_cfg.h"
#include "sysbus.h"
-#include "qemu-error.h"
-#include "qemu-config.h"
+#include "qemu/error.h"
+#include "qemu/config-file.h"
/* debug firmware config */
//#define DEBUG_FW_CFG
diff --git a/hw/grlib_gptimer.c b/hw/grlib_gptimer.c
index 41770a9..ac35899 100644
--- a/hw/grlib_gptimer.c
+++ b/hw/grlib_gptimer.c
@@ -23,7 +23,7 @@
*/
#include "sysbus.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ptimer.h"
#include "trace.h"
diff --git a/hw/hid.c b/hw/hid.c
index 7935998..0fee3b6 100644
--- a/hw/hid.c
+++ b/hw/hid.c
@@ -24,7 +24,7 @@
*/
#include "hw.h"
#include "ui/console.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "hid.h"
#define HID_USAGE_ERROR_ROLLOVER 0x01
diff --git a/hw/hpet.c b/hw/hpet.c
index 6b5b198..c3ba044 100644
--- a/hw/hpet.c
+++ b/hw/hpet.c
@@ -27,7 +27,7 @@
#include "hw.h"
#include "pc.h"
#include "ui/console.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "hpet_emul.h"
#include "sysbus.h"
#include "mc146818rtc.h"
diff --git a/hw/hw.h b/hw/hw.h
index 1163673..7db3d22 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -12,7 +12,7 @@
#include "irq.h"
#include "migration/file.h"
#include "migration/vmstate.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#ifdef NEED_CPU_H
#if TARGET_LONG_BITS == 64
diff --git a/hw/i8254.c b/hw/i8254.c
index 77bd5e8..2ddd783 100644
--- a/hw/i8254.c
+++ b/hw/i8254.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "pc.h"
#include "isa.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "i8254.h"
#include "i8254_internal.h"
diff --git a/hw/i8254_common.c b/hw/i8254_common.c
index a03d7cd..08ab8d1 100644
--- a/hw/i8254_common.c
+++ b/hw/i8254_common.c
@@ -25,7 +25,7 @@
#include "hw.h"
#include "pc.h"
#include "isa.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "i8254.h"
#include "i8254_internal.h"
diff --git a/hw/i8259.c b/hw/i8259.c
index 46fe358..b0df972 100644
--- a/hw/i8259.c
+++ b/hw/i8259.c
@@ -25,7 +25,7 @@
#include "pc.h"
#include "isa.h"
#include "monitor/monitor.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "i8259_internal.h"
/* debug PIC */
diff --git a/hw/ide/core.c b/hw/ide/core.c
index d683a8c..2860eeb 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -26,8 +26,8 @@
#include <hw/pc.h>
#include <hw/pci.h>
#include <hw/isa.h>
-#include "qemu-error.h"
-#include "qemu-timer.h"
+#include "qemu/error.h"
+#include "qemu/timer.h"
#include "sysemu.h"
#include "dma.h"
#include "hw/block-common.h"
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index f2e4ea4..1be4dbc 100644
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -18,7 +18,7 @@
*/
#include <hw/hw.h>
#include "dma.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include <hw/ide/internal.h>
#include "blockdev.h"
#include "hw/block-common.h"
diff --git a/hw/imx_avic.c b/hw/imx_avic.c
index b1a8fe6..a00fb03 100644
--- a/hw/imx_avic.c
+++ b/hw/imx_avic.c
@@ -16,7 +16,7 @@
#include "hw.h"
#include "sysbus.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#define DEBUG_INT 1
#undef DEBUG_INT /* comment out for debugging */
diff --git a/hw/imx_timer.c b/hw/imx_timer.c
index c28c537..0cf6c25 100644
--- a/hw/imx_timer.c
+++ b/hw/imx_timer.c
@@ -12,7 +12,7 @@
*/
#include "hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ptimer.h"
#include "sysbus.h"
#include "imx.h"
diff --git a/hw/intel-hda.c b/hw/intel-hda.c
index d8e1b23..5cf4a15 100644
--- a/hw/intel-hda.c
+++ b/hw/intel-hda.c
@@ -20,7 +20,7 @@
#include "hw.h"
#include "pci.h"
#include "msi.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "audiodev.h"
#include "intel-hda.h"
#include "intel-hda-defs.h"
diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index 16fec0c..848a6c2 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -23,7 +23,7 @@
#include "kvm.h"
#include "migration/migration.h"
#include "qobject/qerror.h"
-#include "event_notifier.h"
+#include "qemu/event_notifier.h"
#include "qemu-char.h"
#include <sys/mman.h>
diff --git a/hw/kvm/i8254.c b/hw/kvm/i8254.c
index 53d13e3..8ee1c35 100644
--- a/hw/kvm/i8254.c
+++ b/hw/kvm/i8254.c
@@ -22,7 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
#include "hw/i8254.h"
#include "hw/i8254_internal.h"
diff --git a/hw/kvm/pci-assign.c b/hw/kvm/pci-assign.c
index a7652dc..e33b37e 100644
--- a/hw/kvm/pci-assign.c
+++ b/hw/kvm/pci-assign.c
@@ -28,11 +28,11 @@
#include <sys/stat.h>
#include "hw/hw.h"
#include "hw/pc.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "ui/console.h"
#include "hw/loader.h"
#include "monitor/monitor.h"
-#include "range.h"
+#include "qemu/range.h"
#include "sysemu.h"
#include "hw/pci.h"
#include "hw/msi.h"
diff --git a/hw/lance.c b/hw/lance.c
index d0e055c..c269df8 100644
--- a/hw/lance.c
+++ b/hw/lance.c
@@ -37,8 +37,8 @@
#include "sysbus.h"
#include "net/net.h"
-#include "qemu-timer.h"
-#include "qemu_socket.h"
+#include "qemu/timer.h"
+#include "qemu/sockets.h"
#include "sun4m.h"
#include "pcnet.h"
#include "trace.h"
diff --git a/hw/leon3.c b/hw/leon3.c
index 449b9b5..c694eb8 100644
--- a/hw/leon3.c
+++ b/hw/leon3.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ptimer.h"
#include "qemu-char.h"
#include "sysemu.h"
diff --git a/hw/lm32_sys.c b/hw/lm32_sys.c
index bbe03c4..8a186ae 100644
--- a/hw/lm32_sys.c
+++ b/hw/lm32_sys.c
@@ -31,10 +31,10 @@
#include "hw.h"
#include "sysbus.h"
#include "trace.h"
-#include "qemu-log.h"
-#include "qemu-error.h"
+#include "qemu/log.h"
+#include "qemu/error.h"
#include "sysemu.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
enum {
R_CTRL = 0,
diff --git a/hw/lm32_timer.c b/hw/lm32_timer.c
index e9450a0..ce9f8d1 100644
--- a/hw/lm32_timer.c
+++ b/hw/lm32_timer.c
@@ -24,9 +24,9 @@
#include "hw.h"
#include "sysbus.h"
#include "trace.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ptimer.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#define DEFAULT_FREQUENCY (50*1000000)
diff --git a/hw/lm32_uart.c b/hw/lm32_uart.c
index 57066e2..f40ffe3 100644
--- a/hw/lm32_uart.c
+++ b/hw/lm32_uart.c
@@ -26,7 +26,7 @@
#include "sysbus.h"
#include "trace.h"
#include "qemu-char.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
enum {
R_RXTX = 0,
diff --git a/hw/lm832x.c b/hw/lm832x.c
index b14a089..3649e3d 100644
--- a/hw/lm832x.c
+++ b/hw/lm832x.c
@@ -20,7 +20,7 @@
#include "hw.h"
#include "i2c.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ui/console.h"
typedef struct {
diff --git a/hw/m48t59.c b/hw/m48t59.c
index dd6cb37..2987122 100644
--- a/hw/m48t59.c
+++ b/hw/m48t59.c
@@ -23,7 +23,7 @@
*/
#include "hw.h"
#include "nvram.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
#include "sysbus.h"
#include "isa.h"
diff --git a/hw/mac_dbdma.c b/hw/mac_dbdma.c
index ac98fe9..0f4a330 100644
--- a/hw/mac_dbdma.c
+++ b/hw/mac_dbdma.c
@@ -39,7 +39,7 @@
#include "hw.h"
#include "isa.h"
#include "mac_dbdma.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
/* debug DBDMA */
//#define DEBUG_DBDMA
diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index 332a77d..20512fb 100644
--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
#include "mc146818rtc.h"
diff --git a/hw/mcf5206.c b/hw/mcf5206.c
index 42575e4..6d5bab1 100644
--- a/hw/mcf5206.c
+++ b/hw/mcf5206.c
@@ -7,7 +7,7 @@
*/
#include "hw.h"
#include "mcf.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ptimer.h"
#include "sysemu.h"
#include "exec/exec-memory.h"
diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index 4e73c50..5b38072 100644
--- a/hw/mcf5208.c
+++ b/hw/mcf5208.c
@@ -7,7 +7,7 @@
*/
#include "hw.h"
#include "mcf.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ptimer.h"
#include "sysemu.h"
#include "net/net.h"
diff --git a/hw/megasas.c b/hw/megasas.c
index 2b062c3..6612c30 100644
--- a/hw/megasas.c
+++ b/hw/megasas.c
@@ -22,7 +22,7 @@
#include "pci.h"
#include "dma.h"
#include "msix.h"
-#include "iov.h"
+#include "qemu/iov.h"
#include "scsi.h"
#include "scsi-defs.h"
#include "block/block_int.h"
diff --git a/hw/microblaze_boot.c b/hw/microblaze_boot.c
index 1030e9c..e93c256 100644
--- a/hw/microblaze_boot.c
+++ b/hw/microblaze_boot.c
@@ -24,8 +24,8 @@
* THE SOFTWARE.
*/
-#include "qemu-option.h"
-#include "qemu-config.h"
+#include "qemu/option.h"
+#include "qemu/config-file.h"
#include "qemu-common.h"
#include "device_tree.h"
#include "loader.h"
diff --git a/hw/milkymist-ac97.c b/hw/milkymist-ac97.c
index 4414f39..34e1039 100644
--- a/hw/milkymist-ac97.c
+++ b/hw/milkymist-ac97.c
@@ -25,7 +25,7 @@
#include "sysbus.h"
#include "trace.h"
#include "audio/audio.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
enum {
R_AC97_CTRL = 0,
diff --git a/hw/milkymist-hpdmc.c b/hw/milkymist-hpdmc.c
index 2da0293..e8880fc 100644
--- a/hw/milkymist-hpdmc.c
+++ b/hw/milkymist-hpdmc.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "sysbus.h"
#include "trace.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
enum {
R_SYSTEM = 0,
diff --git a/hw/milkymist-memcard.c b/hw/milkymist-memcard.c
index 3515c3c..f0048e0 100644
--- a/hw/milkymist-memcard.c
+++ b/hw/milkymist-memcard.c
@@ -25,7 +25,7 @@
#include "sysbus.h"
#include "sysemu.h"
#include "trace.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "blockdev.h"
#include "sd.h"
diff --git a/hw/milkymist-minimac2.c b/hw/milkymist-minimac2.c
index dbcbaa0..bf60af1 100644
--- a/hw/milkymist-minimac2.c
+++ b/hw/milkymist-minimac2.c
@@ -26,7 +26,7 @@
#include "sysbus.h"
#include "trace.h"
#include "net/net.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "qdev-addr.h"
#include <zlib.h>
diff --git a/hw/milkymist-pfpu.c b/hw/milkymist-pfpu.c
index 0f9ff4a..657662f 100644
--- a/hw/milkymist-pfpu.c
+++ b/hw/milkymist-pfpu.c
@@ -25,8 +25,8 @@
#include "hw.h"
#include "sysbus.h"
#include "trace.h"
-#include "qemu-log.h"
-#include "qemu-error.h"
+#include "qemu/log.h"
+#include "qemu/error.h"
#include <math.h>
/* #define TRACE_EXEC */
diff --git a/hw/milkymist-softusb.c b/hw/milkymist-softusb.c
index 62585c4..cb09210 100644
--- a/hw/milkymist-softusb.c
+++ b/hw/milkymist-softusb.c
@@ -26,7 +26,7 @@
#include "trace.h"
#include "ui/console.h"
#include "hid.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
enum {
R_CTRL = 0,
diff --git a/hw/milkymist-sysctl.c b/hw/milkymist-sysctl.c
index 8878d2b..fe36a98 100644
--- a/hw/milkymist-sysctl.c
+++ b/hw/milkymist-sysctl.c
@@ -25,9 +25,9 @@
#include "sysbus.h"
#include "sysemu.h"
#include "trace.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ptimer.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
enum {
CTRL_ENABLE = (1<<0),
diff --git a/hw/milkymist-tmu2.c b/hw/milkymist-tmu2.c
index 210ceed..985b8b7 100644
--- a/hw/milkymist-tmu2.c
+++ b/hw/milkymist-tmu2.c
@@ -27,7 +27,7 @@
#include "hw.h"
#include "sysbus.h"
#include "trace.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include <X11/Xlib.h>
#include <GL/gl.h>
diff --git a/hw/milkymist-uart.c b/hw/milkymist-uart.c
index 291fe3c..bbf37ec 100644
--- a/hw/milkymist-uart.c
+++ b/hw/milkymist-uart.c
@@ -25,7 +25,7 @@
#include "sysbus.h"
#include "trace.h"
#include "qemu-char.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
enum {
R_RXTX = 0,
diff --git a/hw/milkymist-vgafb.c b/hw/milkymist-vgafb.c
index 6a07bc6..de5d9a0 100644
--- a/hw/milkymist-vgafb.c
+++ b/hw/milkymist-vgafb.c
@@ -28,7 +28,7 @@
#include "ui/console.h"
#include "framebuffer.h"
#include "pixel_ops.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#define BITS 8
#include "milkymist-vgafb_template.h"
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index 5a2e3b3..f7642c5 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -33,7 +33,7 @@
#include "qemu-char.h"
#include "sysemu.h"
#include "audio/audio.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "loader.h"
#include "mips-bios.h"
#include "ide.h"
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index c6dd7e2..3321a2a 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -38,7 +38,7 @@
#include "sysemu.h"
#include "arch_init.h"
#include "boards.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "mips-bios.h"
#include "ide.h"
#include "loader.h"
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 4fff980..28540db 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -17,7 +17,7 @@
#include "sysemu.h"
#include "boards.h"
#include "flash.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "mips-bios.h"
#include "ide.h"
#include "loader.h"
diff --git a/hw/mips_timer.c b/hw/mips_timer.c
index 7aa9004..83c400c 100644
--- a/hw/mips_timer.c
+++ b/hw/mips_timer.c
@@ -22,7 +22,7 @@
#include "hw.h"
#include "mips_cpudevs.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#define TIMER_FREQ 100 * 1000 * 1000
diff --git a/hw/msi.c b/hw/msi.c
index e2273a0..4e707bf 100644
--- a/hw/msi.c
+++ b/hw/msi.c
@@ -19,7 +19,7 @@
*/
#include "msi.h"
-#include "range.h"
+#include "qemu/range.h"
/* Eventually those constants should go to Linux pci_regs.h */
#define PCI_MSI_PENDING_32 0x10
diff --git a/hw/msix.c b/hw/msix.c
index b623cb5..7efeada 100644
--- a/hw/msix.c
+++ b/hw/msix.c
@@ -18,7 +18,7 @@
#include "msi.h"
#include "msix.h"
#include "pci.h"
-#include "range.h"
+#include "qemu/range.h"
#define MSIX_CAP_LENGTH 12
diff --git a/hw/musicpal.c b/hw/musicpal.c
index 6e7990a..14cf8a7 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -16,7 +16,7 @@
#include "sysemu.h"
#include "boards.h"
#include "serial.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ptimer.h"
#include "block/block.h"
#include "flash.h"
diff --git a/hw/nand.c b/hw/nand.c
index 01f3ada..0d949e5 100644
--- a/hw/nand.c
+++ b/hw/nand.c
@@ -22,7 +22,7 @@
# include "flash.h"
# include "blockdev.h"
# include "sysbus.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
# define NAND_CMD_READ0 0x00
# define NAND_CMD_READ1 0x01
diff --git a/hw/omap1.c b/hw/omap1.c
index ad60cc4..ae98c20 100644
--- a/hw/omap1.c
+++ b/hw/omap1.c
@@ -22,7 +22,7 @@
#include "sysemu.h"
#include "soc_dma.h"
#include "blockdev.h"
-#include "range.h"
+#include "qemu/range.h"
#include "sysbus.h"
/* Should signal the TCMI/GPMC */
diff --git a/hw/omap2.c b/hw/omap2.c
index 4278dd1..f492a77 100644
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -23,7 +23,7 @@
#include "arm-misc.h"
#include "omap.h"
#include "sysemu.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-char.h"
#include "flash.h"
#include "soc_dma.h"
diff --git a/hw/omap_dma.c b/hw/omap_dma.c
index 389cb78..8335fb3 100644
--- a/hw/omap_dma.c
+++ b/hw/omap_dma.c
@@ -18,7 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "omap.h"
#include "irq.h"
#include "soc_dma.h"
diff --git a/hw/omap_gptimer.c b/hw/omap_gptimer.c
index 7a14519..4bd6781 100644
--- a/hw/omap_gptimer.c
+++ b/hw/omap_gptimer.c
@@ -18,7 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "omap.h"
/* GP timers */
diff --git a/hw/omap_synctimer.c b/hw/omap_synctimer.c
index 367f26e..b6f3e97 100644
--- a/hw/omap_synctimer.c
+++ b/hw/omap_synctimer.c
@@ -18,7 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "omap.h"
struct omap_synctimer_s {
MemoryRegion iomem;
diff --git a/hw/onenand.c b/hw/onenand.c
index 0b93690..33eaf3a 100644
--- a/hw/onenand.c
+++ b/hw/onenand.c
@@ -26,7 +26,7 @@
#include "memory.h"
#include "exec/exec-memory.h"
#include "sysbus.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
/* 11 for 2kB-page OneNAND ("2nd generation") and 10 for 1kB-page chips */
#define PAGE_SHIFT 11
diff --git a/hw/openrisc_timer.c b/hw/openrisc_timer.c
index 7916e61..d965be7 100644
--- a/hw/openrisc_timer.c
+++ b/hw/openrisc_timer.c
@@ -20,7 +20,7 @@
#include "cpu.h"
#include "hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#define TIMER_FREQ (20 * 1000 * 1000) /* 20MHz */
diff --git a/hw/pc.c b/hw/pc.c
index 07c1b56..1b4ed66 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -50,7 +50,7 @@
#include "memory.h"
#include "exec/exec-memory.h"
#include "arch_init.h"
-#include "bitmap.h"
+#include "qemu/bitmap.h"
/* debug PC/ISA interrupts */
//#define DEBUG_IRQ
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index 0ece4c2..f8f4d74 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -30,7 +30,7 @@
#include "monitor/monitor.h"
#include "scsi.h"
#include "virtio-blk.h"
-#include "qemu-config.h"
+#include "qemu/config-file.h"
#include "blockdev.h"
#include "qapi/error.h"
diff --git a/hw/pci.c b/hw/pci.c
index 7fe848d..f41ecdc 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -29,7 +29,7 @@
#include "net/net.h"
#include "sysemu.h"
#include "loader.h"
-#include "range.h"
+#include "qemu/range.h"
#include "qmp-commands.h"
#include "msi.h"
#include "msix.h"
diff --git a/hw/pci_bridge.c b/hw/pci_bridge.c
index 5c6455f..603e653 100644
--- a/hw/pci_bridge.c
+++ b/hw/pci_bridge.c
@@ -31,7 +31,7 @@
#include "pci_bridge.h"
#include "pci_internals.h"
-#include "range.h"
+#include "qemu/range.h"
/* PCI bridge subsystem vendor ID helper functions */
#define PCI_SSVID_SIZEOF 8
diff --git a/hw/pcie.c b/hw/pcie.c
index 7c92f19..d364d01 100644
--- a/hw/pcie.c
+++ b/hw/pcie.c
@@ -25,7 +25,7 @@
#include "msi.h"
#include "pci_internals.h"
#include "pcie_regs.h"
-#include "range.h"
+#include "qemu/range.h"
//#define DEBUG_PCIE
#ifdef DEBUG_PCIE
diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c
index ea4cabb..f11b0cf 100644
--- a/hw/pcnet-pci.c
+++ b/hw/pcnet-pci.c
@@ -30,7 +30,7 @@
#include "pci.h"
#include "net/net.h"
#include "loader.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "dma.h"
#include "pcnet.h"
diff --git a/hw/pcnet.c b/hw/pcnet.c
index 7fedf13..80cf26d 100644
--- a/hw/pcnet.c
+++ b/hw/pcnet.c
@@ -37,8 +37,8 @@
#include "qdev.h"
#include "net/net.h"
-#include "qemu-timer.h"
-#include "qemu_socket.h"
+#include "qemu/timer.h"
+#include "qemu/sockets.h"
#include "sysemu.h"
#include "pcnet.h"
diff --git a/hw/pcspk.c b/hw/pcspk.c
index e430324..1b2b928 100644
--- a/hw/pcspk.c
+++ b/hw/pcspk.c
@@ -26,7 +26,7 @@
#include "pc.h"
#include "isa.h"
#include "audio/audio.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "i8254.h"
#include "pcspk.h"
diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index 78e1e24..903c2f8 100644
--- a/hw/pflash_cfi01.c
+++ b/hw/pflash_cfi01.c
@@ -39,9 +39,9 @@
#include "hw.h"
#include "flash.h"
#include "block/block.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "exec/exec-memory.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#define PFLASH_BUG(fmt, ...) \
do { \
diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c
index 9387901..3714266 100644
--- a/hw/pflash_cfi02.c
+++ b/hw/pflash_cfi02.c
@@ -37,10 +37,10 @@
#include "hw.h"
#include "flash.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "block/block.h"
#include "exec/exec-memory.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
//#define PFLASH_DEBUG
#ifdef PFLASH_DEBUG
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index 537fc19..60c1bcd 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -28,7 +28,7 @@
#include "pci_host.h"
#include "isa.h"
#include "sysbus.h"
-#include "range.h"
+#include "qemu/range.h"
#include "xen.h"
/*
diff --git a/hw/pl031.c b/hw/pl031.c
index 6cbaf23..be27489 100644
--- a/hw/pl031.c
+++ b/hw/pl031.c
@@ -12,7 +12,7 @@
*/
#include "sysbus.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
//#define DEBUG_PL031
diff --git a/hw/ppc.c b/hw/ppc.c
index 98546de..f39985a 100644
--- a/hw/ppc.c
+++ b/hw/ppc.c
@@ -23,10 +23,10 @@
*/
#include "hw.h"
#include "ppc.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
#include "nvram.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "loader.h"
#include "kvm.h"
#include "kvm_ppc.h"
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 470f7c3..553db61 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -32,7 +32,7 @@
#include "elf.h"
#include "hw/sysbus.h"
#include "exec/exec-memory.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#define BINARY_DEVICE_TREE_FILE "mpc8544ds.dtb"
#define UIMAGE_LOAD_BASE 0
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index a691139..8eadf46 100644
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -29,7 +29,7 @@
#include "sysemu.h"
#include "block/block.h"
#include "boards.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "loader.h"
#include "blockdev.h"
#include "exec/exec-memory.h"
diff --git a/hw/ppc405_uc.c b/hw/ppc405_uc.c
index 544192d..a1e6af3 100644
--- a/hw/ppc405_uc.c
+++ b/hw/ppc405_uc.c
@@ -25,9 +25,9 @@
#include "ppc.h"
#include "ppc405.h"
#include "serial.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "exec/exec-memory.h"
#define DEBUG_OPBA
diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c
index e9e334b..0811c89 100644
--- a/hw/ppc4xx_devs.c
+++ b/hw/ppc4xx_devs.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "ppc.h"
#include "ppc4xx.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "exec/exec-memory.h"
//#define DEBUG_MMIO
diff --git a/hw/ppc_booke.c b/hw/ppc_booke.c
index d51e7fa..a7182be 100644
--- a/hw/ppc_booke.c
+++ b/hw/ppc_booke.c
@@ -23,10 +23,10 @@
*/
#include "hw.h"
#include "ppc.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
#include "nvram.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "loader.h"
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index d431395..25fd195 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -33,7 +33,7 @@
#include "pci_host.h"
#include "ppc.h"
#include "boards.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "ide.h"
#include "loader.h"
#include "mc146818rtc.h"
diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c
index ab1fe4b..1c9d8e2 100644
--- a/hw/ppce500_pci.c
+++ b/hw/ppce500_pci.c
@@ -17,7 +17,7 @@
#include "hw.h"
#include "pci.h"
#include "pci_host.h"
-#include "bswap.h"
+#include "qemu/bswap.h"
#ifdef DEBUG_PCI
#define pci_debug(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
diff --git a/hw/ptimer.c b/hw/ptimer.c
index bc0b3f8..24af6a2 100644
--- a/hw/ptimer.c
+++ b/hw/ptimer.c
@@ -6,9 +6,9 @@
* This code is licensed under the GNU LGPL.
*/
#include "hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ptimer.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
struct ptimer_state
{
diff --git a/hw/ptimer.h b/hw/ptimer.h
index 9d172f7..28fcaf1 100644
--- a/hw/ptimer.h
+++ b/hw/ptimer.h
@@ -9,7 +9,7 @@
#define PTIMER_H
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "migration/vmstate.h"
/* ptimer.c */
diff --git a/hw/pxa2xx_timer.c b/hw/pxa2xx_timer.c
index 77b033b..b28cc55 100644
--- a/hw/pxa2xx_timer.c
+++ b/hw/pxa2xx_timer.c
@@ -8,7 +8,7 @@
*/
#include "hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
#include "pxa.h"
#include "sysbus.h"
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
index 3def428..f55cad3 100644
--- a/hw/qdev-monitor.c
+++ b/hw/qdev-monitor.c
@@ -21,7 +21,7 @@
#include "monitor/monitor.h"
#include "qmp-commands.h"
#include "arch_init.h"
-#include "qemu-config.h"
+#include "qemu/config-file.h"
/*
* Aliases were a bad idea from the start. Let's keep them
diff --git a/hw/qdev.h b/hw/qdev.h
index 69a8855..ef6cd10 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -2,8 +2,8 @@
#define QDEV_H
#include "hw.h"
-#include "qemu-queue.h"
-#include "qemu-option.h"
+#include "qemu/queue.h"
+#include "qemu/option.h"
#include "qapi/visit-core.h"
#include "qom/object.h"
#include "qapi/error.h"
diff --git a/hw/qxl-logger.c b/hw/qxl-logger.c
index fe2878c..3cd85d9 100644
--- a/hw/qxl-logger.c
+++ b/hw/qxl-logger.c
@@ -19,7 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qxl.h"
static const char *qxl_type[] = {
diff --git a/hw/qxl.c b/hw/qxl.c
index 67c40cb..cfe2415 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -21,8 +21,8 @@
#include <zlib.h>
#include "qemu-common.h"
-#include "qemu-timer.h"
-#include "qemu-queue.h"
+#include "qemu/timer.h"
+#include "qemu/queue.h"
#include "monitor/monitor.h"
#include "sysemu.h"
#include "trace.h"
diff --git a/hw/qxl.h b/hw/qxl.h
index 8202c08..fc879d2 100644
--- a/hw/qxl.h
+++ b/hw/qxl.h
@@ -4,7 +4,7 @@
#include "hw.h"
#include "pci.h"
#include "vga_int.h"
-#include "qemu-thread.h"
+#include "qemu/thread.h"
#include "ui/qemu-spice.h"
#include "ui/spice-display.h"
diff --git a/hw/rc4030.c b/hw/rc4030.c
index 9f39b30..7c7ecd0 100644
--- a/hw/rc4030.c
+++ b/hw/rc4030.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "mips.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
/********************************************************/
/* debug rc4030 */
diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index 3ab9895..07eb356 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -54,11 +54,11 @@
#include "hw.h"
#include "pci.h"
#include "dma.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "net/net.h"
#include "loader.h"
#include "sysemu.h"
-#include "iov.h"
+#include "qemu/iov.h"
/* debug RTL8139 card */
//#define DEBUG_RTL8139 1
diff --git a/hw/sb16.c b/hw/sb16.c
index 523ab0d..bb460cc 100644
--- a/hw/sb16.c
+++ b/hw/sb16.c
@@ -26,8 +26,8 @@
#include "audio/audio.h"
#include "isa.h"
#include "qdev.h"
-#include "qemu-timer.h"
-#include "host-utils.h"
+#include "qemu/timer.h"
+#include "qemu/host-utils.h"
#define dolog(...) AUD_log ("sb16", __VA_ARGS__)
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index dfb2631..4741567 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -1,5 +1,5 @@
#include "hw.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "scsi.h"
#include "scsi-defs.h"
#include "qdev.h"
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 1b0afa6..ca050a8 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -29,7 +29,7 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0)
#endif
#include "qemu-common.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "scsi.h"
#include "scsi-defs.h"
#include "sysemu.h"
diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c
index d904534..3bd891a 100644
--- a/hw/scsi-generic.c
+++ b/hw/scsi-generic.c
@@ -12,7 +12,7 @@
*/
#include "qemu-common.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "scsi.h"
#include "blockdev.h"
diff --git a/hw/sd.c b/hw/sd.c
index b3945f7..f4cb66a 100644
--- a/hw/sd.c
+++ b/hw/sd.c
@@ -32,7 +32,7 @@
#include "hw.h"
#include "block/block.h"
#include "sd.h"
-#include "bitmap.h"
+#include "qemu/bitmap.h"
//#define DEBUG_SD 1
diff --git a/hw/serial.c b/hw/serial.c
index 5adbfaf..43bb109 100644
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -25,7 +25,7 @@
#include "serial.h"
#include "qemu-char.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
//#define DEBUG_SERIAL
diff --git a/hw/sh_pci.c b/hw/sh_pci.c
index c0e4e7f..da077fc 100644
--- a/hw/sh_pci.c
+++ b/hw/sh_pci.c
@@ -25,7 +25,7 @@
#include "sh.h"
#include "pci.h"
#include "pci_host.h"
-#include "bswap.h"
+#include "qemu/bswap.h"
#include "exec/exec-memory.h"
typedef struct SHPCIState {
diff --git a/hw/sh_timer.c b/hw/sh_timer.c
index d9d7bf2..7a5aba7 100644
--- a/hw/sh_timer.c
+++ b/hw/sh_timer.c
@@ -10,7 +10,7 @@
#include "hw.h"
#include "sh.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "exec/exec-memory.h"
#include "ptimer.h"
diff --git a/hw/shpc.c b/hw/shpc.c
index a5baf24..bbfc4f2 100644
--- a/hw/shpc.c
+++ b/hw/shpc.c
@@ -1,7 +1,7 @@
#include <strings.h>
#include <stdint.h>
-#include "range.h"
-#include "range.h"
+#include "qemu/range.h"
+#include "qemu/range.h"
#include "shpc.h"
#include "pci.h"
#include "pci_internals.h"
diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c
index 97edebb..f4c8b0b 100644
--- a/hw/slavio_timer.c
+++ b/hw/slavio_timer.c
@@ -23,7 +23,7 @@
*/
#include "sun4m.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ptimer.h"
#include "sysbus.h"
#include "trace.h"
diff --git a/hw/sm501.c b/hw/sm501.c
index c677f20..479976b 100644
--- a/hw/sm501.c
+++ b/hw/sm501.c
@@ -29,7 +29,7 @@
#include "devices.h"
#include "sysbus.h"
#include "qdev-addr.h"
-#include "range.h"
+#include "qemu/range.h"
/*
* Status: 2010/05/07
diff --git a/hw/soc_dma.c b/hw/soc_dma.c
index 03bc846..9e0c6d7 100644
--- a/hw/soc_dma.c
+++ b/hw/soc_dma.c
@@ -18,7 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "soc_dma.h"
static void transfer_mem2mem(struct soc_dma_ch_s *ch)
diff --git a/hw/spitz.c b/hw/spitz.c
index 7e1b258..c0d41d3 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -18,7 +18,7 @@
#include "i2c.h"
#include "ssi.h"
#include "flash.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "devices.h"
#include "sharpsl.h"
#include "ui/console.h"
diff --git a/hw/stellaris.c b/hw/stellaris.c
index 8662566..c6e2304 100644
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -11,7 +11,7 @@
#include "ssi.h"
#include "arm-misc.h"
#include "devices.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "i2c.h"
#include "net/net.h"
#include "boards.h"
diff --git a/hw/strongarm.c b/hw/strongarm.c
index 4847e43..f81eff2 100644
--- a/hw/strongarm.c
+++ b/hw/strongarm.c
@@ -28,7 +28,7 @@
*/
#include "sysbus.h"
#include "strongarm.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "arm-misc.h"
#include "qemu-char.h"
#include "sysemu.h"
diff --git a/hw/sun4m.c b/hw/sun4m.c
index 980908d..482f869 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "sysbus.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sun4m.h"
#include "nvram.h"
#include "sparc32_dma.h"
diff --git a/hw/sun4u.c b/hw/sun4u.c
index 1d20b37..b52d9ef 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -29,7 +29,7 @@
#include "nvram.h"
#include "fdc.h"
#include "net/net.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
#include "boards.h"
#include "firmware_abi.h"
diff --git a/hw/tsc2005.c b/hw/tsc2005.c
index e232628..740ff86 100644
--- a/hw/tsc2005.c
+++ b/hw/tsc2005.c
@@ -19,7 +19,7 @@
*/
#include "hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ui/console.h"
#include "devices.h"
diff --git a/hw/tsc210x.c b/hw/tsc210x.c
index 2b3535d..2076c35 100644
--- a/hw/tsc210x.c
+++ b/hw/tsc210x.c
@@ -21,7 +21,7 @@
#include "hw.h"
#include "audio/audio.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ui/console.h"
#include "omap.h" /* For I2SCodec and uWireSlave */
#include "devices.h"
diff --git a/hw/tusb6010.c b/hw/tusb6010.c
index 5ba8da6..46f0c80 100644
--- a/hw/tusb6010.c
+++ b/hw/tusb6010.c
@@ -19,7 +19,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "usb.h"
#include "omap.h"
#include "irq.h"
diff --git a/hw/twl92230.c b/hw/twl92230.c
index ce699bd..3210b9e 100644
--- a/hw/twl92230.c
+++ b/hw/twl92230.c
@@ -20,7 +20,7 @@
*/
#include "hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "i2c.h"
#include "sysemu.h"
#include "ui/console.h"
diff --git a/hw/usb.h b/hw/usb.h
index 48c8926..ce90b50 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -26,7 +26,7 @@
*/
#include "qdev.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
/* Constants related to the USB / PCI interaction */
#define USB_SBRN 0x60 /* Serial Bus Release Number Register */
diff --git a/hw/usb/core.c b/hw/usb/core.c
index b9f1f7a..3bca86a 100644
--- a/hw/usb/core.c
+++ b/hw/usb/core.c
@@ -25,7 +25,7 @@
*/
#include "qemu-common.h"
#include "hw/usb.h"
-#include "iov.h"
+#include "qemu/iov.h"
#include "trace.h"
void usb_attach(USBPort *port)
diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index 58b7995..558a3b6 100644
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.c
@@ -26,7 +26,7 @@
#include "ui/console.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "hw/hid.h"
/* HID interface requests */
diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index 81142b7..6296130 100644
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -27,10 +27,10 @@
#include "hw/usb.h"
#include "hw/usb/desc.h"
#include "net/net.h"
-#include "qemu-queue.h"
-#include "qemu-config.h"
+#include "qemu/queue.h"
+#include "qemu/config-file.h"
#include "sysemu.h"
-#include "iov.h"
+#include "qemu/iov.h"
/*#define TRAFFIC_DEBUG*/
/* Thanks to NetChip Technologies for donating this product ID.
diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index a466f99..689e361 100644
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -9,7 +9,7 @@
*/
#include "qemu-common.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
#include "qemu-char.h"
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index 99be794..4ed800c 100644
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -35,7 +35,7 @@
*/
#include "qemu-common.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
#include "monitor/monitor.h"
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index c1c7bea..5a1c715 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -8,8 +8,8 @@
*/
#include "qemu-common.h"
-#include "qemu-option.h"
-#include "qemu-config.h"
+#include "qemu/option.h"
+#include "qemu/config-file.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
#include "hw/scsi.h"
diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c
index 4389380..b1a5523 100644
--- a/hw/usb/dev-uas.c
+++ b/hw/usb/dev-uas.c
@@ -10,8 +10,8 @@
*/
#include "qemu-common.h"
-#include "qemu-option.h"
-#include "qemu-config.h"
+#include "qemu/option.h"
+#include "qemu/config-file.h"
#include "trace.h"
#include "hw/usb.h"
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index 1944c2d..e4abb29 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -28,7 +28,7 @@
*/
#include "hw/hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "hw/usb.h"
#include "hw/pci.h"
#include "monitor/monitor.h"
diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c
index 0bb5c7b..46284a5 100644
--- a/hw/usb/hcd-musb.c
+++ b/hw/usb/hcd-musb.c
@@ -21,7 +21,7 @@
* Only host-mode and non-DMA accesses are currently supported.
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "hw/usb.h"
#include "hw/irq.h"
#include "hw/hw.h"
diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index 59c7055..1a4cc4c 100644
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -27,7 +27,7 @@
*/
#include "hw/hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "hw/usb.h"
#include "hw/pci.h"
#include "hw/sysbus.h"
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index c2f08e3..48ae244 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -28,8 +28,8 @@
#include "hw/hw.h"
#include "hw/usb.h"
#include "hw/pci.h"
-#include "qemu-timer.h"
-#include "iov.h"
+#include "qemu/timer.h"
+#include "qemu/iov.h"
#include "dma.h"
#include "trace.h"
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 3a41b06..c0ba81f 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -19,7 +19,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw/hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "hw/usb.h"
#include "hw/pci.h"
#include "hw/msi.h"
diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c
index 1d2ff26..1d4d9c6 100644
--- a/hw/usb/host-linux.c
+++ b/hw/usb/host-linux.c
@@ -31,7 +31,7 @@
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "monitor/monitor.h"
#include "sysemu.h"
#include "trace.h"
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 04dfd5b..833785a 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -26,7 +26,7 @@
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "monitor/monitor.h"
#include "sysemu.h"
diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c
index 3dd09b8..8d8e6c0 100644
--- a/hw/vfio_pci.c
+++ b/hw/vfio_pci.c
@@ -27,7 +27,7 @@
#include <linux/vfio.h>
#include "config.h"
-#include "event_notifier.h"
+#include "qemu/event_notifier.h"
#include "exec/exec-memory.h"
#include "kvm.h"
#include "memory.h"
@@ -35,9 +35,9 @@
#include "msix.h"
#include "pci.h"
#include "qemu-common.h"
-#include "qemu-error.h"
-#include "qemu-queue.h"
-#include "range.h"
+#include "qemu/error.h"
+#include "qemu/queue.h"
+#include "qemu/range.h"
/* #define DEBUG_VFIO */
#ifdef DEBUG_VFIO
diff --git a/hw/vga-isa-mm.c b/hw/vga-isa-mm.c
index 486d375..e15abe3 100644
--- a/hw/vga-isa-mm.c
+++ b/hw/vga-isa-mm.c
@@ -26,7 +26,7 @@
#include "pc.h"
#include "vga_int.h"
#include "pixel_ops.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#define VGA_RAM_SIZE (8192 * 1024)
diff --git a/hw/vga-isa.c b/hw/vga-isa.c
index c7cbded..d3dd3f4 100644
--- a/hw/vga-isa.c
+++ b/hw/vga-isa.c
@@ -28,7 +28,7 @@
#include "pc.h"
#include "vga_int.h"
#include "pixel_ops.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "loader.h"
typedef struct ISAVGAState {
diff --git a/hw/vga-pci.c b/hw/vga-pci.c
index 4609924..d99b5ee 100644
--- a/hw/vga-pci.c
+++ b/hw/vga-pci.c
@@ -28,7 +28,7 @@
#include "pci.h"
#include "vga_int.h"
#include "pixel_ops.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "loader.h"
#define PCI_VGA_IOPORT_OFFSET 0x400
diff --git a/hw/vga.c b/hw/vga.c
index ca07013..08fe0df 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -28,7 +28,7 @@
#include "pci.h"
#include "vga_int.h"
#include "pixel_ops.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "xen.h"
#include "trace.h"
diff --git a/hw/vhost.c b/hw/vhost.c
index c431990..aae7401 100644
--- a/hw/vhost.c
+++ b/hw/vhost.c
@@ -16,7 +16,7 @@
#include <sys/ioctl.h>
#include "vhost.h"
#include "hw/hw.h"
-#include "range.h"
+#include "qemu/range.h"
#include <linux/vhost.h>
#include "exec/exec-memory.h"
diff --git a/hw/vhost_net.c b/hw/vhost_net.c
index 2962b4d..feb124f 100644
--- a/hw/vhost_net.c
+++ b/hw/vhost_net.c
@@ -18,7 +18,7 @@
#include "virtio-net.h"
#include "vhost_net.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "config.h"
diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index 62d3f99..2a69822 100644
--- a/hw/virtex_ml507.c
+++ b/hw/virtex_ml507.c
@@ -32,7 +32,7 @@
#include "device_tree.h"
#include "loader.h"
#include "elf.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "exec/exec-memory.h"
#include "ppc.h"
diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c
index 996f3ca..f77bd58 100644
--- a/hw/virtio-balloon.c
+++ b/hw/virtio-balloon.c
@@ -13,7 +13,7 @@
*
*/
-#include "iov.h"
+#include "qemu/iov.h"
#include "qemu-common.h"
#include "virtio.h"
#include "pc.h"
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index e25cc96..9cc720f 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -12,7 +12,7 @@
*/
#include "qemu-common.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "trace.h"
#include "hw/block-common.h"
#include "blockdev.h"
diff --git a/hw/virtio-console.c b/hw/virtio-console.c
index cffee3d..230c99c 100644
--- a/hw/virtio-console.c
+++ b/hw/virtio-console.c
@@ -11,7 +11,7 @@
*/
#include "qemu-char.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "trace.h"
#include "virtio-serial.h"
diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index b3dbe78..3209cac 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -11,13 +11,13 @@
*
*/
-#include "iov.h"
+#include "qemu/iov.h"
#include "virtio.h"
#include "net/net.h"
#include "net/checksum.h"
#include "net/tap.h"
-#include "qemu-error.h"
-#include "qemu-timer.h"
+#include "qemu/error.h"
+#include "qemu/timer.h"
#include "virtio-net.h"
#include "vhost_net.h"
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index f1a4c06..83c82a2 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -23,14 +23,14 @@
#include "virtio-serial.h"
#include "virtio-scsi.h"
#include "pci.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "msi.h"
#include "msix.h"
#include "loader.h"
#include "kvm.h"
#include "blockdev.h"
#include "virtio-pci.h"
-#include "range.h"
+#include "qemu/range.h"
/* from Linux's linux/virtio_pci.h */
diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index 318bdbd..f350409 100644
--- a/hw/virtio-serial-bus.c
+++ b/hw/virtio-serial-bus.c
@@ -18,9 +18,9 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include "iov.h"
+#include "qemu/iov.h"
#include "monitor/monitor.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "sysbus.h"
#include "trace.h"
#include "virtio-serial.h"
diff --git a/hw/virtio.c b/hw/virtio.c
index 6821092..c9e91fd 100644
--- a/hw/virtio.c
+++ b/hw/virtio.c
@@ -14,9 +14,9 @@
#include <inttypes.h>
#include "trace.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "virtio.h"
-#include "qemu-barrier.h"
+#include "qemu/atomic.h"
/* The alignment to use between consumer and producer parts of vring.
* x86 pagesize again. */
diff --git a/hw/virtio.h b/hw/virtio.h
index 257018a..4a4e2ed 100644
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -18,7 +18,7 @@
#include "net/net.h"
#include "qdev.h"
#include "sysemu.h"
-#include "event_notifier.h"
+#include "qemu/event_notifier.h"
#ifdef CONFIG_LINUX
#include "9p.h"
#endif
diff --git a/hw/vt82c686.c b/hw/vt82c686.c
index 5d7c00c..dbcda42 100644
--- a/hw/vt82c686.c
+++ b/hw/vt82c686.c
@@ -23,7 +23,7 @@
#include "acpi.h"
#include "pm_smbus.h"
#include "sysemu.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
typedef uint32_t pci_addr_t;
#include "pci_host.h"
diff --git a/hw/watchdog.c b/hw/watchdog.c
index daa8936..d5a7d54 100644
--- a/hw/watchdog.c
+++ b/hw/watchdog.c
@@ -20,9 +20,9 @@
*/
#include "qemu-common.h"
-#include "qemu-option.h"
-#include "qemu-config.h"
-#include "qemu-queue.h"
+#include "qemu/option.h"
+#include "qemu/config-file.h"
+#include "qemu/queue.h"
#include "qapi/qmp-types.h"
#include "monitor/monitor.h"
#include "sysemu.h"
diff --git a/hw/watchdog.h b/hw/watchdog.h
index c12a293..3e9a970 100644
--- a/hw/watchdog.h
+++ b/hw/watchdog.h
@@ -22,7 +22,7 @@
#ifndef QEMU_WATCHDOG_H
#define QEMU_WATCHDOG_H
-#include "qemu-queue.h"
+#include "qemu/queue.h"
struct WatchdogTimerModel {
QLIST_ENTRY(WatchdogTimerModel) entry;
diff --git a/hw/wdt_i6300esb.c b/hw/wdt_i6300esb.c
index 4a83474..f1d6e3f 100644
--- a/hw/wdt_i6300esb.c
+++ b/hw/wdt_i6300esb.c
@@ -22,7 +22,7 @@
#include <inttypes.h>
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "watchdog.h"
#include "hw.h"
#include "pci.h"
diff --git a/hw/wdt_ib700.c b/hw/wdt_ib700.c
index 7f6c21d..4475f7b 100644
--- a/hw/wdt_ib700.c
+++ b/hw/wdt_ib700.c
@@ -20,7 +20,7 @@
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "watchdog.h"
#include "hw.h"
#include "isa.h"
diff --git a/hw/xen_backend.c b/hw/xen_backend.c
index f83a1e1..270584f 100644
--- a/hw/xen_backend.c
+++ b/hw/xen_backend.c
@@ -36,7 +36,7 @@
#include "hw.h"
#include "qemu-char.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "xen_backend.h"
#include <xen/grant_table.h>
diff --git a/hw/xen_common.h b/hw/xen_common.h
index 727757a..95bc9a7 100644
--- a/hw/xen_common.h
+++ b/hw/xen_common.h
@@ -16,7 +16,7 @@
#include "hw.h"
#include "xen.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
/*
* We don't support Xen prior to 3.3.0.
diff --git a/hw/xen_domainbuild.c b/hw/xen_domainbuild.c
index db14974..a4272f0 100644
--- a/hw/xen_domainbuild.c
+++ b/hw/xen_domainbuild.c
@@ -1,8 +1,8 @@
#include <signal.h>
#include "xen_backend.h"
#include "xen_domainbuild.h"
-#include "qemu-timer.h"
-#include "qemu-log.h"
+#include "qemu/timer.h"
+#include "qemu/log.h"
#include <xenguest.h>
diff --git a/hw/xen_pt.c b/hw/xen_pt.c
index 42c643d..691315f 100644
--- a/hw/xen_pt.c
+++ b/hw/xen_pt.c
@@ -58,7 +58,7 @@
#include "xen.h"
#include "xen_backend.h"
#include "xen_pt.h"
-#include "range.h"
+#include "qemu/range.h"
#include "exec/exec-memory.h"
#define XEN_PT_NR_IRQS (256)
diff --git a/hw/xen_pt_config_init.c b/hw/xen_pt_config_init.c
index 0a5f82c..54a179a 100644
--- a/hw/xen_pt_config_init.c
+++ b/hw/xen_pt_config_init.c
@@ -12,7 +12,7 @@
* This file implements direct PCI assignment to a HVM guest
*/
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "xen_backend.h"
#include "xen_pt.h"
diff --git a/hw/xgmac.c b/hw/xgmac.c
index 55f0b4f..8c12d54 100644
--- a/hw/xgmac.c
+++ b/hw/xgmac.c
@@ -26,7 +26,7 @@
#include "sysbus.h"
#include "qemu-char.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "net/net.h"
#include "net/checksum.h"
diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c
index 264cb6e..0ccad90 100644
--- a/hw/xilinx_axidma.c
+++ b/hw/xilinx_axidma.c
@@ -23,9 +23,9 @@
*/
#include "sysbus.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "ptimer.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "qdev-addr.h"
#include "stream.h"
diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c
index 9282801..b83c09a 100644
--- a/hw/xilinx_axienet.c
+++ b/hw/xilinx_axienet.c
@@ -23,7 +23,7 @@
*/
#include "sysbus.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "net/net.h"
#include "net/checksum.h"
diff --git a/hw/xilinx_spi.c b/hw/xilinx_spi.c
index 5cdf967..adca63f 100644
--- a/hw/xilinx_spi.c
+++ b/hw/xilinx_spi.c
@@ -26,7 +26,7 @@
#include "sysbus.h"
#include "sysemu.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "fifo.h"
#include "ssi.h"
diff --git a/hw/xilinx_spips.c b/hw/xilinx_spips.c
index f64a782..9021d17 100644
--- a/hw/xilinx_spips.c
+++ b/hw/xilinx_spips.c
@@ -25,7 +25,7 @@
#include "sysbus.h"
#include "sysemu.h"
#include "ptimer.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "fifo.h"
#include "ssi.h"
diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c
index 2e48ca2..68bb43a 100644
--- a/hw/xilinx_timer.c
+++ b/hw/xilinx_timer.c
@@ -24,7 +24,7 @@
#include "sysbus.h"
#include "ptimer.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#define D(x)
diff --git a/hw/xtensa_pic.c b/hw/xtensa_pic.c
index 653ded6..7bb3406 100644
--- a/hw/xtensa_pic.c
+++ b/hw/xtensa_pic.c
@@ -26,8 +26,8 @@
*/
#include "hw.h"
-#include "qemu-log.h"
-#include "qemu-timer.h"
+#include "qemu/log.h"
+#include "qemu/timer.h"
void xtensa_advance_ccount(CPUXtensaState *env, uint32_t d)
{
diff --git a/hw/zynq_slcr.c b/hw/zynq_slcr.c
index 8acba01..626bab4 100644
--- a/hw/zynq_slcr.c
+++ b/hw/zynq_slcr.c
@@ -15,7 +15,7 @@
*/
#include "hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysbus.h"
#include "sysemu.h"
diff --git a/include/audio/audio.h b/include/audio/audio.h
index a70fda9..e7ea397 100644
--- a/include/audio/audio.h
+++ b/include/audio/audio.h
@@ -25,7 +25,7 @@
#define QEMU_AUDIO_H
#include "config-host.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
typedef void (*audio_callback_fn) (void *opaque, int avail);
diff --git a/include/block/aio.h b/include/block/aio.h
index 40053b4..5fe2faf 100644
--- a/include/block/aio.h
+++ b/include/block/aio.h
@@ -15,7 +15,7 @@
#define QEMU_AIO_H
#include "qemu-common.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
typedef struct BlockDriverAIOCB BlockDriverAIOCB;
typedef void BlockDriverCompletionFunc(void *opaque, int ret);
diff --git a/include/block/block.h b/include/block/block.h
index 574ba62..db353ca 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -3,7 +3,7 @@
#include "block/aio.h"
#include "qemu-common.h"
-#include "qemu-option.h"
+#include "qemu/option.h"
#include "block/coroutine.h"
#include "qobject/qobject.h"
#include "qapi-types.h"
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 71dee00..17bd297 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -25,10 +25,10 @@
#define BLOCK_INT_H
#include "block/block.h"
-#include "qemu-option.h"
-#include "qemu-queue.h"
+#include "qemu/option.h"
+#include "qemu/queue.h"
#include "block/coroutine.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qapi-types.h"
#include "qobject/qerror.h"
#include "monitor/monitor.h"
diff --git a/include/block/coroutine.h b/include/block/coroutine.h
index 34c15d4..c31fae3 100644
--- a/include/block/coroutine.h
+++ b/include/block/coroutine.h
@@ -16,8 +16,8 @@
#define QEMU_COROUTINE_H
#include <stdbool.h>
-#include "qemu-queue.h"
-#include "qemu-timer.h"
+#include "qemu/queue.h"
+#include "qemu/timer.h"
/**
* Coroutines are a mechanism for stack switching and can be used for
diff --git a/include/block/coroutine_int.h b/include/block/coroutine_int.h
index 282a3ce..17eb71e 100644
--- a/include/block/coroutine_int.h
+++ b/include/block/coroutine_int.h
@@ -25,7 +25,7 @@
#ifndef QEMU_COROUTINE_INT_H
#define QEMU_COROUTINE_INT_H
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "block/coroutine.h"
typedef enum {
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index 45b044f..fb80504 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -20,7 +20,7 @@
#define CPU_ALL_H
#include "qemu-common.h"
-#include "qemu-tls.h"
+#include "qemu/tls.h"
#include "exec/cpu-common.h"
/* some important defines:
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index 922d2c4..90b6f79 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -9,8 +9,8 @@
#include "exec/poison.h"
#endif
-#include "bswap.h"
-#include "qemu-queue.h"
+#include "qemu/bswap.h"
+#include "qemu/queue.h"
#if !defined(CONFIG_USER_ONLY)
diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h
index 47702dd..7d8c5d7 100644
--- a/include/exec/cpu-defs.h
+++ b/include/exec/cpu-defs.h
@@ -27,8 +27,8 @@
#include <setjmp.h>
#include <inttypes.h>
#include <signal.h>
-#include "osdep.h"
-#include "qemu-queue.h"
+#include "qemu/osdep.h"
+#include "qemu/queue.h"
#include "exec/targphys.h"
#ifndef TARGET_LONG_BITS
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index d377925..0bcb247 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -74,7 +74,7 @@ extern target_ulong gen_opc_pc[OPC_BUF_SIZE];
extern uint8_t gen_opc_instr_start[OPC_BUF_SIZE];
extern uint16_t gen_opc_icount[OPC_BUF_SIZE];
-#include "qemu-log.h"
+#include "qemu/log.h"
void gen_intermediate_code(CPUArchState *env, struct TranslationBlock *tb);
void gen_intermediate_code_pc(CPUArchState *env, struct TranslationBlock *tb);
diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h
index 430cb44..14e0200 100644
--- a/include/exec/gen-icount.h
+++ b/include/exec/gen-icount.h
@@ -1,4 +1,4 @@
-#include "qemu-timer.h"
+#include "qemu/timer.h"
/* Helpers for instruction counting code generation. */
diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_template.h
index e2490f0..2f3ff29 100644
--- a/include/exec/softmmu_template.h
+++ b/include/exec/softmmu_template.h
@@ -21,7 +21,7 @@
* 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 "qemu-timer.h"
+#include "qemu/timer.h"
#include "memory.h"
#define DATA_SIZE (1 << SHIFT)
diff --git a/include/migration/migration.h b/include/migration/migration.h
index 900b09d..375587b 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -16,7 +16,7 @@
#include "qobject/qdict.h"
#include "qemu-common.h"
-#include "notify.h"
+#include "qemu/notify.h"
#include "qapi/error.h"
#include "migration/vmstate.h"
#include "qapi-types.h"
diff --git a/include/net/net.h b/include/net/net.h
index dd2f344..d4aef2d 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -1,10 +1,10 @@
#ifndef QEMU_NET_H
#define QEMU_NET_H
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu-common.h"
#include "qobject/qdict.h"
-#include "qemu-option.h"
+#include "qemu/option.h"
#include "net/queue.h"
#include "migration/vmstate.h"
#include "qapi-types.h"
diff --git a/include/net/slirp.h b/include/net/slirp.h
index b6ab8ba..301921d 100644
--- a/include/net/slirp.h
+++ b/include/net/slirp.h
@@ -26,7 +26,7 @@
#include "qemu-common.h"
#include "qobject/qdict.h"
-#include "qemu-option.h"
+#include "qemu/option.h"
#include "qapi-types.h"
#ifdef CONFIG_SLIRP
diff --git a/include/qapi/error.h b/include/qapi/error.h
index 4d52e73..5cd2f0c 100644
--- a/include/qapi/error.h
+++ b/include/qapi/error.h
@@ -12,7 +12,7 @@
#ifndef ERROR_H
#define ERROR_H
-#include "compiler.h"
+#include "qemu/compiler.h"
#include "qapi-types.h"
#include <stdbool.h>
diff --git a/include/qapi/opts-visitor.h b/include/qapi/opts-visitor.h
index 5408e53..d7e0774 100644
--- a/include/qapi/opts-visitor.h
+++ b/include/qapi/opts-visitor.h
@@ -14,7 +14,7 @@
#define OPTS_VISITOR_H
#include "qapi/visit-core.h"
-#include "qemu-option.h"
+#include "qemu/option.h"
typedef struct OptsVisitor OptsVisitor;
diff --git a/acl.h b/include/qemu/acl.h
similarity index 98%
rename from acl.h
rename to include/qemu/acl.h
index 0ef7804..116487e 100644
--- a/acl.h
+++ b/include/qemu/acl.h
@@ -25,7 +25,7 @@
#ifndef __QEMU_ACL_H__
#define __QEMU_ACL_H__
-#include "qemu-queue.h"
+#include "qemu/queue.h"
typedef struct qemu_acl_entry qemu_acl_entry;
typedef struct qemu_acl qemu_acl;
diff --git a/qemu-barrier.h b/include/qemu/atomic.h
similarity index 96%
rename from qemu-barrier.h
rename to include/qemu/atomic.h
index faa83d2..96a194b 100644
--- a/qemu-barrier.h
+++ b/include/qemu/atomic.h
@@ -6,7 +6,7 @@
#if defined(__i386__)
-#include "compiler.h" /* QEMU_GNUC_PREREQ */
+#include "qemu/compiler.h" /* QEMU_GNUC_PREREQ */
/*
* Because of the strongly ordered x86 storage model, wmb() and rmb() are nops
diff --git a/bitmap.h b/include/qemu/bitmap.h
similarity index 99%
rename from bitmap.h
rename to include/qemu/bitmap.h
index 08755eb..308bbb7 100644
--- a/bitmap.h
+++ b/include/qemu/bitmap.h
@@ -13,7 +13,7 @@
#define BITMAP_H
#include "qemu-common.h"
-#include "bitops.h"
+#include "qemu/bitops.h"
/*
* The available bitmap operations and their rough meaning in the
diff --git a/bitops.h b/include/qemu/bitops.h
similarity index 100%
rename from bitops.h
rename to include/qemu/bitops.h
diff --git a/bswap.h b/include/qemu/bswap.h
similarity index 100%
rename from bswap.h
rename to include/qemu/bswap.h
diff --git a/cache-utils.h b/include/qemu/cache-utils.h
similarity index 100%
rename from cache-utils.h
rename to include/qemu/cache-utils.h
diff --git a/compatfd.h b/include/qemu/compatfd.h
similarity index 100%
rename from compatfd.h
rename to include/qemu/compatfd.h
diff --git a/compiler.h b/include/qemu/compiler.h
similarity index 100%
rename from compiler.h
rename to include/qemu/compiler.h
diff --git a/qemu-config.h b/include/qemu/config-file.h
similarity index 96%
rename from qemu-config.h
rename to include/qemu/config-file.h
index f3c6276..475f564 100644
--- a/qemu-config.h
+++ b/include/qemu/config-file.h
@@ -2,7 +2,7 @@
#define QEMU_CONFIG_H
#include "qapi/error.h"
-#include "qemu-option.h"
+#include "qemu/option.h"
extern QemuOptsList qemu_fsdev_opts;
extern QemuOptsList qemu_virtfs_opts;
diff --git a/envlist.h b/include/qemu/envlist.h
similarity index 100%
rename from envlist.h
rename to include/qemu/envlist.h
diff --git a/qemu-error.h b/include/qemu/error.h
similarity index 100%
rename from qemu-error.h
rename to include/qemu/error.h
diff --git a/event_notifier.h b/include/qemu/event_notifier.h
similarity index 100%
rename from event_notifier.h
rename to include/qemu/event_notifier.h
diff --git a/host-utils.h b/include/qemu/host-utils.h
similarity index 99%
rename from host-utils.h
rename to include/qemu/host-utils.h
index 821db93..5cb0b62 100644
--- a/host-utils.h
+++ b/include/qemu/host-utils.h
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
-#include "compiler.h" /* QEMU_GNUC_PREREQ */
+#include "qemu/compiler.h" /* QEMU_GNUC_PREREQ */
#if defined(__x86_64__)
#define __HAVE_FAST_MULU64__
diff --git a/int128.h b/include/qemu/int128.h
similarity index 100%
rename from int128.h
rename to include/qemu/int128.h
diff --git a/iov.h b/include/qemu/iov.h
similarity index 100%
rename from iov.h
rename to include/qemu/iov.h
diff --git a/qemu-log.h b/include/qemu/log.h
similarity index 100%
rename from qemu-log.h
rename to include/qemu/log.h
diff --git a/main-loop.h b/include/qemu/main-loop.h
similarity index 100%
rename from main-loop.h
rename to include/qemu/main-loop.h
diff --git a/module.h b/include/qemu/module.h
similarity index 100%
rename from module.h
rename to include/qemu/module.h
diff --git a/notify.h b/include/qemu/notify.h
similarity index 97%
rename from notify.h
rename to include/qemu/notify.h
index 03cf26c..4e2e7f0 100644
--- a/notify.h
+++ b/include/qemu/notify.h
@@ -14,7 +14,7 @@
#ifndef QEMU_NOTIFY_H
#define QEMU_NOTIFY_H
-#include "qemu-queue.h"
+#include "qemu/queue.h"
typedef struct Notifier Notifier;
diff --git a/qemu-option.h b/include/qemu/option.h
similarity index 99%
rename from qemu-option.h
rename to include/qemu/option.h
index a068cfb..64d35f6 100644
--- a/qemu-option.h
+++ b/include/qemu/option.h
@@ -27,7 +27,7 @@
#define QEMU_OPTIONS_H
#include <stdint.h>
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qapi/error.h"
#include "qobject/qdict.h"
diff --git a/qemu-option-internal.h b/include/qemu/option_int.h
similarity index 98%
rename from qemu-option-internal.h
rename to include/qemu/option_int.h
index 19fdc1c..cb4eacc 100644
--- a/qemu-option-internal.h
+++ b/include/qemu/option_int.h
@@ -26,7 +26,7 @@
#ifndef QEMU_OPTIONS_INTERNAL_H
#define QEMU_OPTIONS_INTERNAL_H
-#include "qemu-option.h"
+#include "qemu/option.h"
struct QemuOpt {
const char *name;
diff --git a/osdep.h b/include/qemu/osdep.h
similarity index 100%
rename from osdep.h
rename to include/qemu/osdep.h
diff --git a/qemu-queue.h b/include/qemu/queue.h
similarity index 99%
rename from qemu-queue.h
rename to include/qemu/queue.h
index 9288cd8..d433b90 100644
--- a/qemu-queue.h
+++ b/include/qemu/queue.h
@@ -78,7 +78,7 @@
* For details on the use of these macros, see the queue(3) manual page.
*/
-#include "qemu-barrier.h" /* for smp_wmb() */
+#include "qemu/atomic.h" /* for smp_wmb() */
/*
* List definitions.
diff --git a/range.h b/include/qemu/range.h
similarity index 100%
rename from range.h
rename to include/qemu/range.h
diff --git a/qemu_socket.h b/include/qemu/sockets.h
similarity index 99%
rename from qemu_socket.h
rename to include/qemu/sockets.h
index 1f7eea1..5cdbabe 100644
--- a/qemu_socket.h
+++ b/include/qemu/sockets.h
@@ -26,7 +26,7 @@ int inet_aton(const char *cp, struct in_addr *ia);
#endif /* !_WIN32 */
-#include "qemu-option.h"
+#include "qemu/option.h"
#include "qapi/error.h"
#include "qobject/qerror.h"
diff --git a/qemu-thread-posix.h b/include/qemu/thread-posix.h
similarity index 100%
rename from qemu-thread-posix.h
rename to include/qemu/thread-posix.h
diff --git a/qemu-thread-win32.h b/include/qemu/thread-win32.h
similarity index 100%
rename from qemu-thread-win32.h
rename to include/qemu/thread-win32.h
diff --git a/qemu-thread.h b/include/qemu/thread.h
similarity index 95%
rename from qemu-thread.h
rename to include/qemu/thread.h
index 05fdaaf..079e5a1 100644
--- a/qemu-thread.h
+++ b/include/qemu/thread.h
@@ -9,9 +9,9 @@ typedef struct QemuCond QemuCond;
typedef struct QemuThread QemuThread;
#ifdef _WIN32
-#include "qemu-thread-win32.h"
+#include "qemu/thread-win32.h"
#else
-#include "qemu-thread-posix.h"
+#include "qemu/thread-posix.h"
#endif
#define QEMU_THREAD_JOINABLE 0
diff --git a/qemu-timer.h b/include/qemu/timer.h
similarity index 99%
rename from qemu-timer.h
rename to include/qemu/timer.h
index da7e97c..1766b2d 100644
--- a/qemu-timer.h
+++ b/include/qemu/timer.h
@@ -2,8 +2,8 @@
#define QEMU_TIMER_H
#include "qemu-common.h"
-#include "main-loop.h"
-#include "notify.h"
+#include "qemu/main-loop.h"
+#include "qemu/notify.h"
#ifdef __FreeBSD__
#include <sys/param.h>
diff --git a/qemu-tls.h b/include/qemu/tls.h
similarity index 100%
rename from qemu-tls.h
rename to include/qemu/tls.h
diff --git a/uri.h b/include/qemu/uri.h
similarity index 100%
rename from uri.h
rename to include/qemu/uri.h
diff --git a/qemu-xattr.h b/include/qemu/xattr.h
similarity index 100%
rename from qemu-xattr.h
rename to include/qemu/xattr.h
diff --git a/include/qobject/qdict.h b/include/qobject/qdict.h
index c3dc2db..560dad8 100644
--- a/include/qobject/qdict.h
+++ b/include/qobject/qdict.h
@@ -15,7 +15,7 @@
#include "qobject/qobject.h"
#include "qobject/qlist.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include <stdint.h>
#define QDICT_BUCKET_MAX 512
diff --git a/include/qobject/qerror.h b/include/qobject/qerror.h
index 26c5fca..eca45b0 100644
--- a/include/qobject/qerror.h
+++ b/include/qobject/qerror.h
@@ -14,7 +14,7 @@
#include "qobject/qdict.h"
#include "qobject/qstring.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "qapi/error.h"
#include "qapi-types.h"
#include <stdarg.h>
diff --git a/include/qobject/qjson.h b/include/qobject/qjson.h
index 03faf50..7c65cd4 100644
--- a/include/qobject/qjson.h
+++ b/include/qobject/qjson.h
@@ -15,7 +15,7 @@
#define QJSON_H
#include <stdarg.h>
-#include "compiler.h"
+#include "qemu/compiler.h"
#include "qobject/qobject.h"
#include "qobject/qstring.h"
diff --git a/include/qobject/qlist.h b/include/qobject/qlist.h
index 3f94780..9d3aef8 100644
--- a/include/qobject/qlist.h
+++ b/include/qobject/qlist.h
@@ -14,9 +14,9 @@
#define QLIST_H
#include "qobject/qobject.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu-common.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
typedef struct QListEntry {
QObject *value;
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 48ee709..089e352 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -21,7 +21,7 @@
#define QEMU_CPU_H
#include "qom/object.h"
-#include "qemu-thread.h"
+#include "qemu/thread.h"
/**
* SECTION:cpu
diff --git a/include/qom/object.h b/include/qom/object.h
index cc75fee..b335d07 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -17,7 +17,7 @@
#include <glib.h>
#include <stdint.h>
#include <stdbool.h>
-#include "qemu-queue.h"
+#include "qemu/queue.h"
struct Visitor;
struct Error;
diff --git a/include/ui/console.h b/include/ui/console.h
index 77f7314..9dfca8e 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -2,7 +2,7 @@
#define CONSOLE_H
#include "qobject/qdict.h"
-#include "notify.h"
+#include "qemu/notify.h"
#include "monitor/monitor.h"
#include "trace.h"
#include "qapi-types.h"
diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index 3e08be0..73422ad 100644
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -22,8 +22,8 @@
#include <spice.h>
-#include "qemu-option.h"
-#include "qemu-config.h"
+#include "qemu/option.h"
+#include "qemu/config-file.h"
#include "monitor/monitor.h"
extern int using_spice;
diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h
index 3e58380..9f8ce22 100644
--- a/include/ui/spice-display.h
+++ b/include/ui/spice-display.h
@@ -19,7 +19,7 @@
#include <spice/enums.h>
#include <spice/qxl_dev.h>
-#include "qemu-thread.h"
+#include "qemu/thread.h"
#include "ui/console.h"
#include "pflib.h"
#include "sysemu.h"
diff --git a/iohandler.c b/iohandler.c
index fb0bc11..c8ae40b 100644
--- a/iohandler.c
+++ b/iohandler.c
@@ -24,8 +24,8 @@
#include "config-host.h"
#include "qemu-common.h"
-#include "qemu-queue.h"
-#include "main-loop.h"
+#include "qemu/queue.h"
+#include "qemu/main-loop.h"
#ifndef _WIN32
#include <sys/wait.h>
diff --git a/iov.c b/iov.c
index ae17e7d..627444b 100644
--- a/iov.c
+++ b/iov.c
@@ -16,7 +16,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include "iov.h"
+#include "qemu/iov.h"
#ifdef _WIN32
# include <windows.h>
diff --git a/kvm-all.c b/kvm-all.c
index 0aeb5f1..2427140 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -21,18 +21,18 @@
#include <linux/kvm.h>
#include "qemu-common.h"
-#include "qemu-barrier.h"
-#include "qemu-option.h"
-#include "qemu-config.h"
+#include "qemu/atomic.h"
+#include "qemu/option.h"
+#include "qemu/config-file.h"
#include "sysemu.h"
#include "hw/hw.h"
#include "hw/msi.h"
#include "exec/gdbstub.h"
#include "kvm.h"
-#include "bswap.h"
+#include "qemu/bswap.h"
#include "memory.h"
#include "exec/exec-memory.h"
-#include "event_notifier.h"
+#include "qemu/event_notifier.h"
/* This check must be after config-host.h is included */
#ifdef CONFIG_EVENTFD
diff --git a/kvm.h b/kvm.h
index eefcb49..38df4b1 100644
--- a/kvm.h
+++ b/kvm.h
@@ -16,7 +16,7 @@
#include <errno.h>
#include "config-host.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#ifdef CONFIG_KVM
#include <linux/kvm.h>
diff --git a/libcacard/event.c b/libcacard/event.c
index 6192376..2d7500f 100644
--- a/libcacard/event.c
+++ b/libcacard/event.c
@@ -6,7 +6,7 @@
*/
#include "qemu-common.h"
-#include "qemu-thread.h"
+#include "qemu/thread.h"
#include "vcard.h"
#include "vreader.h"
diff --git a/libcacard/vreader.c b/libcacard/vreader.c
index 96d2407..313349b 100644
--- a/libcacard/vreader.c
+++ b/libcacard/vreader.c
@@ -6,7 +6,7 @@
*/
#include "qemu-common.h"
-#include "qemu-thread.h"
+#include "qemu/thread.h"
#include "vcard.h"
#include "vcard_emul.h"
diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c
index b64c93d..2fce52b 100644
--- a/libcacard/vscclient.c
+++ b/libcacard/vscclient.c
@@ -13,8 +13,8 @@
#include <netdb.h>
#include "qemu-common.h"
-#include "qemu-thread.h"
-#include "qemu_socket.h"
+#include "qemu/thread.h"
+#include "qemu/sockets.h"
#include "vscard_common.h"
diff --git a/libfdt_env.h b/libfdt_env.h
index 90d7f3b..7938d73 100644
--- a/libfdt_env.h
+++ b/libfdt_env.h
@@ -19,7 +19,7 @@
#ifndef _LIBFDT_ENV_H
#define _LIBFDT_ENV_H
-#include "bswap.h"
+#include "qemu/bswap.h"
#ifdef HOST_WORDS_BIGENDIAN
#define fdt32_to_cpu(x) (x)
diff --git a/linux-aio.c b/linux-aio.c
index cc995fb..15f39f8 100644
--- a/linux-aio.c
+++ b/linux-aio.c
@@ -9,7 +9,7 @@
*/
#include "qemu-common.h"
#include "block/aio.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "block/raw-posix-aio.h"
#include <sys/eventfd.h>
diff --git a/linux-user/main.c b/linux-user/main.c
index 5d20abd..6fc0fc1 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -28,11 +28,11 @@
#include "qemu.h"
#include "qemu-common.h"
-#include "cache-utils.h"
+#include "qemu/cache-utils.h"
#include "cpu.h"
#include "tcg.h"
-#include "qemu-timer.h"
-#include "envlist.h"
+#include "qemu/timer.h"
+#include "qemu/envlist.h"
#include "elf.h"
#define DEBUG_LOGFILE "/tmp/qemu.log"
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 2cf7937..f3a0774 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -18,7 +18,7 @@
#include "syscall.h"
#include "target_signal.h"
#include "exec/gdbstub.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#if defined(CONFIG_USE_NPTL)
#define THREAD __thread
@@ -217,7 +217,7 @@ unsigned long init_guest_space(unsigned long host_start,
unsigned long guest_start,
bool fixed);
-#include "qemu-log.h"
+#include "qemu/log.h"
/* syscall.c */
int host_to_target_waitstatus(int status);
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index e4291ed..4584479 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -72,7 +72,7 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
#include <sys/epoll.h>
#endif
#ifdef CONFIG_ATTR
-#include "qemu-xattr.h"
+#include "qemu/xattr.h"
#endif
#define termios host_termios
diff --git a/main-loop.c b/main-loop.c
index 154aa5e..a377c35 100644
--- a/main-loop.c
+++ b/main-loop.c
@@ -23,13 +23,13 @@
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "slirp/libslirp.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
#ifndef _WIN32
-#include "compatfd.h"
+#include "qemu/compatfd.h"
static int io_thread_fd = -1;
diff --git a/memory.c b/memory.c
index 7e9b90e..f1b280c 100644
--- a/memory.c
+++ b/memory.c
@@ -16,7 +16,7 @@
#include "memory.h"
#include "exec/exec-memory.h"
#include "ioport.h"
-#include "bitops.h"
+#include "qemu/bitops.h"
#include "kvm.h"
#include <assert.h>
diff --git a/memory.h b/memory.h
index 6adcc40..095dd8f 100644
--- a/memory.h
+++ b/memory.h
@@ -21,10 +21,10 @@
#include "qemu-common.h"
#include "exec/cpu-common.h"
#include "exec/targphys.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "iorange.h"
#include "ioport.h"
-#include "int128.h"
+#include "qemu/int128.h"
typedef struct MemoryRegionOps MemoryRegionOps;
typedef struct MemoryRegion MemoryRegion;
diff --git a/memory_mapping.h b/memory_mapping.h
index ef72b0a..96e7c44 100644
--- a/memory_mapping.h
+++ b/memory_mapping.h
@@ -14,7 +14,7 @@
#ifndef MEMORY_MAPPING_H
#define MEMORY_MAPPING_H
-#include "qemu-queue.h"
+#include "qemu/queue.h"
/* The physical and virtual address in the memory mapping are contiguous. */
typedef struct MemoryMapping {
diff --git a/migration-exec.c b/migration-exec.c
index 8cbde63..9f6a5ef 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -16,7 +16,7 @@
*/
#include "qemu-common.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "migration/migration.h"
#include "buffered_file.h"
#include "block/block.h"
diff --git a/migration-fd.c b/migration-fd.c
index 6b501b4..2b5ed76 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -14,12 +14,12 @@
*/
#include "qemu-common.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "migration/migration.h"
#include "monitor/monitor.h"
#include "buffered_file.h"
#include "block/block.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
//#define DEBUG_MIGRATION_FD
diff --git a/migration-tcp.c b/migration-tcp.c
index 1bc0aab..a5e575c 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -14,7 +14,7 @@
*/
#include "qemu-common.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "migration/migration.h"
#include "buffered_file.h"
#include "block/block.h"
diff --git a/migration-unix.c b/migration-unix.c
index eadc1dc..0db6b30 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -14,7 +14,7 @@
*/
#include "qemu-common.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "migration/migration.h"
#include "buffered_file.h"
#include "block/block.h"
diff --git a/migration.c b/migration.c
index cfcf547..a69e3de 100644
--- a/migration.c
+++ b/migration.c
@@ -19,7 +19,7 @@
#include "buffered_file.h"
#include "sysemu.h"
#include "block/block.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "migration/block.h"
#include "qmp-commands.h"
diff --git a/module.c b/module.c
index c3a6da7..7acc33d 100644
--- a/module.c
+++ b/module.c
@@ -14,8 +14,8 @@
*/
#include "qemu-common.h"
-#include "qemu-queue.h"
-#include "module.h"
+#include "qemu/queue.h"
+#include "qemu/module.h"
typedef struct ModuleEntry
{
diff --git a/monitor.c b/monitor.c
index 68d0a7c..0983d9f 100644
--- a/monitor.c
+++ b/monitor.c
@@ -43,10 +43,10 @@
#include "audio/audio.h"
#include "disas/disas.h"
#include "balloon.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "migration/migration.h"
#include "kvm.h"
-#include "acl.h"
+#include "qemu/acl.h"
#include "qobject/qint.h"
#include "qobject/qfloat.h"
#include "qobject/qlist.h"
@@ -55,7 +55,7 @@
#include "qobject/qjson.h"
#include "qobject/json-streamer.h"
#include "qobject/json-parser.h"
-#include "osdep.h"
+#include "qemu/osdep.h"
#include "cpu.h"
#include "trace.h"
#include "trace/control.h"
@@ -66,7 +66,7 @@
#include "memory.h"
#include "qmp-commands.h"
#include "hmp.h"
-#include "qemu-thread.h"
+#include "qemu/thread.h"
/* for pic/irq_info */
#if defined(TARGET_SPARC)
diff --git a/nbd.c b/nbd.c
index cf88b1c..3390079 100644
--- a/nbd.c
+++ b/nbd.c
@@ -36,8 +36,8 @@
#include <linux/fs.h>
#endif
-#include "qemu_socket.h"
-#include "qemu-queue.h"
+#include "qemu/sockets.h"
+#include "qemu/queue.h"
//#define DEBUG_NBD
diff --git a/net/dump.c b/net/dump.c
index e0a5d74..d050212 100644
--- a/net/dump.c
+++ b/net/dump.c
@@ -24,9 +24,9 @@
#include "clients.h"
#include "qemu-common.h"
-#include "qemu-error.h"
-#include "qemu-log.h"
-#include "qemu-timer.h"
+#include "qemu/error.h"
+#include "qemu/log.h"
+#include "qemu/timer.h"
#include "hub.h"
typedef struct DumpState {
diff --git a/net/hub.c b/net/hub.c
index 81a73b5..5adfce4 100644
--- a/net/hub.c
+++ b/net/hub.c
@@ -16,7 +16,7 @@
#include "net/net.h"
#include "clients.h"
#include "hub.h"
-#include "iov.h"
+#include "qemu/iov.h"
/*
* A hub broadcasts incoming packets to all its ports except the source port.
diff --git a/net/net.c b/net/net.c
index 6a58bab..05d56af 100644
--- a/net/net.c
+++ b/net/net.c
@@ -31,11 +31,11 @@
#include "monitor/monitor.h"
#include "qemu-common.h"
-#include "qemu_socket.h"
-#include "qemu-config.h"
+#include "qemu/sockets.h"
+#include "qemu/config-file.h"
#include "qmp-commands.h"
#include "hw/qdev.h"
-#include "iov.h"
+#include "qemu/iov.h"
#include "qapi-visit.h"
#include "qapi/opts-visitor.h"
#include "qapi/dealloc-visitor.h"
diff --git a/net/queue.c b/net/queue.c
index 542c549..6eaf5b6 100644
--- a/net/queue.c
+++ b/net/queue.c
@@ -22,7 +22,7 @@
*/
#include "net/queue.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "net/net.h"
/* The delivery handler may only return zero if it will call
diff --git a/net/slirp.c b/net/slirp.c
index 11ea751..80b81ab 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -33,7 +33,7 @@
#include "clients.h"
#include "hub.h"
#include "monitor/monitor.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "slirp/libslirp.h"
#include "qemu-char.h"
diff --git a/net/socket.c b/net/socket.c
index 590452b..41075d7 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -27,10 +27,10 @@
#include "clients.h"
#include "monitor/monitor.h"
#include "qemu-common.h"
-#include "qemu-error.h"
-#include "qemu-option.h"
-#include "qemu_socket.h"
-#include "iov.h"
+#include "qemu/error.h"
+#include "qemu/option.h"
+#include "qemu/sockets.h"
+#include "qemu/iov.h"
typedef struct NetSocketState {
NetClientState nc;
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index a1c55ad..80961ff 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -25,7 +25,7 @@
#include "tap_int.h"
#include "qemu-common.h"
#include "sysemu.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#ifdef __NetBSD__
#include <sys/ioctl.h>
diff --git a/net/tap-linux.c b/net/tap-linux.c
index 377df2e..5518fbf 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -32,7 +32,7 @@
#include "sysemu.h"
#include "qemu-common.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#define PATH_NET_TUN "/dev/net/tun"
diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index f228fff..683e7c5 100644
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -38,7 +38,7 @@
#include <net/if.h>
#include <syslog.h>
#include <stropts.h>
-#include "qemu-error.h"
+#include "qemu/error.h"
ssize_t tap_read_packet(int tapfd, uint8_t *buf, int maxlen)
{
diff --git a/net/tap-win32.c b/net/tap-win32.c
index b2a6e73..46ee550 100644
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -32,7 +32,7 @@
#include "clients.h" /* net_init_tap */
#include "net/net.h"
#include "sysemu.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include <stdio.h>
#include <windows.h>
#include <winioctl.h>
diff --git a/net/tap.c b/net/tap.c
index 3b2e311..5febae7 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -38,7 +38,7 @@
#include "monitor/monitor.h"
#include "sysemu.h"
#include "qemu-common.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "net/tap.h"
diff --git a/net/vde.c b/net/vde.c
index 52d4f19..754a141 100644
--- a/net/vde.c
+++ b/net/vde.c
@@ -28,7 +28,7 @@
#include "net/net.h"
#include "clients.h"
#include "qemu-common.h"
-#include "qemu-option.h"
+#include "qemu/option.h"
typedef struct VDEState {
NetClientState nc;
diff --git a/notify.c b/notify.c
index 12282a6..7b7692a 100644
--- a/notify.c
+++ b/notify.c
@@ -14,7 +14,7 @@
*/
#include "qemu-common.h"
-#include "notify.h"
+#include "qemu/notify.h"
void notifier_list_init(NotifierList *list)
{
diff --git a/osdep.c b/osdep.c
index 2af734b..4eacb6c 100644
--- a/osdep.c
+++ b/osdep.c
@@ -47,7 +47,7 @@ extern int madvise(caddr_t, size_t, int);
#include "qemu-common.h"
#include "trace.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "monitor/monitor.h"
static bool fips_enabled = false;
diff --git a/oslib-posix.c b/oslib-posix.c
index dbeb627..13ab0c3 100644
--- a/oslib-posix.c
+++ b/oslib-posix.c
@@ -51,7 +51,7 @@ extern int daemon(int, int);
#include "config-host.h"
#include "sysemu.h"
#include "trace.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#if defined(CONFIG_VALGRIND)
static int running_on_valgrind = -1;
diff --git a/oslib-win32.c b/oslib-win32.c
index 51b33e8..7f0dd07 100644
--- a/oslib-win32.c
+++ b/oslib-win32.c
@@ -28,9 +28,9 @@
#include <windows.h>
#include "config-host.h"
#include "sysemu.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
#include "trace.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
void *qemu_oom_check(void *ptr)
{
diff --git a/posix-aio-compat.c b/posix-aio-compat.c
index 5529515..0609bbb 100644
--- a/posix-aio-compat.c
+++ b/posix-aio-compat.c
@@ -23,13 +23,13 @@
#include <stdlib.h>
#include <stdio.h>
-#include "qemu-queue.h"
-#include "osdep.h"
+#include "qemu/queue.h"
+#include "qemu/osdep.h"
#include "sysemu.h"
#include "qemu-common.h"
#include "trace.h"
#include "block/block_int.h"
-#include "iov.h"
+#include "qemu/iov.h"
#include "block/raw-posix-aio.h"
diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index 4af2468..2d90cfb 100644
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -11,8 +11,8 @@
*/
#include "qapi/opts-visitor.h"
-#include "qemu-queue.h"
-#include "qemu-option-internal.h"
+#include "qemu/queue.h"
+#include "qemu/option_int.h"
#include "qapi/visit-impl.h"
diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c
index 1674783..bbd64f4 100644
--- a/qapi/qapi-dealloc-visitor.c
+++ b/qapi/qapi-dealloc-visitor.c
@@ -12,7 +12,7 @@
*/
#include "qapi/dealloc-visitor.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu-common.h"
#include "qapi/qmp-types.h"
diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index a4d92a6..e4c7f6f 100644
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@@ -13,7 +13,7 @@
#include "qapi/qmp-input-visitor.h"
#include "qapi/visit-impl.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu-common.h"
#include "qapi/qmp-types.h"
#include "qobject/qerror.h"
diff --git a/qapi/qmp-output-visitor.c b/qapi/qmp-output-visitor.c
index 21192b5..09f4a11 100644
--- a/qapi/qmp-output-visitor.c
+++ b/qapi/qmp-output-visitor.c
@@ -13,7 +13,7 @@
#include "qapi/qmp-output-visitor.h"
#include "qapi/visit-impl.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu-common.h"
#include "qapi/qmp-types.h"
#include "qobject/qerror.h"
diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c
index 652eec9..287bfd5 100644
--- a/qemu-bridge-helper.c
+++ b/qemu-bridge-helper.c
@@ -39,7 +39,7 @@
#include <linux/if_bridge.h>
#endif
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "net/tap-linux.h"
diff --git a/qemu-char.c b/qemu-char.c
index 7f2b4ac..a6da6ac 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -25,7 +25,7 @@
#include "monitor/monitor.h"
#include "ui/console.h"
#include "sysemu.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-char.h"
#include "hw/usb.h"
#include "hw/baum.h"
@@ -94,7 +94,7 @@
#endif
#endif
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "ui/qemu-spice.h"
#define READ_BUF_LEN 4096
diff --git a/qemu-char.h b/qemu-char.h
index 5d3f36c..b500023 100644
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -2,12 +2,12 @@
#define QEMU_CHAR_H
#include "qemu-common.h"
-#include "qemu-queue.h"
-#include "qemu-option.h"
-#include "qemu-config.h"
+#include "qemu/queue.h"
+#include "qemu/option.h"
+#include "qemu/config-file.h"
#include "qobject/qobject.h"
#include "qobject/qstring.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
/* character device */
diff --git a/qemu-common.h b/qemu-common.h
index b54612b..bdde24a 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -3,7 +3,7 @@
#ifndef QEMU_COMMON_H
#define QEMU_COMMON_H
-#include "compiler.h"
+#include "qemu/compiler.h"
#include "config-host.h"
#if defined(__arm__) || defined(__sparc__) || defined(__mips__) || defined(__hppa__) || defined(__ia64__)
@@ -120,8 +120,8 @@ extern int use_icount;
/* FIXME: Remove NEED_CPU_H. */
#ifndef NEED_CPU_H
-#include "osdep.h"
-#include "bswap.h"
+#include "qemu/osdep.h"
+#include "qemu/bswap.h"
#else
@@ -457,7 +457,7 @@ static inline bool is_power_of_2(uint64_t value)
/* round down to the nearest power of 2*/
int64_t pow2floor(int64_t value);
-#include "module.h"
+#include "qemu/module.h"
/*
* Implementation of ULEB128 (http://en.wikipedia.org/wiki/LEB128)
diff --git a/qemu-config.c b/qemu-config.c
index e53c444..cea9dd7 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -1,7 +1,7 @@
#include "qemu-common.h"
-#include "qemu-error.h"
-#include "qemu-option.h"
-#include "qemu-config.h"
+#include "qemu/error.h"
+#include "qemu/option.h"
+#include "qemu/config-file.h"
#include "hw/qdev.h"
#include "qapi/error.h"
diff --git a/qemu-coroutine-io.c b/qemu-coroutine-io.c
index 5fae9c7..e8ad1a4 100644
--- a/qemu-coroutine-io.c
+++ b/qemu-coroutine-io.c
@@ -23,9 +23,9 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "block/coroutine.h"
-#include "iov.h"
+#include "qemu/iov.h"
ssize_t coroutine_fn
qemu_co_sendv_recvv(int sockfd, struct iovec *iov, unsigned iov_cnt,
diff --git a/qemu-coroutine-lock.c b/qemu-coroutine-lock.c
index 1feb186..bf0941b 100644
--- a/qemu-coroutine-lock.c
+++ b/qemu-coroutine-lock.c
@@ -25,8 +25,8 @@
#include "qemu-common.h"
#include "block/coroutine.h"
#include "block/coroutine_int.h"
-#include "qemu-queue.h"
-#include "main-loop.h"
+#include "qemu/queue.h"
+#include "qemu/main-loop.h"
#include "trace.h"
static QTAILQ_HEAD(, Coroutine) unlock_bh_queue =
diff --git a/qemu-coroutine-sleep.c b/qemu-coroutine-sleep.c
index 26e6dac..169ce5c 100644
--- a/qemu-coroutine-sleep.c
+++ b/qemu-coroutine-sleep.c
@@ -12,7 +12,7 @@
*/
#include "block/coroutine.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
typedef struct CoSleepCB {
QEMUTimer *ts;
diff --git a/qemu-img.c b/qemu-img.c
index 51373e0..da743fb 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -25,9 +25,9 @@
#include "qapi/qmp-output-visitor.h"
#include "qobject/qjson.h"
#include "qemu-common.h"
-#include "qemu-option.h"
-#include "qemu-error.h"
-#include "osdep.h"
+#include "qemu/option.h"
+#include "qemu/error.h"
+#include "qemu/osdep.h"
#include "sysemu.h"
#include "block/block_int.h"
#include <getopt.h>
diff --git a/qemu-io.c b/qemu-io.c
index c725e37..8fddb02 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -15,7 +15,7 @@
#include <libgen.h>
#include "qemu-common.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
#include "block/block_int.h"
#include "cmd.h"
#include "trace/control.h"
diff --git a/qemu-log.c b/qemu-log.c
index a4c3d1f..b655b30 100644
--- a/qemu-log.c
+++ b/qemu-log.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#ifdef WIN32
static const char *logfilename = "qemu.log";
diff --git a/qemu-option.c b/qemu-option.c
index 235c734..81446ed 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -27,11 +27,11 @@
#include <string.h>
#include "qemu-common.h"
-#include "qemu-error.h"
+#include "qemu/error.h"
#include "qapi/qmp-types.h"
#include "qapi/error.h"
#include "qobject/qerror.h"
-#include "qemu-option-internal.h"
+#include "qemu/option_int.h"
/*
* Extracts the name of an option from the parameter string (p points at the
diff --git a/qemu-os-win32.h b/qemu-os-win32.h
index 8ba466d..21f7565 100644
--- a/qemu-os-win32.h
+++ b/qemu-os-win32.h
@@ -28,7 +28,7 @@
#include <windows.h>
#include <winsock2.h>
-#include "main-loop.h"
+#include "qemu/main-loop.h"
/* Workaround for older versions of MinGW. */
#ifndef ECONNREFUSED
diff --git a/qemu-progress.c b/qemu-progress.c
index 5f1b8df..08d6794 100644
--- a/qemu-progress.c
+++ b/qemu-progress.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
-#include "osdep.h"
+#include "qemu/osdep.h"
#include "sysemu.h"
#include <stdio.h>
diff --git a/qemu-seccomp.h b/qemu-seccomp.h
index b2fc3f8..1189fa2 100644
--- a/qemu-seccomp.h
+++ b/qemu-seccomp.h
@@ -16,7 +16,7 @@
#define QEMU_SECCOMP_H
#include <seccomp.h>
-#include "osdep.h"
+#include "qemu/osdep.h"
int seccomp_start(void);
#endif
diff --git a/qemu-sockets.c b/qemu-sockets.c
index 4a0c0e5..c0335e0 100644
--- a/qemu-sockets.c
+++ b/qemu-sockets.c
@@ -23,9 +23,9 @@
#include <unistd.h>
#include "monitor/monitor.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "qemu-common.h" /* for qemu_isdigit */
-#include "main-loop.h"
+#include "qemu/main-loop.h"
#ifndef AI_ADDRCONFIG
# define AI_ADDRCONFIG 0
diff --git a/qemu-thread-posix.c b/qemu-thread-posix.c
index 8fbabda..b510184 100644
--- a/qemu-thread-posix.c
+++ b/qemu-thread-posix.c
@@ -17,7 +17,7 @@
#include <signal.h>
#include <stdint.h>
#include <string.h>
-#include "qemu-thread.h"
+#include "qemu/thread.h"
static void error_exit(int err, const char *msg)
{
diff --git a/qemu-thread-win32.c b/qemu-thread-win32.c
index 177b398..cd0c5bc 100644
--- a/qemu-thread-win32.c
+++ b/qemu-thread-win32.c
@@ -11,7 +11,7 @@
*
*/
#include "qemu-common.h"
-#include "qemu-thread.h"
+#include "qemu/thread.h"
#include <process.h>
#include <assert.h>
#include <limits.h>
diff --git a/qemu-timer-common.c b/qemu-timer-common.c
index 755e300..16f5e75 100644
--- a/qemu-timer-common.c
+++ b/qemu-timer-common.c
@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include "qemu-timer.h"
+#include "qemu/timer.h"
/***********************************************************/
/* real time host monotonic timer */
diff --git a/qemu-timer.c b/qemu-timer.c
index 86cc0a1..183b249 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -28,7 +28,7 @@
#include "hw/hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#ifdef _WIN32
#include <mmsystem.h>
@@ -472,7 +472,7 @@ static void host_alarm_handler(int host_signum)
#if defined(__linux__)
-#include "compatfd.h"
+#include "qemu/compatfd.h"
static int dynticks_start_timer(struct qemu_alarm_timer *t)
{
diff --git a/qemu-tool.c b/qemu-tool.c
index c9840c6..e3f35bb 100644
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -15,12 +15,12 @@
#include "qemu-common.h"
#include "monitor/monitor.h"
-#include "qemu-timer.h"
-#include "qemu-log.h"
+#include "qemu/timer.h"
+#include "qemu/log.h"
#include "migration/migration.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
#include "sysemu.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "slirp/libslirp.h"
#include <sys/time.h>
diff --git a/qga/channel-posix.c b/qga/channel-posix.c
index d152827..7dc6582 100644
--- a/qga/channel-posix.c
+++ b/qga/channel-posix.c
@@ -1,6 +1,6 @@
#include <glib.h>
#include <termios.h>
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "qga/channel.h"
#ifdef CONFIG_SOLARIS
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 4381182..cc0b134 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -18,8 +18,8 @@
#include "qga/guest-agent-core.h"
#include "qga-qmp-commands.h"
#include "qobject/qerror.h"
-#include "qemu-queue.h"
-#include "host-utils.h"
+#include "qemu/queue.h"
+#include "qemu/host-utils.h"
#ifndef CONFIG_HAS_ENVIRON
#ifdef __APPLE__
diff --git a/qga/main.c b/qga/main.c
index 67fce71..9af45b5 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -25,7 +25,7 @@
#include "qobject/qint.h"
#include "qobject/qjson.h"
#include "qga/guest-agent-core.h"
-#include "module.h"
+#include "qemu/module.h"
#include "signal.h"
#include "qobject/qerror.h"
#include "qapi/qmp-core.h"
diff --git a/qobject/qdict.c b/qobject/qdict.c
index 97a9972..a320506 100644
--- a/qobject/qdict.c
+++ b/qobject/qdict.c
@@ -16,7 +16,7 @@
#include "qobject/qbool.h"
#include "qobject/qstring.h"
#include "qobject/qobject.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu-common.h"
static void qdict_destroy_obj(QObject *obj);
diff --git a/qobject/qlist.c b/qobject/qlist.c
index 7300076..7bb0dce 100644
--- a/qobject/qlist.c
+++ b/qobject/qlist.c
@@ -12,7 +12,7 @@
#include "qobject/qlist.h"
#include "qobject/qobject.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu-common.h"
static void qlist_destroy_obj(QObject *obj);
diff --git a/qom/container.c b/qom/container.c
index ceb0f01..5270a5e 100644
--- a/qom/container.c
+++ b/qom/container.c
@@ -11,7 +11,7 @@
*/
#include "qom/object.h"
-#include "module.h"
+#include "qemu/module.h"
#include <assert.h>
static TypeInfo container_info = {
diff --git a/savevm.c b/savevm.c
index 27ad7a5..b448221 100644
--- a/savevm.c
+++ b/savevm.c
@@ -75,12 +75,12 @@
#include "net/net.h"
#include "monitor/monitor.h"
#include "sysemu.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "audio/audio.h"
#include "migration/migration.h"
-#include "qemu_socket.h"
-#include "qemu-queue.h"
-#include "qemu-timer.h"
+#include "qemu/sockets.h"
+#include "qemu/queue.h"
+#include "qemu/timer.h"
#include "cpus.h"
#include "memory.h"
#include "qmp-commands.h"
diff --git a/slirp/if.c b/slirp/if.c
index 533295d..dcd5faf 100644
--- a/slirp/if.c
+++ b/slirp/if.c
@@ -6,7 +6,7 @@
*/
#include <slirp.h>
-#include "qemu-timer.h"
+#include "qemu/timer.h"
static void
ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead)
diff --git a/slirp/ip_input.c b/slirp/ip_input.c
index 6f4cff8..880bdfd 100644
--- a/slirp/ip_input.c
+++ b/slirp/ip_input.c
@@ -39,7 +39,7 @@
*/
#include <slirp.h>
-#include <osdep.h>
+#include <qemu/osdep.h>
#include "ip_icmp.h"
static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp);
diff --git a/slirp/sbuf.c b/slirp/sbuf.c
index 637f8fe..08ec2b4 100644
--- a/slirp/sbuf.c
+++ b/slirp/sbuf.c
@@ -6,7 +6,7 @@
*/
#include <slirp.h>
-#include <main-loop.h>
+#include <qemu/main-loop.h>
static void sbappendsb(struct sbuf *sb, struct mbuf *m);
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 38e0a21..a064b29 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-char.h"
#include "slirp.h"
#include "hw/hw.h"
diff --git a/slirp/slirp.h b/slirp/slirp.h
index acd0276..09bcec7 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -128,8 +128,8 @@ void free(void *ptr);
#include "debug.h"
-#include "qemu-queue.h"
-#include "qemu_socket.h"
+#include "qemu/queue.h"
+#include "qemu/sockets.h"
#include "slirp/libslirp.h"
#include "ip.h"
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 09aa22d..8d6170d 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -4,7 +4,7 @@
#include <spice.h>
#include <spice-experimental.h>
-#include "osdep.h"
+#include "qemu/osdep.h"
#define dprintf(_scd, _level, _fmt, ...) \
do { \
diff --git a/sysemu.h b/sysemu.h
index 0c39a3a..cc3480b 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -3,12 +3,12 @@
/* Misc. things related to the system emulator. */
#include "qemu-common.h"
-#include "qemu-option.h"
-#include "qemu-queue.h"
-#include "qemu-timer.h"
+#include "qemu/option.h"
+#include "qemu/queue.h"
+#include "qemu/timer.h"
#include "qapi-types.h"
-#include "notify.h"
-#include "main-loop.h"
+#include "qemu/notify.h"
+#include "qemu/main-loop.h"
/* vl.c */
diff --git a/target-alpha/int_helper.c b/target-alpha/int_helper.c
index 1d832f0..c9b42b6 100644
--- a/target-alpha/int_helper.c
+++ b/target-alpha/int_helper.c
@@ -19,7 +19,7 @@
#include "cpu.h"
#include "helper.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
uint64_t helper_umulh(uint64_t op1, uint64_t op2)
diff --git a/target-alpha/sys_helper.c b/target-alpha/sys_helper.c
index 40ca49c..2bc2b02 100644
--- a/target-alpha/sys_helper.c
+++ b/target-alpha/sys_helper.c
@@ -20,7 +20,7 @@
#include "cpu.h"
#include "helper.h"
#include "sysemu.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
uint64_t helper_load_pcc(CPUAlphaState *env)
diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 8d73b4b..6d06cb5 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -19,7 +19,7 @@
#include "cpu.h"
#include "disas/disas.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "tcg-op.h"
#include "helper.h"
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 138f817..5b09e5e 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -1,9 +1,9 @@
#include "cpu.h"
#include "exec/gdbstub.h"
#include "helper.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "sysemu.h"
-#include "bitops.h"
+#include "qemu/bitops.h"
#ifndef CONFIG_USER_ONLY
static inline int get_phys_addr(CPUARMState *env, uint32_t address,
diff --git a/target-arm/translate.c b/target-arm/translate.c
index a11f245..4ef7681 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -27,7 +27,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "tcg-op.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "helper.h"
#define GEN_HELPER 1
diff --git a/target-cris/helper.c b/target-cris/helper.c
index 1bdb7e2..c361810 100644
--- a/target-cris/helper.c
+++ b/target-cris/helper.c
@@ -20,7 +20,7 @@
#include "cpu.h"
#include "mmu.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
//#define CRIS_HELPER_DEBUG
diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
index dc9aad9..9c881b5 100644
--- a/target-cris/op_helper.c
+++ b/target-cris/op_helper.c
@@ -21,7 +21,7 @@
#include "cpu.h"
#include "mmu.h"
#include "helper.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
//#define CRIS_OP_HELPER_DEBUG
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index e847a22..735fc47 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -24,8 +24,8 @@
#include "cpu.h"
#include "kvm.h"
-#include "qemu-option.h"
-#include "qemu-config.h"
+#include "qemu/option.h"
+#include "qemu/config-file.h"
#include "qapi/visit-core.h"
#include "arch_init.h"
diff --git a/target-i386/excp_helper.c b/target-i386/excp_helper.c
index aaa5ca2..64c8346 100644
--- a/target-i386/excp_helper.c
+++ b/target-i386/excp_helper.c
@@ -18,7 +18,7 @@
*/
#include "cpu.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "sysemu.h"
#include "helper.h"
diff --git a/target-i386/int_helper.c b/target-i386/int_helper.c
index f39747e..84b812d 100644
--- a/target-i386/int_helper.c
+++ b/target-i386/int_helper.c
@@ -18,7 +18,7 @@
*/
#include "cpu.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "helper.h"
//#define DEBUG_MULDIV
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 3a24153..445bc00 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -26,8 +26,8 @@
#include "kvm_i386.h"
#include "cpu.h"
#include "exec/gdbstub.h"
-#include "host-utils.h"
-#include "qemu-config.h"
+#include "qemu/host-utils.h"
+#include "qemu/config-file.h"
#include "hw/pc.h"
#include "hw/apic.h"
#include "ioport.h"
diff --git a/target-i386/seg_helper.c b/target-i386/seg_helper.c
index be795d7..c2a99ee 100644
--- a/target-i386/seg_helper.c
+++ b/target-i386/seg_helper.c
@@ -19,7 +19,7 @@
*/
#include "cpu.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "helper.h"
//#define DEBUG_PCALL
diff --git a/target-lm32/helper.c b/target-lm32/helper.c
index 1ea477f..8076c60 100644
--- a/target-lm32/helper.c
+++ b/target-lm32/helper.c
@@ -18,7 +18,7 @@
*/
#include "cpu.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
int cpu_lm32_handle_mmu_fault(CPULM32State *env, target_ulong address, int rw,
int mmu_idx)
diff --git a/target-lm32/op_helper.c b/target-lm32/op_helper.c
index d5ff156..d126e2a 100644
--- a/target-lm32/op_helper.c
+++ b/target-lm32/op_helper.c
@@ -1,7 +1,7 @@
#include <assert.h>
#include "cpu.h"
#include "helper.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "hw/lm32_pic.h"
#include "hw/lm32_juart.h"
diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index 71fb762..cf4a751 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -21,7 +21,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "tcg-op.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "helpers.h"
#define GEN_HELPER 1
diff --git a/target-microblaze/helper.c b/target-microblaze/helper.c
index 29c4679..3dc6be6 100644
--- a/target-microblaze/helper.c
+++ b/target-microblaze/helper.c
@@ -19,7 +19,7 @@
*/
#include "cpu.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#define D(x)
#define DMMU(x)
diff --git a/target-microblaze/op_helper.c b/target-microblaze/op_helper.c
index 52755e0..598ff63 100644
--- a/target-microblaze/op_helper.c
+++ b/target-microblaze/op_helper.c
@@ -21,7 +21,7 @@
#include <assert.h>
#include "cpu.h"
#include "helper.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#define D(x)
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index 044eb7d..baae0b4 100644
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -18,7 +18,7 @@
*/
#include <stdlib.h>
#include "cpu.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "helper.h"
diff --git a/target-openrisc/int_helper.c b/target-openrisc/int_helper.c
index 2fdfd27..20f9837 100644
--- a/target-openrisc/int_helper.c
+++ b/target-openrisc/int_helper.c
@@ -21,7 +21,7 @@
#include "cpu.h"
#include "helper.h"
#include "exception.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
target_ulong HELPER(ff1)(target_ulong x)
{
diff --git a/target-openrisc/interrupt.c b/target-openrisc/interrupt.c
index 226ce43..7f2c025 100644
--- a/target-openrisc/interrupt.c
+++ b/target-openrisc/interrupt.c
@@ -20,7 +20,7 @@
#include "cpu.h"
#include "qemu-common.h"
#include "exec/gdbstub.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#ifndef CONFIG_USER_ONLY
#include "hw/loader.h"
#endif
diff --git a/target-openrisc/mmu.c b/target-openrisc/mmu.c
index f507c7f..1968f6b 100644
--- a/target-openrisc/mmu.c
+++ b/target-openrisc/mmu.c
@@ -21,7 +21,7 @@
#include "cpu.h"
#include "qemu-common.h"
#include "exec/gdbstub.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#ifndef CONFIG_USER_ONLY
#include "hw/loader.h"
#endif
diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c
index 15f1629..0563f26 100644
--- a/target-openrisc/translate.c
+++ b/target-openrisc/translate.c
@@ -23,9 +23,9 @@
#include "disas/disas.h"
#include "tcg-op.h"
#include "qemu-common.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "config.h"
-#include "bitops.h"
+#include "qemu/bitops.h"
#include "helper.h"
#define GEN_HELPER 1
diff --git a/target-ppc/int_helper.c b/target-ppc/int_helper.c
index f39b4f6..783079d 100644
--- a/target-ppc/int_helper.c
+++ b/target-ppc/int_helper.c
@@ -17,7 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "cpu.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "helper.h"
#include "helper_regs.h"
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 5cbe98a..4b69796 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -23,7 +23,7 @@
#include <linux/kvm.h>
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
#include "kvm.h"
#include "kvm_ppc.h"
diff --git a/target-ppc/kvm_ppc.c b/target-ppc/kvm_ppc.c
index a2e49cd..2de59fd 100644
--- a/target-ppc/kvm_ppc.c
+++ b/target-ppc/kvm_ppc.c
@@ -12,7 +12,7 @@
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "kvm_ppc.h"
#include "device_tree.h"
diff --git a/target-ppc/mem_helper.c b/target-ppc/mem_helper.c
index 215d5fe..b18dc84 100644
--- a/target-ppc/mem_helper.c
+++ b/target-ppc/mem_helper.c
@@ -17,7 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "cpu.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "helper.h"
#include "helper_regs.h"
diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index 33d12bc..4678a45 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -21,7 +21,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "tcg-op.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "helper.h"
#define GEN_HELPER 1
diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
index 619b202..249f063 100644
--- a/target-s390x/cpu.c
+++ b/target-s390x/cpu.c
@@ -22,7 +22,7 @@
#include "cpu.h"
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
/* CPUClass::reset() */
diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index c40ab47..4f4543a 100644
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -20,7 +20,7 @@
#include "cpu.h"
#include "exec/gdbstub.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#ifndef CONFIG_USER_ONLY
#include "sysemu.h"
#endif
diff --git a/target-s390x/int_helper.c b/target-s390x/int_helper.c
index f202a7e..b683709 100644
--- a/target-s390x/int_helper.c
+++ b/target-s390x/int_helper.c
@@ -19,7 +19,7 @@
*/
#include "cpu.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "helper.h"
/* #define DEBUG_HELPER */
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 07edf93..1a376fc 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -25,7 +25,7 @@
#include <asm/ptrace.h>
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
#include "kvm.h"
#include "cpu.h"
diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
index e542e0c..24ad5ed 100644
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -20,11 +20,11 @@
#include "cpu.h"
#include "memory.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "helper.h"
#include <string.h>
#include "kvm.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#ifdef CONFIG_KVM
#include <linux/kvm.h>
#endif
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index 17932ac..e97166e 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -32,7 +32,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "tcg-op.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
/* global register indexes */
static TCGv_ptr cpu_env;
diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h
index 9e7bce3..74e7354 100644
--- a/target-sparc/cpu.h
+++ b/target-sparc/cpu.h
@@ -3,7 +3,7 @@
#include "config.h"
#include "qemu-common.h"
-#include "bswap.h"
+#include "qemu/bswap.h"
#if !defined(TARGET_SPARC64)
#define TARGET_LONG_BITS 32
diff --git a/target-sparc/helper.c b/target-sparc/helper.c
index 556ac28..7fe073e 100644
--- a/target-sparc/helper.c
+++ b/target-sparc/helper.c
@@ -18,7 +18,7 @@
*/
#include "cpu.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "helper.h"
#include "sysemu.h"
diff --git a/target-sparc/machine.c b/target-sparc/machine.c
index eb4d87f..a353dab 100644
--- a/target-sparc/machine.c
+++ b/target-sparc/machine.c
@@ -1,6 +1,6 @@
#include "hw/hw.h"
#include "hw/boards.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "cpu.h"
diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
index 2adbd16..ff4f628 100644
--- a/target-unicore32/helper.c
+++ b/target-unicore32/helper.c
@@ -12,7 +12,7 @@
#include "cpu.h"
#include "exec/gdbstub.h"
#include "helper.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "ui/console.h"
#undef DEBUG_UC32
diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c
index 93583b1..88f77ec 100644
--- a/target-unicore32/translate.c
+++ b/target-unicore32/translate.c
@@ -17,7 +17,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "tcg-op.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "helper.h"
#define GEN_HELPER 1
diff --git a/target-xtensa/core-dc232b.c b/target-xtensa/core-dc232b.c
index d1a594c..0bfcf24 100644
--- a/target-xtensa/core-dc232b.c
+++ b/target-xtensa/core-dc232b.c
@@ -28,7 +28,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/gdbstub.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "core-dc232b/core-isa.h"
#include "overlay_tool.h"
diff --git a/target-xtensa/core-dc233c.c b/target-xtensa/core-dc233c.c
index ead6b3b..11acbf3 100644
--- a/target-xtensa/core-dc233c.c
+++ b/target-xtensa/core-dc233c.c
@@ -29,7 +29,7 @@
#include "exec/exec-all.h"
#include "exec/gdbstub.h"
#include "qemu-common.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "core-dc233c/core-isa.h"
#include "overlay_tool.h"
diff --git a/target-xtensa/core-fsf.c b/target-xtensa/core-fsf.c
index a387aee..d4660ed 100644
--- a/target-xtensa/core-fsf.c
+++ b/target-xtensa/core-fsf.c
@@ -28,7 +28,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/gdbstub.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "core-fsf/core-isa.h"
#include "overlay_tool.h"
diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c
index 8a3783a..ad69d76 100644
--- a/target-xtensa/helper.c
+++ b/target-xtensa/helper.c
@@ -28,7 +28,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/gdbstub.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#if !defined(CONFIG_USER_ONLY)
#include "hw/loader.h"
#endif
diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c
index c5ad4d0..40f53fb 100644
--- a/target-xtensa/op_helper.c
+++ b/target-xtensa/op_helper.c
@@ -27,7 +27,7 @@
#include "cpu.h"
#include "helper.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
static void do_unaligned_access(CPUXtensaState *env,
target_ulong addr, int is_write, int is_user, uintptr_t retaddr);
diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c
index 15d5203..fa25f53 100644
--- a/target-xtensa/translate.c
+++ b/target-xtensa/translate.c
@@ -34,7 +34,7 @@
#include "exec/exec-all.h"
#include "disas/disas.h"
#include "tcg-op.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "sysemu.h"
#include "helper.h"
diff --git a/target-xtensa/xtensa-semi.c b/target-xtensa/xtensa-semi.c
index 52be07a..381ca1f 100644
--- a/target-xtensa/xtensa-semi.c
+++ b/target-xtensa/xtensa-semi.c
@@ -31,7 +31,7 @@
#include <stddef.h>
#include "cpu.h"
#include "helper.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
enum {
TARGET_SYS_exit = 1,
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 5faaca5..09f55be 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -37,9 +37,9 @@
#endif
#include "qemu-common.h"
-#include "cache-utils.h"
-#include "host-utils.h"
-#include "qemu-timer.h"
+#include "qemu/cache-utils.h"
+#include "qemu/host-utils.h"
+#include "qemu/timer.h"
/* Note: the long term plan is to reduce the dependancies on the QEMU
CPU definitions. Currently they are used for qemu_ld/st
diff --git a/tests/libqtest.c b/tests/libqtest.c
index 71b84c1..913fa05 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -26,8 +26,8 @@
#include <unistd.h>
#include <string.h>
-#include "compiler.h"
-#include "osdep.h"
+#include "qemu/compiler.h"
+#include "qemu/osdep.h"
#define MAX_IRQ 256
diff --git a/tests/tcg/test-i386.c b/tests/tcg/test-i386.c
index 64d929e..7572caa 100644
--- a/tests/tcg/test-i386.c
+++ b/tests/tcg/test-i386.c
@@ -17,7 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#define _GNU_SOURCE
-#include "compiler.h"
+#include "qemu/compiler.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/tests/test-iov.c b/tests/test-iov.c
index cbe7a89..a480bc8 100644
--- a/tests/test-iov.c
+++ b/tests/test-iov.c
@@ -1,7 +1,7 @@
#include <glib.h>
#include "qemu-common.h"
-#include "iov.h"
-#include "qemu_socket.h"
+#include "qemu/iov.h"
+#include "qemu/sockets.h"
/* create a randomly-sized iovec with random vectors */
static void iov_random(struct iovec **iovp, unsigned *iov_cntp)
diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c
index 2a68cba..f220ffe 100644
--- a/tests/test-qmp-commands.c
+++ b/tests/test-qmp-commands.c
@@ -2,7 +2,7 @@
#include "qapi/qmp-types.h"
#include "test-qmp-commands.h"
#include "qapi/qmp-core.h"
-#include "module.h"
+#include "qemu/module.h"
#include "qapi/qmp-input-visitor.h"
#include "tests/test-qapi-types.h"
#include "tests/test-qapi-visit.h"
diff --git a/trace/simple.c b/trace/simple.c
index d83681b..ce17d64 100644
--- a/trace/simple.c
+++ b/trace/simple.c
@@ -16,7 +16,7 @@
#include <signal.h>
#include <pthread.h>
#endif
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "trace.h"
#include "trace/control.h"
diff --git a/translate-all.c b/translate-all.c
index 8cf72ae..7524c21 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -28,7 +28,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "tcg.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
/* code generation context */
TCGContext tcg_ctx;
diff --git a/ui/console.c b/ui/console.c
index 0d80e4e..1a22e09 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "ui/console.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qmp-commands.h"
#include "qemu-char.h"
diff --git a/ui/sdl_zoom.c b/ui/sdl_zoom.c
index a986c7c..122027c 100644
--- a/ui/sdl_zoom.c
+++ b/ui/sdl_zoom.c
@@ -12,7 +12,7 @@
*/
#include "sdl_zoom.h"
-#include "osdep.h"
+#include "qemu/osdep.h"
#include <stdint.h>
#include <stdio.h>
diff --git a/ui/spice-core.c b/ui/spice-core.c
index dd3057b..c797e54 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -23,17 +23,17 @@
#include "qemu-common.h"
#include "ui/qemu-spice.h"
-#include "qemu-thread.h"
-#include "qemu-timer.h"
-#include "qemu-queue.h"
+#include "qemu/thread.h"
+#include "qemu/timer.h"
+#include "qemu/queue.h"
#include "qemu-x509.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "qmp-commands.h"
#include "qobject/qint.h"
#include "qobject/qbool.h"
#include "qobject/qstring.h"
#include "qobject/qjson.h"
-#include "notify.h"
+#include "qemu/notify.h"
#include "migration/migration.h"
#include "monitor/monitor.h"
#include "hw/hw.h"
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 443ffa8..9aaac86 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -17,8 +17,8 @@
#include "qemu-common.h"
#include "ui/qemu-spice.h"
-#include "qemu-timer.h"
-#include "qemu-queue.h"
+#include "qemu/timer.h"
+#include "qemu/queue.h"
#include "monitor/monitor.h"
#include "ui/console.h"
#include "sysemu.h"
diff --git a/ui/vnc-auth-sasl.h b/ui/vnc-auth-sasl.h
index ee243a9..8091d68 100644
--- a/ui/vnc-auth-sasl.h
+++ b/ui/vnc-auth-sasl.h
@@ -32,7 +32,7 @@
typedef struct VncStateSASL VncStateSASL;
typedef struct VncDisplaySASL VncDisplaySASL;
-#include "acl.h"
+#include "qemu/acl.h"
struct VncStateSASL {
sasl_conn_t *conn;
diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index 2a6d90e..493c60e 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -44,7 +44,7 @@
#include <jpeglib.h>
#endif
-#include "bswap.h"
+#include "qemu/bswap.h"
#include "qobject/qint.h"
#include "vnc.h"
#include "vnc-enc-tight.h"
diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
index 3c592b3..766de4e 100644
--- a/ui/vnc-jobs.c
+++ b/ui/vnc-jobs.c
@@ -28,7 +28,7 @@
#include "vnc.h"
#include "vnc-jobs.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
/*
* Locking:
diff --git a/ui/vnc-palette.h b/ui/vnc-palette.h
index ecf44ad..ecc388f 100644
--- a/ui/vnc-palette.h
+++ b/ui/vnc-palette.h
@@ -30,7 +30,7 @@
#define VNC_PALETTE_H
#include "qobject/qlist.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include <stdint.h>
#define VNC_PALETTE_HASH_SIZE 256
diff --git a/ui/vnc-tls.c b/ui/vnc-tls.c
index a7f7d07..5629263 100644
--- a/ui/vnc-tls.c
+++ b/ui/vnc-tls.c
@@ -26,7 +26,7 @@
#include "qemu-x509.h"
#include "vnc.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#if defined(_VNC_DEBUG) && _VNC_DEBUG >= 2
/* Very verbose, so only enabled for _VNC_DEBUG >= 2 */
diff --git a/ui/vnc-tls.h b/ui/vnc-tls.h
index 2b93633..36a2227 100644
--- a/ui/vnc-tls.h
+++ b/ui/vnc-tls.h
@@ -31,7 +31,7 @@
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
-#include "acl.h"
+#include "qemu/acl.h"
enum {
VNC_WIREMODE_CLEAR,
diff --git a/ui/vnc.c b/ui/vnc.c
index 9f7bd70..c7b017d 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -27,12 +27,12 @@
#include "vnc.h"
#include "vnc-jobs.h"
#include "sysemu.h"
-#include "qemu_socket.h"
-#include "qemu-timer.h"
-#include "acl.h"
+#include "qemu/sockets.h"
+#include "qemu/timer.h"
+#include "qemu/acl.h"
#include "qapi/qmp-types.h"
#include "qmp-commands.h"
-#include "osdep.h"
+#include "qemu/osdep.h"
#define VNC_REFRESH_INTERVAL_BASE 30
#define VNC_REFRESH_INTERVAL_INC 50
diff --git a/ui/vnc.h b/ui/vnc.h
index 47d788f..98c15e2 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -28,12 +28,12 @@
#define __QEMU_VNC_H
#include "qemu-common.h"
-#include "qemu-queue.h"
-#include "qemu-thread.h"
+#include "qemu/queue.h"
+#include "qemu/thread.h"
#include "ui/console.h"
#include "monitor/monitor.h"
#include "audio/audio.h"
-#include "bitmap.h"
+#include "qemu/bitmap.h"
#include <zlib.h>
#include <stdbool.h>
diff --git a/uri.c b/uri.c
index dd922de..c2f02b6 100644
--- a/uri.c
+++ b/uri.c
@@ -55,7 +55,7 @@
#include <string.h>
#include <stdio.h>
-#include "uri.h"
+#include "qemu/uri.h"
static void uri_clean(URI *uri);
diff --git a/vl.c b/vl.c
index ba2f312..0105fe6 100644
--- a/vl.c
+++ b/vl.c
@@ -28,7 +28,7 @@
#include <errno.h>
#include <sys/time.h>
#include <zlib.h>
-#include "bitmap.h"
+#include "qemu/bitmap.h"
/* Needed early for CONFIG_BSD etc. */
#include "config-host.h"
@@ -133,9 +133,9 @@ int main(int argc, char **argv)
#include "ui/console.h"
#include "sysemu.h"
#include "exec/gdbstub.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "qemu-char.h"
-#include "cache-utils.h"
+#include "qemu/cache-utils.h"
#include "blockdev.h"
#include "hw/block-common.h"
#include "migration/block.h"
@@ -144,11 +144,11 @@ int main(int argc, char **argv)
#include "migration/migration.h"
#include "kvm.h"
#include "qobject/qjson.h"
-#include "qemu-option.h"
-#include "qemu-config.h"
+#include "qemu/option.h"
+#include "qemu/config-file.h"
#include "qemu-options.h"
#include "qmp-commands.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
#ifdef CONFIG_VIRTFS
#include "fsdev/qemu-fsdev.h"
#endif
@@ -156,16 +156,16 @@ int main(int argc, char **argv)
#include "disas/disas.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
#include "slirp/libslirp.h"
#include "trace.h"
#include "trace/control.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "cpus.h"
#include "arch_init.h"
-#include "osdep.h"
+#include "qemu/osdep.h"
#include "ui/qemu-spice.h"
diff --git a/xen-all.c b/xen-all.c
index 11485db..e854641 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -16,7 +16,7 @@
#include "hw/xen_backend.h"
#include "qmp-commands.h"
-#include "range.h"
+#include "qemu/range.h"
#include "xen-mapcache.h"
#include "trace.h"
#include "exec/exec-memory.h"
diff --git a/xen-mapcache.c b/xen-mapcache.c
index 9cd6db3..ef824cc 100644
--- a/xen-mapcache.c
+++ b/xen-mapcache.c
@@ -14,7 +14,7 @@
#include "hw/xen_backend.h"
#include "blockdev.h"
-#include "bitmap.h"
+#include "qemu/bitmap.h"
#include <xen/hvm/params.h>
#include <sys/mman.h>
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 28/32] softmmu: move include files to include/sysemu/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (26 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 27/32] misc: move include files to include/qemu/ Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:58 ` [Qemu-devel] [PATCH 29/32] softmmu: move remaining include files to include/ subdirectories Paolo Bonzini
` (6 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch_init.c | 6 +++---
audio/audio.c | 2 +-
audio/winwaveaudio.c | 2 +-
balloon.c | 4 ++--
block-migration.c | 2 +-
block.c | 2 +-
block/vdi.c | 2 +-
blockdev-nbd.c | 4 ++--
blockdev.c | 6 +++---
cpu-exec.c | 2 +-
cpus.c | 10 +++++-----
cputlb.c | 6 +++---
device_tree.c | 2 +-
dma-helpers.c | 2 +-
dump-stub.c | 2 +-
dump.c | 8 ++++----
exec.c | 10 +++++-----
gdbstub.c | 4 ++--
hw/ac97.c | 2 +-
hw/acpi.c | 2 +-
hw/acpi_piix4.c | 4 ++--
hw/alpha_dp264.c | 2 +-
hw/alpha_pci.c | 2 +-
hw/alpha_typhoon.c | 2 +-
hw/apb_pci.c | 2 +-
hw/apic_common.c | 2 +-
hw/apic_internal.h | 2 +-
hw/arm-misc.h | 2 +-
hw/arm_boot.c | 4 ++--
hw/arm_sysctl.c | 2 +-
hw/axis_dev88.c | 2 +-
hw/block-common.c | 2 +-
hw/bonito.c | 2 +-
hw/cbus.c | 2 +-
hw/collie.c | 2 +-
hw/cuda.c | 2 +-
hw/device-hotplug.c | 4 ++--
hw/e1000.c | 4 ++--
hw/eepro100.c | 4 ++--
hw/es1370.c | 2 +-
hw/etraxfs_dma.c | 2 +-
hw/etraxfs_timer.c | 2 +-
hw/exynos4210.c | 2 +-
hw/exynos4210.h | 2 +-
hw/exynos4210_rtc.c | 2 +-
hw/exynos4210_uart.c | 2 +-
hw/exynos4_boards.c | 2 +-
hw/fdc.c | 4 ++--
hw/flash.h | 2 +-
hw/framebuffer.h | 2 +-
hw/fw_cfg.c | 2 +-
hw/gumstix.c | 2 +-
hw/highbank.c | 4 ++--
hw/hw.h | 2 +-
hw/ide.h | 2 +-
hw/ide/ahci.c | 2 +-
hw/ide/cmd646.c | 4 ++--
hw/ide/core.c | 6 +++---
hw/ide/ich.c | 2 +-
hw/ide/internal.h | 6 +++---
hw/ide/isa.c | 2 +-
hw/ide/macio.c | 2 +-
hw/ide/microdrive.c | 2 +-
hw/ide/mmio.c | 2 +-
hw/ide/pci.c | 2 +-
hw/ide/piix.c | 6 +++---
hw/ide/qdev.c | 6 +++---
hw/ide/via.c | 4 ++--
hw/imx_ccm.c | 2 +-
hw/imx_serial.c | 2 +-
hw/integratorcp.c | 2 +-
hw/intel-hda.c | 2 +-
hw/ioapic_internal.h | 2 +-
hw/isa-bus.c | 2 +-
hw/isa.h | 4 ++--
hw/ivshmem.c | 2 +-
hw/kvm/apic.c | 2 +-
hw/kvm/clock.c | 4 ++--
hw/kvm/i8254.c | 4 ++--
hw/kvm/i8259.c | 2 +-
hw/kvm/ioapic.c | 2 +-
hw/kvm/pci-assign.c | 2 +-
hw/kvmvapic.c | 6 +++---
hw/kzm.c | 2 +-
hw/lan9118.c | 2 +-
hw/leon3.c | 2 +-
hw/lm32_boards.c | 2 +-
hw/lm32_sys.c | 2 +-
hw/loader.c | 4 ++--
hw/lsi53c895a.c | 2 +-
hw/m25p80.c | 2 +-
hw/m48t59.c | 2 +-
hw/mac_dbdma.h | 2 +-
hw/mac_nvram.c | 2 +-
hw/mainstone.c | 2 +-
hw/mc146818rtc.c | 2 +-
hw/mcf5206.c | 2 +-
hw/mcf5208.c | 2 +-
hw/megasas.c | 2 +-
hw/microblaze_boot.c | 2 +-
hw/milkymist-memcard.c | 4 ++--
hw/milkymist-sysctl.c | 2 +-
hw/milkymist.c | 4 ++--
hw/mips.h | 2 +-
hw/mips_fulong2e.c | 4 ++--
hw/mips_jazz.c | 6 +++---
hw/mips_malta.c | 6 +++---
hw/mips_mipssim.c | 2 +-
hw/mips_r4k.c | 4 ++--
hw/mpc8544_guts.c | 2 +-
hw/multiboot.c | 2 +-
hw/musicpal.c | 4 ++--
hw/nand.c | 2 +-
hw/ne2000.c | 2 +-
hw/nseries.c | 4 ++--
hw/omap.h | 2 +-
hw/omap1.c | 4 ++--
hw/omap2.c | 4 ++--
hw/omap_gpmc.c | 2 +-
hw/omap_sx1.c | 2 +-
hw/onenand.c | 4 ++--
hw/opencores_eth.c | 2 +-
hw/openrisc_sim.c | 4 ++--
hw/palm.c | 2 +-
hw/parallel.c | 2 +-
hw/pc.c | 10 +++++-----
hw/pc.h | 6 +++---
hw/pc_piix.c | 10 +++++-----
hw/pc_sysfw.c | 6 +++---
hw/pci-hotplug.c | 2 +-
hw/pci-stub.c | 2 +-
hw/pci.c | 2 +-
hw/pci.h | 4 ++--
hw/pci_bridge_dev.c | 2 +-
hw/pcie_aer.c | 2 +-
hw/pcie_host.h | 2 +-
hw/pckbd.c | 2 +-
hw/pcnet-pci.c | 2 +-
hw/pcnet.c | 2 +-
hw/pcnet.h | 2 +-
hw/petalogix_ml605_mmu.c | 4 ++--
hw/petalogix_s3adsp1800_mmu.c | 4 ++--
hw/pl031.c | 2 +-
hw/pl181.c | 2 +-
hw/ppc.c | 4 ++--
hw/ppc/e500.c | 6 +++---
hw/ppc/e500plat.c | 2 +-
hw/ppc/mpc8544ds.c | 2 +-
hw/ppc405_boards.c | 4 ++--
hw/ppc405_uc.c | 2 +-
hw/ppc440_bamboo.c | 6 +++---
hw/ppc_booke.c | 2 +-
hw/ppc_mac.h | 2 +-
hw/ppc_newworld.c | 6 +++---
hw/ppc_oldworld.c | 6 +++---
hw/ppc_prep.c | 6 +++---
hw/ppce500_spin.c | 4 ++--
hw/ps2.c | 2 +-
hw/pxa.h | 2 +-
hw/pxa2xx.c | 4 ++--
hw/pxa2xx_lcd.c | 2 +-
hw/pxa2xx_timer.c | 2 +-
hw/qdev-monitor.c | 2 +-
hw/qdev-properties.c | 2 +-
hw/qdev.c | 2 +-
hw/qxl.c | 2 +-
hw/r2d.c | 4 ++--
hw/realview.c | 4 ++--
hw/rtl8139.c | 4 ++--
hw/s390-virtio-bus.c | 4 ++--
hw/s390-virtio.c | 6 +++---
hw/scsi-bus.c | 4 ++--
hw/scsi-disk.c | 6 +++---
hw/scsi-generic.c | 2 +-
hw/scsi.h | 2 +-
hw/serial.h | 4 ++--
hw/sga.c | 2 +-
hw/sh7750.c | 2 +-
hw/shix.c | 2 +-
hw/shpc.h | 2 +-
hw/slavio_misc.c | 2 +-
hw/smbios.c | 2 +-
hw/soc_dma.h | 2 +-
hw/spapr.c | 10 +++++-----
hw/spapr.h | 2 +-
hw/spapr_hcall.c | 4 ++--
hw/spapr_iommu.c | 4 ++--
hw/spapr_rtas.c | 4 ++--
hw/spapr_vio.c | 6 +++---
hw/spapr_vio.h | 2 +-
hw/spitz.c | 4 ++--
hw/ssi-sd.c | 2 +-
hw/strongarm.c | 2 +-
hw/strongarm.h | 2 +-
hw/sun4m.c | 4 ++--
hw/sun4u.c | 4 ++--
hw/sysbus.h | 2 +-
hw/tc6393xb.c | 2 +-
hw/tosa.c | 2 +-
hw/twl92230.c | 2 +-
hw/usb/bus.c | 2 +-
hw/usb/dev-network.c | 2 +-
hw/usb/dev-storage.c | 4 ++--
hw/usb/hcd-ehci.c | 4 ++--
hw/usb/hcd-uhci.c | 2 +-
hw/usb/host-linux.c | 2 +-
hw/usb/libhw.c | 2 +-
hw/usb/redirect.c | 2 +-
hw/versatilepb.c | 4 ++--
hw/vexpress.c | 4 ++--
hw/vfio_pci.c | 4 ++--
hw/vga_int.h | 2 +-
hw/vhost.h | 2 +-
hw/virtex_ml507.c | 6 +++---
hw/virtio-balloon.c | 4 ++--
hw/virtio-blk.c | 2 +-
hw/virtio-pci.c | 4 ++--
hw/virtio.h | 2 +-
hw/vmport.c | 2 +-
hw/vt82c686.c | 2 +-
hw/watchdog.c | 2 +-
hw/xen_backend.h | 2 +-
hw/xen_devconfig.c | 2 +-
hw/xen_disk.c | 2 +-
hw/xen_machine_pv.c | 2 +-
hw/xilinx_spi.c | 2 +-
hw/xilinx_spips.c | 2 +-
hw/xilinx_zynq.c | 4 ++--
hw/xtensa_lx60.c | 6 +++---
hw/xtensa_sim.c | 4 ++--
hw/z2.c | 4 ++--
hw/zynq_slcr.c | 2 +-
include/exec/exec-memory.h | 2 +-
include/exec/softmmu_template.h | 2 +-
arch_init.h => include/sysemu/arch_init.h | 0
balloon.h => include/sysemu/balloon.h | 0
blockdev.h => include/sysemu/blockdev.h | 0
cpus.h => include/sysemu/cpus.h | 0
cputlb.h => include/sysemu/cputlb.h | 0
device_tree.h => include/sysemu/device_tree.h | 0
dma.h => include/sysemu/dma.h | 4 ++--
dump.h => include/sysemu/dump.h | 0
ioport.h => include/sysemu/ioport.h | 2 +-
iorange.h => include/sysemu/iorange.h | 0
kvm.h => include/sysemu/kvm.h | 0
.../sysemu/memory-internal.h | 0
memory.h => include/sysemu/memory.h | 4 ++--
.../sysemu/memory_mapping.h | 0
qemu-os-posix.h => include/sysemu/os-posix.h | 0
qemu-os-win32.h => include/sysemu/os-win32.h | 0
qtest.h => include/sysemu/qtest.h | 0
qemu-seccomp.h => include/sysemu/seccomp.h | 0
sysemu.h => include/sysemu/sysemu.h | 0
xen-mapcache.h => include/sysemu/xen-mapcache.h | 0
include/ui/spice-display.h | 2 +-
ioport.c | 4 ++--
kvm-all.c | 6 +++---
kvm-stub.c | 2 +-
memory.c | 8 ++++----
memory_mapping-stub.c | 2 +-
memory_mapping.c | 2 +-
migration.c | 2 +-
monitor.c | 10 +++++-----
net/tap-bsd.c | 2 +-
net/tap-linux.c | 2 +-
net/tap-solaris.c | 2 +-
net/tap-win32.c | 2 +-
net/tap.c | 2 +-
os-posix.c | 2 +-
os-win32.c | 2 +-
oslib-posix.c | 2 +-
oslib-win32.c | 2 +-
posix-aio-compat.c | 2 +-
qemu-char.c | 2 +-
qemu-common.h | 4 ++--
qemu-img.c | 2 +-
qemu-progress.c | 2 +-
qemu-seccomp.c | 2 +-
qemu-timer.c | 2 +-
qemu-tool.c | 2 +-
qmp.c | 8 ++++----
qtest.c | 10 +++++-----
savevm.c | 6 +++---
target-alpha/sys_helper.c | 2 +-
target-arm/cpu.c | 2 +-
target-arm/helper.c | 2 +-
target-i386/arch_dump.c | 2 +-
target-i386/arch_memory_mapping.c | 2 +-
target-i386/cpu.c | 4 ++--
target-i386/excp_helper.c | 2 +-
target-i386/helper.c | 4 ++--
target-i386/ioport-user.c | 2 +-
target-i386/kvm.c | 6 +++---
target-i386/kvm_i386.h | 2 +-
target-i386/machine.c | 2 +-
target-i386/misc_helper.c | 2 +-
target-m68k/m68k-semi.c | 2 +-
target-ppc/helper.c | 4 ++--
target-ppc/kvm.c | 8 ++++----
target-ppc/kvm_ppc.c | 2 +-
target-ppc/kvm_ppc.h | 2 +-
target-ppc/machine.c | 2 +-
target-ppc/mmu_helper.c | 2 +-
target-ppc/translate_init.c | 4 ++--
target-s390x/helper.c | 2 +-
target-s390x/interrupt.c | 2 +-
target-s390x/kvm.c | 6 +++---
target-s390x/misc_helper.c | 6 +++---
target-sparc/helper.c | 2 +-
target-sparc/int32_helper.c | 2 +-
target-xtensa/translate.c | 2 +-
ui/cocoa.m | 2 +-
ui/curses.c | 2 +-
ui/input.c | 2 +-
ui/keymaps.c | 2 +-
ui/sdl.c | 2 +-
ui/spice-core.c | 2 +-
ui/spice-display.c | 2 +-
ui/vnc.c | 2 +-
vl.c | 16 ++++++++--------
xen-all.c | 2 +-
xen-mapcache.c | 4 ++--
xen-stub.c | 2 +-
323 files changed, 471 insertions(+), 471 deletions(-)
rename arch_init.h => include/sysemu/arch_init.h (100%)
rename balloon.h => include/sysemu/balloon.h (100%)
rename blockdev.h => include/sysemu/blockdev.h (100%)
rename cpus.h => include/sysemu/cpus.h (100%)
rename cputlb.h => include/sysemu/cputlb.h (100%)
rename device_tree.h => include/sysemu/device_tree.h (100%)
rename dma.h => include/sysemu/dma.h (99%)
rename dump.h => include/sysemu/dump.h (100%)
rename ioport.h => include/sysemu/ioport.h (98%)
rename iorange.h => include/sysemu/iorange.h (100%)
rename kvm.h => include/sysemu/kvm.h (100%)
rename memory-internal.h => include/sysemu/memory-internal.h (100%)
rename memory.h => include/sysemu/memory.h (99%)
rename memory_mapping.h => include/sysemu/memory_mapping.h (100%)
rename qemu-os-posix.h => include/sysemu/os-posix.h (100%)
rename qemu-os-win32.h => include/sysemu/os-win32.h (100%)
rename qtest.h => include/sysemu/qtest.h (100%)
rename qemu-seccomp.h => include/sysemu/seccomp.h (100%)
rename sysemu.h => include/sysemu/sysemu.h (100%)
rename xen-mapcache.h => include/sysemu/xen-mapcache.h (100%)
diff --git a/arch_init.c b/arch_init.c
index 2feabd5..135ce43 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -30,15 +30,15 @@
#endif
#include "config.h"
#include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/bitops.h"
#include "qemu/bitmap.h"
-#include "arch_init.h"
+#include "sysemu/arch_init.h"
#include "audio/audio.h"
#include "hw/pc.h"
#include "hw/pci.h"
#include "hw/audiodev.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "migration/migration.h"
#include "exec/gdbstub.h"
#include "hw/smbios.h"
diff --git a/audio/audio.c b/audio/audio.c
index 0e12069..372100e 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -25,7 +25,7 @@
#include "audio/audio.h"
#include "monitor/monitor.h"
#include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#define AUDIO_CAP "audio"
#include "audio_int.h"
diff --git a/audio/winwaveaudio.c b/audio/winwaveaudio.c
index 34bcd47..a30fcad 100644
--- a/audio/winwaveaudio.c
+++ b/audio/winwaveaudio.c
@@ -1,7 +1,7 @@
/* public domain */
#include "qemu-common.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "audio/audio.h"
#define AUDIO_CAP "winwave"
diff --git a/balloon.c b/balloon.c
index 06a6010..cc971a8 100644
--- a/balloon.c
+++ b/balloon.c
@@ -26,8 +26,8 @@
#include "monitor/monitor.h"
#include "exec/cpu-common.h"
-#include "kvm.h"
-#include "balloon.h"
+#include "sysemu/kvm.h"
+#include "sysemu/balloon.h"
#include "trace.h"
#include "qmp-commands.h"
#include "qobject/qjson.h"
diff --git a/block-migration.c b/block-migration.c
index 4e865a6..ca4ba3f 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -20,7 +20,7 @@
#include "qemu/timer.h"
#include "migration/block.h"
#include "migration/migration.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include <assert.h>
#define BLOCK_SIZE (BDRV_SECTORS_PER_DIRTY_CHUNK << BDRV_SECTOR_BITS)
diff --git a/block.c b/block.c
index 3019139..f1388a1 100644
--- a/block.c
+++ b/block.c
@@ -29,7 +29,7 @@
#include "block/blockjob.h"
#include "qemu/module.h"
#include "qobject/qjson.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/notify.h"
#include "block/coroutine.h"
#include "qmp-commands.h"
diff --git a/block/vdi.c b/block/vdi.c
index be35268..dd4bc58 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -58,7 +58,7 @@
#include <uuid/uuid.h>
#else
/* TODO: move uuid emulation to some central place in QEMU. */
-#include "sysemu.h" /* UUID_FMT */
+#include "sysemu/sysemu.h" /* UUID_FMT */
typedef unsigned char uuid_t[16];
void uuid_generate(uuid_t out);
int uuid_is_null(const uuid_t uu);
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index bb06e97..2dd7197 100644
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -9,11 +9,11 @@
* later. See the COPYING file in the top-level directory.
*/
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "hw/block-common.h"
#include "monitor/monitor.h"
#include "qobject/qerror.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qmp-commands.h"
#include "trace.h"
#include "block/nbd.h"
diff --git a/blockdev.c b/blockdev.c
index 3278eb3..9f51448 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -7,7 +7,7 @@
* later. See the COPYING file in the top-level directory.
*/
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "hw/block-common.h"
#include "block/blockjob.h"
#include "monitor/monitor.h"
@@ -15,11 +15,11 @@
#include "qemu/option.h"
#include "qemu/config-file.h"
#include "qapi/qmp-types.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "block/block_int.h"
#include "qmp-commands.h"
#include "trace.h"
-#include "arch_init.h"
+#include "sysemu/arch_init.h"
static QTAILQ_HEAD(drivelist, DriveInfo) drives = QTAILQ_HEAD_INITIALIZER(drives);
diff --git a/cpu-exec.c b/cpu-exec.c
index 654cfc7..4592f4d 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -21,7 +21,7 @@
#include "disas/disas.h"
#include "tcg.h"
#include "qemu/atomic.h"
-#include "qtest.h"
+#include "sysemu/qtest.h"
int tb_invalidated_flag;
diff --git a/cpus.c b/cpus.c
index 16f14f3..56055a9 100644
--- a/cpus.c
+++ b/cpus.c
@@ -26,15 +26,15 @@
#include "config-host.h"
#include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "exec/gdbstub.h"
-#include "dma.h"
-#include "kvm.h"
+#include "sysemu/dma.h"
+#include "sysemu/kvm.h"
#include "qmp-commands.h"
#include "qemu/thread.h"
-#include "cpus.h"
-#include "qtest.h"
+#include "sysemu/cpus.h"
+#include "sysemu/qtest.h"
#include "qemu/main-loop.h"
#include "qemu/bitmap.h"
diff --git a/cputlb.c b/cputlb.c
index e9d1c89..9d55401 100644
--- a/cputlb.c
+++ b/cputlb.c
@@ -20,12 +20,12 @@
#include "config.h"
#include "cpu.h"
#include "exec/exec-all.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#include "exec/exec-memory.h"
-#include "cputlb.h"
+#include "sysemu/cputlb.h"
-#include "memory-internal.h"
+#include "sysemu/memory-internal.h"
//#define DEBUG_TLB
//#define DEBUG_TLB_CHECK
diff --git a/device_tree.c b/device_tree.c
index c3e1ba4..56af24b 100644
--- a/device_tree.c
+++ b/device_tree.c
@@ -20,7 +20,7 @@
#include "config.h"
#include "qemu-common.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
#include "hw/loader.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
diff --git a/dma-helpers.c b/dma-helpers.c
index 402b0d4..942b6dc 100644
--- a/dma-helpers.c
+++ b/dma-helpers.c
@@ -7,7 +7,7 @@
* (GNU GPL), version 2 or later.
*/
-#include "dma.h"
+#include "sysemu/dma.h"
#include "trace.h"
#include "qemu/range.h"
#include "qemu/thread.h"
diff --git a/dump-stub.c b/dump-stub.c
index aa2e8da..93976dd 100644
--- a/dump-stub.c
+++ b/dump-stub.c
@@ -12,7 +12,7 @@
*/
#include "qemu-common.h"
-#include "dump.h"
+#include "sysemu/dump.h"
#include "qobject/qerror.h"
#include "qmp-commands.h"
diff --git a/dump.c b/dump.c
index 77781c2..df635c4 100644
--- a/dump.c
+++ b/dump.c
@@ -17,10 +17,10 @@
#include "exec/cpu-all.h"
#include "exec/targphys.h"
#include "monitor/monitor.h"
-#include "kvm.h"
-#include "dump.h"
-#include "sysemu.h"
-#include "memory_mapping.h"
+#include "sysemu/kvm.h"
+#include "sysemu/dump.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/memory_mapping.h"
#include "qapi/error.h"
#include "qmp-commands.h"
#include "exec/gdbstub.h"
diff --git a/exec.c b/exec.c
index acd7a2f..ab0e135 100644
--- a/exec.c
+++ b/exec.c
@@ -30,11 +30,11 @@
#include "hw/hw.h"
#include "hw/qdev.h"
#include "qemu/osdep.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "hw/xen.h"
#include "qemu/timer.h"
#include "qemu/config-file.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#include "exec/exec-memory.h"
#if defined(CONFIG_USER_ONLY)
#include <qemu.h>
@@ -54,13 +54,13 @@
#endif
#endif
#else /* !CONFIG_USER_ONLY */
-#include "xen-mapcache.h"
+#include "sysemu/xen-mapcache.h"
#include "trace.h"
#endif
-#include "cputlb.h"
+#include "sysemu/cputlb.h"
-#include "memory-internal.h"
+#include "sysemu/memory-internal.h"
//#define DEBUG_TB_INVALIDATE
//#define DEBUG_FLUSH
diff --git a/gdbstub.c b/gdbstub.c
index 4b178a6..2fca1a7 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -31,7 +31,7 @@
#else
#include "monitor/monitor.h"
#include "qemu-char.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "exec/gdbstub.h"
#endif
@@ -39,7 +39,7 @@
#include "cpu.h"
#include "qemu/sockets.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#ifndef TARGET_CPU_MEMORY_RW_DEBUG
static inline int target_memory_rw_debug(CPUArchState *env, target_ulong addr,
diff --git a/hw/ac97.c b/hw/ac97.c
index 0f561fa..03e7aae 100644
--- a/hw/ac97.c
+++ b/hw/ac97.c
@@ -21,7 +21,7 @@
#include "audiodev.h"
#include "audio/audio.h"
#include "pci.h"
-#include "dma.h"
+#include "sysemu/dma.h"
enum {
AC97_Reset = 0x00,
diff --git a/hw/acpi.c b/hw/acpi.c
index 773eb6d..e4345c4 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -18,7 +18,7 @@
* Contributions after 2012-01-13 are licensed under the terms of the
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "hw.h"
#include "pc.h"
#include "acpi.h"
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index cc90476..f8cacb1 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -24,9 +24,9 @@
#include "pm_smbus.h"
#include "pci.h"
#include "acpi.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/range.h"
-#include "ioport.h"
+#include "sysemu/ioport.h"
#include "fw_cfg.h"
//#define DEBUG
diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c
index 76d8ae8..e7e52c1 100644
--- a/hw/alpha_dp264.c
+++ b/hw/alpha_dp264.c
@@ -11,7 +11,7 @@
#include "loader.h"
#include "boards.h"
#include "alpha_sys.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "mc146818rtc.h"
#include "ide.h"
#include "i8254.h"
diff --git a/hw/alpha_pci.c b/hw/alpha_pci.c
index 08be842..063baaf 100644
--- a/hw/alpha_pci.c
+++ b/hw/alpha_pci.c
@@ -9,7 +9,7 @@
#include "config.h"
#include "alpha_sys.h"
#include "qemu/log.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
/* PCI IO reads/writes, to byte-word addressable memory. */
diff --git a/hw/alpha_typhoon.c b/hw/alpha_typhoon.c
index 87c4588..bbf8d59 100644
--- a/hw/alpha_typhoon.c
+++ b/hw/alpha_typhoon.c
@@ -10,7 +10,7 @@
#include "exec/exec-all.h"
#include "hw.h"
#include "devices.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "alpha_sys.h"
#include "exec/exec-memory.h"
diff --git a/hw/apb_pci.c b/hw/apb_pci.c
index e4d2c3e..dba8256 100644
--- a/hw/apb_pci.c
+++ b/hw/apb_pci.c
@@ -32,7 +32,7 @@
#include "pci_bridge.h"
#include "pci_internals.h"
#include "apb_pci.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "exec/exec-memory.h"
/* debug APB */
diff --git a/hw/apic_common.c b/hw/apic_common.c
index 371f95d..156eff5 100644
--- a/hw/apic_common.c
+++ b/hw/apic_common.c
@@ -20,7 +20,7 @@
#include "apic.h"
#include "apic_internal.h"
#include "trace.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
static int apic_irq_delivered;
bool apic_report_tpr_access;
diff --git a/hw/apic_internal.h b/hw/apic_internal.h
index 906f053..4d600fd 100644
--- a/hw/apic_internal.h
+++ b/hw/apic_internal.h
@@ -20,7 +20,7 @@
#ifndef QEMU_APIC_INTERNAL_H
#define QEMU_APIC_INTERNAL_H
-#include "memory.h"
+#include "sysemu/memory.h"
#include "sysbus.h"
#include "qemu/timer.h"
diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index bdd8fec..23fddf5 100644
--- a/hw/arm-misc.h
+++ b/hw/arm-misc.h
@@ -11,7 +11,7 @@
#ifndef ARM_MISC_H
#define ARM_MISC_H 1
-#include "memory.h"
+#include "sysemu/memory.h"
/* The CPU is also modeled as an interrupt controller. */
#define ARM_PIC_CPU_IRQ 0
diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index e7a1678..9fd103a 100644
--- a/hw/arm_boot.c
+++ b/hw/arm_boot.c
@@ -10,11 +10,11 @@
#include "config.h"
#include "hw.h"
#include "arm-misc.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "loader.h"
#include "elf.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
#include "qemu/config-file.h"
#define KERNEL_ARGS_ADDR 0x100
diff --git a/hw/arm_sysctl.c b/hw/arm_sysctl.c
index f17de3a..990733e 100644
--- a/hw/arm_sysctl.c
+++ b/hw/arm_sysctl.c
@@ -11,7 +11,7 @@
#include "qemu/timer.h"
#include "sysbus.h"
#include "primecell.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#define LOCK_VALUE 0xa05f
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index c666d0b..890b313 100644
--- a/hw/axis_dev88.c
+++ b/hw/axis_dev88.c
@@ -30,7 +30,7 @@
#include "loader.h"
#include "elf.h"
#include "cris-boot.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
#define D(x)
diff --git a/hw/block-common.c b/hw/block-common.c
index f082d55..e21e0f2 100644
--- a/hw/block-common.c
+++ b/hw/block-common.c
@@ -7,7 +7,7 @@
* later. See the COPYING file in the top-level directory.
*/
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "hw/block-common.h"
#include "qemu/error.h"
diff --git a/hw/bonito.c b/hw/bonito.c
index 76a0a32..0fbb42a 100644
--- a/hw/bonito.c
+++ b/hw/bonito.c
@@ -44,7 +44,7 @@
#include "pc.h"
#include "mips.h"
#include "pci_host.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "exec/exec-memory.h"
//#define DEBUG_BONITO
diff --git a/hw/cbus.c b/hw/cbus.c
index 7216899..6fd3905 100644
--- a/hw/cbus.c
+++ b/hw/cbus.c
@@ -23,7 +23,7 @@
#include "qemu-common.h"
#include "irq.h"
#include "devices.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
//#define DEBUG
diff --git a/hw/collie.c b/hw/collie.c
index 70f8cbf..1efe8c3 100644
--- a/hw/collie.c
+++ b/hw/collie.c
@@ -15,7 +15,7 @@
#include "strongarm.h"
#include "arm-misc.h"
#include "flash.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
static struct arm_boot_info collie_binfo = {
diff --git a/hw/cuda.c b/hw/cuda.c
index e57f387..8101c2d 100644
--- a/hw/cuda.c
+++ b/hw/cuda.c
@@ -26,7 +26,7 @@
#include "ppc_mac.h"
#include "adb.h"
#include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
/* XXX: implement all timer modes */
diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c
index 32f2984..d60c692 100644
--- a/hw/device-hotplug.c
+++ b/hw/device-hotplug.c
@@ -24,9 +24,9 @@
#include "hw.h"
#include "boards.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "qemu/config-file.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
DriveInfo *add_init_drive(const char *optstr)
diff --git a/hw/e1000.c b/hw/e1000.c
index 071d077..40dfa67 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -30,8 +30,8 @@
#include "net/net.h"
#include "net/checksum.h"
#include "loader.h"
-#include "sysemu.h"
-#include "dma.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/dma.h"
#include "e1000_hw.h"
diff --git a/hw/eepro100.c b/hw/eepro100.c
index 0375fc8..4e219dd 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -45,8 +45,8 @@
#include "pci.h"
#include "net/net.h"
#include "eeprom93xx.h"
-#include "sysemu.h"
-#include "dma.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/dma.h"
/* QEMU sends frames smaller than 60 bytes to ethernet nics.
* Such frames are rejected by real nics and their emulations.
diff --git a/hw/es1370.c b/hw/es1370.c
index e34234c..e772511 100644
--- a/hw/es1370.c
+++ b/hw/es1370.c
@@ -30,7 +30,7 @@
#include "audiodev.h"
#include "audio/audio.h"
#include "pci.h"
-#include "dma.h"
+#include "sysemu/dma.h"
/* Missing stuff:
SCTRL_P[12](END|ST)INC
diff --git a/hw/etraxfs_dma.c b/hw/etraxfs_dma.c
index ad30390..65cfe95 100644
--- a/hw/etraxfs_dma.c
+++ b/hw/etraxfs_dma.c
@@ -26,7 +26,7 @@
#include "hw.h"
#include "exec/exec-memory.h"
#include "qemu-common.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "etraxfs_dma.h"
diff --git a/hw/etraxfs_timer.c b/hw/etraxfs_timer.c
index 01d1ff0..c61ad60 100644
--- a/hw/etraxfs_timer.c
+++ b/hw/etraxfs_timer.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/timer.h"
#include "ptimer.h"
diff --git a/hw/exynos4210.c b/hw/exynos4210.c
index 00d4db8..b38bb0e 100644
--- a/hw/exynos4210.c
+++ b/hw/exynos4210.c
@@ -22,7 +22,7 @@
*/
#include "boards.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "sysbus.h"
#include "arm-misc.h"
#include "loader.h"
diff --git a/hw/exynos4210.h b/hw/exynos4210.h
index a43ba3a..c8db301 100644
--- a/hw/exynos4210.h
+++ b/hw/exynos4210.h
@@ -27,7 +27,7 @@
#define EXYNOS4210_H_
#include "qemu-common.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#define EXYNOS4210_NCPUS 2
diff --git a/hw/exynos4210_rtc.c b/hw/exynos4210_rtc.c
index a93a1c5..7b3c737 100644
--- a/hw/exynos4210_rtc.c
+++ b/hw/exynos4210_rtc.c
@@ -32,7 +32,7 @@
#include "hw.h"
#include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "exynos4210.h"
diff --git a/hw/exynos4210_uart.c b/hw/exynos4210_uart.c
index ccc4780..c319933 100644
--- a/hw/exynos4210_uart.c
+++ b/hw/exynos4210_uart.c
@@ -20,7 +20,7 @@
*/
#include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu-char.h"
#include "exynos4210.h"
diff --git a/hw/exynos4_boards.c b/hw/exynos4_boards.c
index 7a4f950..70b0722 100644
--- a/hw/exynos4_boards.c
+++ b/hw/exynos4_boards.c
@@ -21,7 +21,7 @@
*
*/
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "sysbus.h"
#include "net/net.h"
#include "arm-misc.h"
diff --git a/hw/fdc.c b/hw/fdc.c
index b375c64..249d681 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -34,8 +34,8 @@
#include "isa.h"
#include "sysbus.h"
#include "qdev-addr.h"
-#include "blockdev.h"
-#include "sysemu.h"
+#include "sysemu/blockdev.h"
+#include "sysemu/sysemu.h"
#include "qemu/log.h"
/********************************************************/
diff --git a/hw/flash.h b/hw/flash.h
index 9c9e526..cd339b1 100644
--- a/hw/flash.h
+++ b/hw/flash.h
@@ -1,6 +1,6 @@
/* NOR flash devices */
-#include "memory.h"
+#include "sysemu/memory.h"
typedef struct pflash_t pflash_t;
diff --git a/hw/framebuffer.h b/hw/framebuffer.h
index 527a6b8..18307b0 100644
--- a/hw/framebuffer.h
+++ b/hw/framebuffer.h
@@ -1,7 +1,7 @@
#ifndef QEMU_FRAMEBUFFER_H
#define QEMU_FRAMEBUFFER_H
-#include "memory.h"
+#include "sysemu/memory.h"
/* Framebuffer device helper routines. */
diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c
index 2714fbe..df736b4 100644
--- a/hw/fw_cfg.c
+++ b/hw/fw_cfg.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "isa.h"
#include "fw_cfg.h"
#include "sysbus.h"
diff --git a/hw/gumstix.c b/hw/gumstix.c
index b250bb5..ffa8962 100644
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -40,7 +40,7 @@
#include "flash.h"
#include "devices.h"
#include "boards.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
static const int sector_len = 128 * 1024;
diff --git a/hw/highbank.c b/hw/highbank.c
index 6210ef6..4f51661 100644
--- a/hw/highbank.c
+++ b/hw/highbank.c
@@ -22,10 +22,10 @@
#include "devices.h"
#include "loader.h"
#include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "sysbus.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
#define SMP_BOOT_ADDR 0x100
diff --git a/hw/hw.h b/hw/hw.h
index 7db3d22..7bf6407 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -8,7 +8,7 @@
#include "exec/cpu-common.h"
#endif
-#include "ioport.h"
+#include "sysemu/ioport.h"
#include "irq.h"
#include "migration/file.h"
#include "migration/vmstate.h"
diff --git a/hw/ide.h b/hw/ide.h
index 2db4079..e4919f3 100644
--- a/hw/ide.h
+++ b/hw/ide.h
@@ -3,7 +3,7 @@
#include "isa.h"
#include "pci.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#define MAX_IDE_DEVS 2
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 0376aa3..155a3dc 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -28,7 +28,7 @@
#include <hw/sysbus.h>
#include "monitor/monitor.h"
-#include "dma.h"
+#include "sysemu/dma.h"
#include "exec/cpu-common.h"
#include "internal.h"
#include <hw/ide/pci.h>
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 94a612f..dbcd0ba 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -27,8 +27,8 @@
#include <hw/pci.h>
#include <hw/isa.h>
#include "block/block.h"
-#include "sysemu.h"
-#include "dma.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/dma.h"
#include <hw/ide/pci.h>
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 2860eeb..11c4e1a 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -28,10 +28,10 @@
#include <hw/isa.h>
#include "qemu/error.h"
#include "qemu/timer.h"
-#include "sysemu.h"
-#include "dma.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/dma.h"
#include "hw/block-common.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include <hw/ide/internal.h>
diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 6f0632c..58913e6 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -66,7 +66,7 @@
#include <hw/pci.h>
#include <hw/isa.h>
#include "block/block.h"
-#include "dma.h"
+#include "sysemu/dma.h"
#include <hw/ide/pci.h>
#include <hw/ide/ahci.h>
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index bf7d313..19e8104 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -8,9 +8,9 @@
*/
#include <hw/ide.h>
#include <hw/isa.h>
-#include "iorange.h"
-#include "dma.h"
-#include "sysemu.h"
+#include "sysemu/iorange.h"
+#include "sysemu/dma.h"
+#include "sysemu/sysemu.h"
#include "hw/block-common.h"
#include "hw/scsi-defs.h"
diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 39df87c..aa0e7fa 100644
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -26,7 +26,7 @@
#include <hw/pc.h>
#include <hw/isa.h>
#include "block/block.h"
-#include "dma.h"
+#include "sysemu/dma.h"
#include <hw/ide/internal.h>
diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index 90fdb83..878084c 100644
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -26,7 +26,7 @@
#include <hw/ppc_mac.h>
#include <hw/mac_dbdma.h>
#include "block/block.h"
-#include "dma.h"
+#include "sysemu/dma.h"
#include <hw/ide/internal.h>
diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index 6cce523..642774e 100644
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -26,7 +26,7 @@
#include <hw/pc.h>
#include <hw/pcmcia.h>
#include "block/block.h"
-#include "dma.h"
+#include "sysemu/dma.h"
#include <hw/ide/internal.h>
diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c
index 28fd939..3cc3b8d 100644
--- a/hw/ide/mmio.c
+++ b/hw/ide/mmio.c
@@ -24,7 +24,7 @@
*/
#include <hw/hw.h>
#include "block/block.h"
-#include "dma.h"
+#include "sysemu/dma.h"
#include <hw/ide/internal.h>
diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index ce66b15..0d7c390 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -27,7 +27,7 @@
#include <hw/pci.h>
#include <hw/isa.h>
#include "block/block.h"
-#include "dma.h"
+#include "sysemu/dma.h"
#include <hw/ide/pci.h>
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 4ded9ee..5028721 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -27,9 +27,9 @@
#include <hw/pc.h>
#include <hw/pci.h>
#include <hw/isa.h>
-#include "blockdev.h"
-#include "sysemu.h"
-#include "dma.h"
+#include "sysemu/blockdev.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/dma.h"
#include <hw/ide/pci.h>
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index 1be4dbc..694d919 100644
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -17,12 +17,12 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include <hw/hw.h>
-#include "dma.h"
+#include "sysemu/dma.h"
#include "qemu/error.h"
#include <hw/ide/internal.h>
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "hw/block-common.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
/* --------------------------------- */
diff --git a/hw/ide/via.c b/hw/ide/via.c
index fba8c6b..ea036da 100644
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -28,8 +28,8 @@
#include <hw/pci.h>
#include <hw/isa.h>
#include "block/block.h"
-#include "sysemu.h"
-#include "dma.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/dma.h"
#include <hw/ide/pci.h>
diff --git a/hw/imx_ccm.c b/hw/imx_ccm.c
index 10952c6..c2514d5 100644
--- a/hw/imx_ccm.c
+++ b/hw/imx_ccm.c
@@ -12,7 +12,7 @@
#include "hw.h"
#include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "imx.h"
#define CKIH_FREQ 26000000 /* 26MHz crystal input */
diff --git a/hw/imx_serial.c b/hw/imx_serial.c
index d4eae43..09ec6fe 100644
--- a/hw/imx_serial.c
+++ b/hw/imx_serial.c
@@ -19,7 +19,7 @@
#include "hw.h"
#include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu-char.h"
#include "imx.h"
diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index 866075e..d1fc703 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -13,7 +13,7 @@
#include "arm-misc.h"
#include "net/net.h"
#include "exec/exec-memory.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
typedef struct {
SysBusDevice busdev;
diff --git a/hw/intel-hda.c b/hw/intel-hda.c
index 5cf4a15..173eae4 100644
--- a/hw/intel-hda.c
+++ b/hw/intel-hda.c
@@ -24,7 +24,7 @@
#include "audiodev.h"
#include "intel-hda.h"
#include "intel-hda-defs.h"
-#include "dma.h"
+#include "sysemu/dma.h"
/* --------------------------------------------------------------------- */
/* hda bus */
diff --git a/hw/ioapic_internal.h b/hw/ioapic_internal.h
index e04c9f3..cf13c17 100644
--- a/hw/ioapic_internal.h
+++ b/hw/ioapic_internal.h
@@ -23,7 +23,7 @@
#define QEMU_IOAPIC_INTERNAL_H
#include "hw.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#include "sysbus.h"
#define MAX_IOAPICS 1
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 8932637..925ecb1 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -19,7 +19,7 @@
#include "hw.h"
#include "monitor/monitor.h"
#include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "isa.h"
#include "exec/exec-memory.h"
diff --git a/hw/isa.h b/hw/isa.h
index 8fb498a..f707e43 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -3,8 +3,8 @@
/* ISA bus */
-#include "ioport.h"
-#include "memory.h"
+#include "sysemu/ioport.h"
+#include "sysemu/memory.h"
#include "qdev.h"
#define ISA_NUM_IRQS 16
diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index 848a6c2..7690a4f 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -20,7 +20,7 @@
#include "pc.h"
#include "pci.h"
#include "msix.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "migration/migration.h"
#include "qobject/qerror.h"
#include "qemu/event_notifier.h"
diff --git a/hw/kvm/apic.c b/hw/kvm/apic.c
index 80e3e48..82b0494 100644
--- a/hw/kvm/apic.c
+++ b/hw/kvm/apic.c
@@ -11,7 +11,7 @@
*/
#include "hw/apic_internal.h"
#include "hw/msi.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
static inline void kvm_apic_set_reg(struct kvm_lapic_state *kapic,
int reg_id, uint32_t val)
diff --git a/hw/kvm/clock.c b/hw/kvm/clock.c
index 824b978..6fcca95 100644
--- a/hw/kvm/clock.c
+++ b/hw/kvm/clock.c
@@ -14,8 +14,8 @@
*/
#include "qemu-common.h"
-#include "sysemu.h"
-#include "kvm.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/kvm.h"
#include "hw/sysbus.h"
#include "hw/kvm/clock.h"
diff --git a/hw/kvm/i8254.c b/hw/kvm/i8254.c
index 8ee1c35..57faf64 100644
--- a/hw/kvm/i8254.c
+++ b/hw/kvm/i8254.c
@@ -23,10 +23,10 @@
* THE SOFTWARE.
*/
#include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "hw/i8254.h"
#include "hw/i8254_internal.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#define KVM_PIT_REINJECT_BIT 0
diff --git a/hw/kvm/i8259.c b/hw/kvm/i8259.c
index 1e24cd4..70e1d18 100644
--- a/hw/kvm/i8259.c
+++ b/hw/kvm/i8259.c
@@ -11,7 +11,7 @@
*/
#include "hw/i8259_internal.h"
#include "hw/apic_internal.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
static void kvm_pic_get(PICCommonState *s)
{
diff --git a/hw/kvm/ioapic.c b/hw/kvm/ioapic.c
index 6c3b8fe..1d47bf4 100644
--- a/hw/kvm/ioapic.c
+++ b/hw/kvm/ioapic.c
@@ -13,7 +13,7 @@
#include "hw/pc.h"
#include "hw/ioapic_internal.h"
#include "hw/apic_internal.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
typedef struct KVMIOAPICState KVMIOAPICState;
diff --git a/hw/kvm/pci-assign.c b/hw/kvm/pci-assign.c
index e33b37e..716ef95 100644
--- a/hw/kvm/pci-assign.c
+++ b/hw/kvm/pci-assign.c
@@ -33,7 +33,7 @@
#include "hw/loader.h"
#include "monitor/monitor.h"
#include "qemu/range.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "hw/pci.h"
#include "hw/msi.h"
#include "kvm_i386.h"
diff --git a/hw/kvmvapic.c b/hw/kvmvapic.c
index 5d83625..81be88f 100644
--- a/hw/kvmvapic.c
+++ b/hw/kvmvapic.c
@@ -8,9 +8,9 @@
* (at your option) any later version. See the COPYING file in the
* top-level directory.
*/
-#include "sysemu.h"
-#include "cpus.h"
-#include "kvm.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/cpus.h"
+#include "sysemu/kvm.h"
#include "apic_internal.h"
#define APIC_DEFAULT_ADDRESS 0xfee00000
diff --git a/hw/kzm.c b/hw/kzm.c
index d3c1fb3..3c601c5 100644
--- a/hw/kzm.c
+++ b/hw/kzm.c
@@ -19,7 +19,7 @@
#include "arm-misc.h"
#include "devices.h"
#include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "serial.h"
#include "imx.h"
diff --git a/hw/lan9118.c b/hw/lan9118.c
index cf33af1..dc96bf5 100644
--- a/hw/lan9118.c
+++ b/hw/lan9118.c
@@ -13,7 +13,7 @@
#include "sysbus.h"
#include "net/net.h"
#include "devices.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "ptimer.h"
/* For crc32 */
#include <zlib.h>
diff --git a/hw/leon3.c b/hw/leon3.c
index c694eb8..61c991c 100644
--- a/hw/leon3.c
+++ b/hw/leon3.c
@@ -25,7 +25,7 @@
#include "qemu/timer.h"
#include "ptimer.h"
#include "qemu-char.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "loader.h"
#include "elf.h"
diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c
index fe92592..e108e49 100644
--- a/hw/lm32_boards.c
+++ b/hw/lm32_boards.c
@@ -23,7 +23,7 @@
#include "devices.h"
#include "boards.h"
#include "loader.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "elf.h"
#include "lm32_hwsetup.h"
#include "lm32.h"
diff --git a/hw/lm32_sys.c b/hw/lm32_sys.c
index 8a186ae..24f9f94 100644
--- a/hw/lm32_sys.c
+++ b/hw/lm32_sys.c
@@ -33,7 +33,7 @@
#include "trace.h"
#include "qemu/log.h"
#include "qemu/error.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/log.h"
enum {
diff --git a/hw/loader.c b/hw/loader.c
index 5d8ca2e..8b50d62 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -45,11 +45,11 @@
#include "hw.h"
#include "disas/disas.h"
#include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "uboot_image.h"
#include "loader.h"
#include "fw_cfg.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#include "exec/exec-memory.h"
#include <zlib.h>
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 34afe96..a43450d 100644
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -15,7 +15,7 @@
#include "hw.h"
#include "pci.h"
#include "scsi.h"
-#include "dma.h"
+#include "sysemu/dma.h"
//#define DEBUG_LSI
//#define DEBUG_LSI_REG
diff --git a/hw/m25p80.c b/hw/m25p80.c
index 9a56de8..a55349a 100644
--- a/hw/m25p80.c
+++ b/hw/m25p80.c
@@ -22,7 +22,7 @@
*/
#include "hw.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "ssi.h"
#include "devices.h"
diff --git a/hw/m48t59.c b/hw/m48t59.c
index 2987122..d64bca2 100644
--- a/hw/m48t59.c
+++ b/hw/m48t59.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "nvram.h"
#include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "sysbus.h"
#include "isa.h"
diff --git a/hw/mac_dbdma.h b/hw/mac_dbdma.h
index 6d1abe6..0495bdd 100644
--- a/hw/mac_dbdma.h
+++ b/hw/mac_dbdma.h
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
-#include "memory.h"
+#include "sysemu/memory.h"
typedef struct DBDMA_io DBDMA_io;
diff --git a/hw/mac_nvram.c b/hw/mac_nvram.c
index ed0a2b7..2aafdde 100644
--- a/hw/mac_nvram.c
+++ b/hw/mac_nvram.c
@@ -24,7 +24,7 @@
*/
#include "hw.h"
#include "firmware_abi.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "ppc_mac.h"
/* debug NVR */
diff --git a/hw/mainstone.c b/hw/mainstone.c
index 178bf7a..d8e9632 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -18,7 +18,7 @@
#include "devices.h"
#include "boards.h"
#include "flash.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "sysbus.h"
#include "exec/exec-memory.h"
diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index 20512fb..3338285 100644
--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
@@ -23,7 +23,7 @@
*/
#include "hw.h"
#include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "mc146818rtc.h"
#ifdef TARGET_I386
diff --git a/hw/mcf5206.c b/hw/mcf5206.c
index 6d5bab1..06f84f4 100644
--- a/hw/mcf5206.c
+++ b/hw/mcf5206.c
@@ -9,7 +9,7 @@
#include "mcf.h"
#include "qemu/timer.h"
#include "ptimer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "exec/exec-memory.h"
/* General purpose timer module. */
diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index 5b38072..9d392a4 100644
--- a/hw/mcf5208.c
+++ b/hw/mcf5208.c
@@ -9,7 +9,7 @@
#include "mcf.h"
#include "qemu/timer.h"
#include "ptimer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "net/net.h"
#include "boards.h"
#include "loader.h"
diff --git a/hw/megasas.c b/hw/megasas.c
index 6612c30..7a4db49 100644
--- a/hw/megasas.c
+++ b/hw/megasas.c
@@ -20,7 +20,7 @@
#include "hw.h"
#include "pci.h"
-#include "dma.h"
+#include "sysemu/dma.h"
#include "msix.h"
#include "qemu/iov.h"
#include "scsi.h"
diff --git a/hw/microblaze_boot.c b/hw/microblaze_boot.c
index e93c256..f09058a 100644
--- a/hw/microblaze_boot.c
+++ b/hw/microblaze_boot.c
@@ -27,7 +27,7 @@
#include "qemu/option.h"
#include "qemu/config-file.h"
#include "qemu-common.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
#include "loader.h"
#include "elf.h"
diff --git a/hw/milkymist-memcard.c b/hw/milkymist-memcard.c
index f0048e0..e5f8778 100644
--- a/hw/milkymist-memcard.c
+++ b/hw/milkymist-memcard.c
@@ -23,10 +23,10 @@
#include "hw.h"
#include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "trace.h"
#include "qemu/error.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "sd.h"
enum {
diff --git a/hw/milkymist-sysctl.c b/hw/milkymist-sysctl.c
index fe36a98..95167ae 100644
--- a/hw/milkymist-sysctl.c
+++ b/hw/milkymist-sysctl.c
@@ -23,7 +23,7 @@
#include "hw.h"
#include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "trace.h"
#include "qemu/timer.h"
#include "ptimer.h"
diff --git a/hw/milkymist.c b/hw/milkymist.c
index 7cb9989..70dfdaf 100644
--- a/hw/milkymist.c
+++ b/hw/milkymist.c
@@ -20,12 +20,12 @@
#include "sysbus.h"
#include "hw.h"
#include "flash.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "devices.h"
#include "boards.h"
#include "loader.h"
#include "elf.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "milkymist-hw.h"
#include "lm32.h"
#include "exec/exec-memory.h"
diff --git a/hw/mips.h b/hw/mips.h
index a7e6d4c..fc9289c 100644
--- a/hw/mips.h
+++ b/hw/mips.h
@@ -2,7 +2,7 @@
#define HW_MIPS_H
/* Definitions for mips board emulation. */
-#include "memory.h"
+#include "sysemu/memory.h"
/* gt64xxx.c */
PCIBus *gt64120_register(qemu_irq *pic);
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index f7642c5..e0c9e64 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -31,7 +31,7 @@
#include "mips_cpudevs.h"
#include "pci.h"
#include "qemu-char.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "audio/audio.h"
#include "qemu/log.h"
#include "loader.h"
@@ -41,7 +41,7 @@
#include "vt82c686.h"
#include "mc146818rtc.h"
#include "i8254.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
#define DEBUG_FULONG2E_INIT
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 4cc233e..20c45d1 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -29,8 +29,8 @@
#include "serial.h"
#include "isa.h"
#include "fdc.h"
-#include "sysemu.h"
-#include "arch_init.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/arch_init.h"
#include "boards.h"
#include "net/net.h"
#include "esp.h"
@@ -39,7 +39,7 @@
#include "mc146818rtc.h"
#include "i8254.h"
#include "pcspk.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "sysbus.h"
#include "exec/exec-memory.h"
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 3321a2a..1c52a0a 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -35,8 +35,8 @@
#include "mips_cpudevs.h"
#include "pci.h"
#include "qemu-char.h"
-#include "sysemu.h"
-#include "arch_init.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/arch_init.h"
#include "boards.h"
#include "qemu/log.h"
#include "mips-bios.h"
@@ -45,7 +45,7 @@
#include "elf.h"
#include "mc146818rtc.h"
#include "i8254.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
#include "sysbus.h" /* SysBusDevice */
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index 51705f9..0ee4a15 100644
--- a/hw/mips_mipssim.c
+++ b/hw/mips_mipssim.c
@@ -30,7 +30,7 @@
#include "serial.h"
#include "isa.h"
#include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "mips-bios.h"
#include "loader.h"
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 28540db..518ded7 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -14,7 +14,7 @@
#include "serial.h"
#include "isa.h"
#include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "flash.h"
#include "qemu/log.h"
@@ -24,7 +24,7 @@
#include "elf.h"
#include "mc146818rtc.h"
#include "i8254.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
#define MAX_IDE_BUS 2
diff --git a/hw/mpc8544_guts.c b/hw/mpc8544_guts.c
index 13b0ddd..6037921 100644
--- a/hw/mpc8544_guts.c
+++ b/hw/mpc8544_guts.c
@@ -18,7 +18,7 @@
*/
#include "hw.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "sysbus.h"
#define MPC8544_GUTS_MMIO_SIZE 0x1000
diff --git a/hw/multiboot.c b/hw/multiboot.c
index b1e04c5..01d1c7c 100644
--- a/hw/multiboot.c
+++ b/hw/multiboot.c
@@ -27,7 +27,7 @@
#include "multiboot.h"
#include "loader.h"
#include "elf.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
/* Show multiboot debug output */
//#define DEBUG_MULTIBOOT
diff --git a/hw/musicpal.c b/hw/musicpal.c
index 14cf8a7..a41a3f4 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -13,7 +13,7 @@
#include "arm-misc.h"
#include "devices.h"
#include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "serial.h"
#include "qemu/timer.h"
@@ -22,7 +22,7 @@
#include "flash.h"
#include "ui/console.h"
#include "i2c.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
#define MP_MISC_BASE 0x80002000
diff --git a/hw/nand.c b/hw/nand.c
index 0d949e5..4a5b673 100644
--- a/hw/nand.c
+++ b/hw/nand.c
@@ -20,7 +20,7 @@
# include "hw.h"
# include "flash.h"
-# include "blockdev.h"
+# include "sysemu/blockdev.h"
# include "sysbus.h"
#include "qemu/error.h"
diff --git a/hw/ne2000.c b/hw/ne2000.c
index 72a2e32..07209ec 100644
--- a/hw/ne2000.c
+++ b/hw/ne2000.c
@@ -26,7 +26,7 @@
#include "net/net.h"
#include "ne2000.h"
#include "loader.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
/* debug NE2000 card */
//#define DEBUG_NE2000
diff --git a/hw/nseries.c b/hw/nseries.c
index 76db6ce..8073837 100644
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -19,7 +19,7 @@
*/
#include "qemu-common.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "omap.h"
#include "arm-misc.h"
#include "irq.h"
@@ -31,7 +31,7 @@
#include "hw.h"
#include "bt.h"
#include "loader.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "sysbus.h"
#include "exec/exec-memory.h"
diff --git a/hw/omap.h b/hw/omap.h
index 413851b..83edc46 100644
--- a/hw/omap.h
+++ b/hw/omap.h
@@ -17,7 +17,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef hw_omap_h
-#include "memory.h"
+#include "sysemu/memory.h"
# define hw_omap_h "omap.h"
# define OMAP_EMIFS_BASE 0x00000000
diff --git a/hw/omap1.c b/hw/omap1.c
index ae98c20..8935765 100644
--- a/hw/omap1.c
+++ b/hw/omap1.c
@@ -19,9 +19,9 @@
#include "hw.h"
#include "arm-misc.h"
#include "omap.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "soc_dma.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "qemu/range.h"
#include "sysbus.h"
diff --git a/hw/omap2.c b/hw/omap2.c
index f492a77..21e722b 100644
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -18,11 +18,11 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "hw.h"
#include "arm-misc.h"
#include "omap.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/timer.h"
#include "qemu-char.h"
#include "flash.h"
diff --git a/hw/omap_gpmc.c b/hw/omap_gpmc.c
index 6625ffe..d162efb 100644
--- a/hw/omap_gpmc.c
+++ b/hw/omap_gpmc.c
@@ -21,7 +21,7 @@
#include "hw.h"
#include "flash.h"
#include "omap.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#include "exec/exec-memory.h"
/* General-Purpose Memory Controller */
diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index 8012a90..52a73b7 100644
--- a/hw/omap_sx1.c
+++ b/hw/omap_sx1.c
@@ -31,7 +31,7 @@
#include "boards.h"
#include "arm-misc.h"
#include "flash.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
/*****************************************************************************/
diff --git a/hw/onenand.c b/hw/onenand.c
index 33eaf3a..406f511 100644
--- a/hw/onenand.c
+++ b/hw/onenand.c
@@ -22,8 +22,8 @@
#include "hw.h"
#include "flash.h"
#include "irq.h"
-#include "blockdev.h"
-#include "memory.h"
+#include "sysemu/blockdev.h"
+#include "sysemu/memory.h"
#include "exec/exec-memory.h"
#include "sysbus.h"
#include "qemu/error.h"
diff --git a/hw/opencores_eth.c b/hw/opencores_eth.c
index 2bb10e8..413b4b5 100644
--- a/hw/opencores_eth.c
+++ b/hw/opencores_eth.c
@@ -34,7 +34,7 @@
#include "hw.h"
#include "sysbus.h"
#include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "trace.h"
/* RECSMALL is not used because it breaks tap networking in linux:
diff --git a/hw/openrisc_sim.c b/hw/openrisc_sim.c
index b146fb5..77f7432 100644
--- a/hw/openrisc_sim.c
+++ b/hw/openrisc_sim.c
@@ -25,9 +25,9 @@
#include "net/net.h"
#include "loader.h"
#include "exec/exec-memory.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "sysbus.h"
-#include "qtest.h"
+#include "sysemu/qtest.h"
#define KERNEL_LOAD_ADDR 0x100
diff --git a/hw/palm.c b/hw/palm.c
index e388cb0..0cbd992 100644
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -18,7 +18,7 @@
*/
#include "hw.h"
#include "audio/audio.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "ui/console.h"
#include "omap.h"
#include "boards.h"
diff --git a/hw/parallel.c b/hw/parallel.c
index 219f384..7b8a723 100644
--- a/hw/parallel.c
+++ b/hw/parallel.c
@@ -26,7 +26,7 @@
#include "qemu-char.h"
#include "isa.h"
#include "pc.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
//#define DEBUG_PARALLEL
diff --git a/hw/pc.c b/hw/pc.c
index 1b4ed66..9b45f92 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -40,16 +40,16 @@
#include "pcspk.h"
#include "msi.h"
#include "sysbus.h"
-#include "sysemu.h"
-#include "kvm.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/kvm.h"
#include "kvm_i386.h"
#include "xen.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "hw/block-common.h"
#include "ui/qemu-spice.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#include "exec/exec-memory.h"
-#include "arch_init.h"
+#include "sysemu/arch_init.h"
#include "qemu/bitmap.h"
/* debug PC/ISA interrupts */
diff --git a/hw/pc.h b/hw/pc.h
index e9aa0ea..d1fecaf 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -2,12 +2,12 @@
#define HW_PC_H
#include "qemu-common.h"
-#include "memory.h"
-#include "ioport.h"
+#include "sysemu/memory.h"
+#include "sysemu/ioport.h"
#include "isa.h"
#include "fdc.h"
#include "net/net.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#include "ioapic.h"
/* PC-style peripherals (also used by other machines). */
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index a3f8ae3..1c2aeaf 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -33,15 +33,15 @@
#include "net/net.h"
#include "boards.h"
#include "ide.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "kvm/clock.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "sysbus.h"
-#include "arch_init.h"
-#include "blockdev.h"
+#include "sysemu/arch_init.h"
+#include "sysemu/blockdev.h"
#include "smbus.h"
#include "xen.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#include "exec/exec-memory.h"
#ifdef CONFIG_XEN
# include <xen/hvm/hvm_info_table.h>
diff --git a/hw/pc_sysfw.c b/hw/pc_sysfw.c
index b45f0ac..926fef5 100644
--- a/hw/pc_sysfw.c
+++ b/hw/pc_sysfw.c
@@ -23,15 +23,15 @@
* THE SOFTWARE.
*/
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "sysbus.h"
#include "hw.h"
#include "pc.h"
#include "hw/boards.h"
#include "loader.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "flash.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#define BIOS_FILENAME "bios.bin"
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index f8f4d74..6e78571 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -31,7 +31,7 @@
#include "scsi.h"
#include "virtio-blk.h"
#include "qemu/config-file.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "qapi/error.h"
#if defined(TARGET_I386)
diff --git a/hw/pci-stub.c b/hw/pci-stub.c
index 4cea395..f4fa3f7 100644
--- a/hw/pci-stub.c
+++ b/hw/pci-stub.c
@@ -18,7 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
#include "pci.h"
#include "qmp-commands.h"
diff --git a/hw/pci.c b/hw/pci.c
index f41ecdc..ae8ef1a 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -27,7 +27,7 @@
#include "pci_internals.h"
#include "monitor/monitor.h"
#include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "loader.h"
#include "qemu/range.h"
#include "qmp-commands.h"
diff --git a/hw/pci.h b/hw/pci.h
index 1f902f5..83a711b 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -4,8 +4,8 @@
#include "qemu-common.h"
#include "qdev.h"
-#include "memory.h"
-#include "dma.h"
+#include "sysemu/memory.h"
+#include "sysemu/dma.h"
/* PCI includes legacy ISA access. */
#include "isa.h"
diff --git a/hw/pci_bridge_dev.c b/hw/pci_bridge_dev.c
index f706396..8c0de78 100644
--- a/hw/pci_bridge_dev.c
+++ b/hw/pci_bridge_dev.c
@@ -24,7 +24,7 @@
#include "msi.h"
#include "shpc.h"
#include "slotid_cap.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#include "pci_internals.h"
#define REDHAT_PCI_VENDOR_ID 0x1b36
diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c
index 3ca071e..9e7ca66 100644
--- a/hw/pcie_aer.c
+++ b/hw/pcie_aer.c
@@ -18,7 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qapi/qmp-types.h"
#include "monitor/monitor.h"
#include "pci_bridge.h"
diff --git a/hw/pcie_host.h b/hw/pcie_host.h
index 0074508..38aef69 100644
--- a/hw/pcie_host.h
+++ b/hw/pcie_host.h
@@ -22,7 +22,7 @@
#define PCIE_HOST_H
#include "pci_host.h"
-#include "memory.h"
+#include "sysemu/memory.h"
struct PCIExpressHost {
PCIHostState pci;
diff --git a/hw/pckbd.c b/hw/pckbd.c
index 69857ba..656ee8f 100644
--- a/hw/pckbd.c
+++ b/hw/pckbd.c
@@ -25,7 +25,7 @@
#include "isa.h"
#include "pc.h"
#include "ps2.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
/* debug PC keyboard */
//#define DEBUG_KBD
diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c
index f11b0cf..f5d52ee 100644
--- a/hw/pcnet-pci.c
+++ b/hw/pcnet-pci.c
@@ -31,7 +31,7 @@
#include "net/net.h"
#include "loader.h"
#include "qemu/timer.h"
-#include "dma.h"
+#include "sysemu/dma.h"
#include "pcnet.h"
diff --git a/hw/pcnet.c b/hw/pcnet.c
index 80cf26d..31ce610 100644
--- a/hw/pcnet.c
+++ b/hw/pcnet.c
@@ -39,7 +39,7 @@
#include "net/net.h"
#include "qemu/timer.h"
#include "qemu/sockets.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "pcnet.h"
diff --git a/hw/pcnet.h b/hw/pcnet.h
index d0af54a..557b4f2 100644
--- a/hw/pcnet.h
+++ b/hw/pcnet.h
@@ -4,7 +4,7 @@
#define PCNET_LOOPTEST_CRC 1
#define PCNET_LOOPTEST_NOCRC 2
-#include "memory.h"
+#include "sysemu/memory.h"
/* BUS CONFIGURATION REGISTERS */
#define BCR_MSRDA 0
diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c
index 2fa9152..7a1c345 100644
--- a/hw/petalogix_ml605_mmu.c
+++ b/hw/petalogix_ml605_mmu.c
@@ -29,11 +29,11 @@
#include "hw.h"
#include "net/net.h"
#include "flash.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "devices.h"
#include "boards.h"
#include "xilinx.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "serial.h"
#include "exec/exec-memory.h"
#include "ssi.h"
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index 4d81c82..b66f79d 100644
--- a/hw/petalogix_s3adsp1800_mmu.c
+++ b/hw/petalogix_s3adsp1800_mmu.c
@@ -27,11 +27,11 @@
#include "hw.h"
#include "net/net.h"
#include "flash.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "devices.h"
#include "boards.h"
#include "xilinx.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
#include "microblaze_boot.h"
diff --git a/hw/pl031.c b/hw/pl031.c
index be27489..9a62617 100644
--- a/hw/pl031.c
+++ b/hw/pl031.c
@@ -13,7 +13,7 @@
#include "sysbus.h"
#include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
//#define DEBUG_PL031
diff --git a/hw/pl181.c b/hw/pl181.c
index 5a73473..d854be6 100644
--- a/hw/pl181.c
+++ b/hw/pl181.c
@@ -7,7 +7,7 @@
* This code is licensed under the GPL.
*/
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "sysbus.h"
#include "sd.h"
diff --git a/hw/ppc.c b/hw/ppc.c
index f39985a..e77c6bd 100644
--- a/hw/ppc.c
+++ b/hw/ppc.c
@@ -24,11 +24,11 @@
#include "hw.h"
#include "ppc.h"
#include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "nvram.h"
#include "qemu/log.h"
#include "loader.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "kvm_ppc.h"
//#define PPC_DEBUG_IRQ
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 553db61..150811a 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -22,10 +22,10 @@
#include "hw/serial.h"
#include "hw/pci.h"
#include "hw/boards.h"
-#include "sysemu.h"
-#include "kvm.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/kvm.h"
#include "kvm_ppc.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
#include "hw/openpic.h"
#include "hw/ppc.h"
#include "hw/loader.h"
diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
index 4cfb940..dd3830d 100644
--- a/hw/ppc/e500plat.c
+++ b/hw/ppc/e500plat.c
@@ -13,7 +13,7 @@
#include "qemu-common.h"
#include "e500.h"
#include "../boards.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
{
diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c
index e651661..50d7eaa 100644
--- a/hw/ppc/mpc8544ds.c
+++ b/hw/ppc/mpc8544ds.c
@@ -13,7 +13,7 @@
#include "qemu-common.h"
#include "e500.h"
#include "../boards.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
static void mpc8544ds_fixup_devtree(PPCE500Params *params, void *fdt)
{
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index 8eadf46..0190a5a 100644
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -26,12 +26,12 @@
#include "ppc405.h"
#include "nvram.h"
#include "flash.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "block/block.h"
#include "boards.h"
#include "qemu/log.h"
#include "loader.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
#define BIOS_FILENAME "ppc405_rom.bin"
diff --git a/hw/ppc405_uc.c b/hw/ppc405_uc.c
index a1e6af3..00020f5 100644
--- a/hw/ppc405_uc.c
+++ b/hw/ppc405_uc.c
@@ -26,7 +26,7 @@
#include "ppc405.h"
#include "serial.h"
#include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/log.h"
#include "exec/exec-memory.h"
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 762d40f..5230fd2 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -17,16 +17,16 @@
#include "hw.h"
#include "pci.h"
#include "boards.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "kvm_ppc.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
#include "loader.h"
#include "elf.h"
#include "exec/exec-memory.h"
#include "serial.h"
#include "ppc.h"
#include "ppc405.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "sysbus.h"
#define BINARY_DEVICE_TREE_FILE "bamboo.dtb"
diff --git a/hw/ppc_booke.c b/hw/ppc_booke.c
index a7182be..5c89fc3 100644
--- a/hw/ppc_booke.c
+++ b/hw/ppc_booke.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "ppc.h"
#include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "nvram.h"
#include "qemu/log.h"
#include "loader.h"
diff --git a/hw/ppc_mac.h b/hw/ppc_mac.h
index 7d08418..e985ca0 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 "memory.h"
+#include "sysemu/memory.h"
/* SMP is not enabled, for now */
#define MAX_CPUS 1
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index 1080e33..2f11dcc 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -54,7 +54,7 @@
#include "nvram.h"
#include "pci.h"
#include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "fw_cfg.h"
#include "escc.h"
@@ -62,10 +62,10 @@
#include "ide.h"
#include "loader.h"
#include "elf.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "kvm_ppc.h"
#include "hw/usb.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
#define MAX_IDE_BUS 2
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index 3011143..a3127cc 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -29,7 +29,7 @@
#include "adb.h"
#include "mac_dbdma.h"
#include "nvram.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "net/net.h"
#include "isa.h"
#include "pci.h"
@@ -39,9 +39,9 @@
#include "ide.h"
#include "loader.h"
#include "elf.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "kvm_ppc.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
#define MAX_IDE_BUS 2
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 25fd195..ad1c389 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -27,7 +27,7 @@
#include "serial.h"
#include "fdc.h"
#include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "isa.h"
#include "pci.h"
#include "pci_host.h"
@@ -37,8 +37,8 @@
#include "ide.h"
#include "loader.h"
#include "mc146818rtc.h"
-#include "blockdev.h"
-#include "arch_init.h"
+#include "sysemu/blockdev.h"
+#include "sysemu/arch_init.h"
#include "exec/exec-memory.h"
//#define HARD_DEBUG_PPC_IO
diff --git a/hw/ppce500_spin.c b/hw/ppce500_spin.c
index c5b8e05..9b4465c 100644
--- a/hw/ppce500_spin.c
+++ b/hw/ppce500_spin.c
@@ -28,9 +28,9 @@
*/
#include "hw.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "sysbus.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#define MAX_CPUS 32
diff --git a/hw/ps2.c b/hw/ps2.c
index ba80089..15cfd5b 100644
--- a/hw/ps2.c
+++ b/hw/ps2.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "ps2.h"
#include "ui/console.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
/* debug PC keyboard */
//#define DEBUG_KBD
diff --git a/hw/pxa.h b/hw/pxa.h
index 6a21205..d5f6ed1 100644
--- a/hw/pxa.h
+++ b/hw/pxa.h
@@ -9,7 +9,7 @@
#ifndef PXA_H
# define PXA_H "pxa.h"
-#include "memory.h"
+#include "sysemu/memory.h"
/* Interrupt numbers */
# define PXA2XX_PIC_SSP3 0
diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c
index 4ec904f..da20e08 100644
--- a/hw/pxa2xx.c
+++ b/hw/pxa2xx.c
@@ -9,12 +9,12 @@
#include "sysbus.h"
#include "pxa.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "serial.h"
#include "i2c.h"
#include "ssi.h"
#include "qemu-char.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
static struct {
target_phys_addr_t io_base;
diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c
index 0b1ee9a..5bf5061 100644
--- a/hw/pxa2xx_lcd.c
+++ b/hw/pxa2xx_lcd.c
@@ -15,7 +15,7 @@
#include "pxa.h"
#include "pixel_ops.h"
/* FIXME: For graphic_rotate. Should probably be done in common code. */
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "framebuffer.h"
struct DMAChannel {
diff --git a/hw/pxa2xx_timer.c b/hw/pxa2xx_timer.c
index b28cc55..bbcdd3a 100644
--- a/hw/pxa2xx_timer.c
+++ b/hw/pxa2xx_timer.c
@@ -9,7 +9,7 @@
#include "hw.h"
#include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "pxa.h"
#include "sysbus.h"
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
index f55cad3..38ca0c7 100644
--- a/hw/qdev-monitor.c
+++ b/hw/qdev-monitor.c
@@ -20,7 +20,7 @@
#include "qdev.h"
#include "monitor/monitor.h"
#include "qmp-commands.h"
-#include "arch_init.h"
+#include "sysemu/arch_init.h"
#include "qemu/config-file.h"
/*
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 583d603..523534b 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -1,7 +1,7 @@
#include "net/net.h"
#include "qdev.h"
#include "qobject/qerror.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "hw/block-common.h"
#include "qemu-char.h"
diff --git a/hw/qdev.c b/hw/qdev.c
index 4498de0..734001a 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -27,7 +27,7 @@
#include "net/net.h"
#include "qdev.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qapi/error.h"
int qdev_hotplug = 0;
diff --git a/hw/qxl.c b/hw/qxl.c
index cfe2415..70a3dd0 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -24,7 +24,7 @@
#include "qemu/timer.h"
#include "qemu/queue.h"
#include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "trace.h"
#include "qxl.h"
diff --git a/hw/r2d.c b/hw/r2d.c
index e0831d1..ee71979 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -27,7 +27,7 @@
#include "hw.h"
#include "sh.h"
#include "devices.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "pci.h"
#include "net/net.h"
@@ -36,7 +36,7 @@
#include "loader.h"
#include "usb.h"
#include "flash.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
#define FLASH_BASE 0x00000000
diff --git a/hw/realview.c b/hw/realview.c
index 21633e5..b388786 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -13,10 +13,10 @@
#include "devices.h"
#include "pci.h"
#include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "i2c.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
#define SMP_BOOT_ADDR 0xe0000000
diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index 07eb356..4a0d20d 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -53,11 +53,11 @@
#include "hw.h"
#include "pci.h"
-#include "dma.h"
+#include "sysemu/dma.h"
#include "qemu/timer.h"
#include "net/net.h"
#include "loader.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/iov.h"
/* debug RTL8139 card */
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index ff9b68e..f98f725 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -19,7 +19,7 @@
#include "hw.h"
#include "block/block.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "monitor/monitor.h"
#include "loader.h"
@@ -28,7 +28,7 @@
#include "hw/virtio-serial.h"
#include "hw/virtio-net.h"
#include "hw/sysbus.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "hw/s390-virtio-bus.h"
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index c62e1b1..21c59d8 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -19,8 +19,8 @@
#include "hw.h"
#include "block/block.h"
-#include "blockdev.h"
-#include "sysemu.h"
+#include "sysemu/blockdev.h"
+#include "sysemu/sysemu.h"
#include "net/net.h"
#include "boards.h"
#include "monitor/monitor.h"
@@ -28,7 +28,7 @@
#include "elf.h"
#include "hw/virtio.h"
#include "hw/sysbus.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "exec/exec-memory.h"
#include "hw/s390-virtio-bus.h"
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 4741567..0e55b4b 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -3,9 +3,9 @@
#include "scsi.h"
#include "scsi-defs.h"
#include "qdev.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "trace.h"
-#include "dma.h"
+#include "sysemu/dma.h"
static char *scsibus_get_dev_path(DeviceState *dev);
static char *scsibus_get_fw_dev_path(DeviceState *dev);
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index ca050a8..fa86978 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -32,10 +32,10 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0)
#include "qemu/error.h"
#include "scsi.h"
#include "scsi-defs.h"
-#include "sysemu.h"
-#include "blockdev.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/blockdev.h"
#include "hw/block-common.h"
-#include "dma.h"
+#include "sysemu/dma.h"
#ifdef __linux
#include <scsi/sg.h>
diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c
index 3bd891a..e7a1adb 100644
--- a/hw/scsi-generic.c
+++ b/hw/scsi-generic.c
@@ -14,7 +14,7 @@
#include "qemu-common.h"
#include "qemu/error.h"
#include "scsi.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#ifdef __linux__
diff --git a/hw/scsi.h b/hw/scsi.h
index 24ed522..a5b5b2e 100644
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -4,7 +4,7 @@
#include "qdev.h"
#include "block/block.h"
#include "hw/block-common.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#define MAX_SCSI_DEVS 255
diff --git a/hw/serial.h b/hw/serial.h
index 55a1ac5..316470e 100644
--- a/hw/serial.h
+++ b/hw/serial.h
@@ -24,8 +24,8 @@
*/
#include "hw.h"
-#include "sysemu.h"
-#include "memory.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/memory.h"
#define UART_FIFO_LENGTH 16 /* 16550A Fifo Length */
diff --git a/hw/sga.c b/hw/sga.c
index a666349..7bb7166 100644
--- a/hw/sga.c
+++ b/hw/sga.c
@@ -27,7 +27,7 @@
#include "pci.h"
#include "pc.h"
#include "loader.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#define SGABIOS_FILENAME "sgabios.bin"
diff --git a/hw/sh7750.c b/hw/sh7750.c
index 8ace676..58791c2 100644
--- a/hw/sh7750.c
+++ b/hw/sh7750.c
@@ -25,7 +25,7 @@
#include <stdio.h>
#include "hw.h"
#include "sh.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "sh7750_regs.h"
#include "sh7750_regnames.h"
#include "sh_intc.h"
diff --git a/hw/shix.c b/hw/shix.c
index 9cc4512..e194391 100644
--- a/hw/shix.c
+++ b/hw/shix.c
@@ -29,7 +29,7 @@
*/
#include "hw.h"
#include "sh.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "loader.h"
#include "exec/exec-memory.h"
diff --git a/hw/shpc.h b/hw/shpc.h
index 946c779..9e6d2fc 100644
--- a/hw/shpc.h
+++ b/hw/shpc.h
@@ -2,7 +2,7 @@
#define SHPC_H
#include "qemu-common.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#include "migration/vmstate.h"
struct SHPCDevice {
diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c
index 944835e..556bc32 100644
--- a/hw/slavio_misc.c
+++ b/hw/slavio_misc.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "sysbus.h"
#include "trace.h"
diff --git a/hw/smbios.c b/hw/smbios.c
index c57237d..a7b8bfc 100644
--- a/hw/smbios.c
+++ b/hw/smbios.c
@@ -13,7 +13,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "smbios.h"
#include "loader.h"
diff --git a/hw/soc_dma.h b/hw/soc_dma.h
index 904b26c..6e43120 100644
--- a/hw/soc_dma.h
+++ b/hw/soc_dma.h
@@ -18,7 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "memory.h"
+#include "sysemu/memory.h"
struct soc_dma_s;
struct soc_dma_ch_s;
diff --git a/hw/spapr.c b/hw/spapr.c
index ef486f7..e5b6e02 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -24,13 +24,13 @@
* THE SOFTWARE.
*
*/
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "hw.h"
#include "elf.h"
#include "net/net.h"
-#include "blockdev.h"
-#include "cpus.h"
-#include "kvm.h"
+#include "sysemu/blockdev.h"
+#include "sysemu/cpus.h"
+#include "sysemu/kvm.h"
#include "kvm_ppc.h"
#include "hw/boards.h"
@@ -43,7 +43,7 @@
#include "hw/xics.h"
#include "hw/msi.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "kvm_ppc.h"
#include "pci.h"
diff --git a/hw/spapr.h b/hw/spapr.h
index e984e3f..2756999 100644
--- a/hw/spapr.h
+++ b/hw/spapr.h
@@ -1,7 +1,7 @@
#if !defined(__HW_SPAPR_H__)
#define __HW_SPAPR_H__
-#include "dma.h"
+#include "sysemu/dma.h"
#include "hw/xics.h"
struct VIOsPAPRBus;
diff --git a/hw/spapr_hcall.c b/hw/spapr_hcall.c
index ea6119e..4dfdba2 100644
--- a/hw/spapr_hcall.c
+++ b/hw/spapr_hcall.c
@@ -1,6 +1,6 @@
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "cpu.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "helper_regs.h"
#include "hw/spapr.h"
diff --git a/hw/spapr_iommu.c b/hw/spapr_iommu.c
index eae1f64..2c42ae5 100644
--- a/hw/spapr_iommu.c
+++ b/hw/spapr_iommu.c
@@ -17,10 +17,10 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "qdev.h"
#include "kvm_ppc.h"
-#include "dma.h"
+#include "sysemu/dma.h"
#include "exec/exec-memory.h"
#include "hw/spapr.h"
diff --git a/hw/spapr_rtas.c b/hw/spapr_rtas.c
index b808f80..405684e 100644
--- a/hw/spapr_rtas.c
+++ b/hw/spapr_rtas.c
@@ -25,10 +25,10 @@
*
*/
#include "cpu.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu-char.h"
#include "hw/qdev.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
#include "hw/spapr.h"
#include "hw/spapr_vio.h"
diff --git a/hw/spapr_vio.c b/hw/spapr_vio.c
index 0d0f496..5ea0ee3 100644
--- a/hw/spapr_vio.c
+++ b/hw/spapr_vio.c
@@ -20,14 +20,14 @@
*/
#include "hw.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "monitor/monitor.h"
#include "loader.h"
#include "elf.h"
#include "hw/sysbus.h"
-#include "kvm.h"
-#include "device_tree.h"
+#include "sysemu/kvm.h"
+#include "sysemu/device_tree.h"
#include "kvm_ppc.h"
#include "hw/spapr.h"
diff --git a/hw/spapr_vio.h b/hw/spapr_vio.h
index cc85d26..f98ec0a 100644
--- a/hw/spapr_vio.h
+++ b/hw/spapr_vio.h
@@ -21,7 +21,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "dma.h"
+#include "sysemu/dma.h"
#define TYPE_VIO_SPAPR_DEVICE "vio-spapr-device"
#define VIO_SPAPR_DEVICE(obj) \
diff --git a/hw/spitz.c b/hw/spitz.c
index c0d41d3..0fd4ae0 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -13,7 +13,7 @@
#include "hw.h"
#include "pxa.h"
#include "arm-misc.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "pcmcia.h"
#include "i2c.h"
#include "ssi.h"
@@ -25,7 +25,7 @@
#include "block/block.h"
#include "audio/audio.h"
#include "boards.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "sysbus.h"
#include "exec/exec-memory.h"
diff --git a/hw/ssi-sd.c b/hw/ssi-sd.c
index c5505ee..d61c332 100644
--- a/hw/ssi-sd.c
+++ b/hw/ssi-sd.c
@@ -10,7 +10,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "ssi.h"
#include "sd.h"
diff --git a/hw/strongarm.c b/hw/strongarm.c
index f81eff2..b081ab9 100644
--- a/hw/strongarm.c
+++ b/hw/strongarm.c
@@ -31,7 +31,7 @@
#include "qemu/error.h"
#include "arm-misc.h"
#include "qemu-char.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "ssi.h"
//#define DEBUG
diff --git a/hw/strongarm.h b/hw/strongarm.h
index d30dd6a..45102bc 100644
--- a/hw/strongarm.h
+++ b/hw/strongarm.h
@@ -1,7 +1,7 @@
#ifndef _STRONGARM_H
#define _STRONGARM_H
-#include "memory.h"
+#include "sysemu/memory.h"
#define SA_CS0 0x00000000
#define SA_CS1 0x08000000
diff --git a/hw/sun4m.c b/hw/sun4m.c
index 482f869..0cdea06 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -27,7 +27,7 @@
#include "nvram.h"
#include "sparc32_dma.h"
#include "fdc.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "net/net.h"
#include "boards.h"
#include "firmware_abi.h"
@@ -40,7 +40,7 @@
#include "qdev-addr.h"
#include "loader.h"
#include "elf.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "trace.h"
/*
diff --git a/hw/sun4u.c b/hw/sun4u.c
index b52d9ef..7e979ac 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -30,7 +30,7 @@
#include "fdc.h"
#include "net/net.h"
#include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "firmware_abi.h"
#include "fw_cfg.h"
@@ -38,7 +38,7 @@
#include "ide.h"
#include "loader.h"
#include "elf.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
//#define DEBUG_IRQ
diff --git a/hw/sysbus.h b/hw/sysbus.h
index acfbcfb..fbd5dce 100644
--- a/hw/sysbus.h
+++ b/hw/sysbus.h
@@ -4,7 +4,7 @@
/* Devices attached directly to the main system bus. */
#include "qdev.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#define QDEV_MAX_MMIO 32
#define QDEV_MAX_PIO 32
diff --git a/hw/tc6393xb.c b/hw/tc6393xb.c
index afb78bb..712eb75 100644
--- a/hw/tc6393xb.c
+++ b/hw/tc6393xb.c
@@ -15,7 +15,7 @@
#include "flash.h"
#include "ui/console.h"
#include "pixel_ops.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#define IRQ_TC6393_NAND 0
#define IRQ_TC6393_MMC 1
diff --git a/hw/tosa.c b/hw/tosa.c
index 25370fd..a67f02e 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -21,7 +21,7 @@
#include "boards.h"
#include "i2c.h"
#include "ssi.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "sysbus.h"
#include "exec/exec-memory.h"
diff --git a/hw/twl92230.c b/hw/twl92230.c
index 3210b9e..c71e4a2 100644
--- a/hw/twl92230.c
+++ b/hw/twl92230.c
@@ -22,7 +22,7 @@
#include "hw.h"
#include "qemu/timer.h"
#include "i2c.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "ui/console.h"
#define VERBOSE 1
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index dbf4d80..1345dff 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -1,7 +1,7 @@
#include "hw/hw.h"
#include "hw/usb.h"
#include "hw/qdev.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
#include "trace.h"
diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index 6296130..b7bb1b1 100644
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -29,7 +29,7 @@
#include "net/net.h"
#include "qemu/queue.h"
#include "qemu/config-file.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/iov.h"
/*#define TRAFFIC_DEBUG*/
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 5a1c715..72981a1 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -15,8 +15,8 @@
#include "hw/scsi.h"
#include "ui/console.h"
#include "monitor/monitor.h"
-#include "sysemu.h"
-#include "blockdev.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/blockdev.h"
//#define DEBUG_MSD
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index e4abb29..f6063dd 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -33,8 +33,8 @@
#include "hw/pci.h"
#include "monitor/monitor.h"
#include "trace.h"
-#include "dma.h"
-#include "sysemu.h"
+#include "sysemu/dma.h"
+#include "sysemu/sysemu.h"
#define EHCI_DEBUG 0
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index 48ae244..f8b6b36 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -30,7 +30,7 @@
#include "hw/pci.h"
#include "qemu/timer.h"
#include "qemu/iov.h"
-#include "dma.h"
+#include "sysemu/dma.h"
#include "trace.h"
//#define DEBUG
diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c
index 1d4d9c6..8cc65ed 100644
--- a/hw/usb/host-linux.c
+++ b/hw/usb/host-linux.c
@@ -33,7 +33,7 @@
#include "qemu-common.h"
#include "qemu/timer.h"
#include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "trace.h"
#include <dirent.h>
diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c
index f826a42..9c3de84 100644
--- a/hw/usb/libhw.c
+++ b/hw/usb/libhw.c
@@ -22,7 +22,7 @@
#include "qemu-common.h"
#include "exec/cpu-common.h"
#include "hw/usb.h"
-#include "dma.h"
+#include "sysemu/dma.h"
int usb_packet_map(USBPacket *p, QEMUSGList *sgl)
{
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 833785a..c5b203d 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -28,7 +28,7 @@
#include "qemu-common.h"
#include "qemu/timer.h"
#include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include <dirent.h>
#include <sys/ioctl.h>
diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index 55a9a1f..480a899 100644
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -11,11 +11,11 @@
#include "arm-misc.h"
#include "devices.h"
#include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "pci.h"
#include "i2c.h"
#include "boards.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/exec-memory.h"
#include "flash.h"
diff --git a/hw/vexpress.c b/hw/vexpress.c
index 1090db6..6572ad8 100644
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -26,10 +26,10 @@
#include "primecell.h"
#include "devices.h"
#include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "exec/exec-memory.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "flash.h"
#define VEXPRESS_BOARD_ID 0x8e0
diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c
index 8d8e6c0..155cd77 100644
--- a/hw/vfio_pci.c
+++ b/hw/vfio_pci.c
@@ -29,8 +29,8 @@
#include "config.h"
#include "qemu/event_notifier.h"
#include "exec/exec-memory.h"
-#include "kvm.h"
-#include "memory.h"
+#include "sysemu/kvm.h"
+#include "sysemu/memory.h"
#include "msi.h"
#include "msix.h"
#include "pci.h"
diff --git a/hw/vga_int.h b/hw/vga_int.h
index 6093867..687d3df 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -24,7 +24,7 @@
#include <hw/hw.h>
#include "qapi/error.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#define ST01_V_RETRACE 0x08
#define ST01_DISP_ENABLE 0x01
diff --git a/hw/vhost.h b/hw/vhost.h
index 0c47229..8d4b1e0 100644
--- a/hw/vhost.h
+++ b/hw/vhost.h
@@ -3,7 +3,7 @@
#include "hw/hw.h"
#include "hw/virtio.h"
-#include "memory.h"
+#include "sysemu/memory.h"
/* Generic structures common for any vhost based device. */
struct vhost_virtqueue {
diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index 2a69822..c41e6e9 100644
--- a/hw/virtex_ml507.c
+++ b/hw/virtex_ml507.c
@@ -26,10 +26,10 @@
#include "hw.h"
#include "serial.h"
#include "flash.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "devices.h"
#include "boards.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
#include "loader.h"
#include "elf.h"
#include "qemu/log.h"
@@ -39,7 +39,7 @@
#include "ppc4xx.h"
#include "ppc405.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "xilinx.h"
#define EPAPR_MAGIC (0x45504150)
diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c
index f77bd58..840be0f 100644
--- a/hw/virtio-balloon.c
+++ b/hw/virtio-balloon.c
@@ -18,9 +18,9 @@
#include "virtio.h"
#include "pc.h"
#include "cpu.h"
-#include "balloon.h"
+#include "sysemu/balloon.h"
#include "virtio-balloon.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "exec/exec-memory.h"
#if defined(__linux__)
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index 9cc720f..9e5a34c 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -15,7 +15,7 @@
#include "qemu/error.h"
#include "trace.h"
#include "hw/block-common.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "virtio-blk.h"
#include "scsi-defs.h"
#ifdef __linux__
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index 83c82a2..1713a4d 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -27,8 +27,8 @@
#include "msi.h"
#include "msix.h"
#include "loader.h"
-#include "kvm.h"
-#include "blockdev.h"
+#include "sysemu/kvm.h"
+#include "sysemu/blockdev.h"
#include "virtio-pci.h"
#include "qemu/range.h"
diff --git a/hw/virtio.h b/hw/virtio.h
index 4a4e2ed..9b422b0 100644
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -17,7 +17,7 @@
#include "hw.h"
#include "net/net.h"
#include "qdev.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/event_notifier.h"
#ifdef CONFIG_LINUX
#include "9p.h"
diff --git a/hw/vmport.c b/hw/vmport.c
index a4f52ee..2d270a3 100644
--- a/hw/vmport.c
+++ b/hw/vmport.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "isa.h"
#include "pc.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "qdev.h"
//#define VMPORT_DEBUG
diff --git a/hw/vt82c686.c b/hw/vt82c686.c
index dbcda42..7fcf684 100644
--- a/hw/vt82c686.c
+++ b/hw/vt82c686.c
@@ -22,7 +22,7 @@
#include "apm.h"
#include "acpi.h"
#include "pm_smbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/timer.h"
typedef uint32_t pci_addr_t;
diff --git a/hw/watchdog.c b/hw/watchdog.c
index d5a7d54..2298f98 100644
--- a/hw/watchdog.c
+++ b/hw/watchdog.c
@@ -25,7 +25,7 @@
#include "qemu/queue.h"
#include "qapi/qmp-types.h"
#include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "hw/watchdog.h"
/* Possible values for action parameter. */
diff --git a/hw/xen_backend.h b/hw/xen_backend.h
index 92ab501..f37afb1 100644
--- a/hw/xen_backend.h
+++ b/hw/xen_backend.h
@@ -2,7 +2,7 @@
#define QEMU_HW_XEN_BACKEND_H 1
#include "xen_common.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "net/net.h"
/* ------------------------------------------------------------- */
diff --git a/hw/xen_devconfig.c b/hw/xen_devconfig.c
index d83e8d0..e2ba741 100644
--- a/hw/xen_devconfig.c
+++ b/hw/xen_devconfig.c
@@ -1,5 +1,5 @@
#include "xen_backend.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
/* ------------------------------------------------------------- */
diff --git a/hw/xen_disk.c b/hw/xen_disk.c
index 423b580..a6a64a2 100644
--- a/hw/xen_disk.c
+++ b/hw/xen_disk.c
@@ -38,7 +38,7 @@
#include "hw.h"
#include "xen_backend.h"
#include "xen_blkif.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
/* ------------------------------------------------------------- */
diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index 4264703..9feecd5 100644
--- a/hw/xen_machine_pv.c
+++ b/hw/xen_machine_pv.c
@@ -27,7 +27,7 @@
#include "boards.h"
#include "xen_backend.h"
#include "xen_domainbuild.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
static void xen_init_pv(QEMUMachineInitArgs *args)
{
diff --git a/hw/xilinx_spi.c b/hw/xilinx_spi.c
index adca63f..463a622 100644
--- a/hw/xilinx_spi.c
+++ b/hw/xilinx_spi.c
@@ -25,7 +25,7 @@
*/
#include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/log.h"
#include "fifo.h"
diff --git a/hw/xilinx_spips.c b/hw/xilinx_spips.c
index 9021d17..49945cd 100644
--- a/hw/xilinx_spips.c
+++ b/hw/xilinx_spips.c
@@ -23,7 +23,7 @@
*/
#include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "ptimer.h"
#include "qemu/log.h"
#include "fifo.h"
diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c
index c650404..4d649e5 100644
--- a/hw/xilinx_zynq.c
+++ b/hw/xilinx_zynq.c
@@ -19,10 +19,10 @@
#include "arm-misc.h"
#include "net/net.h"
#include "exec/exec-memory.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "flash.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "loader.h"
#include "ssi.h"
diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index a775979..5feb016 100644
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -25,17 +25,17 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "loader.h"
#include "elf.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#include "exec/exec-memory.h"
#include "serial.h"
#include "net/net.h"
#include "sysbus.h"
#include "flash.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "qemu-char.h"
#include "xtensa_bootparam.h"
diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c
index 569141e..52c2a20 100644
--- a/hw/xtensa_sim.c
+++ b/hw/xtensa_sim.c
@@ -25,11 +25,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "boards.h"
#include "loader.h"
#include "elf.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#include "exec/exec-memory.h"
static uint64_t translate_phys_addr(void *env, uint64_t addr)
diff --git a/hw/z2.c b/hw/z2.c
index 316922e..6c90562 100644
--- a/hw/z2.c
+++ b/hw/z2.c
@@ -18,9 +18,9 @@
#include "i2c.h"
#include "ssi.h"
#include "boards.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "flash.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "ui/console.h"
#include "audio/audio.h"
#include "exec/exec-memory.h"
diff --git a/hw/zynq_slcr.c b/hw/zynq_slcr.c
index 626bab4..d0b22b4 100644
--- a/hw/zynq_slcr.c
+++ b/hw/zynq_slcr.c
@@ -17,7 +17,7 @@
#include "hw.h"
#include "qemu/timer.h"
#include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#ifdef ZYNQ_ARM_SLCR_ERR_DEBUG
#define DB_PRINT(...) do { \
diff --git a/include/exec/exec-memory.h b/include/exec/exec-memory.h
index ac1d07d..35668e9 100644
--- a/include/exec/exec-memory.h
+++ b/include/exec/exec-memory.h
@@ -19,7 +19,7 @@
* you're one of them.
*/
-#include "memory.h"
+#include "sysemu/memory.h"
#ifndef CONFIG_USER_ONLY
diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_template.h
index 2f3ff29..9da97a7 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 "memory.h"
+#include "sysemu/memory.h"
#define DATA_SIZE (1 << SHIFT)
diff --git a/arch_init.h b/include/sysemu/arch_init.h
similarity index 100%
rename from arch_init.h
rename to include/sysemu/arch_init.h
diff --git a/balloon.h b/include/sysemu/balloon.h
similarity index 100%
rename from balloon.h
rename to include/sysemu/balloon.h
diff --git a/blockdev.h b/include/sysemu/blockdev.h
similarity index 100%
rename from blockdev.h
rename to include/sysemu/blockdev.h
diff --git a/cpus.h b/include/sysemu/cpus.h
similarity index 100%
rename from cpus.h
rename to include/sysemu/cpus.h
diff --git a/cputlb.h b/include/sysemu/cputlb.h
similarity index 100%
rename from cputlb.h
rename to include/sysemu/cputlb.h
diff --git a/device_tree.h b/include/sysemu/device_tree.h
similarity index 100%
rename from device_tree.h
rename to include/sysemu/device_tree.h
diff --git a/dma.h b/include/sysemu/dma.h
similarity index 99%
rename from dma.h
rename to include/sysemu/dma.h
index 89c4161..108d868 100644
--- a/dma.h
+++ b/include/sysemu/dma.h
@@ -11,10 +11,10 @@
#define DMA_H
#include <stdio.h>
-#include "memory.h"
+#include "sysemu/memory.h"
#include "hw/hw.h"
#include "block/block.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
typedef struct DMAContext DMAContext;
typedef struct ScatterGatherEntry ScatterGatherEntry;
diff --git a/dump.h b/include/sysemu/dump.h
similarity index 100%
rename from dump.h
rename to include/sysemu/dump.h
diff --git a/ioport.h b/include/sysemu/ioport.h
similarity index 98%
rename from ioport.h
rename to include/sysemu/ioport.h
index 23441cb..4adf3e0 100644
--- a/ioport.h
+++ b/include/sysemu/ioport.h
@@ -25,7 +25,7 @@
#define IOPORT_H
#include "qemu-common.h"
-#include "iorange.h"
+#include "sysemu/iorange.h"
typedef uint32_t pio_addr_t;
#define FMT_pioaddr PRIx32
diff --git a/iorange.h b/include/sysemu/iorange.h
similarity index 100%
rename from iorange.h
rename to include/sysemu/iorange.h
diff --git a/kvm.h b/include/sysemu/kvm.h
similarity index 100%
rename from kvm.h
rename to include/sysemu/kvm.h
diff --git a/memory-internal.h b/include/sysemu/memory-internal.h
similarity index 100%
rename from memory-internal.h
rename to include/sysemu/memory-internal.h
diff --git a/memory.h b/include/sysemu/memory.h
similarity index 99%
rename from memory.h
rename to include/sysemu/memory.h
index 095dd8f..0305b5a 100644
--- a/memory.h
+++ b/include/sysemu/memory.h
@@ -22,8 +22,8 @@
#include "exec/cpu-common.h"
#include "exec/targphys.h"
#include "qemu/queue.h"
-#include "iorange.h"
-#include "ioport.h"
+#include "sysemu/iorange.h"
+#include "sysemu/ioport.h"
#include "qemu/int128.h"
typedef struct MemoryRegionOps MemoryRegionOps;
diff --git a/memory_mapping.h b/include/sysemu/memory_mapping.h
similarity index 100%
rename from memory_mapping.h
rename to include/sysemu/memory_mapping.h
diff --git a/qemu-os-posix.h b/include/sysemu/os-posix.h
similarity index 100%
rename from qemu-os-posix.h
rename to include/sysemu/os-posix.h
diff --git a/qemu-os-win32.h b/include/sysemu/os-win32.h
similarity index 100%
rename from qemu-os-win32.h
rename to include/sysemu/os-win32.h
diff --git a/qtest.h b/include/sysemu/qtest.h
similarity index 100%
rename from qtest.h
rename to include/sysemu/qtest.h
diff --git a/qemu-seccomp.h b/include/sysemu/seccomp.h
similarity index 100%
rename from qemu-seccomp.h
rename to include/sysemu/seccomp.h
diff --git a/sysemu.h b/include/sysemu/sysemu.h
similarity index 100%
rename from sysemu.h
rename to include/sysemu/sysemu.h
diff --git a/xen-mapcache.h b/include/sysemu/xen-mapcache.h
similarity index 100%
rename from xen-mapcache.h
rename to include/sysemu/xen-mapcache.h
diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h
index 9f8ce22..275ddc3 100644
--- a/include/ui/spice-display.h
+++ b/include/ui/spice-display.h
@@ -22,7 +22,7 @@
#include "qemu/thread.h"
#include "ui/console.h"
#include "pflib.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#define NUM_MEMSLOTS 8
#define MEMSLOT_GENERATION_BITS 8
diff --git a/ioport.c b/ioport.c
index 6e4ca0d..2c7ea83 100644
--- a/ioport.c
+++ b/ioport.c
@@ -25,9 +25,9 @@
* splitted out ioport related stuffs from vl.c.
*/
-#include "ioport.h"
+#include "sysemu/ioport.h"
#include "trace.h"
-#include "memory.h"
+#include "sysemu/memory.h"
/***********************************************************/
/* IO Port */
diff --git a/kvm-all.c b/kvm-all.c
index 2427140..96515d9 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -24,13 +24,13 @@
#include "qemu/atomic.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "hw/hw.h"
#include "hw/msi.h"
#include "exec/gdbstub.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "qemu/bswap.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#include "exec/exec-memory.h"
#include "qemu/event_notifier.h"
diff --git a/kvm-stub.c b/kvm-stub.c
index 4184fb4..0fd08b8 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -15,7 +15,7 @@
#include "hw/msi.h"
#include "cpu.h"
#include "exec/gdbstub.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
KVMState *kvm_state;
bool kvm_kernel_irqchip;
diff --git a/memory.c b/memory.c
index f1b280c..e0ab742 100644
--- a/memory.c
+++ b/memory.c
@@ -13,14 +13,14 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include "memory.h"
+#include "sysemu/memory.h"
#include "exec/exec-memory.h"
-#include "ioport.h"
+#include "sysemu/ioport.h"
#include "qemu/bitops.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include <assert.h>
-#include "memory-internal.h"
+#include "sysemu/memory-internal.h"
unsigned memory_region_transaction_depth = 0;
static bool global_dirty_log = false;
diff --git a/memory_mapping-stub.c b/memory_mapping-stub.c
index 5f5fb99..24d5d67 100644
--- a/memory_mapping-stub.c
+++ b/memory_mapping-stub.c
@@ -13,7 +13,7 @@
#include "cpu.h"
#include "exec/cpu-all.h"
-#include "memory_mapping.h"
+#include "sysemu/memory_mapping.h"
int qemu_get_guest_memory_mapping(MemoryMappingList *list)
{
diff --git a/memory_mapping.c b/memory_mapping.c
index bcf02ca..a547fda 100644
--- a/memory_mapping.c
+++ b/memory_mapping.c
@@ -13,7 +13,7 @@
#include "cpu.h"
#include "exec/cpu-all.h"
-#include "memory_mapping.h"
+#include "sysemu/memory_mapping.h"
static void memory_mapping_list_add_mapping_sorted(MemoryMappingList *list,
MemoryMapping *mapping)
diff --git a/migration.c b/migration.c
index a69e3de..062f270 100644
--- a/migration.c
+++ b/migration.c
@@ -17,7 +17,7 @@
#include "migration/migration.h"
#include "monitor/monitor.h"
#include "buffered_file.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "block/block.h"
#include "qemu/sockets.h"
#include "migration/block.h"
diff --git a/monitor.c b/monitor.c
index 0983d9f..ac5b8b9 100644
--- a/monitor.c
+++ b/monitor.c
@@ -35,17 +35,17 @@
#include "net/slirp.h"
#include "qemu-char.h"
#include "ui/qemu-spice.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
#include "monitor/readline.h"
#include "ui/console.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "audio/audio.h"
#include "disas/disas.h"
-#include "balloon.h"
+#include "sysemu/balloon.h"
#include "qemu/timer.h"
#include "migration/migration.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "qemu/acl.h"
#include "qobject/qint.h"
#include "qobject/qfloat.h"
@@ -63,7 +63,7 @@
#include "trace/simple.h"
#endif
#include "ui/qemu-spice.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#include "qmp-commands.h"
#include "hmp.h"
#include "qemu/thread.h"
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 80961ff..45f7813 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -24,7 +24,7 @@
#include "tap_int.h"
#include "qemu-common.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/error.h"
#ifdef __NetBSD__
diff --git a/net/tap-linux.c b/net/tap-linux.c
index 5518fbf..16bf386 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -30,7 +30,7 @@
#include <net/if.h>
#include <sys/ioctl.h>
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu-common.h"
#include "qemu/error.h"
diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index 683e7c5..8f44c96 100644
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -23,7 +23,7 @@
*/
#include "tap_int.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include <sys/stat.h>
#include <sys/ethernet.h>
diff --git a/net/tap-win32.c b/net/tap-win32.c
index 46ee550..110f3f4 100644
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -31,7 +31,7 @@
#include "qemu-common.h"
#include "clients.h" /* net_init_tap */
#include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/error.h"
#include <stdio.h>
#include <windows.h>
diff --git a/net/tap.c b/net/tap.c
index 5febae7..d8cebe9 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -36,7 +36,7 @@
#include "net/net.h"
#include "clients.h"
#include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu-common.h"
#include "qemu/error.h"
diff --git a/os-posix.c b/os-posix.c
index 488e480..5c64518 100644
--- a/os-posix.c
+++ b/os-posix.c
@@ -36,7 +36,7 @@
/* Needed early for CONFIG_BSD etc. */
#include "config-host.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "net/slirp.h"
#include "qemu-options.h"
diff --git a/os-win32.c b/os-win32.c
index 13892ba..9673a81 100644
--- a/os-win32.c
+++ b/os-win32.c
@@ -30,7 +30,7 @@
#include <errno.h>
#include <sys/time.h>
#include "config-host.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu-options.h"
/***********************************************************/
diff --git a/oslib-posix.c b/oslib-posix.c
index 13ab0c3..23e9a35 100644
--- a/oslib-posix.c
+++ b/oslib-posix.c
@@ -49,7 +49,7 @@ extern int daemon(int, int);
#endif
#include "config-host.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "trace.h"
#include "qemu/sockets.h"
diff --git a/oslib-win32.c b/oslib-win32.c
index 7f0dd07..e7e283e 100644
--- a/oslib-win32.c
+++ b/oslib-win32.c
@@ -27,7 +27,7 @@
*/
#include <windows.h>
#include "config-host.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/main-loop.h"
#include "trace.h"
#include "qemu/sockets.h"
diff --git a/posix-aio-compat.c b/posix-aio-compat.c
index 0609bbb..53f7697 100644
--- a/posix-aio-compat.c
+++ b/posix-aio-compat.c
@@ -25,7 +25,7 @@
#include "qemu/queue.h"
#include "qemu/osdep.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu-common.h"
#include "trace.h"
#include "block/block_int.h"
diff --git a/qemu-char.c b/qemu-char.c
index a6da6ac..b38b9c0 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -24,7 +24,7 @@
#include "qemu-common.h"
#include "monitor/monitor.h"
#include "ui/console.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/timer.h"
#include "qemu-char.h"
#include "hw/usb.h"
diff --git a/qemu-common.h b/qemu-common.h
index bdde24a..576adca 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -41,11 +41,11 @@ typedef struct MigrationParams MigrationParams;
#include <glib.h>
#ifdef _WIN32
-#include "qemu-os-win32.h"
+#include "sysemu/os-win32.h"
#endif
#ifdef CONFIG_POSIX
-#include "qemu-os-posix.h"
+#include "sysemu/os-posix.h"
#endif
#ifndef O_LARGEFILE
diff --git a/qemu-img.c b/qemu-img.c
index da743fb..634504d 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -28,7 +28,7 @@
#include "qemu/option.h"
#include "qemu/error.h"
#include "qemu/osdep.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "block/block_int.h"
#include <getopt.h>
#include <stdio.h>
diff --git a/qemu-progress.c b/qemu-progress.c
index 08d6794..9a3f96c 100644
--- a/qemu-progress.c
+++ b/qemu-progress.c
@@ -24,7 +24,7 @@
#include "qemu-common.h"
#include "qemu/osdep.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include <stdio.h>
struct progress_state {
diff --git a/qemu-seccomp.c b/qemu-seccomp.c
index 64329a3..1d0664e 100644
--- a/qemu-seccomp.c
+++ b/qemu-seccomp.c
@@ -14,7 +14,7 @@
*/
#include <stdio.h>
#include <seccomp.h>
-#include "qemu-seccomp.h"
+#include "sysemu/seccomp.h"
struct QemuSeccompSyscall {
int32_t num;
diff --git a/qemu-timer.c b/qemu-timer.c
index 183b249..8862779 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
#include "ui/console.h"
diff --git a/qemu-tool.c b/qemu-tool.c
index e3f35bb..e5fc711 100644
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -19,7 +19,7 @@
#include "qemu/log.h"
#include "migration/migration.h"
#include "qemu/main-loop.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/sockets.h"
#include "slirp/libslirp.h"
diff --git a/qmp.c b/qmp.c
index 8d1ebe4..85c5733 100644
--- a/qmp.c
+++ b/qmp.c
@@ -14,15 +14,15 @@
*/
#include "qemu-common.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qmp-commands.h"
#include "qemu-char.h"
#include "ui/qemu-spice.h"
#include "ui/vnc.h"
-#include "kvm.h"
-#include "arch_init.h"
+#include "sysemu/kvm.h"
+#include "sysemu/arch_init.h"
#include "hw/qdev.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "qom/qom-qobject.h"
NameInfo *qmp_query_name(Error **errp)
diff --git a/qtest.c b/qtest.c
index fbfab4e..65edf07 100644
--- a/qtest.c
+++ b/qtest.c
@@ -11,14 +11,14 @@
*
*/
-#include "qtest.h"
+#include "sysemu/qtest.h"
#include "hw/qdev.h"
#include "qemu-char.h"
-#include "ioport.h"
-#include "memory.h"
+#include "sysemu/ioport.h"
+#include "sysemu/memory.h"
#include "hw/irq.h"
-#include "sysemu.h"
-#include "cpus.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/cpus.h"
#define MAX_IRQ 256
diff --git a/savevm.c b/savevm.c
index b448221..b9f5c97 100644
--- a/savevm.c
+++ b/savevm.c
@@ -74,15 +74,15 @@
#include "hw/qdev.h"
#include "net/net.h"
#include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/timer.h"
#include "audio/audio.h"
#include "migration/migration.h"
#include "qemu/sockets.h"
#include "qemu/queue.h"
#include "qemu/timer.h"
-#include "cpus.h"
-#include "memory.h"
+#include "sysemu/cpus.h"
+#include "sysemu/memory.h"
#include "qmp-commands.h"
#include "trace.h"
diff --git a/target-alpha/sys_helper.c b/target-alpha/sys_helper.c
index 2bc2b02..434a63a 100644
--- a/target-alpha/sys_helper.c
+++ b/target-alpha/sys_helper.c
@@ -19,7 +19,7 @@
#include "cpu.h"
#include "helper.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/timer.h"
diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index b00f5fa..17875ed 100644
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -23,7 +23,7 @@
#if !defined(CONFIG_USER_ONLY)
#include "hw/loader.h"
#endif
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
static void cp_reg_reset(gpointer key, gpointer value, gpointer opaque)
{
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 5b09e5e..f126fc6 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -2,7 +2,7 @@
#include "exec/gdbstub.h"
#include "helper.h"
#include "qemu/host-utils.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/bitops.h"
#ifndef CONFIG_USER_ONLY
diff --git a/target-i386/arch_dump.c b/target-i386/arch_dump.c
index 50d866f..8209ce9 100644
--- a/target-i386/arch_dump.c
+++ b/target-i386/arch_dump.c
@@ -13,7 +13,7 @@
#include "cpu.h"
#include "exec/cpu-all.h"
-#include "dump.h"
+#include "sysemu/dump.h"
#include "elf.h"
#ifdef TARGET_X86_64
diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c
index 217e09d..7ccf666 100644
--- a/target-i386/arch_memory_mapping.c
+++ b/target-i386/arch_memory_mapping.c
@@ -13,7 +13,7 @@
#include "cpu.h"
#include "exec/cpu-all.h"
-#include "memory_mapping.h"
+#include "sysemu/memory_mapping.h"
/* PAE Paging or IA-32e Paging */
static void walk_pte(MemoryMappingList *list, target_phys_addr_t pte_start_addr,
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 735fc47..bc1ace5 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -22,13 +22,13 @@
#include <inttypes.h>
#include "cpu.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
#include "qapi/visit-core.h"
-#include "arch_init.h"
+#include "sysemu/arch_init.h"
#include "hyperv.h"
diff --git a/target-i386/excp_helper.c b/target-i386/excp_helper.c
index 64c8346..179ea82 100644
--- a/target-i386/excp_helper.c
+++ b/target-i386/excp_helper.c
@@ -19,7 +19,7 @@
#include "cpu.h"
#include "qemu/log.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "helper.h"
#if 0
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 08500b2..8616727 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -18,9 +18,9 @@
*/
#include "cpu.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#ifndef CONFIG_USER_ONLY
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
#endif
diff --git a/target-i386/ioport-user.c b/target-i386/ioport-user.c
index 03fac22..8762d9f 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 "ioport.h"
+#include "sysemu/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 445bc00..a9985bf 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -21,8 +21,8 @@
#include <linux/kvm_para.h>
#include "qemu-common.h"
-#include "sysemu.h"
-#include "kvm.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/kvm.h"
#include "kvm_i386.h"
#include "cpu.h"
#include "exec/gdbstub.h"
@@ -30,7 +30,7 @@
#include "qemu/config-file.h"
#include "hw/pc.h"
#include "hw/apic.h"
-#include "ioport.h"
+#include "sysemu/ioport.h"
#include "hyperv.h"
#include "hw/pci.h"
diff --git a/target-i386/kvm_i386.h b/target-i386/kvm_i386.h
index f6ab82f..4392ab4 100644
--- a/target-i386/kvm_i386.h
+++ b/target-i386/kvm_i386.h
@@ -11,7 +11,7 @@
#ifndef QEMU_KVM_I386_H
#define QEMU_KVM_I386_H
-#include "kvm.h"
+#include "sysemu/kvm.h"
bool kvm_allows_irq0_override(void);
diff --git a/target-i386/machine.c b/target-i386/machine.c
index 4771508..8c1fed1 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -4,7 +4,7 @@
#include "hw/isa.h"
#include "cpu.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
static const VMStateDescription vmstate_segment = {
.name = "segment",
diff --git a/target-i386/misc_helper.c b/target-i386/misc_helper.c
index 3aac1e5..5779d1f 100644
--- a/target-i386/misc_helper.c
+++ b/target-i386/misc_helper.c
@@ -18,7 +18,7 @@
*/
#include "cpu.h"
-#include "ioport.h"
+#include "sysemu/ioport.h"
#include "helper.h"
#if !defined(CONFIG_USER_ONLY)
diff --git a/target-m68k/m68k-semi.c b/target-m68k/m68k-semi.c
index 17e649f..fb62e68 100644
--- a/target-m68k/m68k-semi.c
+++ b/target-m68k/m68k-semi.c
@@ -36,7 +36,7 @@
#include "exec/gdbstub.h"
#include "exec/softmmu-semi.h"
#endif
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#define HOSTED_EXIT 0
#define HOSTED_INIT_SIM 1
diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index 48b19a7..103855a 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -19,9 +19,9 @@
#include "cpu.h"
#include "helper_regs.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "kvm_ppc.h"
-#include "cpus.h"
+#include "sysemu/cpus.h"
PowerPCCPU *cpu_ppc_init(const char *cpu_model)
{
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 4b69796..5bdcf9e 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -24,12 +24,12 @@
#include "qemu-common.h"
#include "qemu/timer.h"
-#include "sysemu.h"
-#include "kvm.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/kvm.h"
#include "kvm_ppc.h"
#include "cpu.h"
-#include "cpus.h"
-#include "device_tree.h"
+#include "sysemu/cpus.h"
+#include "sysemu/device_tree.h"
#include "hw/sysbus.h"
#include "hw/spapr.h"
diff --git a/target-ppc/kvm_ppc.c b/target-ppc/kvm_ppc.c
index 2de59fd..1b192a8 100644
--- a/target-ppc/kvm_ppc.c
+++ b/target-ppc/kvm_ppc.c
@@ -14,7 +14,7 @@
#include "qemu-common.h"
#include "qemu/timer.h"
#include "kvm_ppc.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
#define PROC_DEVTREE_PATH "/proc/device-tree"
diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h
index baad6eb..40271e4 100644
--- a/target-ppc/kvm_ppc.h
+++ b/target-ppc/kvm_ppc.h
@@ -9,7 +9,7 @@
#ifndef __KVM_PPC_H__
#define __KVM_PPC_H__
-#include "memory.h"
+#include "sysemu/memory.h"
void kvmppc_init(void);
diff --git a/target-ppc/machine.c b/target-ppc/machine.c
index 21ce757..c4b75c0 100644
--- a/target-ppc/machine.c
+++ b/target-ppc/machine.c
@@ -1,6 +1,6 @@
#include "hw/hw.h"
#include "hw/boards.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
void cpu_save(QEMUFile *f, void *opaque)
{
diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c
index 532b114..7afa95a 100644
--- a/target-ppc/mmu_helper.c
+++ b/target-ppc/mmu_helper.c
@@ -18,7 +18,7 @@
*/
#include "cpu.h"
#include "helper.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "kvm_ppc.h"
//#define DEBUG_MMU
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 67b021f..6ed2e28 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -25,9 +25,9 @@
#include "disas/bfd.h"
#include "exec/gdbstub.h"
-#include <kvm.h>
+#include <sysemu/kvm.h>
#include "kvm_ppc.h"
-#include "arch_init.h"
+#include "sysemu/arch_init.h"
//#define PPC_DUMP_CPU
//#define PPC_DEBUG_SPR
diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index 4f4543a..4664314 100644
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -22,7 +22,7 @@
#include "exec/gdbstub.h"
#include "qemu/timer.h"
#ifndef CONFIG_USER_ONLY
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#endif
//#define DEBUG_S390
diff --git a/target-s390x/interrupt.c b/target-s390x/interrupt.c
index c1b034f..6c0024b 100644
--- a/target-s390x/interrupt.c
+++ b/target-s390x/interrupt.c
@@ -8,7 +8,7 @@
*/
#include "cpu.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#if !defined(CONFIG_USER_ONLY)
/* service interrupts are floating therefore we must not pass an cpustate */
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 1a376fc..9f96b57 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -26,10 +26,10 @@
#include "qemu-common.h"
#include "qemu/timer.h"
-#include "sysemu.h"
-#include "kvm.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/kvm.h"
#include "cpu.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
/* #define DEBUG_KVM */
diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
index 24ad5ed..f1eaae8 100644
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -19,11 +19,11 @@
*/
#include "cpu.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#include "qemu/host-utils.h"
#include "helper.h"
#include <string.h>
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "qemu/timer.h"
#ifdef CONFIG_KVM
#include <linux/kvm.h>
@@ -31,7 +31,7 @@
#if !defined(CONFIG_USER_ONLY)
#include "exec/softmmu_exec.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#endif
/* #define DEBUG_HELPER */
diff --git a/target-sparc/helper.c b/target-sparc/helper.c
index 7fe073e..c3c09e6 100644
--- a/target-sparc/helper.c
+++ b/target-sparc/helper.c
@@ -20,7 +20,7 @@
#include "cpu.h"
#include "qemu/host-utils.h"
#include "helper.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
void helper_raise_exception(CPUSPARCState *env, int tt)
{
diff --git a/target-sparc/int32_helper.c b/target-sparc/int32_helper.c
index 507c355..c35f522 100644
--- a/target-sparc/int32_helper.c
+++ b/target-sparc/int32_helper.c
@@ -19,7 +19,7 @@
#include "cpu.h"
#include "trace.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#define DEBUG_PCALL
diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c
index fa25f53..e5e90cd 100644
--- a/target-xtensa/translate.c
+++ b/target-xtensa/translate.c
@@ -35,7 +35,7 @@
#include "disas/disas.h"
#include "tcg-op.h"
#include "qemu/log.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "helper.h"
#define GEN_HELPER 1
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 611bb26..63cb0fd 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -27,7 +27,7 @@
#include "qemu-common.h"
#include "ui/console.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#ifndef MAC_OS_X_VERSION_10_4
#define MAC_OS_X_VERSION_10_4 1040
diff --git a/ui/curses.c b/ui/curses.c
index d5dcb8d..6e104e6 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -34,7 +34,7 @@
#include "qemu-common.h"
#include "ui/console.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#define FONT_HEIGHT 16
#define FONT_WIDTH 8
diff --git a/ui/input.c b/ui/input.c
index 05f6c0c..259fd18 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
#include "ui/console.h"
#include "qapi/error.h"
diff --git a/ui/keymaps.c b/ui/keymaps.c
index f55a2aa..9625d82 100644
--- a/ui/keymaps.c
+++ b/ui/keymaps.c
@@ -23,7 +23,7 @@
*/
#include "keymaps.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
static int get_keysym(const name2keysym_t *table,
const char *name)
diff --git a/ui/sdl.c b/ui/sdl.c
index 485cb08..009575a 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -30,7 +30,7 @@
#include "qemu-common.h"
#include "ui/console.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "x_keymap.h"
#include "sdl_zoom.h"
diff --git a/ui/spice-core.c b/ui/spice-core.c
index c797e54..ad18765 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -19,7 +19,7 @@
#include <spice-experimental.h>
#include <netdb.h>
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu-common.h"
#include "ui/qemu-spice.h"
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 9aaac86..7a46186 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -21,7 +21,7 @@
#include "qemu/queue.h"
#include "monitor/monitor.h"
#include "ui/console.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "trace.h"
#include "ui/spice-display.h"
diff --git a/ui/vnc.c b/ui/vnc.c
index c7b017d..a3dd8b8 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -26,7 +26,7 @@
#include "vnc.h"
#include "vnc-jobs.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/sockets.h"
#include "qemu/timer.h"
#include "qemu/acl.h"
diff --git a/vl.c b/vl.c
index 0105fe6..c1e79dc 100644
--- a/vl.c
+++ b/vl.c
@@ -65,7 +65,7 @@
#endif
#ifdef CONFIG_SECCOMP
-#include "qemu-seccomp.h"
+#include "sysemu/seccomp.h"
#endif
#ifdef __sun__
@@ -131,18 +131,18 @@ int main(int argc, char **argv)
#include "net/slirp.h"
#include "monitor/monitor.h"
#include "ui/console.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "exec/gdbstub.h"
#include "qemu/timer.h"
#include "qemu-char.h"
#include "qemu/cache-utils.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "hw/block-common.h"
#include "migration/block.h"
-#include "dma.h"
+#include "sysemu/dma.h"
#include "audio/audio.h"
#include "migration/migration.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "qobject/qjson.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
@@ -152,7 +152,7 @@ int main(int argc, char **argv)
#ifdef CONFIG_VIRTFS
#include "fsdev/qemu-fsdev.h"
#endif
-#include "qtest.h"
+#include "sysemu/qtest.h"
#include "disas/disas.h"
@@ -163,8 +163,8 @@ int main(int argc, char **argv)
#include "trace.h"
#include "trace/control.h"
#include "qemu/queue.h"
-#include "cpus.h"
-#include "arch_init.h"
+#include "sysemu/cpus.h"
+#include "sysemu/arch_init.h"
#include "qemu/osdep.h"
#include "ui/qemu-spice.h"
diff --git a/xen-all.c b/xen-all.c
index e854641..64bd751 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -17,7 +17,7 @@
#include "qmp-commands.h"
#include "qemu/range.h"
-#include "xen-mapcache.h"
+#include "sysemu/xen-mapcache.h"
#include "trace.h"
#include "exec/exec-memory.h"
diff --git a/xen-mapcache.c b/xen-mapcache.c
index ef824cc..35791b1 100644
--- a/xen-mapcache.c
+++ b/xen-mapcache.c
@@ -13,13 +13,13 @@
#include <sys/resource.h>
#include "hw/xen_backend.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "qemu/bitmap.h"
#include <xen/hvm/params.h>
#include <sys/mman.h>
-#include "xen-mapcache.h"
+#include "sysemu/xen-mapcache.h"
#include "trace.h"
diff --git a/xen-stub.c b/xen-stub.c
index 9214392..e78f360 100644
--- a/xen-stub.c
+++ b/xen-stub.c
@@ -10,7 +10,7 @@
#include "qemu-common.h"
#include "hw/xen.h"
-#include "memory.h"
+#include "sysemu/memory.h"
#include "qmp-commands.h"
void xenstore_store_pv_console_info(int i, CharDriverState *chr)
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 29/32] softmmu: move remaining include files to include/ subdirectories
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (27 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 28/32] softmmu: move include files to include/sysemu/ Paolo Bonzini
@ 2012-10-24 12:58 ` Paolo Bonzini
2012-10-24 12:59 ` [Qemu-devel] [PATCH 30/32] fpu: move public header file to include/fpu Paolo Bonzini
` (5 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:58 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
bt-host.c | 2 +-
bt-vhci.c | 2 +-
gdbstub.c | 2 +-
hmp.c | 2 +-
hw/baum.c | 2 +-
hw/bt-hci-csr.c | 4 ++--
hw/bt-hci.c | 2 +-
hw/bt.c | 2 +-
hw/cadence_uart.c | 2 +-
hw/ccid-card-emulated.c | 2 +-
hw/ccid-card-passthru.c | 2 +-
hw/debugcon.c | 2 +-
hw/escc.c | 2 +-
hw/etraxfs_ser.c | 2 +-
hw/exynos4210_uart.c | 2 +-
hw/grlib_apbuart.c | 2 +-
hw/imx_serial.c | 2 +-
hw/ivshmem.c | 2 +-
hw/leon3.c | 2 +-
hw/lm32_juart.c | 2 +-
hw/lm32_uart.c | 2 +-
hw/mcf_uart.c | 2 +-
hw/milkymist-uart.c | 2 +-
hw/mips_fulong2e.c | 2 +-
hw/mips_malta.c | 2 +-
hw/msmouse.c | 2 +-
hw/omap2.c | 2 +-
hw/omap_uart.c | 2 +-
hw/parallel.c | 2 +-
hw/pl011.c | 2 +-
hw/pxa2xx.c | 2 +-
hw/qdev-properties.c | 2 +-
hw/serial.c | 2 +-
hw/sh_serial.c | 2 +-
hw/spapr_rtas.c | 2 +-
hw/spapr_vty.c | 2 +-
hw/strongarm.c | 2 +-
hw/usb/dev-bluetooth.c | 2 +-
hw/usb/dev-serial.c | 2 +-
hw/virtio-console.c | 2 +-
hw/xen_backend.c | 2 +-
hw/xen_console.c | 2 +-
hw/xenfb.c | 2 +-
hw/xgmac.c | 2 +-
hw/xilinx_uartlite.c | 2 +-
hw/xtensa_lx60.c | 2 +-
bt-host.h => include/bt/bt.h | 0
qemu-char.h => include/char/char.h | 0
monitor.c | 2 +-
net/slirp.c | 2 +-
qemu-char.c | 2 +-
qmp.c | 2 +-
qtest.c | 2 +-
slirp/slirp.c | 2 +-
ui/console.c | 2 +-
vl.c | 4 ++--
56 files changed, 56 insertions(+), 56 deletions(-)
rename bt-host.h => include/bt/bt.h (100%)
rename qemu-char.h => include/char/char.h (100%)
diff --git a/bt-host.c b/bt-host.c
index 4f5f9f9..2092754 100644
--- a/bt-host.c
+++ b/bt-host.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "bt-host.h"
+#include "bt/bt.h"
#include "qemu/main-loop.h"
#ifndef _WIN32
diff --git a/bt-vhci.c b/bt-vhci.c
index f5d856a..a6a7ab0 100644
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "bt-host.h"
+#include "bt/bt.h"
#include "hw/bt.h"
#include "qemu/main-loop.h"
diff --git a/gdbstub.c b/gdbstub.c
index 2fca1a7..a8dd437 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -30,7 +30,7 @@
#include "qemu.h"
#else
#include "monitor/monitor.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "sysemu/sysemu.h"
#include "exec/gdbstub.h"
#endif
diff --git a/hmp.c b/hmp.c
index cc25a41..cd058ad 100644
--- a/hmp.c
+++ b/hmp.c
@@ -15,7 +15,7 @@
#include "hmp.h"
#include "net/net.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "qemu/option.h"
#include "qemu/timer.h"
#include "qmp-commands.h"
diff --git a/hw/baum.c b/hw/baum.c
index 97d13ea..09dcb9c 100644
--- a/hw/baum.c
+++ b/hw/baum.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "qemu/timer.h"
#include "usb.h"
#include "baum.h"
diff --git a/hw/bt-hci-csr.c b/hw/bt-hci-csr.c
index e1dcb6d..2070bb9 100644
--- a/hw/bt-hci-csr.c
+++ b/hw/bt-hci-csr.c
@@ -19,10 +19,10 @@
*/
#include "qemu-common.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "qemu/timer.h"
#include "irq.h"
-#include "bt-host.h"
+#include "bt/bt.h"
#include "bt.h"
struct csrhci_s {
diff --git a/hw/bt-hci.c b/hw/bt-hci.c
index da096d8..69d2c73 100644
--- a/hw/bt-hci.c
+++ b/hw/bt-hci.c
@@ -21,7 +21,7 @@
#include "qemu-common.h"
#include "qemu/timer.h"
#include "usb.h"
-#include "bt-host.h"
+#include "bt/bt.h"
#include "bt.h"
struct bt_hci_s {
diff --git a/hw/bt.c b/hw/bt.c
index 3fea098..4f2372d 100644
--- a/hw/bt.c
+++ b/hw/bt.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "bt-host.h"
+#include "bt/bt.h"
#include "bt.h"
/* Slave implementations can ignore this */
diff --git a/hw/cadence_uart.c b/hw/cadence_uart.c
index 764a185..d7d305b 100644
--- a/hw/cadence_uart.c
+++ b/hw/cadence_uart.c
@@ -17,7 +17,7 @@
*/
#include "sysbus.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "qemu/timer.h"
#ifdef CADENCE_UART_ERR_DEBUG
diff --git a/hw/ccid-card-emulated.c b/hw/ccid-card-emulated.c
index e508380..6fd4469 100644
--- a/hw/ccid-card-emulated.c
+++ b/hw/ccid-card-emulated.c
@@ -32,7 +32,7 @@
#include <vcard_emul.h>
#include "qemu/thread.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "monitor/monitor.h"
#include "hw/ccid.h"
diff --git a/hw/ccid-card-passthru.c b/hw/ccid-card-passthru.c
index 48e4228..4be0547 100644
--- a/hw/ccid-card-passthru.c
+++ b/hw/ccid-card-passthru.c
@@ -8,7 +8,7 @@
* See the COPYING file in the top-level directory.
*/
-#include "qemu-char.h"
+#include "char/char.h"
#include "qemu/sockets.h"
#include "monitor/monitor.h"
#include "hw/ccid.h"
diff --git a/hw/debugcon.c b/hw/debugcon.c
index 14ab326..14f83f1 100644
--- a/hw/debugcon.c
+++ b/hw/debugcon.c
@@ -25,7 +25,7 @@
*/
#include "hw.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "isa.h"
#include "pc.h"
diff --git a/hw/escc.c b/hw/escc.c
index ce5a082..073b4f0 100644
--- a/hw/escc.c
+++ b/hw/escc.c
@@ -25,7 +25,7 @@
#include "hw.h"
#include "sysbus.h"
#include "escc.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "ui/console.h"
#include "trace.h"
diff --git a/hw/etraxfs_ser.c b/hw/etraxfs_ser.c
index 50a4a34..46f392e 100644
--- a/hw/etraxfs_ser.c
+++ b/hw/etraxfs_ser.c
@@ -23,7 +23,7 @@
*/
#include "sysbus.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "qemu/log.h"
#define D(x)
diff --git a/hw/exynos4210_uart.c b/hw/exynos4210_uart.c
index c319933..d540a0a 100644
--- a/hw/exynos4210_uart.c
+++ b/hw/exynos4210_uart.c
@@ -21,7 +21,7 @@
#include "sysbus.h"
#include "sysemu/sysemu.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "exynos4210.h"
diff --git a/hw/grlib_apbuart.c b/hw/grlib_apbuart.c
index 73fc989..e00bfb8 100644
--- a/hw/grlib_apbuart.c
+++ b/hw/grlib_apbuart.c
@@ -23,7 +23,7 @@
*/
#include "sysbus.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "trace.h"
diff --git a/hw/imx_serial.c b/hw/imx_serial.c
index 09ec6fe..5a81009 100644
--- a/hw/imx_serial.c
+++ b/hw/imx_serial.c
@@ -20,7 +20,7 @@
#include "hw.h"
#include "sysbus.h"
#include "sysemu/sysemu.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "imx.h"
//#define DEBUG_SERIAL 1
diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index 7690a4f..935f890 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -24,7 +24,7 @@
#include "migration/migration.h"
#include "qobject/qerror.h"
#include "qemu/event_notifier.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include <sys/mman.h>
#include <sys/types.h>
diff --git a/hw/leon3.c b/hw/leon3.c
index 61c991c..f9f9a33 100644
--- a/hw/leon3.c
+++ b/hw/leon3.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "qemu/timer.h"
#include "ptimer.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "sysemu/sysemu.h"
#include "boards.h"
#include "loader.h"
diff --git a/hw/lm32_juart.c b/hw/lm32_juart.c
index f07ed39..7c2d202 100644
--- a/hw/lm32_juart.c
+++ b/hw/lm32_juart.c
@@ -20,7 +20,7 @@
#include "hw.h"
#include "sysbus.h"
#include "trace.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "lm32_juart.h"
diff --git a/hw/lm32_uart.c b/hw/lm32_uart.c
index f40ffe3..cc6aee3 100644
--- a/hw/lm32_uart.c
+++ b/hw/lm32_uart.c
@@ -25,7 +25,7 @@
#include "hw.h"
#include "sysbus.h"
#include "trace.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "qemu/error.h"
enum {
diff --git a/hw/mcf_uart.c b/hw/mcf_uart.c
index afdb3be..c623d2a 100644
--- a/hw/mcf_uart.c
+++ b/hw/mcf_uart.c
@@ -7,7 +7,7 @@
*/
#include "hw.h"
#include "mcf.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "exec/exec-memory.h"
typedef struct {
diff --git a/hw/milkymist-uart.c b/hw/milkymist-uart.c
index bbf37ec..1879c45 100644
--- a/hw/milkymist-uart.c
+++ b/hw/milkymist-uart.c
@@ -24,7 +24,7 @@
#include "hw.h"
#include "sysbus.h"
#include "trace.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "qemu/error.h"
enum {
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index e0c9e64..72ef1d7 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -30,7 +30,7 @@
#include "mips.h"
#include "mips_cpudevs.h"
#include "pci.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "sysemu/sysemu.h"
#include "audio/audio.h"
#include "qemu/log.h"
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 1c52a0a..594ca2e 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -34,7 +34,7 @@
#include "mips.h"
#include "mips_cpudevs.h"
#include "pci.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "sysemu/sysemu.h"
#include "sysemu/arch_init.h"
#include "boards.h"
diff --git a/hw/msmouse.c b/hw/msmouse.c
index decb1a3..ef47aed 100644
--- a/hw/msmouse.c
+++ b/hw/msmouse.c
@@ -23,7 +23,7 @@
*/
#include <stdlib.h>
#include "qemu-common.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "ui/console.h"
#include "msmouse.h"
diff --git a/hw/omap2.c b/hw/omap2.c
index 21e722b..6958d15 100644
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -24,7 +24,7 @@
#include "omap.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "flash.h"
#include "soc_dma.h"
#include "sysbus.h"
diff --git a/hw/omap_uart.c b/hw/omap_uart.c
index 1a47836..0def6df 100644
--- a/hw/omap_uart.c
+++ b/hw/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 "qemu-char.h"
+#include "char/char.h"
#include "hw.h"
#include "omap.h"
#include "serial.h"
diff --git a/hw/parallel.c b/hw/parallel.c
index 7b8a723..9a13f2e 100644
--- a/hw/parallel.c
+++ b/hw/parallel.c
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "isa.h"
#include "pc.h"
#include "sysemu/sysemu.h"
diff --git a/hw/pl011.c b/hw/pl011.c
index fb22736..da1c433 100644
--- a/hw/pl011.c
+++ b/hw/pl011.c
@@ -8,7 +8,7 @@
*/
#include "sysbus.h"
-#include "qemu-char.h"
+#include "char/char.h"
typedef struct {
SysBusDevice busdev;
diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c
index da20e08..6a9cab0 100644
--- a/hw/pxa2xx.c
+++ b/hw/pxa2xx.c
@@ -13,7 +13,7 @@
#include "serial.h"
#include "i2c.h"
#include "ssi.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "sysemu/blockdev.h"
static struct {
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 523534b..3165d18 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -3,7 +3,7 @@
#include "qobject/qerror.h"
#include "sysemu/blockdev.h"
#include "hw/block-common.h"
-#include "qemu-char.h"
+#include "char/char.h"
void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
{
diff --git a/hw/serial.c b/hw/serial.c
index 43bb109..8ef83ea 100644
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -24,7 +24,7 @@
*/
#include "serial.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "qemu/timer.h"
//#define DEBUG_SERIAL
diff --git a/hw/sh_serial.c b/hw/sh_serial.c
index e918da0..4e5f622 100644
--- a/hw/sh_serial.c
+++ b/hw/sh_serial.c
@@ -26,7 +26,7 @@
*/
#include "hw.h"
#include "sh.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "exec/exec-memory.h"
//#define DEBUG_SERIAL
diff --git a/hw/spapr_rtas.c b/hw/spapr_rtas.c
index 405684e..330c2ed 100644
--- a/hw/spapr_rtas.c
+++ b/hw/spapr_rtas.c
@@ -26,7 +26,7 @@
*/
#include "cpu.h"
#include "sysemu/sysemu.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "hw/qdev.h"
#include "sysemu/device_tree.h"
diff --git a/hw/spapr_vty.c b/hw/spapr_vty.c
index 5da17a3..5a481f1 100644
--- a/hw/spapr_vty.c
+++ b/hw/spapr_vty.c
@@ -1,5 +1,5 @@
#include "qdev.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "hw/spapr.h"
#include "hw/spapr_vio.h"
diff --git a/hw/strongarm.c b/hw/strongarm.c
index b081ab9..2ec01a6 100644
--- a/hw/strongarm.c
+++ b/hw/strongarm.c
@@ -30,7 +30,7 @@
#include "strongarm.h"
#include "qemu/error.h"
#include "arm-misc.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "sysemu/sysemu.h"
#include "ssi.h"
diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
index 3b64587..6dd0fd4 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-host.h"
+#include "bt/bt.h"
#include "hw/bt.h"
struct USBBtState {
diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 689e361..6b7d0cc 100644
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -12,7 +12,7 @@
#include "qemu/error.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
-#include "qemu-char.h"
+#include "char/char.h"
//#define DEBUG_Serial
diff --git a/hw/virtio-console.c b/hw/virtio-console.c
index 230c99c..a1f32a6 100644
--- a/hw/virtio-console.c
+++ b/hw/virtio-console.c
@@ -10,7 +10,7 @@
* the COPYING file in the top-level directory.
*/
-#include "qemu-char.h"
+#include "char/char.h"
#include "qemu/error.h"
#include "trace.h"
#include "virtio-serial.h"
diff --git a/hw/xen_backend.c b/hw/xen_backend.c
index 270584f..3fa3009 100644
--- a/hw/xen_backend.c
+++ b/hw/xen_backend.c
@@ -35,7 +35,7 @@
#include <sys/signal.h>
#include "hw.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "qemu/log.h"
#include "xen_backend.h"
diff --git a/hw/xen_console.c b/hw/xen_console.c
index 9426d73..ac36ceb 100644
--- a/hw/xen_console.c
+++ b/hw/xen_console.c
@@ -30,7 +30,7 @@
#include <sys/mman.h>
#include "hw.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "xen_backend.h"
#include <xen/io/console.h>
diff --git a/hw/xenfb.c b/hw/xenfb.c
index 5fbbc9e..5cac263 100644
--- a/hw/xenfb.c
+++ b/hw/xenfb.c
@@ -37,7 +37,7 @@
#include "hw.h"
#include "ui/console.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "xen_backend.h"
#include <xen/event_channel.h>
diff --git a/hw/xgmac.c b/hw/xgmac.c
index 8c12d54..96370c8 100644
--- a/hw/xgmac.c
+++ b/hw/xgmac.c
@@ -25,7 +25,7 @@
*/
#include "sysbus.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "qemu/log.h"
#include "net/net.h"
#include "net/checksum.h"
diff --git a/hw/xilinx_uartlite.c b/hw/xilinx_uartlite.c
index d0f32db..45cd7ca 100644
--- a/hw/xilinx_uartlite.c
+++ b/hw/xilinx_uartlite.c
@@ -23,7 +23,7 @@
*/
#include "sysbus.h"
-#include "qemu-char.h"
+#include "char/char.h"
#define DUART(x)
diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index 5feb016..0ef5b95 100644
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -36,7 +36,7 @@
#include "sysbus.h"
#include "flash.h"
#include "sysemu/blockdev.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "xtensa_bootparam.h"
typedef struct LxBoardDesc {
diff --git a/bt-host.h b/include/bt/bt.h
similarity index 100%
rename from bt-host.h
rename to include/bt/bt.h
diff --git a/qemu-char.h b/include/char/char.h
similarity index 100%
rename from qemu-char.h
rename to include/char/char.h
diff --git a/monitor.c b/monitor.c
index ac5b8b9..b0f75e6 100644
--- a/monitor.c
+++ b/monitor.c
@@ -33,7 +33,7 @@
#include "exec/gdbstub.h"
#include "net/net.h"
#include "net/slirp.h"
-#include "qemu-char.h"
+#include "char/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 80b81ab..b3c149e 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 "qemu-char.h"
+#include "char/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 b38b9c0..a9ac2eb 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 "qemu-char.h"
+#include "char/char.h"
#include "hw/usb.h"
#include "hw/baum.h"
#include "hw/msmouse.h"
diff --git a/qmp.c b/qmp.c
index 85c5733..bbbd99b 100644
--- a/qmp.c
+++ b/qmp.c
@@ -16,7 +16,7 @@
#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "qmp-commands.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "ui/qemu-spice.h"
#include "ui/vnc.h"
#include "sysemu/kvm.h"
diff --git a/qtest.c b/qtest.c
index 65edf07..b4c63b1 100644
--- a/qtest.c
+++ b/qtest.c
@@ -13,7 +13,7 @@
#include "sysemu/qtest.h"
#include "hw/qdev.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "sysemu/ioport.h"
#include "sysemu/memory.h"
#include "hw/irq.h"
diff --git a/slirp/slirp.c b/slirp/slirp.c
index a064b29..db9a17a 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "qemu/timer.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "slirp.h"
#include "hw/hw.h"
diff --git a/ui/console.c b/ui/console.c
index 1a22e09..7fc8f11 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 "qemu-char.h"
+#include "char/char.h"
//#define DEBUG_CONSOLE
#define DEFAULT_BACKSCROLL 512
diff --git a/vl.c b/vl.c
index c1e79dc..3b229a2 100644
--- a/vl.c
+++ b/vl.c
@@ -126,7 +126,7 @@ int main(int argc, char **argv)
#include "hw/xen.h"
#include "hw/qdev.h"
#include "hw/loader.h"
-#include "bt-host.h"
+#include "bt/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 "qemu-char.h"
+#include "char/char.h"
#include "qemu/cache-utils.h"
#include "sysemu/blockdev.h"
#include "hw/block-common.h"
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 30/32] fpu: move public header file to include/fpu
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (28 preceding siblings ...)
2012-10-24 12:58 ` [Qemu-devel] [PATCH 29/32] softmmu: move remaining include files to include/ subdirectories Paolo Bonzini
@ 2012-10-24 12:59 ` Paolo Bonzini
2012-10-24 12:59 ` [Qemu-devel] [PATCH 31/32] hw: move executable format header files to hw/ Paolo Bonzini
` (4 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:59 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 2 +-
fpu/softfloat.c | 2 +-
{fpu => include/fpu}/softfloat.h | 0
include/qemu/bswap.h | 2 +-
linux-user/arm/nwfpe/double_cpdo.c | 2 +-
linux-user/arm/nwfpe/extended_cpdo.c | 2 +-
linux-user/arm/nwfpe/fpa11.h | 2 +-
linux-user/arm/nwfpe/fpa11_cpdt.c | 2 +-
linux-user/arm/nwfpe/fpa11_cprt.c | 2 +-
linux-user/arm/nwfpe/fpopcode.c | 2 +-
linux-user/arm/nwfpe/single_cpdo.c | 2 +-
target-alpha/cpu.h | 2 +-
target-alpha/fpu_helper.c | 2 +-
target-alpha/helper.c | 2 +-
target-alpha/translate.c | 2 +-
target-arm/cpu.h | 2 +-
target-i386/cpu.h | 2 +-
target-m68k/cpu.h | 2 +-
target-microblaze/cpu.h | 2 +-
target-mips/cpu.h | 2 +-
target-openrisc/cpu.h | 2 +-
target-ppc/cpu.h | 2 +-
target-s390x/cpu.h | 2 +-
target-sh4/cpu.h | 4 +---
target-sparc/cpu.h | 2 +-
target-unicore32/cpu.h | 2 +-
26 files changed, 25 insertions(+), 27 deletions(-)
rename {fpu => include/fpu}/softfloat.h (100%)
diff --git a/configure b/configure
index 9329b97..9cb46cb 100755
--- a/configure
+++ b/configure
@@ -268,7 +268,7 @@ QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
-QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/include -I\$(SRC_PATH)/fpu"
+QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/include"
if test "$debug_info" = "yes"; then
CFLAGS="-g $CFLAGS"
LDFLAGS="-g $LDFLAGS"
diff --git a/fpu/softfloat.c b/fpu/softfloat.c
index 8413146..0cfa6b4 100644
--- a/fpu/softfloat.c
+++ b/fpu/softfloat.c
@@ -40,7 +40,7 @@ these four paragraphs for those parts of this code that are retained.
*/
#include "config.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
/*----------------------------------------------------------------------------
| Primitive arithmetic functions, including multi-word arithmetic, and
diff --git a/fpu/softfloat.h b/include/fpu/softfloat.h
similarity index 100%
rename from fpu/softfloat.h
rename to include/fpu/softfloat.h
diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h
index cc7f84d..2006fcd 100644
--- a/include/qemu/bswap.h
+++ b/include/qemu/bswap.h
@@ -4,7 +4,7 @@
#include "config-host.h"
#include <inttypes.h>
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#ifdef CONFIG_MACHINE_BSWAP_H
#include <sys/endian.h>
diff --git a/linux-user/arm/nwfpe/double_cpdo.c b/linux-user/arm/nwfpe/double_cpdo.c
index 8e9b28f..41c28f3 100644
--- a/linux-user/arm/nwfpe/double_cpdo.c
+++ b/linux-user/arm/nwfpe/double_cpdo.c
@@ -19,7 +19,7 @@
*/
#include "fpa11.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#include "fpopcode.h"
float64 float64_exp(float64 Fm);
diff --git a/linux-user/arm/nwfpe/extended_cpdo.c b/linux-user/arm/nwfpe/extended_cpdo.c
index 880ce03..48eca3b 100644
--- a/linux-user/arm/nwfpe/extended_cpdo.c
+++ b/linux-user/arm/nwfpe/extended_cpdo.c
@@ -19,7 +19,7 @@
*/
#include "fpa11.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#include "fpopcode.h"
floatx80 floatx80_exp(floatx80 Fm);
diff --git a/linux-user/arm/nwfpe/fpa11.h b/linux-user/arm/nwfpe/fpa11.h
index 002b3cb..bb9ac65 100644
--- a/linux-user/arm/nwfpe/fpa11.h
+++ b/linux-user/arm/nwfpe/fpa11.h
@@ -43,7 +43,7 @@ extern CPUARMState *user_registers;
/* includes */
#include "fpsr.h" /* FP control and status register definitions */
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#define typeNone 0x00
#define typeSingle 0x01
diff --git a/linux-user/arm/nwfpe/fpa11_cpdt.c b/linux-user/arm/nwfpe/fpa11_cpdt.c
index 3e7a938..007a3d6 100644
--- a/linux-user/arm/nwfpe/fpa11_cpdt.c
+++ b/linux-user/arm/nwfpe/fpa11_cpdt.c
@@ -20,7 +20,7 @@
*/
#include "fpa11.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#include "fpopcode.h"
//#include "fpmodule.h"
//#include "fpmodule.inl"
diff --git a/linux-user/arm/nwfpe/fpa11_cprt.c b/linux-user/arm/nwfpe/fpa11_cprt.c
index 8011897..7be93fa 100644
--- a/linux-user/arm/nwfpe/fpa11_cprt.c
+++ b/linux-user/arm/nwfpe/fpa11_cprt.c
@@ -20,7 +20,7 @@
*/
#include "fpa11.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#include "fpopcode.h"
#include "fpa11.inl"
//#include "fpmodule.h"
diff --git a/linux-user/arm/nwfpe/fpopcode.c b/linux-user/arm/nwfpe/fpopcode.c
index 82ac92f..0dc5c9c 100644
--- a/linux-user/arm/nwfpe/fpopcode.c
+++ b/linux-user/arm/nwfpe/fpopcode.c
@@ -19,7 +19,7 @@
*/
#include "fpa11.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#include "fpopcode.h"
#include "fpsr.h"
//#include "fpmodule.h"
diff --git a/linux-user/arm/nwfpe/single_cpdo.c b/linux-user/arm/nwfpe/single_cpdo.c
index 26168e2..2bfb359 100644
--- a/linux-user/arm/nwfpe/single_cpdo.c
+++ b/linux-user/arm/nwfpe/single_cpdo.c
@@ -19,7 +19,7 @@
*/
#include "fpa11.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#include "fpopcode.h"
float32 float32_exp(float32 Fm);
diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h
index ac61fe4..d756b08 100644
--- a/target-alpha/cpu.h
+++ b/target-alpha/cpu.h
@@ -29,7 +29,7 @@
#include "exec/cpu-defs.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#define TARGET_HAS_ICE 1
diff --git a/target-alpha/fpu_helper.c b/target-alpha/fpu_helper.c
index fe988ec..fad3575 100644
--- a/target-alpha/fpu_helper.c
+++ b/target-alpha/fpu_helper.c
@@ -19,7 +19,7 @@
#include "cpu.h"
#include "helper.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#define FP_STATUS (env->fp_status)
diff --git a/target-alpha/helper.c b/target-alpha/helper.c
index 81d4763..e2107c3 100644
--- a/target-alpha/helper.c
+++ b/target-alpha/helper.c
@@ -22,7 +22,7 @@
#include <stdio.h>
#include "cpu.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#include "helper.h"
uint64_t cpu_alpha_load_fpcr (CPUAlphaState *env)
diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 6d06cb5..12f994e 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -611,7 +611,7 @@ static void gen_qual_roundmode(DisasContext *ctx, int fn11)
}
#if defined(CONFIG_SOFTFLOAT_INLINE)
- /* ??? The "softfloat.h" interface is to call set_float_rounding_mode.
+ /* ??? The "fpu/softfloat.h" interface is to call set_float_rounding_mode.
With CONFIG_SOFTFLOAT that expands to an out-of-line call that just
sets the one field. */
tcg_gen_st8_i32(tmp, cpu_env,
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index e0bda5f..fad64e3 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -29,7 +29,7 @@
#include "qemu-common.h"
#include "exec/cpu-defs.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#define TARGET_HAS_ICE 1
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 470d426..d2efb41 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -46,7 +46,7 @@
#include "exec/cpu-defs.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#define R_EAX 0
#define R_ECX 1
diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h
index 7e5523f..a6d96cf 100644
--- a/target-m68k/cpu.h
+++ b/target-m68k/cpu.h
@@ -28,7 +28,7 @@
#include "qemu-common.h"
#include "exec/cpu-defs.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#define MAX_QREGS 32
diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h
index 2ee2318..2798fc4 100644
--- a/target-microblaze/cpu.h
+++ b/target-microblaze/cpu.h
@@ -27,7 +27,7 @@
#define CPUArchState struct CPUMBState
#include "exec/cpu-defs.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
struct CPUMBState;
typedef struct CPUMBState CPUMBState;
#if !defined(CONFIG_USER_ONLY)
diff --git a/target-mips/cpu.h b/target-mips/cpu.h
index 13fdd83..18afd1f 100644
--- a/target-mips/cpu.h
+++ b/target-mips/cpu.h
@@ -13,7 +13,7 @@
#include "qemu-common.h"
#include "mips-defs.h"
#include "exec/cpu-defs.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
struct CPUMIPSState;
diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h
index bb447e7..e989a51 100644
--- a/target-openrisc/cpu.h
+++ b/target-openrisc/cpu.h
@@ -31,7 +31,7 @@ struct OpenRISCCPU;
#include "config.h"
#include "qemu-common.h"
#include "exec/cpu-defs.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#include "qom/cpu.h"
#include "qapi/error.h"
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 1e746b6..7989554 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -75,7 +75,7 @@
#include "exec/cpu-defs.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#define TARGET_HAS_ICE 1
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index ffc2c51..6806453 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -36,7 +36,7 @@
#include "exec/cpu-all.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#define NB_MMU_MODES 3
diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h
index 756e9f1..e630ec9 100644
--- a/target-sh4/cpu.h
+++ b/target-sh4/cpu.h
@@ -41,7 +41,7 @@
#include "exec/cpu-defs.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#define TARGET_PAGE_BITS 12 /* 4k XXXXX */
@@ -230,8 +230,6 @@ static inline void cpu_set_tls(CPUSH4State *env, target_ulong newtls)
void cpu_load_tlb(CPUSH4State * env);
-#include "softfloat.h"
-
static inline CPUSH4State *cpu_init(const char *cpu_model)
{
SuperHCPU *cpu = cpu_sh4_init(cpu_model);
diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h
index 74e7354..103cb2b 100644
--- a/target-sparc/cpu.h
+++ b/target-sparc/cpu.h
@@ -27,7 +27,7 @@
#include "exec/cpu-defs.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#define TARGET_HAS_ICE 1
diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h
index c8abef1..3607232 100644
--- a/target-unicore32/cpu.h
+++ b/target-unicore32/cpu.h
@@ -24,7 +24,7 @@
#include "config.h"
#include "qemu-common.h"
#include "exec/cpu-defs.h"
-#include "softfloat.h"
+#include "fpu/softfloat.h"
#define NB_MMU_MODES 2
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 31/32] hw: move executable format header files to hw/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (29 preceding siblings ...)
2012-10-24 12:59 ` [Qemu-devel] [PATCH 30/32] fpu: move public header file to include/fpu Paolo Bonzini
@ 2012-10-24 12:59 ` Paolo Bonzini
2012-10-24 12:59 ` [Qemu-devel] [PATCH 32/32] janitor: move remaining public headers to include/ Paolo Bonzini
` (3 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:59 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Or delete a.out.h which is unused.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
a.out.h | 430 -------------------------------------
uboot_image.h => hw/uboot_image.h | 0
2 files changed, 0 insertions(+), 430 deletions(-)
delete mode 100644 a.out.h
rename uboot_image.h => hw/uboot_image.h (100%)
diff --git a/a.out.h b/a.out.h
deleted file mode 100644
index 33ca7f7..0000000
--- a/a.out.h
+++ /dev/null
@@ -1,430 +0,0 @@
-/* a.out.h
-
- Copyright 1997, 1998, 1999, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license. Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _A_OUT_H_
-#define _A_OUT_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define COFF_IMAGE_WITH_PE
-#define COFF_LONG_SECTION_NAMES
-
-/*** coff information for Intel 386/486. */
-
-
-/********************** FILE HEADER **********************/
-
-struct external_filehdr {
- short f_magic; /* magic number */
- short f_nscns; /* number of sections */
- host_ulong f_timdat; /* time & date stamp */
- host_ulong f_symptr; /* file pointer to symtab */
- host_ulong f_nsyms; /* number of symtab entries */
- short f_opthdr; /* sizeof(optional hdr) */
- short f_flags; /* flags */
-};
-
-/* Bits for f_flags:
- * F_RELFLG relocation info stripped from file
- * F_EXEC file is executable (no unresolved external references)
- * F_LNNO line numbers stripped from file
- * F_LSYMS local symbols stripped from file
- * F_AR32WR file has byte ordering of an AR32WR machine (e.g. vax)
- */
-
-#define F_RELFLG (0x0001)
-#define F_EXEC (0x0002)
-#define F_LNNO (0x0004)
-#define F_LSYMS (0x0008)
-
-
-
-#define I386MAGIC 0x14c
-#define I386PTXMAGIC 0x154
-#define I386AIXMAGIC 0x175
-
-/* This is Lynx's all-platform magic number for executables. */
-
-#define LYNXCOFFMAGIC 0415
-
-#define I386BADMAG(x) (((x).f_magic != I386MAGIC) \
- && (x).f_magic != I386AIXMAGIC \
- && (x).f_magic != I386PTXMAGIC \
- && (x).f_magic != LYNXCOFFMAGIC)
-
-#define FILHDR struct external_filehdr
-#define FILHSZ 20
-
-
-/********************** AOUT "OPTIONAL HEADER"=
- **********************/
-
-
-typedef struct
-{
- unsigned short magic; /* type of file */
- unsigned short vstamp; /* version stamp */
- host_ulong tsize; /* text size in bytes, padded to FW bdry*/
- host_ulong dsize; /* initialized data " " */
- host_ulong bsize; /* uninitialized data " " */
- host_ulong entry; /* entry pt. */
- host_ulong text_start; /* base of text used for this file */
- host_ulong data_start; /* base of data used for this file=
- */
-}
-AOUTHDR;
-
-#define AOUTSZ 28
-#define AOUTHDRSZ 28
-
-#define OMAGIC 0404 /* object files, eg as output */
-#define ZMAGIC 0413 /* demand load format, eg normal ld output */
-#define STMAGIC 0401 /* target shlib */
-#define SHMAGIC 0443 /* host shlib */
-
-
-/* define some NT default values */
-/* #define NT_IMAGE_BASE 0x400000 moved to internal.h */
-#define NT_SECTION_ALIGNMENT 0x1000
-#define NT_FILE_ALIGNMENT 0x200
-#define NT_DEF_RESERVE 0x100000
-#define NT_DEF_COMMIT 0x1000
-
-/********************** SECTION HEADER **********************/
-
-
-struct external_scnhdr {
- char s_name[8]; /* section name */
- host_ulong s_paddr; /* physical address, offset
- of last addr in scn */
- host_ulong s_vaddr; /* virtual address */
- host_ulong s_size; /* section size */
- host_ulong s_scnptr; /* file ptr to raw data for section */
- host_ulong s_relptr; /* file ptr to relocation */
- host_ulong s_lnnoptr; /* file ptr to line numbers */
- unsigned short s_nreloc; /* number of relocation entries */
- unsigned short s_nlnno; /* number of line number entries*/
- host_ulong s_flags; /* flags */
-};
-
-#define SCNHDR struct external_scnhdr
-#define SCNHSZ 40
-
-/*
- * names of "special" sections
- */
-#define _TEXT ".text"
-#define _DATA ".data"
-#define _BSS ".bss"
-#define _COMMENT ".comment"
-#define _LIB ".lib"
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
- union {
- host_ulong l_symndx; /* function name symbol index, iff l_lnno 0 */
- host_ulong l_paddr; /* (physical) address of line number */
- } l_addr;
- unsigned short l_lnno; /* line number */
-};
-
-#define LINENO struct external_lineno
-#define LINESZ 6
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN 8 /* # characters in a symbol name */
-#define E_FILNMLEN 14 /* # characters in a file name */
-#define E_DIMNUM 4 /* # array dimensions in auxiliary entry */
-
-struct QEMU_PACKED external_syment
-{
- union {
- char e_name[E_SYMNMLEN];
- struct {
- host_ulong e_zeroes;
- host_ulong e_offset;
- } e;
- } e;
- host_ulong e_value;
- unsigned short e_scnum;
- unsigned short e_type;
- char e_sclass[1];
- char e_numaux[1];
-};
-
-#define N_BTMASK (0xf)
-#define N_TMASK (0x30)
-#define N_BTSHFT (4)
-#define N_TSHIFT (2)
-
-union external_auxent {
- struct {
- host_ulong x_tagndx; /* str, un, or enum tag indx */
- union {
- struct {
- unsigned short x_lnno; /* declaration line number */
- unsigned short x_size; /* str/union/array size */
- } x_lnsz;
- host_ulong x_fsize; /* size of function */
- } x_misc;
- union {
- struct { /* if ISFCN, tag, or .bb */
- host_ulong x_lnnoptr;/* ptr to fcn line # */
- host_ulong x_endndx; /* entry ndx past block end */
- } x_fcn;
- struct { /* if ISARY, up to 4 dimen. */
- char x_dimen[E_DIMNUM][2];
- } x_ary;
- } x_fcnary;
- unsigned short x_tvndx; /* tv index */
- } x_sym;
-
- union {
- char x_fname[E_FILNMLEN];
- struct {
- host_ulong x_zeroes;
- host_ulong x_offset;
- } x_n;
- } x_file;
-
- struct {
- host_ulong x_scnlen; /* section length */
- unsigned short x_nreloc; /* # relocation entries */
- unsigned short x_nlinno; /* # line numbers */
- host_ulong x_checksum; /* section COMDAT checksum */
- unsigned short x_associated;/* COMDAT associated section index */
- char x_comdat[1]; /* COMDAT selection number */
- } x_scn;
-
- struct {
- host_ulong x_tvfill; /* tv fill value */
- unsigned short x_tvlen; /* length of .tv */
- char x_tvran[2][2]; /* tv range */
- } x_tv; /* info about .tv section (in auxent of symbol .tv)) */
-
-};
-
-#define SYMENT struct external_syment
-#define SYMESZ 18
-#define AUXENT union external_auxent
-#define AUXESZ 18
-
-#define _ETEXT "etext"
-
-/********************** RELOCATION DIRECTIVES **********************/
-
-struct external_reloc {
- char r_vaddr[4];
- char r_symndx[4];
- char r_type[2];
-};
-
-#define RELOC struct external_reloc
-#define RELSZ 10
-
-/* end of coff/i386.h */
-
-/* PE COFF header information */
-
-#ifndef _PE_H
-#define _PE_H
-
-/* NT specific file attributes */
-#define IMAGE_FILE_RELOCS_STRIPPED 0x0001
-#define IMAGE_FILE_EXECUTABLE_IMAGE 0x0002
-#define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004
-#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008
-#define IMAGE_FILE_BYTES_REVERSED_LO 0x0080
-#define IMAGE_FILE_32BIT_MACHINE 0x0100
-#define IMAGE_FILE_DEBUG_STRIPPED 0x0200
-#define IMAGE_FILE_SYSTEM 0x1000
-#define IMAGE_FILE_DLL 0x2000
-#define IMAGE_FILE_BYTES_REVERSED_HI 0x8000
-
-/* additional flags to be set for section headers to allow the NT loader to
- read and write to the section data (to replace the addresses of data in
- dlls for one thing); also to execute the section in .text's case=
- */
-#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000
-#define IMAGE_SCN_MEM_EXECUTE 0x20000000
-#define IMAGE_SCN_MEM_READ 0x40000000
-#define IMAGE_SCN_MEM_WRITE 0x80000000
-
-/*
- * Section characteristics added for ppc-nt
- */
-
-#define IMAGE_SCN_TYPE_NO_PAD 0x00000008 /* Reserved. */
-
-#define IMAGE_SCN_CNT_CODE 0x00000020 /* Section contains code. */
-#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 /* Section contains initialized data. */
-#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 /* Section contains uninitialized data. */
-
-#define IMAGE_SCN_LNK_OTHER 0x00000100 /* Reserved. */
-#define IMAGE_SCN_LNK_INFO 0x00000200 /* Section contains comments or some other type of information. */
-#define IMAGE_SCN_LNK_REMOVE 0x00000800 /* Section contents will not become part of image. */
-#define IMAGE_SCN_LNK_COMDAT 0x00001000 /* Section contents comdat. */
-
-#define IMAGE_SCN_MEM_FARDATA 0x00008000
-
-#define IMAGE_SCN_MEM_PURGEABLE 0x00020000
-#define IMAGE_SCN_MEM_16BIT 0x00020000
-#define IMAGE_SCN_MEM_LOCKED 0x00040000
-#define IMAGE_SCN_MEM_PRELOAD 0x00080000
-
-#define IMAGE_SCN_ALIGN_1BYTES 0x00100000
-#define IMAGE_SCN_ALIGN_2BYTES 0x00200000
-#define IMAGE_SCN_ALIGN_4BYTES 0x00300000
-#define IMAGE_SCN_ALIGN_8BYTES 0x00400000
-#define IMAGE_SCN_ALIGN_16BYTES 0x00500000 /* Default alignment if no others are specified. */
-#define IMAGE_SCN_ALIGN_32BYTES 0x00600000
-#define IMAGE_SCN_ALIGN_64BYTES 0x00700000
-
-
-#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000 /* Section contains extended relocations. */
-#define IMAGE_SCN_MEM_NOT_CACHED 0x04000000 /* Section is not cachable. */
-#define IMAGE_SCN_MEM_NOT_PAGED 0x08000000 /* Section is not pageable. */
-#define IMAGE_SCN_MEM_SHARED 0x10000000 /* Section is shareable. */
-
-/* COMDAT selection codes. */
-
-#define IMAGE_COMDAT_SELECT_NODUPLICATES (1) /* Warn if duplicates. */
-#define IMAGE_COMDAT_SELECT_ANY (2) /* No warning. */
-#define IMAGE_COMDAT_SELECT_SAME_SIZE (3) /* Warn if different size. */
-#define IMAGE_COMDAT_SELECT_EXACT_MATCH (4) /* Warn if different. */
-#define IMAGE_COMDAT_SELECT_ASSOCIATIVE (5) /* Base on other section. */
-
-/* Magic values that are true for all dos/nt implementations */
-#define DOSMAGIC 0x5a4d
-#define NT_SIGNATURE 0x00004550
-
-/* NT allows long filenames, we want to accommodate this. This may break
- some of the bfd functions */
-#undef FILNMLEN
-#define FILNMLEN 18 /* # characters in a file name */
-
-
-#ifdef COFF_IMAGE_WITH_PE
-/* The filehdr is only weired in images */
-
-#undef FILHDR
-struct external_PE_filehdr
-{
- /* DOS header fields */
- unsigned short e_magic; /* Magic number, 0x5a4d */
- unsigned short e_cblp; /* Bytes on last page of file, 0x90 */
- unsigned short e_cp; /* Pages in file, 0x3 */
- unsigned short e_crlc; /* Relocations, 0x0 */
- unsigned short e_cparhdr; /* Size of header in paragraphs, 0x4 */
- unsigned short e_minalloc; /* Minimum extra paragraphs needed, 0x0 */
- unsigned short e_maxalloc; /* Maximum extra paragraphs needed, 0xFFFF */
- unsigned short e_ss; /* Initial (relative) SS value, 0x0 */
- unsigned short e_sp; /* Initial SP value, 0xb8 */
- unsigned short e_csum; /* Checksum, 0x0 */
- unsigned short e_ip; /* Initial IP value, 0x0 */
- unsigned short e_cs; /* Initial (relative) CS value, 0x0 */
- unsigned short e_lfarlc; /* File address of relocation table, 0x40 */
- unsigned short e_ovno; /* Overlay number, 0x0 */
- char e_res[4][2]; /* Reserved words, all 0x0 */
- unsigned short e_oemid; /* OEM identifier (for e_oeminfo), 0x0 */
- unsigned short e_oeminfo; /* OEM information; e_oemid specific, 0x0 */
- char e_res2[10][2]; /* Reserved words, all 0x0 */
- host_ulong e_lfanew; /* File address of new exe header, 0x80 */
- char dos_message[16][4]; /* other stuff, always follow DOS header */
- unsigned int nt_signature; /* required NT signature, 0x4550 */
-
- /* From standard header */
-
- unsigned short f_magic; /* magic number */
- unsigned short f_nscns; /* number of sections */
- host_ulong f_timdat; /* time & date stamp */
- host_ulong f_symptr; /* file pointer to symtab */
- host_ulong f_nsyms; /* number of symtab entries */
- unsigned short f_opthdr; /* sizeof(optional hdr) */
- unsigned short f_flags; /* flags */
-};
-
-
-#define FILHDR struct external_PE_filehdr
-#undef FILHSZ
-#define FILHSZ 152
-
-#endif
-
-typedef struct
-{
- unsigned short magic; /* type of file */
- unsigned short vstamp; /* version stamp */
- host_ulong tsize; /* text size in bytes, padded to FW bdry*/
- host_ulong dsize; /* initialized data " " */
- host_ulong bsize; /* uninitialized data " " */
- host_ulong entry; /* entry pt. */
- host_ulong text_start; /* base of text used for this file */
- host_ulong data_start; /* base of all data used for this file */
-
- /* NT extra fields; see internal.h for descriptions */
- host_ulong ImageBase;
- host_ulong SectionAlignment;
- host_ulong FileAlignment;
- unsigned short MajorOperatingSystemVersion;
- unsigned short MinorOperatingSystemVersion;
- unsigned short MajorImageVersion;
- unsigned short MinorImageVersion;
- unsigned short MajorSubsystemVersion;
- unsigned short MinorSubsystemVersion;
- char Reserved1[4];
- host_ulong SizeOfImage;
- host_ulong SizeOfHeaders;
- host_ulong CheckSum;
- unsigned short Subsystem;
- unsigned short DllCharacteristics;
- host_ulong SizeOfStackReserve;
- host_ulong SizeOfStackCommit;
- host_ulong SizeOfHeapReserve;
- host_ulong SizeOfHeapCommit;
- host_ulong LoaderFlags;
- host_ulong NumberOfRvaAndSizes;
- /* IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; */
- char DataDirectory[16][2][4]; /* 16 entries, 2 elements/entry, 4 chars */
-
-} PEAOUTHDR;
-
-
-#undef AOUTSZ
-#define AOUTSZ (AOUTHDRSZ + 196)
-
-#undef E_FILNMLEN
-#define E_FILNMLEN 18 /* # characters in a file name */
-#endif
-
-/* end of coff/pe.h */
-
-#define DT_NON (0) /* no derived type */
-#define DT_PTR (1) /* pointer */
-#define DT_FCN (2) /* function */
-#define DT_ARY (3) /* array */
-
-#define ISPTR(x) (((x) & N_TMASK) == (DT_PTR << N_BTSHFT))
-#define ISFCN(x) (((x) & N_TMASK) == (DT_FCN << N_BTSHFT))
-#define ISARY(x) (((x) & N_TMASK) == (DT_ARY << N_BTSHFT))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _A_OUT_H_ */
diff --git a/uboot_image.h b/hw/uboot_image.h
similarity index 100%
rename from uboot_image.h
rename to hw/uboot_image.h
--
1.7.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [Qemu-devel] [PATCH 32/32] janitor: move remaining public headers to include/
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (30 preceding siblings ...)
2012-10-24 12:59 ` [Qemu-devel] [PATCH 31/32] hw: move executable format header files to hw/ Paolo Bonzini
@ 2012-10-24 12:59 ` Paolo Bonzini
2012-10-24 19:25 ` [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Andreas Färber
` (2 subsequent siblings)
34 siblings, 0 replies; 40+ messages in thread
From: Paolo Bonzini @ 2012-10-24 12:59 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aliguori
Headers in the root directory are now used only from within that
directory.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
config.h => include/config.h | 0
elf.h => include/elf.h | 0
libfdt_env.h => include/libfdt_env.h | 0
qemu-common.h => include/qemu-common.h | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename config.h => include/config.h (100%)
rename elf.h => include/elf.h (100%)
rename libfdt_env.h => include/libfdt_env.h (100%)
rename qemu-common.h => include/qemu-common.h (100%)
diff --git a/config.h b/include/config.h
similarity index 100%
rename from config.h
rename to include/config.h
diff --git a/elf.h b/include/elf.h
similarity index 100%
rename from elf.h
rename to include/elf.h
diff --git a/libfdt_env.h b/include/libfdt_env.h
similarity index 100%
rename from libfdt_env.h
rename to include/libfdt_env.h
diff --git a/qemu-common.h b/include/qemu-common.h
similarity index 100%
rename from qemu-common.h
rename to include/qemu-common.h
--
1.7.1
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (31 preceding siblings ...)
2012-10-24 12:59 ` [Qemu-devel] [PATCH 32/32] janitor: move remaining public headers to include/ Paolo Bonzini
@ 2012-10-24 19:25 ` Andreas Färber
2012-10-25 7:54 ` Stefan Hajnoczi
2012-10-25 8:01 ` Zhi Yong Wu
34 siblings, 0 replies; 40+ messages in thread
From: Andreas Färber @ 2012-10-24 19:25 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: peter.maydell, aliguori, qemu-devel
Am 24.10.2012 14:58, schrieb Paolo Bonzini:
> .gitignore | 1 +
> Makefile | 49 +--
> Makefile.dis | 20 -
> Makefile.objs | 39 +--
> Makefile.target | 8 +-
> Makefile.user | 24 --
[snip]
Please don't forget to update MAINTAINERS for such a rename. :)
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (32 preceding siblings ...)
2012-10-24 19:25 ` [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Andreas Färber
@ 2012-10-25 7:54 ` Stefan Hajnoczi
2012-10-25 8:01 ` Zhi Yong Wu
34 siblings, 0 replies; 40+ messages in thread
From: Stefan Hajnoczi @ 2012-10-25 7:54 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: peter.maydell, aliguori, qemu-devel
On Wed, Oct 24, 2012 at 02:58:30PM +0200, Paolo Bonzini wrote:
> So in the end I decided to hold off the renaming of the .c files.
> This is mostly because there are too many confusing rules for what files
> are included in which build product, and spreading this across multiple
> directories would make things worse.
>
> However, here is the header file renaming in all its beauty. One good
> thing about renaming headers is that it guides you in a) finding the
> best place for the corresponding source file in a multi-directory layout;
> b) finding blatant inclusions of the "wrong" file, with qemu-char.h being
> an especially good candidate for "I'll just include that one". Also, it
> is the only part that is really hard to rebase for me than for everyone
> else: it touches all source files (rather than just the Makefiles), and
> headers are touched (and conflict) much less than source files.
>
> Hence, this series only creates disas/ and qobject/, and moves some
> more files to existing directories such as ui/ or net/ or qga/.
> There are many, many cleanups to do on top of this before attempting to
> rename the .c files in a coherent structure and without any module
> violation. For example:
>
> - remove QEMU-specific stuff from qemu-config.c
>
> - deconstruct qemu-common.h and sysemu.h, to get more hints about where
> to put the various .c files.
>
> - replace stub files (qemu-tool.c, qemu-user.c, etc.) with weak functions
>
> - put all the utility functions together in a static library and just
> link with that one
>
> And all this is not even touching hw/.
>
> This series is organized as follows. Patches 1 to 8 are build system
> cleanups that also create the ldscripts/ and disas/ directories.
>
> Patches 9 to 15 are some more janitorial changes coming from the original
> series that moved files. They avoid massive indirect inclusion via
> qemu-char.h or net.h.
>
> From there on the patches were scripted. Patches 16, 17 and 21 also
> move .c files, the others only move headers.
>
> (This is not ready to be applied; I'll wait until Kevin and Luiz's next
> pull request, and then coordinate with Anthony to pull a rebased version).
>
> Paolo Bonzini (32):
> libcacard: simplify rules for recursive build
> vscclient: use per-target variables
> build: adjust setting of QEMU_INCLUDES
> build: add $(TARGET_DIR) to "GEN config-target.h" lines
> build: move rules from Makefile to */Makefile.objs
> build: create ldscripts/
> build: kill libdis, move disassemblers to disas/
> build: kill libuser
> janitor: move iovector functions out of cutils.c
> janitor: do not rely on indirect inclusions from qemu-char.h
> janitor: do not include qemu-char everywhere
> net: move Bluetooth stuff out of net.h
> net: do not include net.h everywhere
> net: move net.c to net/
> net: reorganize headers
> qemu-ga: move qemu-ga files to qga/
> ui: move files to ui/ and include/ui/
> audio: move public header file to include/audio/
> slirp: move public header file to include/slirp/
> qapi: move include files to include/qapi/
> qapi: create qobject/ and include/qobject/
> block: move include files to include/block/
> exec: move include files to include/exec/
> monitor: move include files to include/monitor/
> migration: move include files to include/migration/
> qom: move include files to include/qom/
> misc: move include files to include/qemu/
> softmmu: move include files to include/sysemu/
> softmmu: move remaining include files to include/ subdirectories
> fpu: move public header file to include/fpu
> hw: move executable format header files to hw/
> janitor: move remaining public headers to include/
>
> .gitignore | 1 +
> Makefile | 49 +--
> Makefile.dis | 20 -
> Makefile.objs | 39 +--
> Makefile.target | 8 +-
> Makefile.user | 24 --
> a.out.h | 430 --------------------
> acl.c | 2 +-
> aes.c | 2 +-
> aio.c | 6 +-
> arch_init.c | 22 +-
> async.c | 4 +-
> audio/Makefile.objs | 3 +
> audio/alsaaudio.c | 4 +-
> audio/audio.c | 8 +-
> audio/audio_pt_int.c | 2 +-
> audio/audio_win_int.c | 3 +-
> audio/coreaudio.c | 2 +-
> audio/dsoundaudio.c | 2 +-
> audio/esdaudio.c | 2 +-
> audio/fmodaudio.c | 2 +-
> audio/mixeng.c | 2 +-
> audio/noaudio.c | 4 +-
> audio/ossaudio.c | 6 +-
> audio/paaudio.c | 2 +-
> audio/sdlaudio.c | 2 +-
> audio/spiceaudio.c | 4 +-
> audio/wavaudio.c | 4 +-
> audio/wavcapture.c | 4 +-
> audio/winwaveaudio.c | 4 +-
> balloon.c | 10 +-
> bitmap.c | 4 +-
> bitops.c | 2 +-
> block-migration.c | 12 +-
> block.c | 18 +-
> block/Makefile.objs | 2 +
> block/blkdebug.c | 5 +-
> block/blkverify.c | 4 +-
> block/bochs.c | 4 +-
> block/cloop.c | 4 +-
> block/commit.c | 4 +-
> block/cow.c | 4 +-
> block/curl.c | 2 +-
> block/dmg.c | 6 +-
> block/gluster.c | 6 +-
> block/iscsi.c | 5 +-
> block/nbd.c | 8 +-
> block/parallels.c | 4 +-
> block/qcow.c | 8 +-
> block/qcow2-cache.c | 2 +-
> block/qcow2-cluster.c | 2 +-
> block/qcow2-refcount.c | 2 +-
> block/qcow2-snapshot.c | 2 +-
> block/qcow2.c | 10 +-
> block/qcow2.h | 4 +-
> block/qed-table.c | 2 +-
> block/qed.c | 6 +-
> block/qed.h | 2 +-
> block/raw-posix.c | 9 +-
> block/raw-win32.c | 6 +-
> block/raw.c | 4 +-
> block/rbd.c | 4 +-
> block/sheepdog.c | 8 +-
> block/stream.c | 4 +-
> block/vdi.c | 8 +-
> block/vmdk.c | 6 +-
> block/vpc.c | 6 +-
> block/vvfat.c | 6 +-
> blockdev-nbd.c | 12 +-
> blockdev.c | 20 +-
> blockjob.c | 14 +-
> bsd-user/elfload.c | 2 +-
> bsd-user/main.c | 4 +-
> bsd-user/qemu.h | 4 +-
> bt-host.c | 5 +-
> bt-host.h | 9 -
> bt-vhci.c | 4 +-
> buffered_file.c | 3 +-
> buffered_file.h | 2 +-
> cache-utils.c | 2 +-
> cmd.c | 4 +-
> compatfd.c | 2 +-
> configure | 53 +--
> coroutine-gthread.c | 2 +-
> coroutine-sigaltstack.c | 2 +-
> coroutine-ucontext.c | 2 +-
> coroutine-win32.c | 2 +-
> cpu-exec.c | 6 +-
> cpus.c | 22 +-
> cputlb.c | 18 +-
> cutils.c | 109 +-----
> device_tree.c | 6 +-
> disas.c | 6 +-
> disas/Makefile.objs | 16 +
> alpha-dis.c => disas/alpha.c | 2 +-
> arm-dis.c => disas/arm.c | 2 +-
> cris-dis.c => disas/cris.c | 2 +-
> hppa-dis.c => disas/hppa.c | 2 +-
> i386-dis.c => disas/i386.c | 2 +-
> ia64-dis.c => disas/ia64.c | 2 +-
> lm32-dis.c => disas/lm32.c | 2 +-
> m68k-dis.c => disas/m68k.c | 2 +-
> microblaze-dis.c => disas/microblaze.c | 2 +-
> mips-dis.c => disas/mips.c | 2 +-
> ppc-dis.c => disas/ppc.c | 2 +-
> s390-dis.c => disas/s390.c | 2 +-
> sh4-dis.c => disas/sh4.c | 2 +-
> sparc-dis.c => disas/sparc.c | 2 +-
> tci-dis.c => disas/tci.c | 2 +-
> dma-helpers.c | 6 +-
> dump-stub.c | 4 +-
> dump.c | 18 +-
> envlist.c | 4 +-
> error.c | 8 +-
> event_notifier.c | 4 +-
> exec.c | 17 +-
> fpu/softfloat.c | 2 +-
> fsdev/qemu-fsdev-dummy.c | 2 +-
> fsdev/qemu-fsdev.c | 6 +-
> fsdev/qemu-fsdev.h | 2 +-
> fsdev/virtfs-proxy-helper.c | 4 +-
> fsdev/virtio-9p-marshal.c | 4 +-
> gdbstub.c | 12 +-
> hmp.c | 11 +-
> hmp.h | 2 +-
> host-utils.c | 2 +-
> hw/9pfs/codir.c | 4 +-
> hw/9pfs/cofile.c | 4 +-
> hw/9pfs/cofs.c | 4 +-
> hw/9pfs/coxattr.c | 4 +-
> hw/9pfs/virtio-9p-coth.c | 5 +-
> hw/9pfs/virtio-9p-coth.h | 4 +-
> hw/9pfs/virtio-9p-device.c | 2 +-
> hw/9pfs/virtio-9p-handle.c | 2 +-
> hw/9pfs/virtio-9p-local.c | 2 +-
> hw/9pfs/virtio-9p-posix-acl.c | 2 +-
> hw/9pfs/virtio-9p-xattr.h | 2 +-
> hw/9pfs/virtio-9p.c | 4 +-
> hw/9pfs/virtio-9p.h | 4 +-
> hw/Makefile.objs | 2 +
> hw/ac97.c | 2 +-
> hw/acpi.c | 4 +-
> hw/acpi.h | 2 +-
> hw/acpi_piix4.c | 6 +-
> hw/adb.c | 2 +-
> hw/adlib.c | 2 +-
> hw/ads7846.c | 2 +-
> hw/alpha_dp264.c | 2 +-
> hw/alpha_pci.c | 4 +-
> hw/alpha_sys.h | 1 -
> hw/alpha_typhoon.c | 6 +-
> hw/an5206.c | 2 +-
> hw/apb_pci.c | 4 +-
> hw/apic.c | 4 +-
> hw/apic_common.c | 2 +-
> hw/apic_internal.h | 4 +-
> hw/applesmc.c | 4 +-
> hw/arm-misc.h | 2 +-
> hw/arm11mpcore.c | 2 +-
> hw/arm_boot.c | 5 +-
> hw/arm_mptimer.c | 2 +-
> hw/arm_sysctl.c | 4 +-
> hw/arm_timer.c | 2 +-
> hw/armv7m_nvic.c | 4 +-
> hw/axis_dev88.c | 6 +-
> hw/baum.c | 4 +-
> hw/blizzard.c | 2 +-
> hw/block-common.c | 4 +-
> hw/bonito.c | 4 +-
> hw/bt-hci-csr.c | 6 +-
> hw/bt-hci.c | 4 +-
> hw/bt-hid.c | 4 +-
> hw/bt-l2cap.c | 2 +-
> hw/bt.c | 2 +-
> hw/cadence_gem.c | 2 +-
> hw/cadence_ttc.c | 2 +-
> hw/cadence_uart.c | 4 +-
> hw/cbus.c | 2 +-
> hw/ccid-card-emulated.c | 6 +-
> hw/ccid-card-passthru.c | 6 +-
> hw/cirrus_vga.c | 2 +-
> hw/collie.c | 4 +-
> hw/cs4231a.c | 2 +-
> hw/cuda.c | 4 +-
> hw/debugcon.c | 2 +-
> hw/device-hotplug.c | 9 +-
> hw/dma.c | 1 +
> hw/dp8393x.c | 4 +-
> hw/dummy_m68k.c | 2 +-
> hw/e1000.c | 6 +-
> hw/eepro100.c | 6 +-
> hw/es1370.c | 2 +-
> hw/escc.c | 4 +-
> hw/esp-pci.c | 2 +-
> hw/esp.c | 2 +-
> hw/etraxfs.h | 2 +-
> hw/etraxfs_dma.c | 4 +-
> hw/etraxfs_eth.c | 2 +-
> hw/etraxfs_ser.c | 4 +-
> hw/etraxfs_timer.c | 4 +-
> hw/exynos4210.c | 2 +-
> hw/exynos4210.h | 2 +-
> hw/exynos4210_fimd.c | 6 +-
> hw/exynos4210_i2c.c | 2 +-
> hw/exynos4210_mct.c | 2 +-
> hw/exynos4210_pwm.c | 2 +-
> hw/exynos4210_rtc.c | 6 +-
> hw/exynos4210_uart.c | 4 +-
> hw/exynos4_boards.c | 6 +-
> hw/fdc.c | 10 +-
> hw/flash.h | 2 +-
> hw/framebuffer.c | 2 +-
> hw/framebuffer.h | 2 +-
> hw/fw_cfg.c | 5 +-
> hw/g364fb.c | 2 +-
> hw/grlib_apbuart.c | 2 +-
> hw/grlib_gptimer.c | 2 +-
> hw/gt64xxx.c | 2 +-
> hw/gumstix.c | 6 +-
> hw/hd-geometry.c | 2 +-
> hw/hid.c | 4 +-
> hw/hid.h | 2 +-
> hw/highbank.c | 8 +-
> hw/hpet.c | 4 +-
> hw/hw.h | 10 +-
> hw/i8254.c | 2 +-
> hw/i8254_common.c | 2 +-
> hw/i8259.c | 4 +-
> hw/ide.h | 2 +-
> hw/ide/ahci.c | 6 +-
> hw/ide/cmd646.c | 6 +-
> hw/ide/core.c | 10 +-
> hw/ide/ich.c | 4 +-
> hw/ide/internal.h | 6 +-
> hw/ide/isa.c | 4 +-
> hw/ide/macio.c | 4 +-
> hw/ide/microdrive.c | 4 +-
> hw/ide/mmio.c | 4 +-
> hw/ide/pci.c | 4 +-
> hw/ide/piix.c | 6 +-
> hw/ide/qdev.c | 8 +-
> hw/ide/via.c | 6 +-
> hw/imx_avic.c | 2 +-
> hw/imx_ccm.c | 2 +-
> hw/imx_serial.c | 4 +-
> hw/imx_timer.c | 2 +-
> hw/integratorcp.c | 6 +-
> hw/intel-hda.c | 4 +-
> hw/ioapic_internal.h | 2 +-
> hw/isa-bus.c | 6 +-
> hw/isa.h | 4 +-
> hw/isa_mmio.c | 2 +-
> hw/ivshmem.c | 9 +-
> hw/jazz_led.c | 2 +-
> hw/kvm/apic.c | 2 +-
> hw/kvm/clock.c | 4 +-
> hw/kvm/i8254.c | 6 +-
> hw/kvm/i8259.c | 2 +-
> hw/kvm/ioapic.c | 2 +-
> hw/kvm/pci-assign.c | 10 +-
> hw/kvmvapic.c | 6 +-
> hw/kzm.c | 6 +-
> hw/lan9118.c | 4 +-
> hw/lance.c | 6 +-
> hw/leon3.c | 8 +-
> hw/lm32_boards.c | 5 +-
> hw/lm32_juart.c | 2 +-
> hw/lm32_pic.c | 2 +-
> hw/lm32_sys.c | 8 +-
> hw/lm32_timer.c | 4 +-
> hw/lm32_uart.c | 4 +-
> hw/lm832x.c | 4 +-
> hw/loader.c | 10 +-
> hw/lsi53c895a.c | 2 +-
> hw/m25p80.c | 2 +-
> hw/m48t59.c | 4 +-
> hw/mac_dbdma.c | 1 +
> hw/mac_dbdma.h | 2 +-
> hw/mac_nvram.c | 2 +-
> hw/mainstone.c | 6 +-
> hw/mc146818rtc.c | 4 +-
> hw/mcf5206.c | 6 +-
> hw/mcf5208.c | 8 +-
> hw/mcf_fec.c | 4 +-
> hw/mcf_intc.c | 2 +-
> hw/mcf_uart.c | 4 +-
> hw/megasas.c | 6 +-
> hw/microblaze_boot.c | 6 +-
> hw/milkymist-ac97.c | 2 +-
> hw/milkymist-hpdmc.c | 2 +-
> hw/milkymist-hw.h | 1 +
> hw/milkymist-memcard.c | 6 +-
> hw/milkymist-minimac2.c | 4 +-
> hw/milkymist-pfpu.c | 4 +-
> hw/milkymist-softusb.c | 4 +-
> hw/milkymist-sysctl.c | 6 +-
> hw/milkymist-tmu2.c | 2 +-
> hw/milkymist-uart.c | 4 +-
> hw/milkymist-vgafb.c | 4 +-
> hw/milkymist.c | 7 +-
> hw/mips.h | 2 +-
> hw/mips_fulong2e.c | 14 +-
> hw/mips_jazz.c | 10 +-
> hw/mips_malta.c | 16 +-
> hw/mips_mipssim.c | 6 +-
> hw/mips_r4k.c | 10 +-
> hw/mips_timer.c | 2 +-
> hw/mipsnet.c | 2 +-
> hw/mpc8544_guts.c | 2 +-
> hw/msi.c | 2 +-
> hw/msix.c | 2 +-
> hw/msmouse.c | 6 +-
> hw/multiboot.c | 2 +-
> hw/musicpal.c | 14 +-
> hw/nand.c | 4 +-
> hw/ne2000-isa.c | 4 +-
> hw/ne2000.c | 4 +-
> hw/nseries.c | 8 +-
> hw/omap.h | 2 +-
> hw/omap1.c | 6 +-
> hw/omap2.c | 8 +-
> hw/omap_dma.c | 2 +-
> hw/omap_dss.c | 2 +-
> hw/omap_gpmc.c | 4 +-
> hw/omap_gptimer.c | 2 +-
> hw/omap_lcdc.c | 2 +-
> hw/omap_sx1.c | 6 +-
> hw/omap_synctimer.c | 2 +-
> hw/omap_uart.c | 4 +-
> hw/onenand.c | 8 +-
> hw/opencores_eth.c | 4 +-
> hw/openrisc_sim.c | 8 +-
> hw/openrisc_timer.c | 2 +-
> hw/palm.c | 6 +-
> hw/parallel.c | 4 +-
> hw/pc.c | 16 +-
> hw/pc.h | 8 +-
> hw/pc_piix.c | 14 +-
> hw/pc_sysfw.c | 6 +-
> hw/pci-hotplug.c | 10 +-
> hw/pci-stub.c | 4 +-
> hw/pci.c | 10 +-
> hw/pci.h | 4 +-
> hw/pci_bridge.c | 2 +-
> hw/pci_bridge_dev.c | 2 +-
> hw/pcie.c | 2 +-
> hw/pcie_aer.c | 6 +-
> hw/pcie_host.c | 2 +-
> hw/pcie_host.h | 2 +-
> hw/pckbd.c | 2 +-
> hw/pcnet-pci.c | 6 +-
> hw/pcnet.c | 8 +-
> hw/pcnet.h | 2 +-
> hw/pcspk.c | 2 +-
> hw/petalogix_ml605_mmu.c | 8 +-
> hw/petalogix_s3adsp1800_mmu.c | 8 +-
> hw/pflash_cfi01.c | 8 +-
> hw/pflash_cfi02.c | 8 +-
> hw/piix_pci.c | 2 +-
> hw/pl011.c | 2 +-
> hw/pl031.c | 4 +-
> hw/pl110.c | 2 +-
> hw/pl181.c | 2 +-
> hw/ppc.c | 8 +-
> hw/ppc/e500.c | 10 +-
> hw/ppc/e500plat.c | 2 +-
> hw/ppc/mpc8544ds.c | 2 +-
> hw/ppc405_boards.c | 10 +-
> hw/ppc405_uc.c | 8 +-
> hw/ppc440_bamboo.c | 10 +-
> hw/ppc4xx_devs.c | 4 +-
> hw/ppc4xx_pci.c | 2 +-
> hw/ppc_booke.c | 6 +-
> hw/ppc_mac.h | 2 +-
> hw/ppc_newworld.c | 10 +-
> hw/ppc_oldworld.c | 10 +-
> hw/ppc_prep.c | 12 +-
> hw/ppce500_pci.c | 4 +-
> hw/ppce500_spin.c | 4 +-
> hw/prep_pci.c | 2 +-
> hw/ps2.c | 4 +-
> hw/ptimer.c | 4 +-
> hw/ptimer.h | 4 +-
> hw/puv3.c | 4 +-
> hw/pxa.h | 2 +-
> hw/pxa2xx.c | 6 +-
> hw/pxa2xx_keypad.c | 2 +-
> hw/pxa2xx_lcd.c | 4 +-
> hw/pxa2xx_timer.c | 4 +-
> hw/qdev-addr.c | 2 +-
> hw/qdev-monitor.c | 5 +-
> hw/qdev-properties.c | 8 +-
> hw/qdev.c | 6 +-
> hw/qdev.h | 11 +-
> hw/qxl-logger.c | 2 +-
> hw/qxl.c | 8 +-
> hw/qxl.h | 4 +-
> hw/r2d.c | 8 +-
> hw/rc4030.c | 2 +-
> hw/realview.c | 8 +-
> hw/rtl8139.c | 10 +-
> hw/s390-virtio-bus.c | 9 +-
> hw/s390-virtio.c | 14 +-
> hw/sb16.c | 4 +-
> hw/scsi-bus.c | 6 +-
> hw/scsi-disk.c | 8 +-
> hw/scsi-generic.c | 4 +-
> hw/scsi.h | 4 +-
> hw/sd.c | 4 +-
> hw/serial.c | 4 +-
> hw/serial.h | 4 +-
> hw/sga.c | 2 +-
> hw/sh7750.c | 4 +-
> hw/sh_intc.h | 2 +-
> hw/sh_pci.c | 4 +-
> hw/sh_serial.c | 4 +-
> hw/sh_timer.c | 4 +-
> hw/shix.c | 4 +-
> hw/shpc.c | 4 +-
> hw/shpc.h | 4 +-
> hw/slavio_intctl.c | 2 +-
> hw/slavio_misc.c | 2 +-
> hw/slavio_timer.c | 2 +-
> hw/sm501.c | 4 +-
> hw/smbios.c | 2 +-
> hw/smc91c111.c | 2 +-
> hw/soc_dma.c | 2 +-
> hw/soc_dma.h | 2 +-
> hw/spapr.c | 14 +-
> hw/spapr.h | 2 +-
> hw/spapr_hcall.c | 6 +-
> hw/spapr_iommu.c | 6 +-
> hw/spapr_llan.c | 2 +-
> hw/spapr_pci.c | 2 +-
> hw/spapr_rtas.c | 6 +-
> hw/spapr_vio.c | 8 +-
> hw/spapr_vio.h | 2 +-
> hw/spapr_vscsi.c | 1 -
> hw/spapr_vty.c | 2 +-
> hw/spitz.c | 12 +-
> hw/ssd0303.c | 2 +-
> hw/ssd0323.c | 2 +-
> hw/ssi-sd.c | 2 +-
> hw/stellaris.c | 6 +-
> hw/stellaris_enet.c | 2 +-
> hw/stellaris_input.c | 2 +-
> hw/stream.h | 2 +-
> hw/strongarm.c | 5 +-
> hw/strongarm.h | 2 +-
> hw/sun4c_intctl.c | 2 +-
> hw/sun4m.c | 8 +-
> hw/sun4u.c | 10 +-
> hw/sysbus.c | 4 +-
> hw/sysbus.h | 2 +-
> hw/tc6393xb.c | 4 +-
> hw/tcx.c | 2 +-
> hw/tosa.c | 6 +-
> hw/tsc2005.c | 4 +-
> hw/tsc210x.c | 4 +-
> hw/tusb6010.c | 2 +-
> hw/twl92230.c | 6 +-
> uboot_image.h => hw/uboot_image.h | 0
> hw/usb.h | 2 +-
> hw/usb/bus.c | 4 +-
> hw/usb/core.c | 2 +-
> hw/usb/dev-bluetooth.c | 2 +-
> hw/usb/dev-hid.c | 4 +-
> hw/usb/dev-network.c | 9 +-
> hw/usb/dev-serial.c | 4 +-
> hw/usb/dev-smartcard-reader.c | 4 +-
> hw/usb/dev-storage.c | 12 +-
> hw/usb/dev-uas.c | 4 +-
> hw/usb/dev-wacom.c | 2 +-
> hw/usb/hcd-ehci.c | 8 +-
> hw/usb/hcd-musb.c | 2 +-
> hw/usb/hcd-ohci.c | 2 +-
> hw/usb/hcd-uhci.c | 6 +-
> hw/usb/hcd-xhci.c | 2 +-
> hw/usb/host-bsd.c | 2 +-
> hw/usb/host-linux.c | 6 +-
> hw/usb/host-stub.c | 4 +-
> hw/usb/libhw.c | 4 +-
> hw/usb/redirect.c | 6 +-
> hw/versatile_pci.c | 2 +-
> hw/versatilepb.c | 8 +-
> hw/vexpress.c | 8 +-
> hw/vfio_pci.c | 14 +-
> hw/vga-isa-mm.c | 4 +-
> hw/vga-isa.c | 4 +-
> hw/vga-pci.c | 4 +-
> hw/vga.c | 4 +-
> hw/vga_int.h | 4 +-
> hw/vhost.c | 4 +-
> hw/vhost.h | 2 +-
> hw/vhost_net.c | 4 +-
> hw/vhost_net.h | 2 +-
> hw/virtex_ml507.c | 11 +-
> hw/virtio-balloon.c | 8 +-
> hw/virtio-blk.c | 4 +-
> hw/virtio-console.c | 4 +-
> hw/virtio-net.c | 8 +-
> hw/virtio-net.h | 28 --
> hw/virtio-pci.c | 9 +-
> hw/virtio-scsi.h | 1 -
> hw/virtio-serial-bus.c | 6 +-
> hw/virtio.c | 4 +-
> hw/virtio.h | 6 +-
> hw/vmmouse.c | 2 +-
> hw/vmport.c | 2 +-
> hw/vmware_vga.c | 2 +-
> hw/vt82c686.c | 4 +-
> hw/watchdog.c | 12 +-
> hw/watchdog.h | 2 +-
> hw/wdt_i6300esb.c | 2 +-
> hw/wdt_ib700.c | 2 +-
> hw/xen_backend.c | 4 +-
> hw/xen_backend.h | 5 +-
> hw/xen_common.h | 2 +-
> hw/xen_console.c | 2 +-
> hw/xen_devconfig.c | 2 +-
> hw/xen_disk.c | 3 +-
> hw/xen_domainbuild.c | 4 +-
> hw/xen_machine_pv.c | 2 +-
> hw/xen_nic.c | 3 +-
> hw/xen_platform.c | 3 +-
> hw/xen_pt.c | 4 +-
> hw/xen_pt_config_init.c | 2 +-
> hw/xenfb.c | 4 +-
> hw/xgmac.c | 6 +-
> hw/xilinx.h | 2 +-
> hw/xilinx_axidma.c | 5 +-
> hw/xilinx_axienet.c | 5 +-
> hw/xilinx_ethlite.c | 2 +-
> hw/xilinx_spi.c | 4 +-
> hw/xilinx_spips.c | 4 +-
> hw/xilinx_timer.c | 2 +-
> hw/xilinx_uartlite.c | 2 +-
> hw/xilinx_zynq.c | 8 +-
> hw/xtensa_lx60.c | 11 +-
> hw/xtensa_pic.c | 4 +-
> hw/xtensa_sim.c | 6 +-
> hw/z2.c | 8 +-
> hw/zynq_slcr.c | 4 +-
> {audio => include/audio}/audio.h | 2 +-
> aes.h => include/block/aes.h | 0
> qemu-aio.h => include/block/aio.h | 2 +-
> block.h => include/block/block.h | 8 +-
> block_int.h => include/block/block_int.h | 14 +-
> blockjob.h => include/block/blockjob.h | 2 +-
> qemu-coroutine.h => include/block/coroutine.h | 4 +-
> .../block/coroutine_int.h | 4 +-
> nbd.h => include/block/nbd.h | 0
> include/bt/bt.h | 20 +
> qemu-char.h => include/char/char.h | 12 +-
> config.h => include/config.h | 0
> dis-asm.h => include/disas/bfd.h | 0
> disas.h => include/disas/disas.h | 0
> elf.h => include/elf.h | 0
> cpu-all.h => include/exec/cpu-all.h | 4 +-
> cpu-common.h => include/exec/cpu-common.h | 8 +-
> cpu-defs.h => include/exec/cpu-defs.h | 6 +-
> def-helper.h => include/exec/def-helper.h | 0
> exec-all.h => include/exec/exec-all.h | 14 +-
> exec-memory.h => include/exec/exec-memory.h | 2 +-
> gdbstub.h => include/exec/gdbstub.h | 0
> gen-icount.h => include/exec/gen-icount.h | 2 +-
> poison.h => include/exec/poison.h | 0
> softmmu-semi.h => include/exec/softmmu-semi.h | 0
> softmmu_defs.h => include/exec/softmmu_defs.h | 0
> softmmu_exec.h => include/exec/softmmu_exec.h | 58 ++--
> softmmu_header.h => include/exec/softmmu_header.h | 0
> .../exec/softmmu_template.h | 4 +-
> qemu-lock.h => include/exec/spinlock.h | 0
> targphys.h => include/exec/targphys.h | 0
> {fpu => include/fpu}/softfloat.h | 2 +-
> libfdt_env.h => include/libfdt_env.h | 2 +-
> block-migration.h => include/migration/block.h | 0
> qemu-file.h => include/migration/file.h | 0
> migration.h => include/migration/migration.h | 8 +-
> include/{qemu => migration}/page_cache.h | 0
> vmstate.h => include/migration/vmstate.h | 0
> monitor.h => include/monitor/monitor.h | 9 +-
> readline.h => include/monitor/readline.h | 0
> {net => include/net}/checksum.h | 0
> net.h => include/net/net.h | 25 +-
> {net => include/net}/queue.h | 0
> {net => include/net}/slirp.h | 4 +-
> {net => include/net}/tap.h | 37 +-
> .../qapi/dealloc-visitor.h | 2 +-
> error.h => include/qapi/error.h | 2 +-
> {qapi => include/qapi}/opts-visitor.h | 4 +-
> {qapi => include/qapi}/qmp-core.h | 6 +-
> {qapi => include/qapi}/qmp-input-visitor.h | 4 +-
> {qapi => include/qapi}/qmp-output-visitor.h | 4 +-
> qemu-objects.h => include/qapi/qmp-types.h | 16 +-
> {qapi => include/qapi}/string-input-visitor.h | 2 +-
> {qapi => include/qapi}/string-output-visitor.h | 2 +-
> .../qapi-types-core.h => include/qapi/types-core.h | 4 +-
> .../qapi-visit-core.h => include/qapi/visit-core.h | 2 +-
> .../qapi-visit-impl.h => include/qapi/visit-impl.h | 4 +-
> qemu-common.h => include/qemu-common.h | 12 +-
> acl.h => include/qemu/acl.h | 2 +-
> qemu-barrier.h => include/qemu/atomic.h | 2 +-
> bitmap.h => include/qemu/bitmap.h | 2 +-
> bitops.h => include/qemu/bitops.h | 0
> bswap.h => include/qemu/bswap.h | 2 +-
> cache-utils.h => include/qemu/cache-utils.h | 0
> compatfd.h => include/qemu/compatfd.h | 0
> compiler.h => include/qemu/compiler.h | 0
> qemu-config.h => include/qemu/config-file.h | 3 +-
> envlist.h => include/qemu/envlist.h | 0
> qemu-error.h => include/qemu/error.h | 0
> event_notifier.h => include/qemu/event_notifier.h | 0
> host-utils.h => include/qemu/host-utils.h | 2 +-
> int128.h => include/qemu/int128.h | 0
> iov.h => include/qemu/iov.h | 0
> qemu-log.h => include/qemu/log.h | 2 +-
> main-loop.h => include/qemu/main-loop.h | 0
> module.h => include/qemu/module.h | 0
> notify.h => include/qemu/notify.h | 2 +-
> qemu-option.h => include/qemu/option.h | 6 +-
> .../qemu/option_int.h | 2 +-
> osdep.h => include/qemu/osdep.h | 0
> qemu-queue.h => include/qemu/queue.h | 2 +-
> range.h => include/qemu/range.h | 0
> qemu_socket.h => include/qemu/sockets.h | 6 +-
> qemu-thread-posix.h => include/qemu/thread-posix.h | 0
> qemu-thread-win32.h => include/qemu/thread-win32.h | 0
> qemu-thread.h => include/qemu/thread.h | 4 +-
> qemu-timer.h => include/qemu/timer.h | 4 +-
> qemu-tls.h => include/qemu/tls.h | 0
> uri.h => include/qemu/uri.h | 0
> qemu-xattr.h => include/qemu/xattr.h | 0
> json-lexer.h => include/qobject/json-lexer.h | 4 +-
> json-parser.h => include/qobject/json-parser.h | 4 +-
> json-streamer.h => include/qobject/json-streamer.h | 4 +-
> qbool.h => include/qobject/qbool.h | 2 +-
> qdict.h => include/qobject/qdict.h | 6 +-
> qerror.h => include/qobject/qerror.h | 8 +-
> qfloat.h => include/qobject/qfloat.h | 2 +-
> qint.h => include/qobject/qint.h | 2 +-
> qjson.h => include/qobject/qjson.h | 6 +-
> qlist.h => include/qobject/qlist.h | 6 +-
> qobject.h => include/qobject/qobject.h | 0
> qstring.h => include/qobject/qstring.h | 2 +-
> include/{qemu => qom}/cpu.h | 4 +-
> include/{qemu => qom}/object.h | 2 +-
> include/{qemu => qom}/qom-qobject.h | 2 +-
> {slirp => include/slirp}/libslirp.h | 5 +
> arch_init.h => include/sysemu/arch_init.h | 0
> balloon.h => include/sysemu/balloon.h | 2 +-
> blockdev.h => include/sysemu/blockdev.h | 6 +-
> cpus.h => include/sysemu/cpus.h | 0
> cputlb.h => include/sysemu/cputlb.h | 0
> device_tree.h => include/sysemu/device_tree.h | 0
> dma.h => include/sysemu/dma.h | 6 +-
> dump.h => include/sysemu/dump.h | 0
> ioport.h => include/sysemu/ioport.h | 2 +-
> iorange.h => include/sysemu/iorange.h | 0
> kvm.h => include/sysemu/kvm.h | 2 +-
> .../sysemu/memory-internal.h | 0
> memory.h => include/sysemu/memory.h | 12 +-
> .../sysemu/memory_mapping.h | 2 +-
> qemu-os-posix.h => include/sysemu/os-posix.h | 0
> qemu-os-win32.h => include/sysemu/os-win32.h | 2 +-
> qtest.h => include/sysemu/qtest.h | 0
> qemu-seccomp.h => include/sysemu/seccomp.h | 2 +-
> sysemu.h => include/sysemu/sysemu.h | 10 +-
> xen-mapcache.h => include/sysemu/xen-mapcache.h | 0
> console.h => include/ui/console.h | 9 +-
> pflib.h => include/ui/pflib.h | 0
> {ui => include/ui}/qemu-spice.h | 9 +-
> {ui => include/ui}/spice-display.h | 6 +-
> iohandler.c | 5 +-
> ioport.c | 4 +-
> iov.c | 105 +++++-
> kvm-all.c | 20 +-
> kvm-stub.c | 4 +-
> alpha.ld => ldscripts/alpha.ld | 0
> arm.ld => ldscripts/arm.ld | 0
> hppa.ld => ldscripts/hppa.ld | 0
> i386.ld => ldscripts/i386.ld | 0
> ia64.ld => ldscripts/ia64.ld | 0
> m68k.ld => ldscripts/m68k.ld | 0
> mips.ld => ldscripts/mips.ld | 0
> ppc.ld => ldscripts/ppc.ld | 0
> ppc64.ld => ldscripts/ppc64.ld | 0
> s390.ld => ldscripts/s390.ld | 0
> sparc.ld => ldscripts/sparc.ld | 0
> sparc64.ld => ldscripts/sparc64.ld | 0
> x86_64.ld => ldscripts/x86_64.ld | 0
> libcacard/event.c | 2 +-
> libcacard/vreader.c | 2 +-
> libcacard/vscclient.c | 4 +-
> linux-aio.c | 3 +-
> linux-user/arm/nwfpe/double_cpdo.c | 2 +-
> linux-user/arm/nwfpe/extended_cpdo.c | 2 +-
> linux-user/arm/nwfpe/fpa11.h | 2 +-
> linux-user/arm/nwfpe/fpa11_cpdt.c | 2 +-
> linux-user/arm/nwfpe/fpa11_cprt.c | 2 +-
> linux-user/arm/nwfpe/fpopcode.c | 2 +-
> linux-user/arm/nwfpe/single_cpdo.c | 2 +-
> linux-user/elfload.c | 2 +-
> linux-user/main.c | 6 +-
> linux-user/qemu.h | 6 +-
> linux-user/syscall.c | 2 +-
> main-loop.c | 8 +-
> memory.c | 12 +-
> memory_mapping-stub.c | 4 +-
> memory_mapping.c | 4 +-
> migration-exec.c | 7 +-
> migration-fd.c | 11 +-
> migration-tcp.c | 7 +-
> migration-unix.c | 7 +-
> migration.c | 12 +-
> module.c | 4 +-
> monitor.c | 50 ++--
> nbd.c | 10 +-
> net/Makefile.objs | 2 +-
> net/clients.h | 2 +-
> net/dump.c | 6 +-
> net/hub.c | 6 +-
> net/hub.h | 2 -
> net.c => net/net.c | 17 +-
> net/queue.c | 4 +-
> net/slirp.c | 7 +-
> net/socket.c | 13 +-
> net/tap-aix.c | 2 +-
> net/tap-bsd.c | 6 +-
> net/tap-haiku.c | 2 +-
> net/tap-linux.c | 7 +-
> net/tap-linux.h | 20 +-
> net/tap-solaris.c | 6 +-
> net/tap-win32.c | 8 +-
> net/tap.c | 13 +-
> net/{tap.h => tap_int.h} | 18 +-
> net/util.c | 2 +-
> net/vde.c | 5 +-
> notify.c | 2 +-
> os-posix.c | 2 +-
> os-win32.c | 2 +-
> osdep.c | 4 +-
> oslib-posix.c | 4 +-
> oslib-win32.c | 6 +-
> page_cache.c | 2 +-
> posix-aio-compat.c | 10 +-
> qapi/opts-visitor.c | 8 +-
> qapi/qapi-dealloc-visitor.c | 6 +-
> qapi/qapi-visit-core.c | 4 +-
> qapi/qmp-dispatch.c | 8 +-
> qapi/qmp-input-visitor.c | 10 +-
> qapi/qmp-output-visitor.c | 10 +-
> qapi/string-input-visitor.c | 6 +-
> qapi/string-output-visitor.c | 6 +-
> qemu-bridge-helper.c | 2 +-
> qemu-char.c | 13 +-
> qemu-config.c | 8 +-
> qemu-coroutine-io.c | 6 +-
> qemu-coroutine-lock.c | 8 +-
> qemu-coroutine-sleep.c | 4 +-
> qemu-coroutine.c | 4 +-
> qemu-error.c | 2 +-
> qemu-img.c | 12 +-
> qemu-io.c | 4 +-
> qemu-log.c | 2 +-
> qemu-nbd.c | 4 +-
> qemu-option.c | 10 +-
> qemu-progress.c | 4 +-
> qemu-seccomp.c | 2 +-
> qemu-sockets.c | 6 +-
> qemu-thread-posix.c | 2 +-
> qemu-thread-win32.c | 2 +-
> qemu-timer-common.c | 2 +-
> qemu-timer.c | 11 +-
> qemu-tool.c | 14 +-
> qemu-user.c | 2 +-
> qga/Makefile.objs | 2 +-
> qga/channel-posix.c | 2 +-
> qga/commands-posix.c | 6 +-
> qga/commands-win32.c | 2 +-
> qga/commands.c | 2 +-
> qemu-ga.c => qga/main.c | 12 +-
> qapi-schema-guest.json => qga/qapi-schema.json | 0
> qmp.c | 11 +-
> qobject/Makefile.objs | 4 +
> json-lexer.c => qobject/json-lexer.c | 10 +-
> json-parser.c => qobject/json-parser.c | 18 +-
> json-streamer.c => qobject/json-streamer.c | 10 +-
> qbool.c => qobject/qbool.c | 4 +-
> qdict.c => qobject/qdict.c | 14 +-
> qerror.c => qobject/qerror.c | 6 +-
> qfloat.c => qobject/qfloat.c | 4 +-
> qint.c => qobject/qint.c | 4 +-
> qjson.c => qobject/qjson.c | 18 +-
> qlist.c => qobject/qlist.c | 6 +-
> qstring.c => qobject/qstring.c | 4 +-
> qom/container.c | 4 +-
> qom/cpu.c | 2 +-
> qom/object.c | 14 +-
> qom/qom-qobject.c | 6 +-
> qtest.c | 12 +-
> readline.c | 4 +-
> rules.mak | 5 +-
> savevm.c | 21 +-
> scripts/feature_to_c.sh | 2 +-
> scripts/qapi-commands.py | 10 +-
> scripts/qapi-types.py | 2 +-
> scripts/qapi-visit.py | 2 +-
> slirp/if.c | 2 +-
> slirp/ip_input.c | 2 +-
> slirp/misc.c | 5 +-
> slirp/sbuf.c | 2 +-
> slirp/slirp.c | 4 +-
> slirp/slirp.h | 11 +-
> spice-qemu-char.c | 2 +-
> target-alpha/cpu-qom.h | 2 +-
> target-alpha/cpu.h | 8 +-
> target-alpha/fpu_helper.c | 2 +-
> target-alpha/helper.c | 2 +-
> target-alpha/helper.h | 4 +-
> target-alpha/int_helper.c | 2 +-
> target-alpha/mem_helper.c | 10 +-
> target-alpha/sys_helper.c | 4 +-
> target-alpha/translate.c | 8 +-
> target-arm/arm-semi.c | 4 +-
> target-arm/cpu-qom.h | 2 +-
> target-arm/cpu.c | 2 +-
> target-arm/cpu.h | 8 +-
> target-arm/helper.c | 8 +-
> target-arm/helper.h | 4 +-
> target-arm/iwmmxt_helper.c | 2 +-
> target-arm/neon_helper.c | 2 +-
> target-arm/op_helper.c | 10 +-
> target-arm/translate.c | 6 +-
> target-cris/cpu-qom.h | 2 +-
> target-cris/cpu.h | 6 +-
> target-cris/helper.c | 2 +-
> target-cris/helper.h | 4 +-
> target-cris/op_helper.c | 12 +-
> target-cris/translate.c | 4 +-
> target-i386/arch_dump.c | 4 +-
> target-i386/arch_memory_mapping.c | 4 +-
> target-i386/cpu-qom.h | 4 +-
> target-i386/cpu.c | 10 +-
> target-i386/cpu.h | 8 +-
> target-i386/excp_helper.c | 4 +-
> target-i386/fpu_helper.c | 2 +-
> target-i386/helper.c | 6 +-
> target-i386/helper.h | 4 +-
> target-i386/int_helper.c | 2 +-
> target-i386/ioport-user.c | 2 +-
> target-i386/kvm.c | 11 +-
> target-i386/kvm_i386.h | 2 +-
> target-i386/machine.c | 2 +-
> target-i386/mem_helper.c | 10 +-
> target-i386/misc_helper.c | 4 +-
> target-i386/seg_helper.c | 4 +-
> target-i386/svm_helper.c | 4 +-
> target-i386/translate.c | 4 +-
> target-lm32/cpu-qom.h | 2 +-
> target-lm32/cpu.h | 6 +-
> target-lm32/helper.c | 2 +-
> target-lm32/helper.h | 4 +-
> target-lm32/op_helper.c | 10 +-
> target-lm32/translate.c | 4 +-
> target-m68k/cpu-qom.h | 2 +-
> target-m68k/cpu.h | 8 +-
> target-m68k/helper.c | 2 +-
> target-m68k/helpers.h | 4 +-
> target-m68k/m68k-semi.c | 6 +-
> target-m68k/op_helper.c | 10 +-
> target-m68k/translate.c | 6 +-
> target-microblaze/cpu-qom.h | 2 +-
> target-microblaze/cpu.h | 8 +-
> target-microblaze/helper.c | 4 +-
> target-microblaze/helper.h | 4 +-
> target-microblaze/op_helper.c | 12 +-
> target-microblaze/translate.c | 4 +-
> target-mips/cpu-qom.h | 2 +-
> target-mips/cpu.h | 8 +-
> target-mips/helper.h | 4 +-
> target-mips/op_helper.c | 12 +-
> target-mips/translate.c | 4 +-
> target-openrisc/cpu.h | 12 +-
> target-openrisc/helper.h | 4 +-
> target-openrisc/int_helper.c | 2 +-
> target-openrisc/interrupt.c | 4 +-
> target-openrisc/mmu.c | 4 +-
> target-openrisc/mmu_helper.c | 10 +-
> target-openrisc/translate.c | 10 +-
> target-ppc/cpu-qom.h | 2 +-
> target-ppc/cpu.h | 8 +-
> target-ppc/helper.c | 4 +-
> target-ppc/helper.h | 4 +-
> target-ppc/int_helper.c | 2 +-
> target-ppc/kvm.c | 10 +-
> target-ppc/kvm_ppc.c | 4 +-
> target-ppc/kvm_ppc.h | 2 +-
> target-ppc/machine.c | 2 +-
> target-ppc/mem_helper.c | 12 +-
> target-ppc/mmu_helper.c | 2 +-
> target-ppc/translate.c | 6 +-
> target-ppc/translate_init.c | 8 +-
> target-s390x/cpu-qom.h | 2 +-
> target-s390x/cpu.c | 2 +-
> target-s390x/cpu.h | 8 +-
> target-s390x/fpu_helper.c | 2 +-
> target-s390x/helper.c | 6 +-
> target-s390x/helper.h | 4 +-
> target-s390x/int_helper.c | 2 +-
> target-s390x/interrupt.c | 2 +-
> target-s390x/kvm.c | 8 +-
> target-s390x/mem_helper.c | 10 +-
> target-s390x/misc_helper.c | 12 +-
> target-s390x/translate.c | 6 +-
> target-sh4/cpu-qom.h | 2 +-
> target-sh4/cpu.h | 10 +-
> target-sh4/helper.h | 4 +-
> target-sh4/op_helper.c | 10 +-
> target-sh4/translate.c | 4 +-
> target-sparc/cpu-qom.h | 2 +-
> target-sparc/cpu.h | 10 +-
> target-sparc/helper.c | 4 +-
> target-sparc/helper.h | 4 +-
> target-sparc/int32_helper.c | 2 +-
> target-sparc/ldst_helper.c | 10 +-
> target-sparc/machine.c | 2 +-
> target-sparc/mmu_helper.c | 2 +-
> target-sparc/translate.c | 4 +-
> target-unicore32/cpu-qom.h | 2 +-
> target-unicore32/cpu.h | 8 +-
> target-unicore32/helper.c | 6 +-
> target-unicore32/helper.h | 4 +-
> target-unicore32/op_helper.c | 8 +-
> target-unicore32/translate.c | 6 +-
> target-xtensa/core-dc232b.c | 6 +-
> target-xtensa/core-dc233c.c | 6 +-
> target-xtensa/core-fsf.c | 6 +-
> target-xtensa/cpu-qom.h | 2 +-
> target-xtensa/cpu.h | 6 +-
> target-xtensa/helper.c | 6 +-
> target-xtensa/helper.h | 4 +-
> target-xtensa/op_helper.c | 10 +-
> target-xtensa/translate.c | 10 +-
> target-xtensa/xtensa-semi.c | 2 +-
> tcg/arm/tcg-target.c | 2 +-
> tcg/hppa/tcg-target.c | 2 +-
> tcg/i386/tcg-target.c | 2 +-
> tcg/ia64/tcg-target.c | 2 +-
> tcg/mips/tcg-target.c | 2 +-
> tcg/ppc/tcg-target.c | 2 +-
> tcg/ppc64/tcg-target.c | 2 +-
> tcg/s390/tcg-target.c | 2 +-
> tcg/sparc/tcg-target.c | 2 +-
> tcg/tcg.c | 6 +-
> tci.c | 2 +-
> tests/check-qdict.c | 6 +-
> tests/check-qfloat.c | 2 +-
> tests/check-qint.c | 2 +-
> tests/check-qjson.c | 14 +-
> tests/check-qlist.c | 4 +-
> tests/check-qstring.c | 2 +-
> tests/libqtest.c | 4 +-
> tests/tcg/test-i386.c | 2 +-
> tests/test-coroutine.c | 2 +-
> tests/test-iov.c | 4 +-
> tests/test-qmp-commands.c | 4 +-
> tests/test-qmp-input-strict.c | 2 +-
> tests/test-qmp-input-visitor.c | 2 +-
> tests/test-qmp-output-visitor.c | 2 +-
> tests/test-string-input-visitor.c | 2 +-
> tests/test-string-output-visitor.c | 2 +-
> tests/test-visitor-serialization.c | 2 +-
> trace/simple.c | 2 +-
> translate-all.c | 4 +-
> ui/Makefile.objs | 7 +-
> ui/cocoa.m | 4 +-
> console.c => ui/console.c | 5 +-
> ui/curses.c | 4 +-
> cursor.c => ui/cursor.c | 2 +-
> cursor_hidden.xpm => ui/cursor_hidden.xpm | 0
> cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm | 0
> input.c => ui/input.c | 9 +-
> ui/keymaps.c | 2 +-
> pflib.c => ui/pflib.c | 4 +-
> qemu-x509.h => ui/qemu-x509.h | 0
> ui/sdl.c | 4 +-
> ui/sdl_zoom.c | 2 +-
> ui/spice-core.c | 28 +-
> ui/spice-display.c | 14 +-
> ui/spice-input.c | 4 +-
> vgafont.h => ui/vgafont.h | 0
> ui/vnc-auth-sasl.h | 2 +-
> ui/vnc-enc-tight.c | 4 +-
> ui/vnc-jobs.c | 2 +-
> ui/vnc-palette.h | 4 +-
> ui/vnc-tls.c | 2 +-
> ui/vnc-tls.h | 2 +-
> ui/vnc.c | 12 +-
> ui/vnc.h | 10 +-
> uri.c | 2 +-
> user-exec.c | 2 +-
> vl.c | 54 ++--
> xen-all.c | 6 +-
> xen-mapcache.c | 6 +-
> xen-stub.c | 2 +-
> 1006 files changed, 2511 insertions(+), 3070 deletions(-)
> delete mode 100644 Makefile.dis
> delete mode 100644 Makefile.user
> delete mode 100644 a.out.h
> delete mode 100644 bt-host.h
> create mode 100644 disas/Makefile.objs
> rename alpha-dis.c => disas/alpha.c (99%)
> rename arm-dis.c => disas/arm.c (99%)
> rename cris-dis.c => disas/cris.c (99%)
> rename hppa-dis.c => disas/hppa.c (99%)
> rename i386-dis.c => disas/i386.c (99%)
> rename ia64-dis.c => disas/ia64.c (99%)
> rename lm32-dis.c => disas/lm32.c (99%)
> rename m68k-dis.c => disas/m68k.c (99%)
> rename microblaze-dis.c => disas/microblaze.c (99%)
> rename mips-dis.c => disas/mips.c (99%)
> rename ppc-dis.c => disas/ppc.c (99%)
> rename s390-dis.c => disas/s390.c (99%)
> rename sh4-dis.c => disas/sh4.c (99%)
> rename sparc-dis.c => disas/sparc.c (99%)
> rename tci-dis.c => disas/tci.c (98%)
> rename uboot_image.h => hw/uboot_image.h (100%)
> rename {audio => include/audio}/audio.h (99%)
> rename aes.h => include/block/aes.h (100%)
> rename qemu-aio.h => include/block/aio.h (98%)
> rename block.h => include/block/block.h (99%)
> rename block_int.h => include/block/block_int.h (98%)
> rename blockjob.h => include/block/blockjob.h (99%)
> rename qemu-coroutine.h => include/block/coroutine.h (99%)
> rename qemu-coroutine-int.h => include/block/coroutine_int.h (96%)
> rename nbd.h => include/block/nbd.h (100%)
> create mode 100644 include/bt/bt.h
> rename qemu-char.h => include/char/char.h (97%)
> rename config.h => include/config.h (100%)
> rename dis-asm.h => include/disas/bfd.h (100%)
> rename disas.h => include/disas/disas.h (100%)
> rename elf.h => include/elf.h (100%)
> rename cpu-all.h => include/exec/cpu-all.h (99%)
> rename cpu-common.h => include/exec/cpu-common.h (97%)
> rename cpu-defs.h => include/exec/cpu-defs.h (99%)
> rename def-helper.h => include/exec/def-helper.h (100%)
> rename exec-all.h => include/exec/exec-all.h (98%)
> rename exec-memory.h => include/exec/exec-memory.h (97%)
> rename gdbstub.h => include/exec/gdbstub.h (100%)
> rename gen-icount.h => include/exec/gen-icount.h (98%)
> rename poison.h => include/exec/poison.h (100%)
> rename softmmu-semi.h => include/exec/softmmu-semi.h (100%)
> rename softmmu_defs.h => include/exec/softmmu_defs.h (100%)
> rename softmmu_exec.h => include/exec/softmmu_exec.h (72%)
> rename softmmu_header.h => include/exec/softmmu_header.h (100%)
> rename softmmu_template.h => include/exec/softmmu_template.h (99%)
> rename qemu-lock.h => include/exec/spinlock.h (100%)
> rename targphys.h => include/exec/targphys.h (100%)
> rename {fpu => include/fpu}/softfloat.h (99%)
> rename libfdt_env.h => include/libfdt_env.h (97%)
> rename block-migration.h => include/migration/block.h (100%)
> rename qemu-file.h => include/migration/file.h (100%)
> rename migration.h => include/migration/migration.h (97%)
> rename include/{qemu => migration}/page_cache.h (100%)
> rename vmstate.h => include/migration/vmstate.h (100%)
> rename monitor.h => include/monitor/monitor.h (96%)
> rename readline.h => include/monitor/readline.h (100%)
> rename {net => include/net}/checksum.h (100%)
> rename net.h => include/net/net.h (90%)
> rename {net => include/net}/queue.h (100%)
> rename {net => include/net}/slirp.h (96%)
> copy {net => include/net}/tap.h (69%)
> rename qapi/qapi-dealloc-visitor.h => include/qapi/dealloc-visitor.h (95%)
> rename error.h => include/qapi/error.h (98%)
> rename {qapi => include/qapi}/opts-visitor.h (93%)
> rename {qapi => include/qapi}/qmp-core.h (93%)
> rename {qapi => include/qapi}/qmp-input-visitor.h (91%)
> rename {qapi => include/qapi}/qmp-output-visitor.h (91%)
> rename qemu-objects.h => include/qapi/qmp-types.h (61%)
> rename {qapi => include/qapi}/string-input-visitor.h (95%)
> rename {qapi => include/qapi}/string-output-visitor.h (95%)
> rename qapi/qapi-types-core.h => include/qapi/types-core.h (87%)
> rename qapi/qapi-visit-core.h => include/qapi/visit-core.h (99%)
> rename qapi/qapi-visit-impl.h => include/qapi/visit-impl.h (90%)
> rename qemu-common.h => include/qemu-common.h (98%)
> rename acl.h => include/qemu/acl.h (98%)
> rename qemu-barrier.h => include/qemu/atomic.h (96%)
> rename bitmap.h => include/qemu/bitmap.h (99%)
> rename bitops.h => include/qemu/bitops.h (100%)
> rename bswap.h => include/qemu/bswap.h (99%)
> rename cache-utils.h => include/qemu/cache-utils.h (100%)
> rename compatfd.h => include/qemu/compatfd.h (100%)
> rename compiler.h => include/qemu/compiler.h (100%)
> rename qemu-config.h => include/qemu/config-file.h (93%)
> rename envlist.h => include/qemu/envlist.h (100%)
> rename qemu-error.h => include/qemu/error.h (100%)
> rename event_notifier.h => include/qemu/event_notifier.h (100%)
> rename host-utils.h => include/qemu/host-utils.h (99%)
> rename int128.h => include/qemu/int128.h (100%)
> rename iov.h => include/qemu/iov.h (100%)
> rename qemu-log.h => include/qemu/log.h (99%)
> rename main-loop.h => include/qemu/main-loop.h (100%)
> rename module.h => include/qemu/module.h (100%)
> rename notify.h => include/qemu/notify.h (97%)
> rename qemu-option.h => include/qemu/option.h (98%)
> rename qemu-option-internal.h => include/qemu/option_int.h (98%)
> rename osdep.h => include/qemu/osdep.h (100%)
> rename qemu-queue.h => include/qemu/queue.h (99%)
> rename range.h => include/qemu/range.h (100%)
> rename qemu_socket.h => include/qemu/sockets.h (96%)
> rename qemu-thread-posix.h => include/qemu/thread-posix.h (100%)
> rename qemu-thread-win32.h => include/qemu/thread-win32.h (100%)
> rename qemu-thread.h => include/qemu/thread.h (95%)
> rename qemu-timer.h => include/qemu/timer.h (99%)
> rename qemu-tls.h => include/qemu/tls.h (100%)
> rename uri.h => include/qemu/uri.h (100%)
> rename qemu-xattr.h => include/qemu/xattr.h (100%)
> rename json-lexer.h => include/qobject/json-lexer.h (94%)
> rename json-parser.h => include/qobject/json-parser.h (90%)
> rename json-streamer.h => include/qobject/json-streamer.h (94%)
> rename qbool.h => include/qobject/qbool.h (94%)
> rename qdict.h => include/qobject/qdict.h (96%)
> rename qerror.h => include/qobject/qerror.h (98%)
> rename qfloat.h => include/qobject/qfloat.h (94%)
> rename qint.h => include/qobject/qint.h (94%)
> rename qjson.h => include/qobject/qjson.h (88%)
> rename qlist.h => include/qobject/qlist.h (95%)
> rename qobject.h => include/qobject/qobject.h (100%)
> rename qstring.h => include/qobject/qstring.h (96%)
> rename include/{qemu => qom}/cpu.h (97%)
> rename include/{qemu => qom}/object.h (99%)
> rename include/{qemu => qom}/qom-qobject.h (97%)
> rename {slirp => include/slirp}/libslirp.h (96%)
> rename arch_init.h => include/sysemu/arch_init.h (100%)
> rename balloon.h => include/sysemu/balloon.h (95%)
> rename blockdev.h => include/sysemu/blockdev.h (96%)
> rename cpus.h => include/sysemu/cpus.h (100%)
> rename cputlb.h => include/sysemu/cputlb.h (100%)
> rename device_tree.h => include/sysemu/device_tree.h (100%)
> rename dma.h => include/sysemu/dma.h (99%)
> rename dump.h => include/sysemu/dump.h (100%)
> rename ioport.h => include/sysemu/ioport.h (98%)
> rename iorange.h => include/sysemu/iorange.h (100%)
> rename kvm.h => include/sysemu/kvm.h (99%)
> rename memory-internal.h => include/sysemu/memory-internal.h (100%)
> rename memory.h => include/sysemu/memory.h (99%)
> rename memory_mapping.h => include/sysemu/memory_mapping.h (98%)
> rename qemu-os-posix.h => include/sysemu/os-posix.h (100%)
> rename qemu-os-win32.h => include/sysemu/os-win32.h (99%)
> rename qtest.h => include/sysemu/qtest.h (100%)
> rename qemu-seccomp.h => include/sysemu/seccomp.h (95%)
> rename sysemu.h => include/sysemu/sysemu.h (97%)
> rename xen-mapcache.h => include/sysemu/xen-mapcache.h (100%)
> rename console.h => include/ui/console.h (99%)
> rename pflib.h => include/ui/pflib.h (100%)
> rename {ui => include/ui}/qemu-spice.h (95%)
> rename {ui => include/ui}/spice-display.h (98%)
> rename alpha.ld => ldscripts/alpha.ld (100%)
> rename arm.ld => ldscripts/arm.ld (100%)
> rename hppa.ld => ldscripts/hppa.ld (100%)
> rename i386.ld => ldscripts/i386.ld (100%)
> rename ia64.ld => ldscripts/ia64.ld (100%)
> rename m68k.ld => ldscripts/m68k.ld (100%)
> rename mips.ld => ldscripts/mips.ld (100%)
> rename ppc.ld => ldscripts/ppc.ld (100%)
> rename ppc64.ld => ldscripts/ppc64.ld (100%)
> rename s390.ld => ldscripts/s390.ld (100%)
> rename sparc.ld => ldscripts/sparc.ld (100%)
> rename sparc64.ld => ldscripts/sparc64.ld (100%)
> rename x86_64.ld => ldscripts/x86_64.ld (100%)
> rename net.c => net/net.c (99%)
> rename net/{tap.h => tap_int.h} (77%)
> rename qemu-ga.c => qga/main.c (99%)
> rename qapi-schema-guest.json => qga/qapi-schema.json (100%)
> create mode 100644 qobject/Makefile.objs
> rename json-lexer.c => qobject/json-lexer.c (98%)
> rename json-parser.c => qobject/json-parser.c (98%)
> rename json-streamer.c => qobject/json-streamer.c (95%)
> rename qbool.c => qobject/qbool.c (95%)
> rename qdict.c => qobject/qdict.c (98%)
> rename qerror.c => qobject/qerror.c (97%)
> rename qfloat.c => qobject/qfloat.c (95%)
> rename qint.c => qobject/qint.c (95%)
> rename qjson.c => qobject/qjson.c (96%)
> rename qlist.c => qobject/qlist.c (97%)
> rename qstring.c => qobject/qstring.c (98%)
> rename console.c => ui/console.c (99%)
> rename cursor.c => ui/cursor.c (99%)
> rename cursor_hidden.xpm => ui/cursor_hidden.xpm (100%)
> rename cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm (100%)
> rename input.c => ui/input.c (99%)
> rename pflib.c => ui/pflib.c (99%)
> rename qemu-x509.h => ui/qemu-x509.h (100%)
> rename vgafont.h => ui/vgafont.h (100%)
Net subsystem parts:
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup
2012-10-24 12:58 [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup Paolo Bonzini
` (33 preceding siblings ...)
2012-10-25 7:54 ` Stefan Hajnoczi
@ 2012-10-25 8:01 ` Zhi Yong Wu
34 siblings, 0 replies; 40+ messages in thread
From: Zhi Yong Wu @ 2012-10-25 8:01 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: peter.maydell, aliguori, qemu-devel
It looks awesome!!! :)
On Wed, Oct 24, 2012 at 8:58 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> So in the end I decided to hold off the renaming of the .c files.
> This is mostly because there are too many confusing rules for what files
> are included in which build product, and spreading this across multiple
> directories would make things worse.
>
> However, here is the header file renaming in all its beauty. One good
> thing about renaming headers is that it guides you in a) finding the
> best place for the corresponding source file in a multi-directory layout;
> b) finding blatant inclusions of the "wrong" file, with qemu-char.h being
> an especially good candidate for "I'll just include that one". Also, it
> is the only part that is really hard to rebase for me than for everyone
> else: it touches all source files (rather than just the Makefiles), and
> headers are touched (and conflict) much less than source files.
>
> Hence, this series only creates disas/ and qobject/, and moves some
> more files to existing directories such as ui/ or net/ or qga/.
> There are many, many cleanups to do on top of this before attempting to
> rename the .c files in a coherent structure and without any module
> violation. For example:
>
> - remove QEMU-specific stuff from qemu-config.c
>
> - deconstruct qemu-common.h and sysemu.h, to get more hints about where
> to put the various .c files.
>
> - replace stub files (qemu-tool.c, qemu-user.c, etc.) with weak functions
>
> - put all the utility functions together in a static library and just
> link with that one
>
> And all this is not even touching hw/.
>
> This series is organized as follows. Patches 1 to 8 are build system
> cleanups that also create the ldscripts/ and disas/ directories.
>
> Patches 9 to 15 are some more janitorial changes coming from the original
> series that moved files. They avoid massive indirect inclusion via
> qemu-char.h or net.h.
>
> From there on the patches were scripted. Patches 16, 17 and 21 also
> move .c files, the others only move headers.
>
> (This is not ready to be applied; I'll wait until Kevin and Luiz's next
> pull request, and then coordinate with Anthony to pull a rebased version).
>
> Paolo Bonzini (32):
> libcacard: simplify rules for recursive build
> vscclient: use per-target variables
> build: adjust setting of QEMU_INCLUDES
> build: add $(TARGET_DIR) to "GEN config-target.h" lines
> build: move rules from Makefile to */Makefile.objs
> build: create ldscripts/
> build: kill libdis, move disassemblers to disas/
> build: kill libuser
> janitor: move iovector functions out of cutils.c
> janitor: do not rely on indirect inclusions from qemu-char.h
> janitor: do not include qemu-char everywhere
> net: move Bluetooth stuff out of net.h
> net: do not include net.h everywhere
> net: move net.c to net/
> net: reorganize headers
> qemu-ga: move qemu-ga files to qga/
> ui: move files to ui/ and include/ui/
> audio: move public header file to include/audio/
> slirp: move public header file to include/slirp/
> qapi: move include files to include/qapi/
> qapi: create qobject/ and include/qobject/
> block: move include files to include/block/
> exec: move include files to include/exec/
> monitor: move include files to include/monitor/
> migration: move include files to include/migration/
> qom: move include files to include/qom/
> misc: move include files to include/qemu/
> softmmu: move include files to include/sysemu/
> softmmu: move remaining include files to include/ subdirectories
> fpu: move public header file to include/fpu
> hw: move executable format header files to hw/
> janitor: move remaining public headers to include/
>
> .gitignore | 1 +
> Makefile | 49 +--
> Makefile.dis | 20 -
> Makefile.objs | 39 +--
> Makefile.target | 8 +-
> Makefile.user | 24 --
> a.out.h | 430 --------------------
> acl.c | 2 +-
> aes.c | 2 +-
> aio.c | 6 +-
> arch_init.c | 22 +-
> async.c | 4 +-
> audio/Makefile.objs | 3 +
> audio/alsaaudio.c | 4 +-
> audio/audio.c | 8 +-
> audio/audio_pt_int.c | 2 +-
> audio/audio_win_int.c | 3 +-
> audio/coreaudio.c | 2 +-
> audio/dsoundaudio.c | 2 +-
> audio/esdaudio.c | 2 +-
> audio/fmodaudio.c | 2 +-
> audio/mixeng.c | 2 +-
> audio/noaudio.c | 4 +-
> audio/ossaudio.c | 6 +-
> audio/paaudio.c | 2 +-
> audio/sdlaudio.c | 2 +-
> audio/spiceaudio.c | 4 +-
> audio/wavaudio.c | 4 +-
> audio/wavcapture.c | 4 +-
> audio/winwaveaudio.c | 4 +-
> balloon.c | 10 +-
> bitmap.c | 4 +-
> bitops.c | 2 +-
> block-migration.c | 12 +-
> block.c | 18 +-
> block/Makefile.objs | 2 +
> block/blkdebug.c | 5 +-
> block/blkverify.c | 4 +-
> block/bochs.c | 4 +-
> block/cloop.c | 4 +-
> block/commit.c | 4 +-
> block/cow.c | 4 +-
> block/curl.c | 2 +-
> block/dmg.c | 6 +-
> block/gluster.c | 6 +-
> block/iscsi.c | 5 +-
> block/nbd.c | 8 +-
> block/parallels.c | 4 +-
> block/qcow.c | 8 +-
> block/qcow2-cache.c | 2 +-
> block/qcow2-cluster.c | 2 +-
> block/qcow2-refcount.c | 2 +-
> block/qcow2-snapshot.c | 2 +-
> block/qcow2.c | 10 +-
> block/qcow2.h | 4 +-
> block/qed-table.c | 2 +-
> block/qed.c | 6 +-
> block/qed.h | 2 +-
> block/raw-posix.c | 9 +-
> block/raw-win32.c | 6 +-
> block/raw.c | 4 +-
> block/rbd.c | 4 +-
> block/sheepdog.c | 8 +-
> block/stream.c | 4 +-
> block/vdi.c | 8 +-
> block/vmdk.c | 6 +-
> block/vpc.c | 6 +-
> block/vvfat.c | 6 +-
> blockdev-nbd.c | 12 +-
> blockdev.c | 20 +-
> blockjob.c | 14 +-
> bsd-user/elfload.c | 2 +-
> bsd-user/main.c | 4 +-
> bsd-user/qemu.h | 4 +-
> bt-host.c | 5 +-
> bt-host.h | 9 -
> bt-vhci.c | 4 +-
> buffered_file.c | 3 +-
> buffered_file.h | 2 +-
> cache-utils.c | 2 +-
> cmd.c | 4 +-
> compatfd.c | 2 +-
> configure | 53 +--
> coroutine-gthread.c | 2 +-
> coroutine-sigaltstack.c | 2 +-
> coroutine-ucontext.c | 2 +-
> coroutine-win32.c | 2 +-
> cpu-exec.c | 6 +-
> cpus.c | 22 +-
> cputlb.c | 18 +-
> cutils.c | 109 +-----
> device_tree.c | 6 +-
> disas.c | 6 +-
> disas/Makefile.objs | 16 +
> alpha-dis.c => disas/alpha.c | 2 +-
> arm-dis.c => disas/arm.c | 2 +-
> cris-dis.c => disas/cris.c | 2 +-
> hppa-dis.c => disas/hppa.c | 2 +-
> i386-dis.c => disas/i386.c | 2 +-
> ia64-dis.c => disas/ia64.c | 2 +-
> lm32-dis.c => disas/lm32.c | 2 +-
> m68k-dis.c => disas/m68k.c | 2 +-
> microblaze-dis.c => disas/microblaze.c | 2 +-
> mips-dis.c => disas/mips.c | 2 +-
> ppc-dis.c => disas/ppc.c | 2 +-
> s390-dis.c => disas/s390.c | 2 +-
> sh4-dis.c => disas/sh4.c | 2 +-
> sparc-dis.c => disas/sparc.c | 2 +-
> tci-dis.c => disas/tci.c | 2 +-
> dma-helpers.c | 6 +-
> dump-stub.c | 4 +-
> dump.c | 18 +-
> envlist.c | 4 +-
> error.c | 8 +-
> event_notifier.c | 4 +-
> exec.c | 17 +-
> fpu/softfloat.c | 2 +-
> fsdev/qemu-fsdev-dummy.c | 2 +-
> fsdev/qemu-fsdev.c | 6 +-
> fsdev/qemu-fsdev.h | 2 +-
> fsdev/virtfs-proxy-helper.c | 4 +-
> fsdev/virtio-9p-marshal.c | 4 +-
> gdbstub.c | 12 +-
> hmp.c | 11 +-
> hmp.h | 2 +-
> host-utils.c | 2 +-
> hw/9pfs/codir.c | 4 +-
> hw/9pfs/cofile.c | 4 +-
> hw/9pfs/cofs.c | 4 +-
> hw/9pfs/coxattr.c | 4 +-
> hw/9pfs/virtio-9p-coth.c | 5 +-
> hw/9pfs/virtio-9p-coth.h | 4 +-
> hw/9pfs/virtio-9p-device.c | 2 +-
> hw/9pfs/virtio-9p-handle.c | 2 +-
> hw/9pfs/virtio-9p-local.c | 2 +-
> hw/9pfs/virtio-9p-posix-acl.c | 2 +-
> hw/9pfs/virtio-9p-xattr.h | 2 +-
> hw/9pfs/virtio-9p.c | 4 +-
> hw/9pfs/virtio-9p.h | 4 +-
> hw/Makefile.objs | 2 +
> hw/ac97.c | 2 +-
> hw/acpi.c | 4 +-
> hw/acpi.h | 2 +-
> hw/acpi_piix4.c | 6 +-
> hw/adb.c | 2 +-
> hw/adlib.c | 2 +-
> hw/ads7846.c | 2 +-
> hw/alpha_dp264.c | 2 +-
> hw/alpha_pci.c | 4 +-
> hw/alpha_sys.h | 1 -
> hw/alpha_typhoon.c | 6 +-
> hw/an5206.c | 2 +-
> hw/apb_pci.c | 4 +-
> hw/apic.c | 4 +-
> hw/apic_common.c | 2 +-
> hw/apic_internal.h | 4 +-
> hw/applesmc.c | 4 +-
> hw/arm-misc.h | 2 +-
> hw/arm11mpcore.c | 2 +-
> hw/arm_boot.c | 5 +-
> hw/arm_mptimer.c | 2 +-
> hw/arm_sysctl.c | 4 +-
> hw/arm_timer.c | 2 +-
> hw/armv7m_nvic.c | 4 +-
> hw/axis_dev88.c | 6 +-
> hw/baum.c | 4 +-
> hw/blizzard.c | 2 +-
> hw/block-common.c | 4 +-
> hw/bonito.c | 4 +-
> hw/bt-hci-csr.c | 6 +-
> hw/bt-hci.c | 4 +-
> hw/bt-hid.c | 4 +-
> hw/bt-l2cap.c | 2 +-
> hw/bt.c | 2 +-
> hw/cadence_gem.c | 2 +-
> hw/cadence_ttc.c | 2 +-
> hw/cadence_uart.c | 4 +-
> hw/cbus.c | 2 +-
> hw/ccid-card-emulated.c | 6 +-
> hw/ccid-card-passthru.c | 6 +-
> hw/cirrus_vga.c | 2 +-
> hw/collie.c | 4 +-
> hw/cs4231a.c | 2 +-
> hw/cuda.c | 4 +-
> hw/debugcon.c | 2 +-
> hw/device-hotplug.c | 9 +-
> hw/dma.c | 1 +
> hw/dp8393x.c | 4 +-
> hw/dummy_m68k.c | 2 +-
> hw/e1000.c | 6 +-
> hw/eepro100.c | 6 +-
> hw/es1370.c | 2 +-
> hw/escc.c | 4 +-
> hw/esp-pci.c | 2 +-
> hw/esp.c | 2 +-
> hw/etraxfs.h | 2 +-
> hw/etraxfs_dma.c | 4 +-
> hw/etraxfs_eth.c | 2 +-
> hw/etraxfs_ser.c | 4 +-
> hw/etraxfs_timer.c | 4 +-
> hw/exynos4210.c | 2 +-
> hw/exynos4210.h | 2 +-
> hw/exynos4210_fimd.c | 6 +-
> hw/exynos4210_i2c.c | 2 +-
> hw/exynos4210_mct.c | 2 +-
> hw/exynos4210_pwm.c | 2 +-
> hw/exynos4210_rtc.c | 6 +-
> hw/exynos4210_uart.c | 4 +-
> hw/exynos4_boards.c | 6 +-
> hw/fdc.c | 10 +-
> hw/flash.h | 2 +-
> hw/framebuffer.c | 2 +-
> hw/framebuffer.h | 2 +-
> hw/fw_cfg.c | 5 +-
> hw/g364fb.c | 2 +-
> hw/grlib_apbuart.c | 2 +-
> hw/grlib_gptimer.c | 2 +-
> hw/gt64xxx.c | 2 +-
> hw/gumstix.c | 6 +-
> hw/hd-geometry.c | 2 +-
> hw/hid.c | 4 +-
> hw/hid.h | 2 +-
> hw/highbank.c | 8 +-
> hw/hpet.c | 4 +-
> hw/hw.h | 10 +-
> hw/i8254.c | 2 +-
> hw/i8254_common.c | 2 +-
> hw/i8259.c | 4 +-
> hw/ide.h | 2 +-
> hw/ide/ahci.c | 6 +-
> hw/ide/cmd646.c | 6 +-
> hw/ide/core.c | 10 +-
> hw/ide/ich.c | 4 +-
> hw/ide/internal.h | 6 +-
> hw/ide/isa.c | 4 +-
> hw/ide/macio.c | 4 +-
> hw/ide/microdrive.c | 4 +-
> hw/ide/mmio.c | 4 +-
> hw/ide/pci.c | 4 +-
> hw/ide/piix.c | 6 +-
> hw/ide/qdev.c | 8 +-
> hw/ide/via.c | 6 +-
> hw/imx_avic.c | 2 +-
> hw/imx_ccm.c | 2 +-
> hw/imx_serial.c | 4 +-
> hw/imx_timer.c | 2 +-
> hw/integratorcp.c | 6 +-
> hw/intel-hda.c | 4 +-
> hw/ioapic_internal.h | 2 +-
> hw/isa-bus.c | 6 +-
> hw/isa.h | 4 +-
> hw/isa_mmio.c | 2 +-
> hw/ivshmem.c | 9 +-
> hw/jazz_led.c | 2 +-
> hw/kvm/apic.c | 2 +-
> hw/kvm/clock.c | 4 +-
> hw/kvm/i8254.c | 6 +-
> hw/kvm/i8259.c | 2 +-
> hw/kvm/ioapic.c | 2 +-
> hw/kvm/pci-assign.c | 10 +-
> hw/kvmvapic.c | 6 +-
> hw/kzm.c | 6 +-
> hw/lan9118.c | 4 +-
> hw/lance.c | 6 +-
> hw/leon3.c | 8 +-
> hw/lm32_boards.c | 5 +-
> hw/lm32_juart.c | 2 +-
> hw/lm32_pic.c | 2 +-
> hw/lm32_sys.c | 8 +-
> hw/lm32_timer.c | 4 +-
> hw/lm32_uart.c | 4 +-
> hw/lm832x.c | 4 +-
> hw/loader.c | 10 +-
> hw/lsi53c895a.c | 2 +-
> hw/m25p80.c | 2 +-
> hw/m48t59.c | 4 +-
> hw/mac_dbdma.c | 1 +
> hw/mac_dbdma.h | 2 +-
> hw/mac_nvram.c | 2 +-
> hw/mainstone.c | 6 +-
> hw/mc146818rtc.c | 4 +-
> hw/mcf5206.c | 6 +-
> hw/mcf5208.c | 8 +-
> hw/mcf_fec.c | 4 +-
> hw/mcf_intc.c | 2 +-
> hw/mcf_uart.c | 4 +-
> hw/megasas.c | 6 +-
> hw/microblaze_boot.c | 6 +-
> hw/milkymist-ac97.c | 2 +-
> hw/milkymist-hpdmc.c | 2 +-
> hw/milkymist-hw.h | 1 +
> hw/milkymist-memcard.c | 6 +-
> hw/milkymist-minimac2.c | 4 +-
> hw/milkymist-pfpu.c | 4 +-
> hw/milkymist-softusb.c | 4 +-
> hw/milkymist-sysctl.c | 6 +-
> hw/milkymist-tmu2.c | 2 +-
> hw/milkymist-uart.c | 4 +-
> hw/milkymist-vgafb.c | 4 +-
> hw/milkymist.c | 7 +-
> hw/mips.h | 2 +-
> hw/mips_fulong2e.c | 14 +-
> hw/mips_jazz.c | 10 +-
> hw/mips_malta.c | 16 +-
> hw/mips_mipssim.c | 6 +-
> hw/mips_r4k.c | 10 +-
> hw/mips_timer.c | 2 +-
> hw/mipsnet.c | 2 +-
> hw/mpc8544_guts.c | 2 +-
> hw/msi.c | 2 +-
> hw/msix.c | 2 +-
> hw/msmouse.c | 6 +-
> hw/multiboot.c | 2 +-
> hw/musicpal.c | 14 +-
> hw/nand.c | 4 +-
> hw/ne2000-isa.c | 4 +-
> hw/ne2000.c | 4 +-
> hw/nseries.c | 8 +-
> hw/omap.h | 2 +-
> hw/omap1.c | 6 +-
> hw/omap2.c | 8 +-
> hw/omap_dma.c | 2 +-
> hw/omap_dss.c | 2 +-
> hw/omap_gpmc.c | 4 +-
> hw/omap_gptimer.c | 2 +-
> hw/omap_lcdc.c | 2 +-
> hw/omap_sx1.c | 6 +-
> hw/omap_synctimer.c | 2 +-
> hw/omap_uart.c | 4 +-
> hw/onenand.c | 8 +-
> hw/opencores_eth.c | 4 +-
> hw/openrisc_sim.c | 8 +-
> hw/openrisc_timer.c | 2 +-
> hw/palm.c | 6 +-
> hw/parallel.c | 4 +-
> hw/pc.c | 16 +-
> hw/pc.h | 8 +-
> hw/pc_piix.c | 14 +-
> hw/pc_sysfw.c | 6 +-
> hw/pci-hotplug.c | 10 +-
> hw/pci-stub.c | 4 +-
> hw/pci.c | 10 +-
> hw/pci.h | 4 +-
> hw/pci_bridge.c | 2 +-
> hw/pci_bridge_dev.c | 2 +-
> hw/pcie.c | 2 +-
> hw/pcie_aer.c | 6 +-
> hw/pcie_host.c | 2 +-
> hw/pcie_host.h | 2 +-
> hw/pckbd.c | 2 +-
> hw/pcnet-pci.c | 6 +-
> hw/pcnet.c | 8 +-
> hw/pcnet.h | 2 +-
> hw/pcspk.c | 2 +-
> hw/petalogix_ml605_mmu.c | 8 +-
> hw/petalogix_s3adsp1800_mmu.c | 8 +-
> hw/pflash_cfi01.c | 8 +-
> hw/pflash_cfi02.c | 8 +-
> hw/piix_pci.c | 2 +-
> hw/pl011.c | 2 +-
> hw/pl031.c | 4 +-
> hw/pl110.c | 2 +-
> hw/pl181.c | 2 +-
> hw/ppc.c | 8 +-
> hw/ppc/e500.c | 10 +-
> hw/ppc/e500plat.c | 2 +-
> hw/ppc/mpc8544ds.c | 2 +-
> hw/ppc405_boards.c | 10 +-
> hw/ppc405_uc.c | 8 +-
> hw/ppc440_bamboo.c | 10 +-
> hw/ppc4xx_devs.c | 4 +-
> hw/ppc4xx_pci.c | 2 +-
> hw/ppc_booke.c | 6 +-
> hw/ppc_mac.h | 2 +-
> hw/ppc_newworld.c | 10 +-
> hw/ppc_oldworld.c | 10 +-
> hw/ppc_prep.c | 12 +-
> hw/ppce500_pci.c | 4 +-
> hw/ppce500_spin.c | 4 +-
> hw/prep_pci.c | 2 +-
> hw/ps2.c | 4 +-
> hw/ptimer.c | 4 +-
> hw/ptimer.h | 4 +-
> hw/puv3.c | 4 +-
> hw/pxa.h | 2 +-
> hw/pxa2xx.c | 6 +-
> hw/pxa2xx_keypad.c | 2 +-
> hw/pxa2xx_lcd.c | 4 +-
> hw/pxa2xx_timer.c | 4 +-
> hw/qdev-addr.c | 2 +-
> hw/qdev-monitor.c | 5 +-
> hw/qdev-properties.c | 8 +-
> hw/qdev.c | 6 +-
> hw/qdev.h | 11 +-
> hw/qxl-logger.c | 2 +-
> hw/qxl.c | 8 +-
> hw/qxl.h | 4 +-
> hw/r2d.c | 8 +-
> hw/rc4030.c | 2 +-
> hw/realview.c | 8 +-
> hw/rtl8139.c | 10 +-
> hw/s390-virtio-bus.c | 9 +-
> hw/s390-virtio.c | 14 +-
> hw/sb16.c | 4 +-
> hw/scsi-bus.c | 6 +-
> hw/scsi-disk.c | 8 +-
> hw/scsi-generic.c | 4 +-
> hw/scsi.h | 4 +-
> hw/sd.c | 4 +-
> hw/serial.c | 4 +-
> hw/serial.h | 4 +-
> hw/sga.c | 2 +-
> hw/sh7750.c | 4 +-
> hw/sh_intc.h | 2 +-
> hw/sh_pci.c | 4 +-
> hw/sh_serial.c | 4 +-
> hw/sh_timer.c | 4 +-
> hw/shix.c | 4 +-
> hw/shpc.c | 4 +-
> hw/shpc.h | 4 +-
> hw/slavio_intctl.c | 2 +-
> hw/slavio_misc.c | 2 +-
> hw/slavio_timer.c | 2 +-
> hw/sm501.c | 4 +-
> hw/smbios.c | 2 +-
> hw/smc91c111.c | 2 +-
> hw/soc_dma.c | 2 +-
> hw/soc_dma.h | 2 +-
> hw/spapr.c | 14 +-
> hw/spapr.h | 2 +-
> hw/spapr_hcall.c | 6 +-
> hw/spapr_iommu.c | 6 +-
> hw/spapr_llan.c | 2 +-
> hw/spapr_pci.c | 2 +-
> hw/spapr_rtas.c | 6 +-
> hw/spapr_vio.c | 8 +-
> hw/spapr_vio.h | 2 +-
> hw/spapr_vscsi.c | 1 -
> hw/spapr_vty.c | 2 +-
> hw/spitz.c | 12 +-
> hw/ssd0303.c | 2 +-
> hw/ssd0323.c | 2 +-
> hw/ssi-sd.c | 2 +-
> hw/stellaris.c | 6 +-
> hw/stellaris_enet.c | 2 +-
> hw/stellaris_input.c | 2 +-
> hw/stream.h | 2 +-
> hw/strongarm.c | 5 +-
> hw/strongarm.h | 2 +-
> hw/sun4c_intctl.c | 2 +-
> hw/sun4m.c | 8 +-
> hw/sun4u.c | 10 +-
> hw/sysbus.c | 4 +-
> hw/sysbus.h | 2 +-
> hw/tc6393xb.c | 4 +-
> hw/tcx.c | 2 +-
> hw/tosa.c | 6 +-
> hw/tsc2005.c | 4 +-
> hw/tsc210x.c | 4 +-
> hw/tusb6010.c | 2 +-
> hw/twl92230.c | 6 +-
> uboot_image.h => hw/uboot_image.h | 0
> hw/usb.h | 2 +-
> hw/usb/bus.c | 4 +-
> hw/usb/core.c | 2 +-
> hw/usb/dev-bluetooth.c | 2 +-
> hw/usb/dev-hid.c | 4 +-
> hw/usb/dev-network.c | 9 +-
> hw/usb/dev-serial.c | 4 +-
> hw/usb/dev-smartcard-reader.c | 4 +-
> hw/usb/dev-storage.c | 12 +-
> hw/usb/dev-uas.c | 4 +-
> hw/usb/dev-wacom.c | 2 +-
> hw/usb/hcd-ehci.c | 8 +-
> hw/usb/hcd-musb.c | 2 +-
> hw/usb/hcd-ohci.c | 2 +-
> hw/usb/hcd-uhci.c | 6 +-
> hw/usb/hcd-xhci.c | 2 +-
> hw/usb/host-bsd.c | 2 +-
> hw/usb/host-linux.c | 6 +-
> hw/usb/host-stub.c | 4 +-
> hw/usb/libhw.c | 4 +-
> hw/usb/redirect.c | 6 +-
> hw/versatile_pci.c | 2 +-
> hw/versatilepb.c | 8 +-
> hw/vexpress.c | 8 +-
> hw/vfio_pci.c | 14 +-
> hw/vga-isa-mm.c | 4 +-
> hw/vga-isa.c | 4 +-
> hw/vga-pci.c | 4 +-
> hw/vga.c | 4 +-
> hw/vga_int.h | 4 +-
> hw/vhost.c | 4 +-
> hw/vhost.h | 2 +-
> hw/vhost_net.c | 4 +-
> hw/vhost_net.h | 2 +-
> hw/virtex_ml507.c | 11 +-
> hw/virtio-balloon.c | 8 +-
> hw/virtio-blk.c | 4 +-
> hw/virtio-console.c | 4 +-
> hw/virtio-net.c | 8 +-
> hw/virtio-net.h | 28 --
> hw/virtio-pci.c | 9 +-
> hw/virtio-scsi.h | 1 -
> hw/virtio-serial-bus.c | 6 +-
> hw/virtio.c | 4 +-
> hw/virtio.h | 6 +-
> hw/vmmouse.c | 2 +-
> hw/vmport.c | 2 +-
> hw/vmware_vga.c | 2 +-
> hw/vt82c686.c | 4 +-
> hw/watchdog.c | 12 +-
> hw/watchdog.h | 2 +-
> hw/wdt_i6300esb.c | 2 +-
> hw/wdt_ib700.c | 2 +-
> hw/xen_backend.c | 4 +-
> hw/xen_backend.h | 5 +-
> hw/xen_common.h | 2 +-
> hw/xen_console.c | 2 +-
> hw/xen_devconfig.c | 2 +-
> hw/xen_disk.c | 3 +-
> hw/xen_domainbuild.c | 4 +-
> hw/xen_machine_pv.c | 2 +-
> hw/xen_nic.c | 3 +-
> hw/xen_platform.c | 3 +-
> hw/xen_pt.c | 4 +-
> hw/xen_pt_config_init.c | 2 +-
> hw/xenfb.c | 4 +-
> hw/xgmac.c | 6 +-
> hw/xilinx.h | 2 +-
> hw/xilinx_axidma.c | 5 +-
> hw/xilinx_axienet.c | 5 +-
> hw/xilinx_ethlite.c | 2 +-
> hw/xilinx_spi.c | 4 +-
> hw/xilinx_spips.c | 4 +-
> hw/xilinx_timer.c | 2 +-
> hw/xilinx_uartlite.c | 2 +-
> hw/xilinx_zynq.c | 8 +-
> hw/xtensa_lx60.c | 11 +-
> hw/xtensa_pic.c | 4 +-
> hw/xtensa_sim.c | 6 +-
> hw/z2.c | 8 +-
> hw/zynq_slcr.c | 4 +-
> {audio => include/audio}/audio.h | 2 +-
> aes.h => include/block/aes.h | 0
> qemu-aio.h => include/block/aio.h | 2 +-
> block.h => include/block/block.h | 8 +-
> block_int.h => include/block/block_int.h | 14 +-
> blockjob.h => include/block/blockjob.h | 2 +-
> qemu-coroutine.h => include/block/coroutine.h | 4 +-
> .../block/coroutine_int.h | 4 +-
> nbd.h => include/block/nbd.h | 0
> include/bt/bt.h | 20 +
> qemu-char.h => include/char/char.h | 12 +-
> config.h => include/config.h | 0
> dis-asm.h => include/disas/bfd.h | 0
> disas.h => include/disas/disas.h | 0
> elf.h => include/elf.h | 0
> cpu-all.h => include/exec/cpu-all.h | 4 +-
> cpu-common.h => include/exec/cpu-common.h | 8 +-
> cpu-defs.h => include/exec/cpu-defs.h | 6 +-
> def-helper.h => include/exec/def-helper.h | 0
> exec-all.h => include/exec/exec-all.h | 14 +-
> exec-memory.h => include/exec/exec-memory.h | 2 +-
> gdbstub.h => include/exec/gdbstub.h | 0
> gen-icount.h => include/exec/gen-icount.h | 2 +-
> poison.h => include/exec/poison.h | 0
> softmmu-semi.h => include/exec/softmmu-semi.h | 0
> softmmu_defs.h => include/exec/softmmu_defs.h | 0
> softmmu_exec.h => include/exec/softmmu_exec.h | 58 ++--
> softmmu_header.h => include/exec/softmmu_header.h | 0
> .../exec/softmmu_template.h | 4 +-
> qemu-lock.h => include/exec/spinlock.h | 0
> targphys.h => include/exec/targphys.h | 0
> {fpu => include/fpu}/softfloat.h | 2 +-
> libfdt_env.h => include/libfdt_env.h | 2 +-
> block-migration.h => include/migration/block.h | 0
> qemu-file.h => include/migration/file.h | 0
> migration.h => include/migration/migration.h | 8 +-
> include/{qemu => migration}/page_cache.h | 0
> vmstate.h => include/migration/vmstate.h | 0
> monitor.h => include/monitor/monitor.h | 9 +-
> readline.h => include/monitor/readline.h | 0
> {net => include/net}/checksum.h | 0
> net.h => include/net/net.h | 25 +-
> {net => include/net}/queue.h | 0
> {net => include/net}/slirp.h | 4 +-
> {net => include/net}/tap.h | 37 +-
> .../qapi/dealloc-visitor.h | 2 +-
> error.h => include/qapi/error.h | 2 +-
> {qapi => include/qapi}/opts-visitor.h | 4 +-
> {qapi => include/qapi}/qmp-core.h | 6 +-
> {qapi => include/qapi}/qmp-input-visitor.h | 4 +-
> {qapi => include/qapi}/qmp-output-visitor.h | 4 +-
> qemu-objects.h => include/qapi/qmp-types.h | 16 +-
> {qapi => include/qapi}/string-input-visitor.h | 2 +-
> {qapi => include/qapi}/string-output-visitor.h | 2 +-
> .../qapi-types-core.h => include/qapi/types-core.h | 4 +-
> .../qapi-visit-core.h => include/qapi/visit-core.h | 2 +-
> .../qapi-visit-impl.h => include/qapi/visit-impl.h | 4 +-
> qemu-common.h => include/qemu-common.h | 12 +-
> acl.h => include/qemu/acl.h | 2 +-
> qemu-barrier.h => include/qemu/atomic.h | 2 +-
> bitmap.h => include/qemu/bitmap.h | 2 +-
> bitops.h => include/qemu/bitops.h | 0
> bswap.h => include/qemu/bswap.h | 2 +-
> cache-utils.h => include/qemu/cache-utils.h | 0
> compatfd.h => include/qemu/compatfd.h | 0
> compiler.h => include/qemu/compiler.h | 0
> qemu-config.h => include/qemu/config-file.h | 3 +-
> envlist.h => include/qemu/envlist.h | 0
> qemu-error.h => include/qemu/error.h | 0
> event_notifier.h => include/qemu/event_notifier.h | 0
> host-utils.h => include/qemu/host-utils.h | 2 +-
> int128.h => include/qemu/int128.h | 0
> iov.h => include/qemu/iov.h | 0
> qemu-log.h => include/qemu/log.h | 2 +-
> main-loop.h => include/qemu/main-loop.h | 0
> module.h => include/qemu/module.h | 0
> notify.h => include/qemu/notify.h | 2 +-
> qemu-option.h => include/qemu/option.h | 6 +-
> .../qemu/option_int.h | 2 +-
> osdep.h => include/qemu/osdep.h | 0
> qemu-queue.h => include/qemu/queue.h | 2 +-
> range.h => include/qemu/range.h | 0
> qemu_socket.h => include/qemu/sockets.h | 6 +-
> qemu-thread-posix.h => include/qemu/thread-posix.h | 0
> qemu-thread-win32.h => include/qemu/thread-win32.h | 0
> qemu-thread.h => include/qemu/thread.h | 4 +-
> qemu-timer.h => include/qemu/timer.h | 4 +-
> qemu-tls.h => include/qemu/tls.h | 0
> uri.h => include/qemu/uri.h | 0
> qemu-xattr.h => include/qemu/xattr.h | 0
> json-lexer.h => include/qobject/json-lexer.h | 4 +-
> json-parser.h => include/qobject/json-parser.h | 4 +-
> json-streamer.h => include/qobject/json-streamer.h | 4 +-
> qbool.h => include/qobject/qbool.h | 2 +-
> qdict.h => include/qobject/qdict.h | 6 +-
> qerror.h => include/qobject/qerror.h | 8 +-
> qfloat.h => include/qobject/qfloat.h | 2 +-
> qint.h => include/qobject/qint.h | 2 +-
> qjson.h => include/qobject/qjson.h | 6 +-
> qlist.h => include/qobject/qlist.h | 6 +-
> qobject.h => include/qobject/qobject.h | 0
> qstring.h => include/qobject/qstring.h | 2 +-
> include/{qemu => qom}/cpu.h | 4 +-
> include/{qemu => qom}/object.h | 2 +-
> include/{qemu => qom}/qom-qobject.h | 2 +-
> {slirp => include/slirp}/libslirp.h | 5 +
> arch_init.h => include/sysemu/arch_init.h | 0
> balloon.h => include/sysemu/balloon.h | 2 +-
> blockdev.h => include/sysemu/blockdev.h | 6 +-
> cpus.h => include/sysemu/cpus.h | 0
> cputlb.h => include/sysemu/cputlb.h | 0
> device_tree.h => include/sysemu/device_tree.h | 0
> dma.h => include/sysemu/dma.h | 6 +-
> dump.h => include/sysemu/dump.h | 0
> ioport.h => include/sysemu/ioport.h | 2 +-
> iorange.h => include/sysemu/iorange.h | 0
> kvm.h => include/sysemu/kvm.h | 2 +-
> .../sysemu/memory-internal.h | 0
> memory.h => include/sysemu/memory.h | 12 +-
> .../sysemu/memory_mapping.h | 2 +-
> qemu-os-posix.h => include/sysemu/os-posix.h | 0
> qemu-os-win32.h => include/sysemu/os-win32.h | 2 +-
> qtest.h => include/sysemu/qtest.h | 0
> qemu-seccomp.h => include/sysemu/seccomp.h | 2 +-
> sysemu.h => include/sysemu/sysemu.h | 10 +-
> xen-mapcache.h => include/sysemu/xen-mapcache.h | 0
> console.h => include/ui/console.h | 9 +-
> pflib.h => include/ui/pflib.h | 0
> {ui => include/ui}/qemu-spice.h | 9 +-
> {ui => include/ui}/spice-display.h | 6 +-
> iohandler.c | 5 +-
> ioport.c | 4 +-
> iov.c | 105 +++++-
> kvm-all.c | 20 +-
> kvm-stub.c | 4 +-
> alpha.ld => ldscripts/alpha.ld | 0
> arm.ld => ldscripts/arm.ld | 0
> hppa.ld => ldscripts/hppa.ld | 0
> i386.ld => ldscripts/i386.ld | 0
> ia64.ld => ldscripts/ia64.ld | 0
> m68k.ld => ldscripts/m68k.ld | 0
> mips.ld => ldscripts/mips.ld | 0
> ppc.ld => ldscripts/ppc.ld | 0
> ppc64.ld => ldscripts/ppc64.ld | 0
> s390.ld => ldscripts/s390.ld | 0
> sparc.ld => ldscripts/sparc.ld | 0
> sparc64.ld => ldscripts/sparc64.ld | 0
> x86_64.ld => ldscripts/x86_64.ld | 0
> libcacard/event.c | 2 +-
> libcacard/vreader.c | 2 +-
> libcacard/vscclient.c | 4 +-
> linux-aio.c | 3 +-
> linux-user/arm/nwfpe/double_cpdo.c | 2 +-
> linux-user/arm/nwfpe/extended_cpdo.c | 2 +-
> linux-user/arm/nwfpe/fpa11.h | 2 +-
> linux-user/arm/nwfpe/fpa11_cpdt.c | 2 +-
> linux-user/arm/nwfpe/fpa11_cprt.c | 2 +-
> linux-user/arm/nwfpe/fpopcode.c | 2 +-
> linux-user/arm/nwfpe/single_cpdo.c | 2 +-
> linux-user/elfload.c | 2 +-
> linux-user/main.c | 6 +-
> linux-user/qemu.h | 6 +-
> linux-user/syscall.c | 2 +-
> main-loop.c | 8 +-
> memory.c | 12 +-
> memory_mapping-stub.c | 4 +-
> memory_mapping.c | 4 +-
> migration-exec.c | 7 +-
> migration-fd.c | 11 +-
> migration-tcp.c | 7 +-
> migration-unix.c | 7 +-
> migration.c | 12 +-
> module.c | 4 +-
> monitor.c | 50 ++--
> nbd.c | 10 +-
> net/Makefile.objs | 2 +-
> net/clients.h | 2 +-
> net/dump.c | 6 +-
> net/hub.c | 6 +-
> net/hub.h | 2 -
> net.c => net/net.c | 17 +-
> net/queue.c | 4 +-
> net/slirp.c | 7 +-
> net/socket.c | 13 +-
> net/tap-aix.c | 2 +-
> net/tap-bsd.c | 6 +-
> net/tap-haiku.c | 2 +-
> net/tap-linux.c | 7 +-
> net/tap-linux.h | 20 +-
> net/tap-solaris.c | 6 +-
> net/tap-win32.c | 8 +-
> net/tap.c | 13 +-
> net/{tap.h => tap_int.h} | 18 +-
> net/util.c | 2 +-
> net/vde.c | 5 +-
> notify.c | 2 +-
> os-posix.c | 2 +-
> os-win32.c | 2 +-
> osdep.c | 4 +-
> oslib-posix.c | 4 +-
> oslib-win32.c | 6 +-
> page_cache.c | 2 +-
> posix-aio-compat.c | 10 +-
> qapi/opts-visitor.c | 8 +-
> qapi/qapi-dealloc-visitor.c | 6 +-
> qapi/qapi-visit-core.c | 4 +-
> qapi/qmp-dispatch.c | 8 +-
> qapi/qmp-input-visitor.c | 10 +-
> qapi/qmp-output-visitor.c | 10 +-
> qapi/string-input-visitor.c | 6 +-
> qapi/string-output-visitor.c | 6 +-
> qemu-bridge-helper.c | 2 +-
> qemu-char.c | 13 +-
> qemu-config.c | 8 +-
> qemu-coroutine-io.c | 6 +-
> qemu-coroutine-lock.c | 8 +-
> qemu-coroutine-sleep.c | 4 +-
> qemu-coroutine.c | 4 +-
> qemu-error.c | 2 +-
> qemu-img.c | 12 +-
> qemu-io.c | 4 +-
> qemu-log.c | 2 +-
> qemu-nbd.c | 4 +-
> qemu-option.c | 10 +-
> qemu-progress.c | 4 +-
> qemu-seccomp.c | 2 +-
> qemu-sockets.c | 6 +-
> qemu-thread-posix.c | 2 +-
> qemu-thread-win32.c | 2 +-
> qemu-timer-common.c | 2 +-
> qemu-timer.c | 11 +-
> qemu-tool.c | 14 +-
> qemu-user.c | 2 +-
> qga/Makefile.objs | 2 +-
> qga/channel-posix.c | 2 +-
> qga/commands-posix.c | 6 +-
> qga/commands-win32.c | 2 +-
> qga/commands.c | 2 +-
> qemu-ga.c => qga/main.c | 12 +-
> qapi-schema-guest.json => qga/qapi-schema.json | 0
> qmp.c | 11 +-
> qobject/Makefile.objs | 4 +
> json-lexer.c => qobject/json-lexer.c | 10 +-
> json-parser.c => qobject/json-parser.c | 18 +-
> json-streamer.c => qobject/json-streamer.c | 10 +-
> qbool.c => qobject/qbool.c | 4 +-
> qdict.c => qobject/qdict.c | 14 +-
> qerror.c => qobject/qerror.c | 6 +-
> qfloat.c => qobject/qfloat.c | 4 +-
> qint.c => qobject/qint.c | 4 +-
> qjson.c => qobject/qjson.c | 18 +-
> qlist.c => qobject/qlist.c | 6 +-
> qstring.c => qobject/qstring.c | 4 +-
> qom/container.c | 4 +-
> qom/cpu.c | 2 +-
> qom/object.c | 14 +-
> qom/qom-qobject.c | 6 +-
> qtest.c | 12 +-
> readline.c | 4 +-
> rules.mak | 5 +-
> savevm.c | 21 +-
> scripts/feature_to_c.sh | 2 +-
> scripts/qapi-commands.py | 10 +-
> scripts/qapi-types.py | 2 +-
> scripts/qapi-visit.py | 2 +-
> slirp/if.c | 2 +-
> slirp/ip_input.c | 2 +-
> slirp/misc.c | 5 +-
> slirp/sbuf.c | 2 +-
> slirp/slirp.c | 4 +-
> slirp/slirp.h | 11 +-
> spice-qemu-char.c | 2 +-
> target-alpha/cpu-qom.h | 2 +-
> target-alpha/cpu.h | 8 +-
> target-alpha/fpu_helper.c | 2 +-
> target-alpha/helper.c | 2 +-
> target-alpha/helper.h | 4 +-
> target-alpha/int_helper.c | 2 +-
> target-alpha/mem_helper.c | 10 +-
> target-alpha/sys_helper.c | 4 +-
> target-alpha/translate.c | 8 +-
> target-arm/arm-semi.c | 4 +-
> target-arm/cpu-qom.h | 2 +-
> target-arm/cpu.c | 2 +-
> target-arm/cpu.h | 8 +-
> target-arm/helper.c | 8 +-
> target-arm/helper.h | 4 +-
> target-arm/iwmmxt_helper.c | 2 +-
> target-arm/neon_helper.c | 2 +-
> target-arm/op_helper.c | 10 +-
> target-arm/translate.c | 6 +-
> target-cris/cpu-qom.h | 2 +-
> target-cris/cpu.h | 6 +-
> target-cris/helper.c | 2 +-
> target-cris/helper.h | 4 +-
> target-cris/op_helper.c | 12 +-
> target-cris/translate.c | 4 +-
> target-i386/arch_dump.c | 4 +-
> target-i386/arch_memory_mapping.c | 4 +-
> target-i386/cpu-qom.h | 4 +-
> target-i386/cpu.c | 10 +-
> target-i386/cpu.h | 8 +-
> target-i386/excp_helper.c | 4 +-
> target-i386/fpu_helper.c | 2 +-
> target-i386/helper.c | 6 +-
> target-i386/helper.h | 4 +-
> target-i386/int_helper.c | 2 +-
> target-i386/ioport-user.c | 2 +-
> target-i386/kvm.c | 11 +-
> target-i386/kvm_i386.h | 2 +-
> target-i386/machine.c | 2 +-
> target-i386/mem_helper.c | 10 +-
> target-i386/misc_helper.c | 4 +-
> target-i386/seg_helper.c | 4 +-
> target-i386/svm_helper.c | 4 +-
> target-i386/translate.c | 4 +-
> target-lm32/cpu-qom.h | 2 +-
> target-lm32/cpu.h | 6 +-
> target-lm32/helper.c | 2 +-
> target-lm32/helper.h | 4 +-
> target-lm32/op_helper.c | 10 +-
> target-lm32/translate.c | 4 +-
> target-m68k/cpu-qom.h | 2 +-
> target-m68k/cpu.h | 8 +-
> target-m68k/helper.c | 2 +-
> target-m68k/helpers.h | 4 +-
> target-m68k/m68k-semi.c | 6 +-
> target-m68k/op_helper.c | 10 +-
> target-m68k/translate.c | 6 +-
> target-microblaze/cpu-qom.h | 2 +-
> target-microblaze/cpu.h | 8 +-
> target-microblaze/helper.c | 4 +-
> target-microblaze/helper.h | 4 +-
> target-microblaze/op_helper.c | 12 +-
> target-microblaze/translate.c | 4 +-
> target-mips/cpu-qom.h | 2 +-
> target-mips/cpu.h | 8 +-
> target-mips/helper.h | 4 +-
> target-mips/op_helper.c | 12 +-
> target-mips/translate.c | 4 +-
> target-openrisc/cpu.h | 12 +-
> target-openrisc/helper.h | 4 +-
> target-openrisc/int_helper.c | 2 +-
> target-openrisc/interrupt.c | 4 +-
> target-openrisc/mmu.c | 4 +-
> target-openrisc/mmu_helper.c | 10 +-
> target-openrisc/translate.c | 10 +-
> target-ppc/cpu-qom.h | 2 +-
> target-ppc/cpu.h | 8 +-
> target-ppc/helper.c | 4 +-
> target-ppc/helper.h | 4 +-
> target-ppc/int_helper.c | 2 +-
> target-ppc/kvm.c | 10 +-
> target-ppc/kvm_ppc.c | 4 +-
> target-ppc/kvm_ppc.h | 2 +-
> target-ppc/machine.c | 2 +-
> target-ppc/mem_helper.c | 12 +-
> target-ppc/mmu_helper.c | 2 +-
> target-ppc/translate.c | 6 +-
> target-ppc/translate_init.c | 8 +-
> target-s390x/cpu-qom.h | 2 +-
> target-s390x/cpu.c | 2 +-
> target-s390x/cpu.h | 8 +-
> target-s390x/fpu_helper.c | 2 +-
> target-s390x/helper.c | 6 +-
> target-s390x/helper.h | 4 +-
> target-s390x/int_helper.c | 2 +-
> target-s390x/interrupt.c | 2 +-
> target-s390x/kvm.c | 8 +-
> target-s390x/mem_helper.c | 10 +-
> target-s390x/misc_helper.c | 12 +-
> target-s390x/translate.c | 6 +-
> target-sh4/cpu-qom.h | 2 +-
> target-sh4/cpu.h | 10 +-
> target-sh4/helper.h | 4 +-
> target-sh4/op_helper.c | 10 +-
> target-sh4/translate.c | 4 +-
> target-sparc/cpu-qom.h | 2 +-
> target-sparc/cpu.h | 10 +-
> target-sparc/helper.c | 4 +-
> target-sparc/helper.h | 4 +-
> target-sparc/int32_helper.c | 2 +-
> target-sparc/ldst_helper.c | 10 +-
> target-sparc/machine.c | 2 +-
> target-sparc/mmu_helper.c | 2 +-
> target-sparc/translate.c | 4 +-
> target-unicore32/cpu-qom.h | 2 +-
> target-unicore32/cpu.h | 8 +-
> target-unicore32/helper.c | 6 +-
> target-unicore32/helper.h | 4 +-
> target-unicore32/op_helper.c | 8 +-
> target-unicore32/translate.c | 6 +-
> target-xtensa/core-dc232b.c | 6 +-
> target-xtensa/core-dc233c.c | 6 +-
> target-xtensa/core-fsf.c | 6 +-
> target-xtensa/cpu-qom.h | 2 +-
> target-xtensa/cpu.h | 6 +-
> target-xtensa/helper.c | 6 +-
> target-xtensa/helper.h | 4 +-
> target-xtensa/op_helper.c | 10 +-
> target-xtensa/translate.c | 10 +-
> target-xtensa/xtensa-semi.c | 2 +-
> tcg/arm/tcg-target.c | 2 +-
> tcg/hppa/tcg-target.c | 2 +-
> tcg/i386/tcg-target.c | 2 +-
> tcg/ia64/tcg-target.c | 2 +-
> tcg/mips/tcg-target.c | 2 +-
> tcg/ppc/tcg-target.c | 2 +-
> tcg/ppc64/tcg-target.c | 2 +-
> tcg/s390/tcg-target.c | 2 +-
> tcg/sparc/tcg-target.c | 2 +-
> tcg/tcg.c | 6 +-
> tci.c | 2 +-
> tests/check-qdict.c | 6 +-
> tests/check-qfloat.c | 2 +-
> tests/check-qint.c | 2 +-
> tests/check-qjson.c | 14 +-
> tests/check-qlist.c | 4 +-
> tests/check-qstring.c | 2 +-
> tests/libqtest.c | 4 +-
> tests/tcg/test-i386.c | 2 +-
> tests/test-coroutine.c | 2 +-
> tests/test-iov.c | 4 +-
> tests/test-qmp-commands.c | 4 +-
> tests/test-qmp-input-strict.c | 2 +-
> tests/test-qmp-input-visitor.c | 2 +-
> tests/test-qmp-output-visitor.c | 2 +-
> tests/test-string-input-visitor.c | 2 +-
> tests/test-string-output-visitor.c | 2 +-
> tests/test-visitor-serialization.c | 2 +-
> trace/simple.c | 2 +-
> translate-all.c | 4 +-
> ui/Makefile.objs | 7 +-
> ui/cocoa.m | 4 +-
> console.c => ui/console.c | 5 +-
> ui/curses.c | 4 +-
> cursor.c => ui/cursor.c | 2 +-
> cursor_hidden.xpm => ui/cursor_hidden.xpm | 0
> cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm | 0
> input.c => ui/input.c | 9 +-
> ui/keymaps.c | 2 +-
> pflib.c => ui/pflib.c | 4 +-
> qemu-x509.h => ui/qemu-x509.h | 0
> ui/sdl.c | 4 +-
> ui/sdl_zoom.c | 2 +-
> ui/spice-core.c | 28 +-
> ui/spice-display.c | 14 +-
> ui/spice-input.c | 4 +-
> vgafont.h => ui/vgafont.h | 0
> ui/vnc-auth-sasl.h | 2 +-
> ui/vnc-enc-tight.c | 4 +-
> ui/vnc-jobs.c | 2 +-
> ui/vnc-palette.h | 4 +-
> ui/vnc-tls.c | 2 +-
> ui/vnc-tls.h | 2 +-
> ui/vnc.c | 12 +-
> ui/vnc.h | 10 +-
> uri.c | 2 +-
> user-exec.c | 2 +-
> vl.c | 54 ++--
> xen-all.c | 6 +-
> xen-mapcache.c | 6 +-
> xen-stub.c | 2 +-
> 1006 files changed, 2511 insertions(+), 3070 deletions(-)
> delete mode 100644 Makefile.dis
> delete mode 100644 Makefile.user
> delete mode 100644 a.out.h
> delete mode 100644 bt-host.h
> create mode 100644 disas/Makefile.objs
> rename alpha-dis.c => disas/alpha.c (99%)
> rename arm-dis.c => disas/arm.c (99%)
> rename cris-dis.c => disas/cris.c (99%)
> rename hppa-dis.c => disas/hppa.c (99%)
> rename i386-dis.c => disas/i386.c (99%)
> rename ia64-dis.c => disas/ia64.c (99%)
> rename lm32-dis.c => disas/lm32.c (99%)
> rename m68k-dis.c => disas/m68k.c (99%)
> rename microblaze-dis.c => disas/microblaze.c (99%)
> rename mips-dis.c => disas/mips.c (99%)
> rename ppc-dis.c => disas/ppc.c (99%)
> rename s390-dis.c => disas/s390.c (99%)
> rename sh4-dis.c => disas/sh4.c (99%)
> rename sparc-dis.c => disas/sparc.c (99%)
> rename tci-dis.c => disas/tci.c (98%)
> rename uboot_image.h => hw/uboot_image.h (100%)
> rename {audio => include/audio}/audio.h (99%)
> rename aes.h => include/block/aes.h (100%)
> rename qemu-aio.h => include/block/aio.h (98%)
> rename block.h => include/block/block.h (99%)
> rename block_int.h => include/block/block_int.h (98%)
> rename blockjob.h => include/block/blockjob.h (99%)
> rename qemu-coroutine.h => include/block/coroutine.h (99%)
> rename qemu-coroutine-int.h => include/block/coroutine_int.h (96%)
> rename nbd.h => include/block/nbd.h (100%)
> create mode 100644 include/bt/bt.h
> rename qemu-char.h => include/char/char.h (97%)
> rename config.h => include/config.h (100%)
> rename dis-asm.h => include/disas/bfd.h (100%)
> rename disas.h => include/disas/disas.h (100%)
> rename elf.h => include/elf.h (100%)
> rename cpu-all.h => include/exec/cpu-all.h (99%)
> rename cpu-common.h => include/exec/cpu-common.h (97%)
> rename cpu-defs.h => include/exec/cpu-defs.h (99%)
> rename def-helper.h => include/exec/def-helper.h (100%)
> rename exec-all.h => include/exec/exec-all.h (98%)
> rename exec-memory.h => include/exec/exec-memory.h (97%)
> rename gdbstub.h => include/exec/gdbstub.h (100%)
> rename gen-icount.h => include/exec/gen-icount.h (98%)
> rename poison.h => include/exec/poison.h (100%)
> rename softmmu-semi.h => include/exec/softmmu-semi.h (100%)
> rename softmmu_defs.h => include/exec/softmmu_defs.h (100%)
> rename softmmu_exec.h => include/exec/softmmu_exec.h (72%)
> rename softmmu_header.h => include/exec/softmmu_header.h (100%)
> rename softmmu_template.h => include/exec/softmmu_template.h (99%)
> rename qemu-lock.h => include/exec/spinlock.h (100%)
> rename targphys.h => include/exec/targphys.h (100%)
> rename {fpu => include/fpu}/softfloat.h (99%)
> rename libfdt_env.h => include/libfdt_env.h (97%)
> rename block-migration.h => include/migration/block.h (100%)
> rename qemu-file.h => include/migration/file.h (100%)
> rename migration.h => include/migration/migration.h (97%)
> rename include/{qemu => migration}/page_cache.h (100%)
> rename vmstate.h => include/migration/vmstate.h (100%)
> rename monitor.h => include/monitor/monitor.h (96%)
> rename readline.h => include/monitor/readline.h (100%)
> rename {net => include/net}/checksum.h (100%)
> rename net.h => include/net/net.h (90%)
> rename {net => include/net}/queue.h (100%)
> rename {net => include/net}/slirp.h (96%)
> copy {net => include/net}/tap.h (69%)
> rename qapi/qapi-dealloc-visitor.h => include/qapi/dealloc-visitor.h (95%)
> rename error.h => include/qapi/error.h (98%)
> rename {qapi => include/qapi}/opts-visitor.h (93%)
> rename {qapi => include/qapi}/qmp-core.h (93%)
> rename {qapi => include/qapi}/qmp-input-visitor.h (91%)
> rename {qapi => include/qapi}/qmp-output-visitor.h (91%)
> rename qemu-objects.h => include/qapi/qmp-types.h (61%)
> rename {qapi => include/qapi}/string-input-visitor.h (95%)
> rename {qapi => include/qapi}/string-output-visitor.h (95%)
> rename qapi/qapi-types-core.h => include/qapi/types-core.h (87%)
> rename qapi/qapi-visit-core.h => include/qapi/visit-core.h (99%)
> rename qapi/qapi-visit-impl.h => include/qapi/visit-impl.h (90%)
> rename qemu-common.h => include/qemu-common.h (98%)
> rename acl.h => include/qemu/acl.h (98%)
> rename qemu-barrier.h => include/qemu/atomic.h (96%)
> rename bitmap.h => include/qemu/bitmap.h (99%)
> rename bitops.h => include/qemu/bitops.h (100%)
> rename bswap.h => include/qemu/bswap.h (99%)
> rename cache-utils.h => include/qemu/cache-utils.h (100%)
> rename compatfd.h => include/qemu/compatfd.h (100%)
> rename compiler.h => include/qemu/compiler.h (100%)
> rename qemu-config.h => include/qemu/config-file.h (93%)
> rename envlist.h => include/qemu/envlist.h (100%)
> rename qemu-error.h => include/qemu/error.h (100%)
> rename event_notifier.h => include/qemu/event_notifier.h (100%)
> rename host-utils.h => include/qemu/host-utils.h (99%)
> rename int128.h => include/qemu/int128.h (100%)
> rename iov.h => include/qemu/iov.h (100%)
> rename qemu-log.h => include/qemu/log.h (99%)
> rename main-loop.h => include/qemu/main-loop.h (100%)
> rename module.h => include/qemu/module.h (100%)
> rename notify.h => include/qemu/notify.h (97%)
> rename qemu-option.h => include/qemu/option.h (98%)
> rename qemu-option-internal.h => include/qemu/option_int.h (98%)
> rename osdep.h => include/qemu/osdep.h (100%)
> rename qemu-queue.h => include/qemu/queue.h (99%)
> rename range.h => include/qemu/range.h (100%)
> rename qemu_socket.h => include/qemu/sockets.h (96%)
> rename qemu-thread-posix.h => include/qemu/thread-posix.h (100%)
> rename qemu-thread-win32.h => include/qemu/thread-win32.h (100%)
> rename qemu-thread.h => include/qemu/thread.h (95%)
> rename qemu-timer.h => include/qemu/timer.h (99%)
> rename qemu-tls.h => include/qemu/tls.h (100%)
> rename uri.h => include/qemu/uri.h (100%)
> rename qemu-xattr.h => include/qemu/xattr.h (100%)
> rename json-lexer.h => include/qobject/json-lexer.h (94%)
> rename json-parser.h => include/qobject/json-parser.h (90%)
> rename json-streamer.h => include/qobject/json-streamer.h (94%)
> rename qbool.h => include/qobject/qbool.h (94%)
> rename qdict.h => include/qobject/qdict.h (96%)
> rename qerror.h => include/qobject/qerror.h (98%)
> rename qfloat.h => include/qobject/qfloat.h (94%)
> rename qint.h => include/qobject/qint.h (94%)
> rename qjson.h => include/qobject/qjson.h (88%)
> rename qlist.h => include/qobject/qlist.h (95%)
> rename qobject.h => include/qobject/qobject.h (100%)
> rename qstring.h => include/qobject/qstring.h (96%)
> rename include/{qemu => qom}/cpu.h (97%)
> rename include/{qemu => qom}/object.h (99%)
> rename include/{qemu => qom}/qom-qobject.h (97%)
> rename {slirp => include/slirp}/libslirp.h (96%)
> rename arch_init.h => include/sysemu/arch_init.h (100%)
> rename balloon.h => include/sysemu/balloon.h (95%)
> rename blockdev.h => include/sysemu/blockdev.h (96%)
> rename cpus.h => include/sysemu/cpus.h (100%)
> rename cputlb.h => include/sysemu/cputlb.h (100%)
> rename device_tree.h => include/sysemu/device_tree.h (100%)
> rename dma.h => include/sysemu/dma.h (99%)
> rename dump.h => include/sysemu/dump.h (100%)
> rename ioport.h => include/sysemu/ioport.h (98%)
> rename iorange.h => include/sysemu/iorange.h (100%)
> rename kvm.h => include/sysemu/kvm.h (99%)
> rename memory-internal.h => include/sysemu/memory-internal.h (100%)
> rename memory.h => include/sysemu/memory.h (99%)
> rename memory_mapping.h => include/sysemu/memory_mapping.h (98%)
> rename qemu-os-posix.h => include/sysemu/os-posix.h (100%)
> rename qemu-os-win32.h => include/sysemu/os-win32.h (99%)
> rename qtest.h => include/sysemu/qtest.h (100%)
> rename qemu-seccomp.h => include/sysemu/seccomp.h (95%)
> rename sysemu.h => include/sysemu/sysemu.h (97%)
> rename xen-mapcache.h => include/sysemu/xen-mapcache.h (100%)
> rename console.h => include/ui/console.h (99%)
> rename pflib.h => include/ui/pflib.h (100%)
> rename {ui => include/ui}/qemu-spice.h (95%)
> rename {ui => include/ui}/spice-display.h (98%)
> rename alpha.ld => ldscripts/alpha.ld (100%)
> rename arm.ld => ldscripts/arm.ld (100%)
> rename hppa.ld => ldscripts/hppa.ld (100%)
> rename i386.ld => ldscripts/i386.ld (100%)
> rename ia64.ld => ldscripts/ia64.ld (100%)
> rename m68k.ld => ldscripts/m68k.ld (100%)
> rename mips.ld => ldscripts/mips.ld (100%)
> rename ppc.ld => ldscripts/ppc.ld (100%)
> rename ppc64.ld => ldscripts/ppc64.ld (100%)
> rename s390.ld => ldscripts/s390.ld (100%)
> rename sparc.ld => ldscripts/sparc.ld (100%)
> rename sparc64.ld => ldscripts/sparc64.ld (100%)
> rename x86_64.ld => ldscripts/x86_64.ld (100%)
> rename net.c => net/net.c (99%)
> rename net/{tap.h => tap_int.h} (77%)
> rename qemu-ga.c => qga/main.c (99%)
> rename qapi-schema-guest.json => qga/qapi-schema.json (100%)
> create mode 100644 qobject/Makefile.objs
> rename json-lexer.c => qobject/json-lexer.c (98%)
> rename json-parser.c => qobject/json-parser.c (98%)
> rename json-streamer.c => qobject/json-streamer.c (95%)
> rename qbool.c => qobject/qbool.c (95%)
> rename qdict.c => qobject/qdict.c (98%)
> rename qerror.c => qobject/qerror.c (97%)
> rename qfloat.c => qobject/qfloat.c (95%)
> rename qint.c => qobject/qint.c (95%)
> rename qjson.c => qobject/qjson.c (96%)
> rename qlist.c => qobject/qlist.c (97%)
> rename qstring.c => qobject/qstring.c (98%)
> rename console.c => ui/console.c (99%)
> rename cursor.c => ui/cursor.c (99%)
> rename cursor_hidden.xpm => ui/cursor_hidden.xpm (100%)
> rename cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm (100%)
> rename input.c => ui/input.c (99%)
> rename pflib.c => ui/pflib.c (99%)
> rename qemu-x509.h => ui/qemu-x509.h (100%)
> rename vgafont.h => ui/vgafont.h (100%)
>
>
--
Regards,
Zhi Yong Wu
^ permalink raw reply [flat|nested] 40+ messages in thread