* [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
@ 2012-10-24 12:58 ` Paolo Bonzini
0 siblings, 0 replies; 54+ 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] 54+ messages in thread
* [Qemu-devel] [PATCH 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines
2012-12-06 13:06 [Qemu-devel] [PATCH 00/32] Build cleanups and header file movement to include/ Paolo Bonzini
@ 2012-12-06 13:06 ` Paolo Bonzini
0 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-06 13:06 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, afaerber
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 77d2360..8448b94 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] 54+ messages in thread
* [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
@ 2012-12-17 18:17 Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 01/32] libcacard: simplify rules for recursive build Paolo Bonzini
` (33 more replies)
0 siblings, 34 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel; +Cc: Anthony Liguori, Michael S. Tsirkin
Anthony,
The following changes since commit a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0:
exec: refactor cpu_restore_state (2012-12-16 08:35:24 +0000)
are available in the git repository at:
git://github.com/bonzini/qemu.git header-dirs
for you to fetch changes up to 394394a788cec72682750f855e5182de156026b4:
janitor: move remaining public headers to include/ (2012-12-17 18:56:58 +0100)
----------------------------------------------------------------
Jason Baron (1):
Fixup q35/ich9 Licenses
Michael S. Tsirkin (12):
tap: reset vnet header size on open
get_maintainer.pl: update from linix 3.8
pci: prepare makefiles for pci code reorganization
MAINTAINERS: add hw/pci/ to list of PCI files
pci: move pci core code to hw/pci
pci: update all users to look in pci/
pci: fix path for local includes
Revert "pci: prepare makefiles for pci code reorganization"
pci: rename pci_internals.h pci_bus.h
pci_bus: update comment
pci_bus.h: tweak include guards
kvm: do not flush after deleting gsi
Paolo Bonzini (33):
Merge commit '1dd3a74d2ee2d873cde0b390b536e45420b3fe05' into HEAD
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: do not rely on indirect inclusions of or 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/
qapi: move inclusions of qemu-common.h from headers to .c files
qapi: remove qapi/qapi-types-core.h
qapi: make struct Visitor opaque
janitor: add guards to headers
qapi: move include files to 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 +
MAINTAINERS | 1 +
Makefile | 47 +--
Makefile.dis | 20 -
Makefile.objs | 32 +-
Makefile.target | 8 +-
Makefile.user | 24 --
a.out.h | 430 ---------------------
acl.c | 2 +-
aes.c | 2 +-
aio-posix.c | 6 +-
aio-win32.c | 6 +-
arch_init.c | 24 +-
async.c | 4 +-
audio/Makefile.objs | 3 +
audio/alsaaudio.c | 2 +-
audio/audio.c | 6 +-
audio/audio.h | 2 +-
audio/noaudio.c | 2 +-
audio/ossaudio.c | 4 +-
audio/spiceaudio.c | 2 +-
audio/wavaudio.c | 2 +-
audio/wavcapture.c | 2 +-
audio/winwaveaudio.c | 2 +-
backends/rng-egd.c | 4 +-
backends/rng-random.c | 4 +-
backends/rng.c | 2 +-
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/linux-aio.c | 6 +-
block/mirror.c | 4 +-
block/nbd.c | 10 +-
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 | 13 +-
block/raw-win32.c | 10 +-
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 +-
block/win32-aio.c | 10 +-
blockdev-nbd.c | 12 +-
blockdev.c | 20 +-
blockjob.c | 14 +-
bsd-user/elfload.c | 2 +-
bsd-user/main.c | 4 +-
bsd-user/qemu.h | 6 +-
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 | 6 +-
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-posix.c | 5 +-
event_notifier-win32.c | 4 +-
exec.c | 19 +-
fpu/softfloat.c | 2 +-
fsdev/qemu-fsdev-dummy.c | 4 +-
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 | 13 +-
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-synth.h | 4 +
hw/9pfs/virtio-9p-xattr.h | 2 +-
hw/9pfs/virtio-9p.c | 4 +-
hw/9pfs/virtio-9p.h | 4 +-
hw/Makefile.objs | 15 +-
hw/ac97.c | 4 +-
hw/acpi.c | 4 +-
hw/acpi.h | 2 +-
hw/acpi_ich9.c | 23 +-
hw/acpi_piix4.c | 10 +-
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 | 5 +-
hw/alpha_typhoon.c | 6 +-
hw/an5206.c | 2 +-
hw/apb_pci.c | 12 +-
hw/apic.c | 6 +-
hw/apic_common.c | 2 +-
hw/apic_internal.h | 4 +-
hw/apm.c | 2 +-
hw/apm.h | 2 +-
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/audiodev.h | 5 +
hw/axis_dev88.c | 6 +-
hw/baum.c | 4 +-
hw/baum.h | 4 +
hw/blizzard.c | 4 +-
hw/block-common.c | 4 +-
hw/boards.h | 2 +-
hw/bonito.c | 8 +-
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/bt.h | 5 +
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 | 4 +-
hw/collie.c | 4 +-
hw/cris-boot.h | 4 +
hw/cs4231a.c | 2 +-
hw/cuda.c | 4 +-
hw/debugcon.c | 2 +-
hw/dec_pci.c | 8 +-
hw/device-hotplug.c | 9 +-
hw/dma.c | 1 +
hw/dp8393x.c | 4 +-
hw/dummy_m68k.c | 2 +-
hw/e1000.c | 8 +-
hw/eepro100.c | 8 +-
hw/empty_slot.h | 5 +
hw/es1370.c | 4 +-
hw/escc.c | 4 +-
hw/escc.h | 5 +
hw/esp-pci.c | 4 +-
hw/esp.c | 2 +-
hw/etraxfs.h | 7 +-
hw/etraxfs_dma.c | 4 +-
hw/etraxfs_dma.h | 5 +
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 | 8 +-
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 | 7 +-
hw/framebuffer.c | 2 +-
hw/framebuffer.h | 2 +-
hw/fw_cfg.c | 5 +-
hw/g364fb.c | 4 +-
hw/grackle_pci.c | 4 +-
hw/grlib_apbuart.c | 2 +-
hw/grlib_gptimer.c | 2 +-
hw/gt64xxx.c | 6 +-
hw/gumstix.c | 6 +-
hw/hd-geometry.c | 2 +-
hw/hda-audio.c | 2 +-
hw/hid.c | 4 +-
hw/hid.h | 2 +-
hw/highbank.c | 8 +-
hw/hpet.c | 4 +-
hw/hw.h | 12 +-
hw/i386/Makefile.objs | 2 +-
hw/i82378.c | 2 +-
hw/i8254.c | 2 +-
hw/i8254_common.c | 2 +-
hw/i8259.c | 4 +-
hw/i82801b11.c | 2 +-
hw/ich9.h | 10 +-
hw/ide.h | 4 +-
hw/ide/ahci.c | 10 +-
hw/ide/cmd646.c | 8 +-
hw/ide/core.c | 12 +-
hw/ide/ich.c | 8 +-
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 | 6 +-
hw/ide/piix.c | 8 +-
hw/ide/qdev.c | 8 +-
hw/ide/via.c | 8 +-
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 | 8 +-
hw/ioapic_internal.h | 2 +-
hw/ioh3420.c | 6 +-
hw/ioh3420.h | 2 +-
hw/isa-bus.c | 6 +-
hw/isa.h | 4 +-
hw/isa_mmio.c | 2 +-
hw/ivshmem.c | 13 +-
hw/jazz_led.c | 5 +-
hw/kvm/apic.c | 4 +-
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 | 14 +-
hw/kvmvapic.c | 6 +-
hw/kzm.c | 6 +-
hw/lan9118.c | 4 +-
hw/lance.c | 6 +-
hw/leon3.c | 8 +-
hw/lm32.h | 5 +
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/lpc_ich9.c | 46 +--
hw/lsi53c895a.c | 4 +-
hw/m25p80.c | 2 +-
hw/m48t59.c | 6 +-
hw/mac_dbdma.c | 1 +
hw/mac_dbdma.h | 6 +-
hw/mac_nvram.c | 2 +-
hw/macio.c | 2 +-
hw/mainstone.c | 6 +-
hw/mc146818rtc.c | 6 +-
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 | 8 +-
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 | 6 +-
hw/milkymist.c | 7 +-
hw/mips.h | 2 +-
hw/mips_fulong2e.c | 16 +-
hw/mips_jazz.c | 10 +-
hw/mips_malta.c | 18 +-
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/msmouse.c | 6 +-
hw/msmouse.h | 5 +
hw/multiboot.c | 2 +-
hw/musicpal.c | 17 +-
hw/nand.c | 4 +-
hw/ne2000-isa.c | 4 +-
hw/ne2000.c | 6 +-
hw/ne2000.h | 5 +
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 | 5 +-
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/openpic.c | 4 +-
hw/openrisc_sim.c | 8 +-
hw/openrisc_timer.c | 2 +-
hw/palm.c | 6 +-
hw/pam.c | 2 +-
hw/pam.h | 2 +-
hw/parallel.c | 4 +-
hw/pc.c | 20 +-
hw/pc.h | 8 +-
hw/pc_piix.c | 18 +-
hw/pc_q35.c | 6 +-
hw/pc_sysfw.c | 6 +-
hw/pci/Makefile.objs | 9 +
hw/{ => pci}/msi.c | 4 +-
hw/{ => pci}/msi.h | 2 +-
hw/{ => pci}/msix.c | 10 +-
hw/{ => pci}/msix.h | 2 +-
hw/{ => pci}/pci-hotplug.c | 22 +-
hw/{ => pci}/pci-stub.c | 6 +-
hw/{ => pci}/pci.c | 24 +-
hw/{ => pci}/pci.h | 14 +-
hw/{ => pci}/pci_bridge.c | 6 +-
hw/{ => pci}/pci_bridge.h | 2 +-
hw/{pci_internals.h => pci/pci_bus.h} | 16 +-
hw/{ => pci}/pci_host.c | 4 +-
hw/{ => pci}/pci_host.h | 2 +-
hw/{ => pci}/pci_ids.h | 4 +
hw/{ => pci}/pci_regs.h | 0
hw/{ => pci}/pcie.c | 14 +-
hw/{ => pci}/pcie.h | 8 +-
hw/{ => pci}/pcie_aer.c | 18 +-
hw/{ => pci}/pcie_aer.h | 2 +-
hw/{ => pci}/pcie_host.c | 8 +-
hw/{ => pci}/pcie_host.h | 4 +-
hw/{ => pci}/pcie_port.c | 2 +-
hw/{ => pci}/pcie_port.h | 4 +-
hw/{ => pci}/pcie_regs.h | 0
hw/{ => pci}/shpc.c | 12 +-
hw/{ => pci}/shpc.h | 4 +-
hw/{ => pci}/slotid_cap.c | 4 +-
hw/{ => pci}/slotid_cap.h | 0
hw/pci_bridge_dev.c | 14 +-
hw/pckbd.c | 2 +-
hw/pcmcia.h | 5 +
hw/pcnet-pci.c | 8 +-
hw/pcnet.c | 8 +-
hw/pcnet.h | 7 +-
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/piix4.c | 2 +-
hw/piix_pci.c | 6 +-
hw/pl011.c | 2 +-
hw/pl031.c | 4 +-
hw/pl110.c | 5 +-
hw/pl181.c | 2 +-
hw/ppc.c | 8 +-
hw/ppc.h | 5 +
hw/ppc/Makefile.objs | 2 +-
hw/ppc/e500.c | 12 +-
hw/ppc/e500plat.c | 2 +-
hw/ppc/mpc8544ds.c | 2 +-
hw/ppc405_boards.c | 10 +-
hw/ppc405_uc.c | 8 +-
hw/ppc440_bamboo.c | 12 +-
hw/ppc4xx.h | 2 +-
hw/ppc4xx_devs.c | 4 +-
hw/ppc4xx_pci.c | 6 +-
hw/ppc_booke.c | 6 +-
hw/ppc_mac.h | 2 +-
hw/ppc_newworld.c | 12 +-
hw/ppc_oldworld.c | 12 +-
hw/ppc_prep.c | 16 +-
hw/ppce500_pci.c | 8 +-
hw/ppce500_spin.c | 4 +-
hw/prep_pci.c | 6 +-
hw/ps2.c | 4 +-
hw/ptimer.c | 4 +-
hw/ptimer.h | 4 +-
hw/puv3.c | 6 +-
hw/pxa.h | 2 +-
hw/pxa2xx.c | 6 +-
hw/pxa2xx_keypad.c | 2 +-
hw/pxa2xx_lcd.c | 6 +-
hw/pxa2xx_timer.c | 4 +-
hw/q35.h | 6 +-
hw/qdev-addr.c | 4 +-
hw/qdev-addr.h | 5 +
hw/qdev-core.h | 10 +-
hw/qdev-monitor.c | 5 +-
hw/qdev-monitor.h | 2 +-
hw/qdev-properties.c | 9 +-
hw/qdev.c | 8 +-
hw/qxl-logger.c | 2 +-
hw/qxl.c | 8 +-
hw/qxl.h | 11 +-
hw/r2d.c | 10 +-
hw/rc4030.c | 2 +-
hw/realview.c | 10 +-
hw/rtl8139.c | 12 +-
hw/s390-virtio-bus.c | 9 +-
hw/s390-virtio-bus.h | 4 +
hw/s390-virtio.c | 14 +-
hw/s390x/event-facility.c | 4 +-
hw/s390x/event-facility.h | 2 +-
hw/s390x/sclp.c | 4 +-
hw/s390x/sclpconsole.c | 3 +-
hw/s390x/sclpquiesce.c | 2 +-
hw/sb16.c | 4 +-
hw/scsi-bus.c | 6 +-
hw/scsi-defs.h | 4 +
hw/scsi-disk.c | 8 +-
hw/scsi-generic.c | 4 +-
hw/scsi.h | 4 +-
hw/sd.c | 4 +-
hw/serial-pci.c | 2 +-
hw/serial.c | 6 +-
hw/serial.h | 8 +-
hw/sga.c | 4 +-
hw/sh7750.c | 4 +-
hw/sh_intc.h | 2 +-
hw/sh_pci.c | 8 +-
hw/sh_serial.c | 4 +-
hw/sh_timer.c | 4 +-
hw/shix.c | 4 +-
hw/slavio_intctl.c | 2 +-
hw/slavio_misc.c | 2 +-
hw/slavio_timer.c | 2 +-
hw/sm501.c | 7 +-
hw/smbios.c | 2 +-
hw/smbus_ich9.c | 18 +-
hw/smc91c111.c | 2 +-
hw/soc_dma.c | 2 +-
hw/soc_dma.h | 8 +-
hw/spapr.c | 18 +-
hw/spapr.h | 2 +-
hw/spapr_events.c | 6 +-
hw/spapr_hcall.c | 6 +-
hw/spapr_iommu.c | 6 +-
hw/spapr_llan.c | 2 +-
hw/spapr_nvram.c | 2 +-
hw/spapr_pci.c | 12 +-
hw/spapr_pci.h | 4 +-
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 | 12 +-
hw/sysbus.c | 4 +-
hw/sysbus.h | 2 +-
hw/tc6393xb.c | 6 +-
hw/tcx.c | 5 +-
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/unin_pci.c | 4 +-
hw/usb.h | 2 +-
hw/usb/bus.c | 4 +-
hw/usb/combined-packet.c | 2 +-
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-pci.c | 4 +-
hw/usb/hcd-ehci.h | 12 +-
hw/usb/hcd-musb.c | 2 +-
hw/usb/hcd-ohci.c | 4 +-
hw/usb/hcd-uhci.c | 8 +-
hw/usb/hcd-xhci.c | 8 +-
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 | 8 +-
hw/versatile_pci.c | 6 +-
hw/versatilepb.c | 10 +-
hw/vexpress.c | 8 +-
hw/vfio_pci.c | 20 +-
hw/vga-isa-mm.c | 6 +-
hw/vga-isa.c | 6 +-
hw/vga-pci.c | 8 +-
hw/vga.c | 8 +-
hw/vga_int.h | 8 +-
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-balloon.h | 2 +-
hw/virtio-blk.c | 4 +-
hw/virtio-console.c | 4 +-
hw/virtio-net.c | 8 +-
hw/virtio-net.h | 30 +-
hw/virtio-pci.c | 15 +-
hw/virtio-rng.c | 2 +-
hw/virtio-scsi.h | 3 +-
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 | 4 +-
hw/vt82c686.c | 10 +-
hw/watchdog.c | 12 +-
hw/watchdog.h | 2 +-
hw/wdt_i6300esb.c | 4 +-
hw/wdt_ib700.c | 2 +-
hw/xen-host-pci-device.h | 2 +-
hw/xen_apic.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 | 5 +-
hw/xen_pt.c | 6 +-
hw/xen_pt.h | 2 +-
hw/xen_pt_config_init.c | 2 +-
hw/xenfb.c | 4 +-
hw/xgmac.c | 6 +-
hw/xilinx.h | 8 +-
hw/xilinx_axidma.c | 5 +-
hw/xilinx_axienet.c | 5 +-
hw/xilinx_ethlite.c | 2 +-
hw/xilinx_spi.c | 4 +-
hw/xilinx_spips.c | 6 +-
hw/xilinx_timer.c | 2 +-
hw/xilinx_uartlite.c | 2 +-
hw/xilinx_zynq.c | 8 +-
hw/xio3130_downstream.c | 6 +-
hw/xio3130_downstream.h | 2 +-
hw/xio3130_upstream.c | 6 +-
hw/xio3130_upstream.h | 2 +-
hw/xtensa_lx60.c | 11 +-
hw/xtensa_pic.c | 4 +-
hw/xtensa_sim.c | 6 +-
hw/z2.c | 8 +-
hw/zynq_slcr.c | 4 +-
aes.h => include/block/aes.h | 0
qemu-aio.h => include/block/aio.h | 4 +-
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
thread-pool.h => include/block/thread-pool.h | 8 +-
include/bt/bt.h | 20 +
qemu-char.h => include/char/char.h | 14 +-
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
exec-memory.h => include/exec/address-spaces.h | 2 +-
cpu-all.h => include/exec/cpu-all.h | 6 +-
cpu-common.h => include/exec/cpu-common.h | 8 +-
cpu-defs.h => include/exec/cpu-defs.h | 6 +-
cputlb.h => include/exec/cputlb.h | 0
def-helper.h => include/exec/def-helper.h | 0
exec-all.h => include/exec/exec-all.h | 14 +-
gdbstub.h => include/exec/gdbstub.h | 0
gen-icount.h => include/exec/gen-icount.h | 7 +-
hwaddr.h => include/exec/hwaddr.h | 0
ioport.h => include/exec/ioport.h | 2 +-
iorange.h => include/exec/iorange.h | 0
.../exec/memory-internal.h | 0
memory.h => include/exec/memory.h | 12 +-
poison.h => include/exec/poison.h | 0
softmmu-semi.h => include/exec/softmmu-semi.h | 4 +
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
qemu-user-types.h => include/exec/user/abitypes.h | 0
thunk.h => include/exec/user/thunk.h | 0
{fpu => include/fpu}/softfloat.h | 2 +-
libfdt_env.h => include/libfdt_env.h | 2 +-
block-migration.h => include/migration/block.h | 0
migration.h => include/migration/migration.h | 8 +-
include/{qemu => migration}/page_cache.h | 0
qemu-file.h => include/migration/qemu-file.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 +-
include/net/tap.h | 67 ++++
.../qapi/dealloc-visitor.h | 2 +-
error.h => include/qapi/error.h | 2 +-
{qapi => include/qapi}/opts-visitor.h | 4 +-
{qapi => include/qapi}/qmp-input-visitor.h | 4 +-
{qapi => include/qapi}/qmp-output-visitor.h | 4 +-
qapi/qmp-core.h => include/qapi/qmp/dispatch.h | 6 +-
json-lexer.h => include/qapi/qmp/json-lexer.h | 4 +-
json-parser.h => include/qapi/qmp/json-parser.h | 4 +-
.../qapi/qmp/json-streamer.h | 4 +-
qbool.h => include/qapi/qmp/qbool.h | 2 +-
qdict.h => include/qapi/qmp/qdict.h | 6 +-
qerror.h => include/qapi/qmp/qerror.h | 8 +-
qfloat.h => include/qapi/qmp/qfloat.h | 2 +-
qint.h => include/qapi/qmp/qint.h | 2 +-
qjson.h => include/qapi/qmp/qjson.h | 6 +-
qlist.h => include/qapi/qmp/qlist.h | 6 +-
qobject.h => include/qapi/qmp/qobject.h | 0
qstring.h => include/qapi/qmp/qstring.h | 2 +-
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 +-
include/qapi/visitor-impl.h | 63 +++
qapi/qapi-visit-core.h => include/qapi/visitor.h | 42 +-
qemu-common.h => include/qemu-common.h | 14 +-
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 | 5 +-
envlist.h => include/qemu/envlist.h | 0
qemu-error.h => include/qemu/error-report.h | 0
event_notifier.h => include/qemu/event_notifier.h | 0
host-utils.h => include/qemu/host-utils.h | 6 +-
int128.h => include/qemu/int128.h | 0
iov.h => include/qemu/iov.h | 5 +
qemu-log.h => include/qemu/log.h | 2 +-
main-loop.h => include/qemu/main-loop.h | 2 +-
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 | 3 +-
osdep.h => include/qemu/osdep.h | 0
qemu-queue.h => include/qemu/queue.h | 2 +-
range.h => include/qemu/range.h | 0
include/qemu/rng-random.h | 2 +-
include/qemu/rng.h | 4 +-
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
qemu-types.h => include/qemu/typedefs.h | 0
uri.h => include/qemu/uri.h | 0
qemu-xattr.h => include/qemu/xattr.h | 0
include/{qemu => qom}/cpu.h | 4 +-
include/{qemu => qom}/object.h | 2 +-
include/{qemu => qom}/qom-qobject.h | 2 +-
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
device_tree.h => include/sysemu/device_tree.h | 0
dma.h => include/sysemu/dma.h | 6 +-
dump.h => include/sysemu/dump.h | 0
kvm.h => include/sysemu/kvm.h | 2 +-
.../sysemu/memory_mapping.h | 2 +-
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 | 2 +-
sysemu.h => include/sysemu/sysemu.h | 12 +-
xen-mapcache.h => include/sysemu/xen-mapcache.h | 0
console.h => include/ui/console.h | 11 +-
{hw => include/ui}/pixel_ops.h | 0
qemu-pixman.h => include/ui/qemu-pixman.h | 0
{ui => include/ui}/qemu-spice.h | 9 +-
{ui => include/ui}/spice-display.h | 6 +-
iohandler.c | 7 +-
ioport.c | 4 +-
iov.c | 2 +-
json-lexer.c | 10 +-
json-parser.c | 18 +-
json-streamer.c | 10 +-
kvm-all.c | 24 +-
kvm-stub.c | 6 +-
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-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/cris/syscall.h | 5 +
linux-user/elfload.c | 2 +-
linux-user/main.c | 6 +-
linux-user/microblaze/syscall.h | 6 +
linux-user/qemu.h | 10 +-
linux-user/syscall.c | 2 +-
linux-user/syscall_defs.h | 6 +
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 | 52 +--
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 | 15 +-
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 +-
pixman | 2 +-
qapi/opts-visitor.c | 10 +-
qapi/qapi-dealloc-visitor.c | 7 +-
qapi/qapi-types-core.h | 21 -
qapi/qapi-visit-core.c | 6 +-
qapi/qapi-visit-impl.h | 23 --
qapi/qmp-dispatch.c | 10 +-
qapi/qmp-input-visitor.c | 10 +-
qapi/qmp-output-visitor.c | 10 +-
qapi/qmp-registry.c | 2 +-
qapi/string-input-visitor.c | 6 +-
qapi/string-output-visitor.c | 6 +-
qbool.c | 4 +-
qdict.c | 14 +-
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 +-
qerror.c | 6 +-
qfloat.c | 4 +-
qga/Makefile.objs | 2 +-
qga/channel-posix.c | 4 +-
qga/commands-posix.c | 6 +-
qga/commands-win32.c | 2 +-
qga/commands.c | 2 +-
qga/guest-agent-core.h | 2 +-
qemu-ga.c => qga/main.c | 14 +-
qapi-schema-guest.json => qga/qapi-schema.json | 0
qint.c | 4 +-
qjson.c | 18 +-
qlist.c | 6 +-
qmp.c | 11 +-
qom/container.c | 4 +-
qom/cpu.c | 2 +-
qom/object.c | 15 +-
qom/qom-qobject.c | 6 +-
qstring.c | 4 +-
qtest.c | 12 +-
readline.c | 4 +-
rules.mak | 5 +-
savevm.c | 23 +-
scripts/feature_to_c.sh | 2 +-
scripts/get_maintainer.pl | 25 +-
scripts/qapi-commands.py | 15 +-
scripts/qapi-types.py | 2 +-
scripts/qapi-visit.py | 3 +-
slirp/bootp.h | 4 +
slirp/if.c | 2 +-
slirp/ip_input.c | 2 +-
slirp/main.h | 4 +
slirp/misc.c | 4 +-
slirp/sbuf.c | 2 +-
slirp/slirp.c | 4 +-
slirp/slirp.h | 4 +-
slirp/tftp.h | 4 +
spice-qemu-char.c | 3 +-
stubs/arch-query-cpu-def.c | 4 +-
stubs/fd-register.c | 2 +-
stubs/fdset-add-fd.c | 2 +-
stubs/fdset-find-fd.c | 2 +-
stubs/fdset-get-fd.c | 2 +-
stubs/fdset-remove-fd.c | 2 +-
stubs/get-fd.c | 2 +-
stubs/set-fd-handler.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/crisv32-decode.h | 4 +
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 | 13 +-
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 | 13 +-
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/arm/tcg-target.h | 3 +
tcg/hppa/tcg-target.c | 2 +-
tcg/hppa/tcg-target.h | 3 +
tcg/i386/tcg-target.c | 2 +-
tcg/i386/tcg-target.h | 3 +
tcg/ia64/tcg-target.c | 2 +-
tcg/ia64/tcg-target.h | 3 +
tcg/mips/tcg-target.c | 2 +-
tcg/mips/tcg-target.h | 3 +
tcg/ppc/tcg-target.c | 2 +-
tcg/ppc/tcg-target.h | 3 +
tcg/ppc64/tcg-target.c | 2 +-
tcg/ppc64/tcg-target.h | 3 +
tcg/s390/tcg-target.c | 2 +-
tcg/s390/tcg-target.h | 3 +
tcg/sparc/tcg-target.c | 2 +-
tcg/sparc/tcg-target.h | 3 +
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/cris/crisutils.h | 5 +
tests/tcg/test-i386-fprem.c | 4 +-
tests/tcg/test-i386.c | 2 +-
tests/test-aio.c | 2 +-
tests/test-coroutine.c | 2 +-
tests/test-iov.c | 4 +-
tests/test-qmp-commands.c | 6 +-
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-thread-pool.c | 6 +-
tests/test-visitor-serialization.c | 2 +-
thread-pool.c | 14 +-
thunk.c | 2 +-
trace/simple.c | 2 +-
translate-all.c | 10 +-
ui/Makefile.objs | 7 +-
ui/cocoa.m | 4 +-
console.c => ui/console.c | 5 +-
ui/curses.c | 4 +-
ui/curses_keys.h | 5 +
cursor.c => ui/cursor.c | 2 +-
cursor_hidden.xpm => ui/cursor_hidden.xpm | 0
cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm | 0
ui/d3des.h | 4 +
input.c => ui/input.c | 9 +-
ui/keymaps.c | 2 +-
qemu-pixman.c => ui/qemu-pixman.c | 2 +-
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 | 8 +-
xen-mapcache.c | 6 +-
xen-stub.c | 2 +-
1124 files changed, 3142 insertions(+), 3427 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%)
create mode 100644 hw/pci/Makefile.objs
rename hw/{ => pci}/msi.c (99%)
rename hw/{ => pci}/msi.h (98%)
rename hw/{ => pci}/msix.c (99%)
rename hw/{ => pci}/msix.h (98%)
rename hw/{ => pci}/pci-hotplug.c (96%)
rename hw/{ => pci}/pci-stub.c (94%)
rename hw/{ => pci}/pci.c (99%)
rename hw/{ => pci}/pci.h (99%)
rename hw/{ => pci}/pci_bridge.c (99%)
rename hw/{ => pci}/pci_bridge.h (98%)
rename hw/{pci_internals.h => pci/pci_bus.h} (79%)
rename hw/{ => pci}/pci_host.c (99%)
rename hw/{ => pci}/pci_host.h (99%)
rename hw/{ => pci}/pci_ids.h (98%)
rename hw/{ => pci}/pci_regs.h (100%)
rename hw/{ => pci}/pcie.c (99%)
rename hw/{ => pci}/pcie.h (98%)
rename hw/{ => pci}/pcie_aer.c (99%)
rename hw/{ => pci}/pcie_aer.h (99%)
rename hw/{ => pci}/pcie_host.c (97%)
rename hw/{ => pci}/pcie_host.h (96%)
rename hw/{ => pci}/pcie_port.c (99%)
rename hw/{ => pci}/pcie_port.h (96%)
rename hw/{ => pci}/pcie_regs.h (100%)
rename hw/{ => pci}/shpc.c (99%)
rename hw/{ => pci}/shpc.h (95%)
rename hw/{ => pci}/slotid_cap.c (95%)
rename hw/{ => pci}/slotid_cap.h (100%)
rename uboot_image.h => hw/uboot_image.h (100%)
rename aes.h => include/block/aes.h (100%)
rename qemu-aio.h => include/block/aio.h (99%)
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%)
rename thread-pool.h => include/block/thread-pool.h (88%)
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 exec-memory.h => include/exec/address-spaces.h (97%)
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 cputlb.h => include/exec/cputlb.h (100%)
rename def-helper.h => include/exec/def-helper.h (100%)
rename exec-all.h => include/exec/exec-all.h (98%)
rename gdbstub.h => include/exec/gdbstub.h (100%)
rename gen-icount.h => include/exec/gen-icount.h (94%)
rename hwaddr.h => include/exec/hwaddr.h (100%)
rename ioport.h => include/exec/ioport.h (99%)
rename iorange.h => include/exec/iorange.h (100%)
rename memory-internal.h => include/exec/memory-internal.h (100%)
rename memory.h => include/exec/memory.h (99%)
rename poison.h => include/exec/poison.h (100%)
rename softmmu-semi.h => include/exec/softmmu-semi.h (97%)
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 qemu-user-types.h => include/exec/user/abitypes.h (100%)
rename thunk.h => include/exec/user/thunk.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 migration.h => include/migration/migration.h (97%)
rename include/{qemu => migration}/page_cache.h (100%)
rename qemu-file.h => include/migration/qemu-file.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%)
create mode 100644 include/net/tap.h
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-input-visitor.h (91%)
rename {qapi => include/qapi}/qmp-output-visitor.h (91%)
rename qapi/qmp-core.h => include/qapi/qmp/dispatch.h (93%)
rename json-lexer.h => include/qapi/qmp/json-lexer.h (94%)
rename json-parser.h => include/qapi/qmp/json-parser.h (90%)
rename json-streamer.h => include/qapi/qmp/json-streamer.h (93%)
rename qbool.h => include/qapi/qmp/qbool.h (94%)
rename qdict.h => include/qapi/qmp/qdict.h (96%)
rename qerror.h => include/qapi/qmp/qerror.h (98%)
rename qfloat.h => include/qapi/qmp/qfloat.h (94%)
rename qint.h => include/qapi/qmp/qint.h (94%)
rename qjson.h => include/qapi/qmp/qjson.h (88%)
rename qlist.h => include/qapi/qmp/qlist.h (95%)
rename qobject.h => include/qapi/qmp/qobject.h (100%)
rename qstring.h => include/qapi/qmp/qstring.h (96%)
rename qemu-objects.h => include/qapi/qmp/types.h (60%)
rename {qapi => include/qapi}/string-input-visitor.h (95%)
rename {qapi => include/qapi}/string-output-visitor.h (95%)
create mode 100644 include/qapi/visitor-impl.h
rename qapi/qapi-visit-core.h => include/qapi/visitor.h (52%)
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 (91%)
rename envlist.h => include/qemu/envlist.h (100%)
rename qemu-error.h => include/qemu/error-report.h (100%)
rename event_notifier.h => include/qemu/event_notifier.h (100%)
rename host-utils.h => include/qemu/host-utils.h (98%)
rename int128.h => include/qemu/int128.h (100%)
rename iov.h => include/qemu/iov.h (99%)
rename qemu-log.h => include/qemu/log.h (99%)
rename main-loop.h => include/qemu/main-loop.h (99%)
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 (96%)
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 (96%)
rename qemu-timer.h => include/qemu/timer.h (99%)
rename qemu-tls.h => include/qemu/tls.h (100%)
rename qemu-types.h => include/qemu/typedefs.h (100%)
rename uri.h => include/qemu/uri.h (100%)
rename qemu-xattr.h => include/qemu/xattr.h (100%)
rename include/{qemu => qom}/cpu.h (98%)
rename include/{qemu => qom}/object.h (99%)
rename include/{qemu => qom}/qom-qobject.h (97%)
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 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 kvm.h => include/sysemu/kvm.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 (100%)
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 {hw => include/ui}/pixel_ops.h (100%)
rename qemu-pixman.h => include/ui/qemu-pixman.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%)
delete mode 100644 qapi/qapi-types-core.h
delete mode 100644 qapi/qapi-visit-impl.h
rename qemu-ga.c => qga/main.c (99%)
rename qapi-schema-guest.json => qga/qapi-schema.json (100%)
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 qemu-pixman.c => ui/qemu-pixman.c (98%)
rename qemu-x509.h => ui/qemu-x509.h (100%)
rename vgafont.h => ui/vgafont.h (100%)
---
1.8.0.2
^ permalink raw reply [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 01/32] libcacard: simplify rules for recursive build
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 02/32] vscclient: use per-target variables Paolo Bonzini
` (32 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 9ecbcbb..d06fbad 100644
--- a/Makefile
+++ b/Makefile
@@ -169,19 +169,11 @@ libqemustub.a: $(stub-obj-y)
# 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 02/32] vscclient: use per-target variables
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 01/32] libcacard: simplify rules for recursive build Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 03/32] build: adjust setting of QEMU_INCLUDES Paolo Bonzini
` (31 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index d06fbad..7e38112 100644
--- a/Makefile
+++ b/Makefile
@@ -189,8 +189,9 @@ qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y) libqemustub.a
qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o
+vscclient$(EXESUF): LIBS += $(libcacard_libs)
vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) libcacard/vscclient.o libqemustub.a
- $(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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 03/32] build: adjust setting of QEMU_INCLUDES
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 01/32] libcacard: simplify rules for recursive build Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 02/32] vscclient: use per-target variables Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines Paolo Bonzini
` (30 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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 7e38112..9ebd3cd 100644
--- a/Makefile
+++ b/Makefile
@@ -145,8 +145,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 ecdb33a..e9ad1b1 100755
--- a/configure
+++ b/configure
@@ -278,7 +278,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"
@@ -3343,7 +3343,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 d0b04e4..77d2360 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (2 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 03/32] build: adjust setting of QEMU_INCLUDES Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 05/32] build: move rules from Makefile to */Makefile.objs Paolo Bonzini
` (29 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
rules.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules.mak b/rules.mak
index 77d2360..8448b94 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 05/32] build: move rules from Makefile to */Makefile.objs
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (3 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 06/32] build: create ldscripts/ Paolo Bonzini
` (28 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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 9ebd3cd..5810718 100644
--- a/Makefile
+++ b/Makefile
@@ -141,16 +141,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 7f01510..c067f38 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -18,3 +18,5 @@ endif
common-obj-y += stream.o
common-obj-y += commit.o
common-obj-y += mirror.o
+
+$(obj)/curl.o: QEMU_CFLAGS+=$(CURL_CFLAGS)
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index bcf278d..2778035 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -204,3 +204,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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 06/32] build: create ldscripts/
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (4 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 05/32] build: move rules from Makefile to */Makefile.objs Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 07/32] build: kill libdis, move disassemblers to disas/ Paolo Bonzini
` (27 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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 insertion(+), 1 deletion(-)
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 e9ad1b1..d2ad181 100755
--- a/configure
+++ b/configure
@@ -4158,7 +4158,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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 07/32] build: kill libdis, move disassemblers to disas/
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (5 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 06/32] build: create ldscripts/ Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 08/32] build: kill libuser Paolo Bonzini
` (26 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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..ca52f01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
config-devices.*
config-all-devices.*
+config-all-disas.*
config-host.*
config-target.*
trace.h
diff --git a/Makefile b/Makefile
index 5810718..da47cb8 100644
--- a/Makefile
+++ b/Makefile
@@ -99,6 +99,7 @@ defconfig:
rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
-include config-all-devices.mak
+-include config-all-disas.mak
all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
@@ -129,9 +130,9 @@ $(SRC_PATH)/pixman/configure:
$(SUBDIR_RULES): libqemustub.a
-$(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-%:
@@ -223,7 +224,7 @@ $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a
-QEMULIBS=libuser libdis libdis-user
+QEMULIBS=libuser
clean:
# avoid old build problems by removing potentially incorrect old files
@@ -255,7 +256,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-disas.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 20fb2c5..3248eaf 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -127,24 +127,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
@@ -252,5 +238,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 927347b..f353651 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
@@ -156,11 +155,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 d2ad181..f180e17 100755
--- a/configure
+++ b/configure
@@ -3697,11 +3697,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
@@ -4043,83 +4038,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-disas.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-disas.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-disas.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-disas.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-disas.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-disas.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-disas.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-disas.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-disas.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-disas.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-disas.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-disas.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-disas.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-disas.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-disas.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-disas.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-disas.mak
fi
case "$ARCH" in
diff --git a/cpu-exec.c b/cpu-exec.c
index 904ee73..b5a32b8 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 6da1dd0..8157b96 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"
typedef struct CPUDebug {
struct disassemble_info info;
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 ba01ca6..52f0940 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 a92ab44..bd63768 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 344eca3..58f69cb 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 71fe1a1..f57c8fd 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 3cf3604..10c548d 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 60bdc24..2a92727 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 f394ea6..026201e 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 e131ad1..9683b9a 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 11defc6..d955c7a 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 efaa123..530e0b5 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 6ceff02..5946a5b 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 65e6725..44e7617 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -22,7 +22,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 9ac999a..2cb9d69 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 653c2fd..8a53105 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 e63627c..984ca9f 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 787e3c6..6e144a6 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 86493e1..41d53e5 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 5859f2e..88802b8 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 3951758..8c49f4d 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 5d8762c..4e81cbd 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 164870a..bbe06db 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -33,7 +33,7 @@
#include "qemu-common.h"
#define NO_CPU_IO_DEFS
#include "cpu.h"
-#include "disas.h"
+#include "disas/disas.h"
#include "tcg.h"
#include "qemu-timer.h"
#include "memory.h"
diff --git a/user-exec.c b/user-exec.c
index 1185cb0..63fb053 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 3ebf01f..571a49b 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 08/32] build: kill libuser
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (6 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 07/32] build: kill libdis, move disassemblers to disas/ Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 09/32] janitor: do not rely on indirect inclusions of or from qemu-char.h Paolo Bonzini
` (25 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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 da47cb8..0c6ad1e 100644
--- a/Makefile
+++ b/Makefile
@@ -132,7 +132,7 @@ $(SUBDIR_RULES): libqemustub.a
$(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-%:
@@ -224,8 +224,6 @@ $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a
-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
@@ -242,7 +240,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
@@ -265,7 +263,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
if test -f pixman/config.log; then make -C pixman distclean; fi
diff --git a/Makefile.objs b/Makefile.objs
index 3248eaf..986f085 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -123,7 +123,6 @@ user-obj-y += tcg-runtime.o host-utils.o
user-obj-y += cache-utils.o
user-obj-y += module.o
user-obj-y += qemu-user.o
-user-obj-y += $(trace-obj-y)
user-obj-y += qom/
######################################################################
@@ -196,6 +195,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 f353651..8bbad38 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -155,9 +155,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 f180e17..4d0e116 100755
--- a/configure
+++ b/configure
@@ -4212,9 +4212,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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 09/32] janitor: do not rely on indirect inclusions of or from qemu-char.h
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (7 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 08/32] build: kill libuser Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 10/32] janitor: do not include qemu-char everywhere Paolo Bonzini
` (24 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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
add missing inclusions of qemu-char.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-posix.c | 1 +
exec.c | 1 +
hw/arm_boot.c | 1 +
hw/dma.c | 1 +
hw/fw_cfg.c | 1 +
hw/jazz_led.c | 1 +
hw/mac_dbdma.c | 1 +
hw/puv3.c | 2 ++
hw/qdev-monitor.c | 1 +
hw/qdev-properties.c | 1 +
hw/s390x/sclpconsole.c | 1 +
hw/tcx.c | 1 +
hw/usb/dev-network.c | 1 +
net.c | 1 +
qemu-config.h | 1 +
spice-qemu-char.c | 1 +
target-i386/kvm.c | 1 +
24 files changed, 25 insertions(+)
diff --git a/arch_init.c b/arch_init.c
index 1645f30..ef866cd 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 294e983..65556e7 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 c0b70b3..33b93d8 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-posix.c b/event_notifier-posix.c
index 6f3239a..f0bd839 100644
--- a/event_notifier-posix.c
+++ b/event_notifier-posix.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 4c1246a..9860841 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 "dma.h"
#include "exec-memory.h"
diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index ec3b8d5..63ff559 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 c2d7b21..364f54d 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 2b92cda..7b0e50f 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/jazz_led.c b/hw/jazz_led.c
index 640e75e..09c7742 100644
--- a/hw/jazz_led.c
+++ b/hw/jazz_led.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu-common.h"
#include "console.h"
#include "pixel_ops.h"
#include "trace.h"
diff --git a/hw/mac_dbdma.c b/hw/mac_dbdma.c
index e551156..41eee50 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/puv3.c b/hw/puv3.c
index 3d77349..6f89c44 100644
--- a/hw/puv3.c
+++ b/hw/puv3.c
@@ -8,6 +8,8 @@
* published by the Free Software Foundation, or any later version.
* See the COPYING file in the top-level directory.
*/
+
+#include "qemu-common.h"
#include "console.h"
#include "elf.h"
#include "exec-memory.h"
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
index a1b4d6a..5aaf74b 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/qdev-properties.c b/hw/qdev-properties.c
index 81d901c..b9cd3c0 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -5,6 +5,7 @@
#include "hw/block-common.h"
#include "net/hub.h"
#include "qapi/qapi-visit-core.h"
+#include "qemu-char.h"
void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
{
diff --git a/hw/s390x/sclpconsole.c b/hw/s390x/sclpconsole.c
index fece878..9ad297c 100644
--- a/hw/s390x/sclpconsole.c
+++ b/hw/s390x/sclpconsole.c
@@ -17,6 +17,7 @@
#include "sclp.h"
#include "event-facility.h"
+#include "qemu-char.h"
typedef struct ASCIIConsoleData {
EventBufferHeader ebh;
diff --git a/hw/tcx.c b/hw/tcx.c
index 7aee2a9..a66fbee 100644
--- a/hw/tcx.c
+++ b/hw/tcx.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu-common.h"
#include "console.h"
#include "pixel_ops.h"
#include "sysbus.h"
diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index 30cb033..0552e6f 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/net.c b/net.c
index e8ae13e..4f3d642 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-config.h b/qemu-config.h
index 812c4c5..eb50eca 100644
--- a/qemu-config.h
+++ b/qemu-config.h
@@ -4,6 +4,7 @@
#include <stdio.h>
#include "qemu-option.h"
#include "error.h"
+#include "qemu-option.h"
extern QemuOptsList qemu_fsdev_opts;
extern QemuOptsList qemu_virtfs_opts;
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 09aa22d..5f95c93 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -1,6 +1,7 @@
#include "config-host.h"
#include "trace.h"
#include "ui/qemu-spice.h"
+#include "qemu-char.h"
#include <spice.h>
#include <spice-experimental.h>
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 0901589..824930c 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 10/32] janitor: do not include qemu-char everywhere
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (8 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 09/32] janitor: do not rely on indirect inclusions of or from qemu-char.h Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 11/32] net: move Bluetooth stuff out of net.h Paolo Bonzini
` (23 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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 -
hmp.c | 1 +
hw/9pfs/virtio-9p-coth.c | 1 -
hw/ivshmem.c | 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 -
qmp.c | 1 +
savevm.c | 1 -
ui/qemu-spice.h | 1 -
31 files changed, 7 insertions(+), 25 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 abfedbe..48eff2f 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 bd0f61d..f13443e 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 048b48e..9ac7b28 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 edb1950..33354e4 100644
--- a/console.h
+++ b/console.h
@@ -1,7 +1,6 @@
#ifndef CONSOLE_H
#define CONSOLE_H
-#include "qemu-char.h"
#include "qemu-pixman.h"
#include "qdict.h"
#include "notify.h"
diff --git a/hmp.c b/hmp.c
index 180ba2b..873962f 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 cf64f32..5c648d9 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/spapr_hcall.c b/hw/spapr_hcall.c
index 63cadb8..1fac362 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 4385515..44bec34 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 4575da1..2fd6068 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 f2e3bf1..c859fde 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 4c42edc..bc10d31 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 60460a6..258f42d 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 "qemu-aio.h"
#include "main-loop.h"
diff --git a/migration-exec.c b/migration-exec.c
index 2b6fcb4..b4a3ca3 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 5fe28e0..6d42287 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 5e855fe..a9bb817 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 dba72b4..e58e8bc 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 b4ef955..4595c21 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 afb52c3..f117412 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 c01323d..cf309cd 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 1abfd44..5ff7893 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/qmp.c b/qmp.c
index e3a7f0b..e873f0a 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 5d04d59..f5886ce 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 11/32] net: move Bluetooth stuff out of net.h
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (9 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 10/32] janitor: do not include qemu-char everywhere Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 12/32] net: do not include net.h everywhere Paolo Bonzini
` (22 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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 39984f5..4a37442 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 12/32] net: do not include net.h everywhere
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (10 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 11/32] net: move Bluetooth stuff out of net.h Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 13/32] net: move net.c to net/ Paolo Bonzini
` (21 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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 insertion(+), 16 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index ef866cd..e479a25 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 b1e5258..348f55c 100644
--- a/hw/alpha_sys.h
+++ b/hw/alpha_sys.h
@@ -6,7 +6,6 @@
#include "pci/pci.h"
#include "pci/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 839b9ea..336ffc2 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 772cb8b..f59d3bf 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 96b2a7f..0253b7a 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(hwaddr base,
qemu_irq irq)
diff --git a/hw/milkymist.c b/hw/milkymist.c
index 4c8111a..c26ea4a 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 e0ac2d1..169dd46 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 6ab8fee..1fdbc49 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 b13be7c..2566ea1 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/pci.h"
#define ETH_ALEN 6
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index d0d6a5e..a2355dc 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -26,7 +26,6 @@
#include "qemu-error.h"
#include "pci/msi.h"
#include "pci/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 7d7cba7..8d9d15f 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/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 10bb560..023499e 100644
--- a/hw/xen_platform.c
+++ b/hw/xen_platform.c
@@ -30,7 +30,6 @@
#include "pci/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 242b799..f066ad0 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 0d2bb94..9b9585b 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 13/32] net: move net.c to net/
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (11 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 12/32] net: do not include net.h everywhere Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 14/32] net: reorganize headers Paolo Bonzini
` (20 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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 986f085..83092dc 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -66,7 +66,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 += qemu-pixman.o
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 4f3d642..7b1600f 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 14/32] net: reorganize headers
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (12 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 13/32] net: move net.c to net/ Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 15/32] qemu-ga: move qemu-ga files to qga/ Paolo Bonzini
` (19 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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/pci-hotplug.c | 2 +-
hw/pci/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 | 2 +-
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
include/net/tap.h | 67 +++++++++++++++++++++++++++++++++++++++++
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, 169 insertions(+), 155 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%)
create mode 100644 include/net/tap.h
rename net/{tap.h => tap_int.h} (77%)
diff --git a/hmp.c b/hmp.c
index 873962f..9b31e9f 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 aa1ac9e..50ddbc9 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 0c037a2..40a2399 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 3f6386e..d59b611 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 c89c8d2..aeee3e6 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -27,7 +27,7 @@
#include "hw.h"
#include "pci/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 992f03a..9e2be4e 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -43,7 +43,7 @@
#include <stddef.h> /* offsetof */
#include "hw.h"
#include "pci/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 725bb9e..bc60713 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 3d42426..289a810 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 bc815bb..c375f16 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 8e35127..90f7cb5 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 77807c3..2b59fea 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 f724e1c..4c72d0d 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 a3e6dd9..a384676 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 5bbecb7..58c8b07 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 b1db549..6326624 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 1ed193c..b5fb18f 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 0253b7a..812ddd2 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(hwaddr base,
qemu_irq irq)
diff --git a/hw/milkymist-minimac2.c b/hw/milkymist-minimac2.c
index b204e5f..926f7f9 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 d5cf33b..bab96b2 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 ea1416a..8e5e8ef 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 571903d..3f9f171 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 20b5f1a..7831742 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 325098a..ec99d7d 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 bece332..bb752d3 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 e0c57c8..4e8399a 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 fb78e5b..2001264 100644
--- a/hw/ne2000.c
+++ b/hw/ne2000.c
@@ -23,7 +23,7 @@
*/
#include "hw.h"
#include "pci/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 b2780b9..fd2f0f6 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 23c66df..a879fb0 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 2237e86..5e4d103 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 c2b4cb0..7268dcd 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -30,7 +30,7 @@
#include "pci/pci.h"
#include "pci/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/pci-hotplug.c b/hw/pci/pci-hotplug.c
index 4b4c931..b850400 100644
--- a/hw/pci/pci-hotplug.c
+++ b/hw/pci/pci-hotplug.c
@@ -25,7 +25,7 @@
#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/pci/pci.h"
-#include "net.h"
+#include "net/net.h"
#include "hw/pc.h"
#include "monitor.h"
#include "hw/scsi.h"
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 2e455e2..105fe95 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -26,7 +26,7 @@
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pci_bus.h"
#include "monitor.h"
-#include "net.h"
+#include "net/net.h"
#include "sysemu.h"
#include "hw/loader.h"
#include "range.h"
diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c
index c1abbf8..c6768bc 100644
--- a/hw/pcnet-pci.c
+++ b/hw/pcnet-pci.c
@@ -28,7 +28,7 @@
*/
#include "pci/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 54eecd0..5b03ede 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 3589a4b..df51a74 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 c5fd5e7..37b0d55 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 0b39a81..5193a0c 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/pci.h"
#include "boards.h"
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index 2bf3094..657f405 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -53,7 +53,7 @@
#include "mac_dbdma.h"
#include "nvram.h"
#include "pci/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 3bc29c6..a149306 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/pci.h"
#include "boards.h"
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index f6ffb59..25cc049 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/pci.h"
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index b9cd3c0..7ab55ef 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -1,4 +1,4 @@
-#include "net.h"
+#include "net/net.h"
#include "qdev.h"
#include "qerror.h"
#include "blockdev.h"
diff --git a/hw/qdev.c b/hw/qdev.c
index 599382c..6b91fb9 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 e18c23b..b1c278f 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -30,7 +30,7 @@
#include "sysemu.h"
#include "boards.h"
#include "pci/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 5fbdcbf..17d1ba2 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -12,7 +12,7 @@
#include "primecell.h"
#include "devices.h"
#include "pci/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 e294a2a..e024520 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -55,7 +55,7 @@
#include "pci/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 7aca0c4..8c724b9 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 4ceed01..2161b4a 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 9bd2fd5..767d065 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 09ad69f..8077eb9 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 b038f10..f3eb4bb 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 a530b10..d7e1e21 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 52cf82b..9a784df 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 47bcf93..d9e752f 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 0552e6f..bf289ff 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 f5a742b..af398d9 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/pci.h"
#include "i2c.h"
diff --git a/hw/vexpress.c b/hw/vexpress.c
index e89694c..5c9c08b 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 8241601..93ad89a 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 108ce07..dc7c6d6 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 2566ea1..d46fb98 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 7c17f7b..cdcb490 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 ec50c74..d0d510e 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 9323fd0..735f8e2 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(hwaddr base, qemu_irq irq, int kind_of_intr)
diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c
index c859fde..35979e6 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 13bd456..4de4a53 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 9ca22a4..67adc52 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 bc10d31..0399de7 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/include/net/tap.h b/include/net/tap.h
new file mode 100644
index 0000000..bb7efb5
--- /dev/null
+++ b/include/net/tap.h
@@ -0,0 +1,67 @@
+/*
+ * QEMU System Emulator
+ *
+ * Copyright (c) 2003-2008 Fabrice Bellard
+ * Copyright (c) 2009 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef QEMU_NET_TAP_H
+#define QEMU_NET_TAP_H
+
+#include "qemu-common.h"
+#include "qapi-types.h"
+
+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_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 bd63768..37b9d20 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 7b1600f..a4395be 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 f117412..5a11ac5 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 cf309cd..8430f1a 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 3eaedc4..3de7b3b 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 f9bd741..e37d8ee 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 5ff7893..f8cabc4 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 f5886ce..ae87878 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 571a49b..a7eeafc 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 15/32] qemu-ga: move qemu-ga files to qga/
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (13 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 14/32] net: reorganize headers Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 16/32] ui: move files to ui/ and include/ui/ Paolo Bonzini
` (18 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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 0c6ad1e..a0321dd 100644
--- a/Makefile
+++ b/Makefile
@@ -200,13 +200,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 :\
@@ -222,7 +222,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) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a
+qemu-ga$(EXESUF): $(qga-obj-y) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a
+ $(call LINK, $^)
clean:
# avoid old build problems by removing potentially incorrect old files
diff --git a/Makefile.objs b/Makefile.objs
index 83092dc..fe78836 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -222,7 +222,7 @@ universal-obj-y += $(qapi-obj-y)
######################################################################
# guest agent
-qga-obj-y = qga/ qemu-ga.o module.o qemu-tool.o
+qga-obj-y = qga/ module.o qemu-tool.o
qga-obj-$(CONFIG_POSIX) += qemu-sockets.o qemu-option.o
vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 16/32] ui: move files to ui/ and include/ui/
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (14 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 15/32] qemu-ga: move qemu-ga files to qga/ Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 17/32] qapi: move inclusions of qemu-common.h from headers to .c files Paolo Bonzini
` (17 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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 | 4 ++--
hw/bt-hid.c | 2 +-
hw/cirrus_vga.c | 2 +-
hw/escc.c | 2 +-
hw/exynos4210_fimd.c | 4 ++--
hw/framebuffer.c | 2 +-
hw/g364fb.c | 4 ++--
hw/hid.c | 2 +-
hw/hpet.c | 2 +-
hw/jazz_led.c | 4 ++--
hw/kvm/pci-assign.c | 2 +-
hw/lm832x.c | 2 +-
hw/milkymist-softusb.c | 2 +-
hw/milkymist-vgafb.c | 4 ++--
hw/msmouse.c | 6 +++---
hw/musicpal.c | 5 ++---
hw/nseries.c | 2 +-
hw/omap_dss.c | 2 +-
hw/omap_lcdc.c | 5 ++---
hw/omap_sx1.c | 2 +-
hw/palm.c | 2 +-
hw/pl110.c | 5 ++---
hw/ps2.c | 2 +-
hw/puv3.c | 2 +-
hw/pxa2xx_keypad.c | 2 +-
hw/pxa2xx_lcd.c | 4 ++--
hw/qxl.h | 2 +-
hw/sm501.c | 5 ++---
hw/spitz.c | 2 +-
hw/ssd0303.c | 2 +-
hw/ssd0323.c | 2 +-
hw/stellaris_input.c | 2 +-
hw/tc6393xb.c | 4 ++--
hw/tcx.c | 4 ++--
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 | 4 ++--
hw/vga-isa.c | 4 ++--
hw/vga-pci.c | 4 ++--
hw/vga.c | 4 ++--
hw/vmmouse.c | 2 +-
hw/vmware_vga.c | 2 +-
hw/xenfb.c | 2 +-
hw/z2.c | 2 +-
console.h => include/ui/console.h | 2 +-
{hw => include/ui}/pixel_ops.h | 0
qemu-pixman.h => include/ui/qemu-pixman.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 +-
qemu-pixman.c => ui/qemu-pixman.c | 2 +-
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 +-
80 files changed, 95 insertions(+), 101 deletions(-)
rename console.h => include/ui/console.h (99%)
rename {hw => include/ui}/pixel_ops.h (100%)
rename qemu-pixman.h => include/ui/qemu-pixman.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 qemu-pixman.c => ui/qemu-pixman.c (98%)
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 fe78836..a637a4a 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -68,8 +68,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 += qemu-pixman.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
@@ -78,7 +77,6 @@ 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
diff --git a/hmp.c b/hmp.c
index 9b31e9f..f235134 100644
--- a/hmp.c
+++ b/hmp.c
@@ -21,7 +21,7 @@
#include "qmp-commands.h"
#include "qemu_socket.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 3b547f0..cc8ad8e 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 1b57eb5..24bde32 100644
--- a/hw/blizzard.c
+++ b/hw/blizzard.c
@@ -19,10 +19,10 @@
*/
#include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
#include "devices.h"
#include "vga_int.h"
-#include "pixel_ops.h"
+#include "ui/pixel_ops.h"
typedef void (*blizzard_fn_t)(uint8_t *, const uint8_t *, unsigned int);
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 7d021f2..80510bc 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -28,7 +28,7 @@
*/
#include "hw.h"
#include "pci/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 a356613..38e8164 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 f2443ca..3ef0847 100644
--- a/hw/exynos4210_fimd.c
+++ b/hw/exynos4210_fimd.c
@@ -25,8 +25,8 @@
#include "qemu-common.h"
#include "cpu-all.h"
#include "sysbus.h"
-#include "console.h"
-#include "pixel_ops.h"
+#include "ui/console.h"
+#include "ui/pixel_ops.h"
#include "bswap.h"
/* Debug messages configuration */
diff --git a/hw/framebuffer.c b/hw/framebuffer.c
index fa0f786..2a87096 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 8192baf..b46a044 100644
--- a/hw/g364fb.c
+++ b/hw/g364fb.c
@@ -18,8 +18,8 @@
*/
#include "hw.h"
-#include "console.h"
-#include "pixel_ops.h"
+#include "ui/console.h"
+#include "ui/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 50ac067..49e1b63 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 09c7742..f4a0406 100644
--- a/hw/jazz_led.c
+++ b/hw/jazz_led.c
@@ -23,8 +23,8 @@
*/
#include "qemu-common.h"
-#include "console.h"
-#include "pixel_ops.h"
+#include "ui/console.h"
+#include "ui/pixel_ops.h"
#include "trace.h"
#include "sysbus.h"
diff --git a/hw/kvm/pci-assign.c b/hw/kvm/pci-assign.c
index 4229159..2629775 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 b162b88..0743668 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 833881c..c347131 100644
--- a/hw/milkymist-vgafb.c
+++ b/hw/milkymist-vgafb.c
@@ -25,9 +25,9 @@
#include "hw.h"
#include "sysbus.h"
#include "trace.h"
-#include "console.h"
+#include "ui/console.h"
#include "framebuffer.h"
-#include "pixel_ops.h"
+#include "ui/pixel_ops.h"
#include "qemu-error.h"
#define BITS 8
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 4e8399a..d16cd14 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -20,10 +20,11 @@
#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"
+#include "ui/pixel_ops.h"
#define MP_MISC_BASE 0x80002000
#define MP_MISC_SIZE 0x00001000
@@ -492,8 +493,6 @@ SET_LCD_PIXEL(8, uint8_t)
SET_LCD_PIXEL(16, uint16_t)
SET_LCD_PIXEL(32, uint32_t)
-#include "pixel_ops.h"
-
static void lcd_refresh(void *opaque)
{
musicpal_lcd_state *s = opaque;
diff --git a/hw/nseries.c b/hw/nseries.c
index 2de8d21..dcd3dc9 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 1e83726..ae51bdf 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 d7ae303..936850a 100644
--- a/hw/omap_lcdc.c
+++ b/hw/omap_lcdc.c
@@ -17,9 +17,10 @@
* 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"
+#include "ui/pixel_ops.h"
struct omap_lcd_panel_s {
MemoryRegion *sysmem;
@@ -66,8 +67,6 @@ static void omap_lcd_interrupts(struct omap_lcd_panel_s *s)
qemu_irq_lower(s->irq);
}
-#include "pixel_ops.h"
-
#define draw_line_func drawfn
#define DEPTH 8
diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index 21a5bbb..918a6f6 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 6f6f414..5aaeb07 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 f869ba6..098e335 100644
--- a/hw/pl110.c
+++ b/hw/pl110.c
@@ -8,8 +8,9 @@
*/
#include "sysbus.h"
-#include "console.h"
+#include "ui/console.h"
#include "framebuffer.h"
+#include "ui/pixel_ops.h"
#define PL110_CR_EN 0x001
#define PL110_CR_BGR 0x100
@@ -109,8 +110,6 @@ static const unsigned char *idregs[] = {
pl111_id
};
-#include "pixel_ops.h"
-
#define BITS 8
#include "pl110_template.h"
#define BITS 15
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 6f89c44..9f8e294 100644
--- a/hw/puv3.c
+++ b/hw/puv3.c
@@ -10,7 +10,7 @@
*/
#include "qemu-common.h"
-#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 257984c..4ff04ad 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 b53dfaf..b5efd4d 100644
--- a/hw/pxa2xx_lcd.c
+++ b/hw/pxa2xx_lcd.c
@@ -11,9 +11,9 @@
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "pxa.h"
-#include "pixel_ops.h"
+#include "ui/pixel_ops.h"
/* FIXME: For graphic_rotate. Should probably be done in common code. */
#include "sysemu.h"
#include "framebuffer.h"
diff --git a/hw/qxl.h b/hw/qxl.h
index 41246c7..8433d1a 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/pci.h"
#include "vga_int.h"
diff --git a/hw/sm501.c b/hw/sm501.c
index 50324cd..714aca0 100644
--- a/hw/sm501.c
+++ b/hw/sm501.c
@@ -25,11 +25,12 @@
#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"
#include "range.h"
+#include "ui/pixel_ops.h"
/*
* Status: 2010/05/07
@@ -1163,8 +1164,6 @@ static const MemoryRegionOps sm501_2d_engine_ops = {
/* draw line functions for all console modes */
-#include "pixel_ops.h"
-
typedef void draw_line_func(uint8_t *d, const uint8_t *s,
int width, const uint32_t *pal);
diff --git a/hw/spitz.c b/hw/spitz.c
index 12e2815..d4575d2 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 d7fd828..cbdf49a 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 4098830..fe6f801 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 f032027..edf7681 100644
--- a/hw/tc6393xb.c
+++ b/hw/tc6393xb.c
@@ -13,8 +13,8 @@
#include "hw.h"
#include "devices.h"
#include "flash.h"
-#include "console.h"
-#include "pixel_ops.h"
+#include "ui/console.h"
+#include "ui/pixel_ops.h"
#include "blockdev.h"
#define IRQ_TC6393_NAND 0
diff --git a/hw/tcx.c b/hw/tcx.c
index a66fbee..185588b 100644
--- a/hw/tcx.c
+++ b/hw/tcx.c
@@ -23,8 +23,8 @@
*/
#include "qemu-common.h"
-#include "console.h"
-#include "pixel_ops.h"
+#include "ui/console.h"
+#include "ui/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 8749128..6953f2e 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 50af971..de56fea 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 f7342b0..9ab368a 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 8ef4320..008703f 100644
--- a/hw/vga-isa-mm.c
+++ b/hw/vga-isa-mm.c
@@ -22,10 +22,10 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "pc.h"
#include "vga_int.h"
-#include "pixel_ops.h"
+#include "ui/pixel_ops.h"
#include "qemu-timer.h"
#define VGA_RAM_SIZE (8192 * 1024)
diff --git a/hw/vga-isa.c b/hw/vga-isa.c
index 046602b..d1d5b11 100644
--- a/hw/vga-isa.c
+++ b/hw/vga-isa.c
@@ -24,10 +24,10 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "pc.h"
#include "vga_int.h"
-#include "pixel_ops.h"
+#include "ui/pixel_ops.h"
#include "qemu-timer.h"
#include "loader.h"
diff --git a/hw/vga-pci.c b/hw/vga-pci.c
index 0cb318e..fe3a3d4 100644
--- a/hw/vga-pci.c
+++ b/hw/vga-pci.c
@@ -24,10 +24,10 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "pci/pci.h"
#include "vga_int.h"
-#include "pixel_ops.h"
+#include "ui/pixel_ops.h"
#include "qemu-timer.h"
#include "loader.h"
diff --git a/hw/vga.c b/hw/vga.c
index ab40d73..4007116 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -23,11 +23,11 @@
*/
#include "hw.h"
#include "vga.h"
-#include "console.h"
+#include "ui/console.h"
#include "pc.h"
#include "pci/pci.h"
#include "vga_int.h"
-#include "pixel_ops.h"
+#include "ui/pixel_ops.h"
#include "qemu-timer.h"
#include "xen.h"
#include "trace.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 333ec8c..b0e772f 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/pci.h"
#undef VERBOSE
diff --git a/hw/xenfb.c b/hw/xenfb.c
index 442a63a..b1122bd 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 99%
rename from console.h
rename to include/ui/console.h
index 33354e4..777881d 100644
--- a/console.h
+++ b/include/ui/console.h
@@ -1,7 +1,7 @@
#ifndef CONSOLE_H
#define CONSOLE_H
-#include "qemu-pixman.h"
+#include "ui/qemu-pixman.h"
#include "qdict.h"
#include "notify.h"
#include "monitor.h"
diff --git a/hw/pixel_ops.h b/include/ui/pixel_ops.h
similarity index 100%
rename from hw/pixel_ops.h
rename to include/ui/pixel_ops.h
diff --git a/qemu-pixman.h b/include/ui/qemu-pixman.h
similarity index 100%
rename from qemu-pixman.h
rename to include/ui/qemu-pixman.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 38b6ea9..928e0a1 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 "qemu-pixman.h"
+#include "ui/qemu-pixman.h"
#include "sysemu.h"
#define NUM_MEMSLOTS 8
diff --git a/monitor.c b/monitor.c
index 37b9d20..6546f8c 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 f066ad0..bc53d09 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 9b9585b..5a99403 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..dc8f0e4 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 qemu-pixman.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 87d2e44..0afa6f8 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 9ac7b28..60bfb72 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 5dc0b2c..5d15e9e 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -29,7 +29,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/qemu-pixman.c b/ui/qemu-pixman.c
similarity index 98%
rename from qemu-pixman.c
rename to ui/qemu-pixman.c
index e7263fb..609335a 100644
--- a/qemu-pixman.c
+++ b/ui/qemu-pixman.c
@@ -3,7 +3,7 @@
* See the COPYING file in the top-level directory.
*/
-#include "qemu-pixman.h"
+#include "ui/qemu-pixman.h"
int qemu_pixman_get_type(int rshift, int gshift, int bshift)
{
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 37f01b2..bcbf89d 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 261c6f2..ec925ec 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 6aff336..681fe32 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 6141e88..7ec1833 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 a7eeafc..6713220 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 17/32] qapi: move inclusions of qemu-common.h from headers to .c files
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (15 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 16/32] ui: move files to ui/ and include/ui/ Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 18/32] qapi: remove qapi/qapi-types-core.h Paolo Bonzini
` (16 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qapi/opts-visitor.c | 1 +
qapi/qapi-types-core.h | 1 -
qapi/qapi-visit-core.c | 1 +
scripts/qapi-commands.py | 1 +
scripts/qapi-visit.py | 1 +
5 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index e048b6c..e3fd254 100644
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -10,6 +10,7 @@
*
*/
+#include "qemu-common.h"
#include "opts-visitor.h"
#include "qemu-queue.h"
#include "qemu-option-internal.h"
diff --git a/qapi/qapi-types-core.h b/qapi/qapi-types-core.h
index f781fc3..831df21 100644
--- a/qapi/qapi-types-core.h
+++ b/qapi/qapi-types-core.h
@@ -14,7 +14,6 @@
#ifndef QAPI_TYPES_CORE_H
#define QAPI_TYPES_CORE_H
-#include "qemu-common.h"
#include "error.h"
#include "qerror.h"
diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
index 7a82b63..3002939 100644
--- a/qapi/qapi-visit-core.c
+++ b/qapi/qapi-visit-core.c
@@ -11,6 +11,7 @@
*
*/
+#include "qemu-common.h"
#include "qapi/qapi-visit-core.h"
#include "qapi/qapi-visit-impl.h"
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 3c4678d..2db0bf1 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -366,6 +366,7 @@ def gen_command_def_prologue(prefix="", proxy=False):
*
*/
+#include "qemu-common.h"
#include "qemu-objects.h"
#include "qapi/qmp-core.h"
#include "qapi/qapi-visit-core.h"
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index a360de7..f1aabb3 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -298,6 +298,7 @@ fdef.write(mcgen('''
*
*/
+#include "qemu-common.h"
#include "%(header)s"
''',
header=basename(h_file)))
--
1.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 18/32] qapi: remove qapi/qapi-types-core.h
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (16 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 17/32] qapi: move inclusions of qemu-common.h from headers to .c files Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 19/32] qapi: make struct Visitor opaque Paolo Bonzini
` (15 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
The file is only including error.h and qerror.h. Prefer explicit
inclusion of whatever files are needed.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qapi/opts-visitor.c | 1 +
qapi/qapi-dealloc-visitor.c | 1 +
qapi/qapi-types-core.h | 20 --------------------
qapi/qapi-visit-core.c | 1 +
qapi/qapi-visit-core.h | 2 +-
qapi/qapi-visit-impl.h | 2 +-
qemu-option-internal.h | 1 +
qom/object.c | 1 +
scripts/qapi-commands.py | 2 ++
target-i386/cpu.c | 1 +
10 files changed, 10 insertions(+), 22 deletions(-)
delete mode 100644 qapi/qapi-types-core.h
diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index e3fd254..6ccb8a1 100644
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -11,6 +11,7 @@
*/
#include "qemu-common.h"
+#include "qerror.h"
#include "opts-visitor.h"
#include "qemu-queue.h"
#include "qemu-option-internal.h"
diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c
index 75214e7..7c44042 100644
--- a/qapi/qapi-dealloc-visitor.c
+++ b/qapi/qapi-dealloc-visitor.c
@@ -15,6 +15,7 @@
#include "qemu-queue.h"
#include "qemu-common.h"
#include "qemu-objects.h"
+#include "qapi-visit-impl.h"
typedef struct StackEntry
{
diff --git a/qapi/qapi-types-core.h b/qapi/qapi-types-core.h
deleted file mode 100644
index 831df21..0000000
--- a/qapi/qapi-types-core.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Core Definitions for QAPI-generated Types
- *
- * Copyright IBM, Corp. 2011
- *
- * Authors:
- * Anthony Liguori <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#ifndef QAPI_TYPES_CORE_H
-#define QAPI_TYPES_CORE_H
-
-#include "error.h"
-#include "qerror.h"
-
-#endif
diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
index 3002939..4649fb7 100644
--- a/qapi/qapi-visit-core.c
+++ b/qapi/qapi-visit-core.c
@@ -12,6 +12,7 @@
*/
#include "qemu-common.h"
+#include "qerror.h"
#include "qapi/qapi-visit-core.h"
#include "qapi/qapi-visit-impl.h"
diff --git a/qapi/qapi-visit-core.h b/qapi/qapi-visit-core.h
index 60aceda..00ce678 100644
--- a/qapi/qapi-visit-core.h
+++ b/qapi/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 "error.h"
#include <stdlib.h>
typedef struct GenericList
diff --git a/qapi/qapi-visit-impl.h b/qapi/qapi-visit-impl.h
index 0f3a189..efd4271 100644
--- a/qapi/qapi-visit-impl.h
+++ b/qapi/qapi-visit-impl.h
@@ -12,7 +12,7 @@
#ifndef QAPI_VISITOR_IMPL_H
#define QAPI_VISITOR_IMPL_H
-#include "qapi/qapi-types-core.h"
+#include "error.h"
#include "qapi/qapi-visit-core.h"
void input_type_enum(Visitor *v, int *obj, const char *strings[],
diff --git a/qemu-option-internal.h b/qemu-option-internal.h
index 19fdc1c..77899b0 100644
--- a/qemu-option-internal.h
+++ b/qemu-option-internal.h
@@ -27,6 +27,7 @@
#define QEMU_OPTIONS_INTERNAL_H
#include "qemu-option.h"
+#include "qemu-error.h"
struct QemuOpt {
const char *name;
diff --git a/qom/object.c b/qom/object.c
index 0739aa2..8d3036d 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -15,6 +15,7 @@
#include "qapi/qapi-visit-core.h"
#include "qapi/string-input-visitor.h"
#include "qapi/string-output-visitor.h"
+#include "qerror.h"
/* TODO: replace QObject with a simpler visitor to avoid a dependency
* of the QOM core on QObject? */
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 2db0bf1..5d034c2 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -367,6 +367,8 @@ def gen_command_def_prologue(prefix="", proxy=False):
*/
#include "qemu-common.h"
+#include "module.h"
+#include "qerror.h"
#include "qemu-objects.h"
#include "qapi/qmp-core.h"
#include "qapi/qapi-visit-core.h"
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 7be3ad8..e968006 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -26,6 +26,7 @@
#include "qemu-option.h"
#include "qemu-config.h"
+#include "qerror.h"
#include "qapi/qapi-visit-core.h"
#include "arch_init.h"
--
1.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 19/32] qapi: make struct Visitor opaque
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (17 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 18/32] qapi: remove qapi/qapi-types-core.h Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 20/32] janitor: add guards to headers Paolo Bonzini
` (14 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
Move its definition from qapi-visit-core.h to qapi-visit-impl.h.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qapi/qapi-visit-core.h | 40 ----------------------------------------
qapi/qapi-visit-impl.h | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/qapi/qapi-visit-core.h b/qapi/qapi-visit-core.h
index 00ce678..602debe 100644
--- a/qapi/qapi-visit-core.h
+++ b/qapi/qapi-visit-core.h
@@ -24,46 +24,6 @@ typedef struct GenericList
typedef struct Visitor Visitor;
-struct Visitor
-{
- /* Must be set */
- void (*start_struct)(Visitor *v, void **obj, const char *kind,
- const char *name, size_t size, Error **errp);
- void (*end_struct)(Visitor *v, Error **errp);
-
- void (*start_list)(Visitor *v, const char *name, Error **errp);
- GenericList *(*next_list)(Visitor *v, GenericList **list, Error **errp);
- void (*end_list)(Visitor *v, Error **errp);
-
- void (*type_enum)(Visitor *v, int *obj, const char *strings[],
- const char *kind, const char *name, Error **errp);
-
- void (*type_int)(Visitor *v, int64_t *obj, const char *name, Error **errp);
- void (*type_bool)(Visitor *v, bool *obj, const char *name, Error **errp);
- void (*type_str)(Visitor *v, char **obj, const char *name, Error **errp);
- void (*type_number)(Visitor *v, double *obj, const char *name,
- Error **errp);
-
- /* May be NULL */
- void (*start_optional)(Visitor *v, bool *present, const char *name,
- Error **errp);
- void (*end_optional)(Visitor *v, Error **errp);
-
- void (*start_handle)(Visitor *v, void **obj, const char *kind,
- const char *name, Error **errp);
- void (*end_handle)(Visitor *v, Error **errp);
- void (*type_uint8)(Visitor *v, uint8_t *obj, const char *name, Error **errp);
- void (*type_uint16)(Visitor *v, uint16_t *obj, const char *name, Error **errp);
- void (*type_uint32)(Visitor *v, uint32_t *obj, const char *name, Error **errp);
- void (*type_uint64)(Visitor *v, uint64_t *obj, const char *name, Error **errp);
- void (*type_int8)(Visitor *v, int8_t *obj, const char *name, Error **errp);
- void (*type_int16)(Visitor *v, int16_t *obj, const char *name, Error **errp);
- void (*type_int32)(Visitor *v, int32_t *obj, const char *name, Error **errp);
- void (*type_int64)(Visitor *v, int64_t *obj, const char *name, Error **errp);
- /* visit_type_size() falls back to (*type_uint64)() if type_size is unset */
- void (*type_size)(Visitor *v, uint64_t *obj, const char *name, Error **errp);
-};
-
void visit_start_handle(Visitor *v, void **obj, const char *kind,
const char *name, Error **errp);
void visit_end_handle(Visitor *v, Error **errp);
diff --git a/qapi/qapi-visit-impl.h b/qapi/qapi-visit-impl.h
index efd4271..9337d62 100644
--- a/qapi/qapi-visit-impl.h
+++ b/qapi/qapi-visit-impl.h
@@ -15,6 +15,46 @@
#include "error.h"
#include "qapi/qapi-visit-core.h"
+struct Visitor
+{
+ /* Must be set */
+ void (*start_struct)(Visitor *v, void **obj, const char *kind,
+ const char *name, size_t size, Error **errp);
+ void (*end_struct)(Visitor *v, Error **errp);
+
+ void (*start_list)(Visitor *v, const char *name, Error **errp);
+ GenericList *(*next_list)(Visitor *v, GenericList **list, Error **errp);
+ void (*end_list)(Visitor *v, Error **errp);
+
+ void (*type_enum)(Visitor *v, int *obj, const char *strings[],
+ const char *kind, const char *name, Error **errp);
+
+ void (*type_int)(Visitor *v, int64_t *obj, const char *name, Error **errp);
+ void (*type_bool)(Visitor *v, bool *obj, const char *name, Error **errp);
+ void (*type_str)(Visitor *v, char **obj, const char *name, Error **errp);
+ void (*type_number)(Visitor *v, double *obj, const char *name,
+ Error **errp);
+
+ /* May be NULL */
+ void (*start_optional)(Visitor *v, bool *present, const char *name,
+ Error **errp);
+ void (*end_optional)(Visitor *v, Error **errp);
+
+ void (*start_handle)(Visitor *v, void **obj, const char *kind,
+ const char *name, Error **errp);
+ void (*end_handle)(Visitor *v, Error **errp);
+ void (*type_uint8)(Visitor *v, uint8_t *obj, const char *name, Error **errp);
+ void (*type_uint16)(Visitor *v, uint16_t *obj, const char *name, Error **errp);
+ void (*type_uint32)(Visitor *v, uint32_t *obj, const char *name, Error **errp);
+ void (*type_uint64)(Visitor *v, uint64_t *obj, const char *name, Error **errp);
+ void (*type_int8)(Visitor *v, int8_t *obj, const char *name, Error **errp);
+ void (*type_int16)(Visitor *v, int16_t *obj, const char *name, Error **errp);
+ void (*type_int32)(Visitor *v, int32_t *obj, const char *name, Error **errp);
+ void (*type_int64)(Visitor *v, int64_t *obj, const char *name, Error **errp);
+ /* visit_type_size() falls back to (*type_uint64)() if type_size is unset */
+ void (*type_size)(Visitor *v, uint64_t *obj, const char *name, Error **errp);
+};
+
void input_type_enum(Visitor *v, int *obj, const char *strings[],
const char *kind, const char *name, Error **errp);
void output_type_enum(Visitor *v, int *obj, const char *strings[],
--
1.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 20/32] janitor: add guards to headers
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (18 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 19/32] qapi: make struct Visitor opaque Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 21/32] qapi: move include files to include/qobject/ Paolo Bonzini
` (13 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
gen-icount.h | 5 +++++
host-utils.h | 4 ++++
hw/9pfs/virtio-9p-synth.h | 4 ++++
hw/audiodev.h | 5 +++++
hw/baum.h | 4 ++++
hw/bt.h | 5 +++++
hw/cris-boot.h | 4 ++++
hw/empty_slot.h | 5 +++++
hw/escc.h | 5 +++++
hw/etraxfs.h | 5 +++++
hw/etraxfs_dma.h | 5 +++++
hw/flash.h | 5 +++++
hw/lm32.h | 5 +++++
hw/mac_dbdma.h | 4 ++++
hw/msmouse.h | 5 +++++
hw/ne2000.h | 5 +++++
hw/pci/pci_ids.h | 4 ++++
hw/pcmcia.h | 5 +++++
hw/pcnet.h | 5 +++++
hw/ppc.h | 5 +++++
hw/qdev-addr.h | 5 +++++
hw/qxl.h | 5 +++++
hw/s390-virtio-bus.h | 4 ++++
hw/scsi-defs.h | 4 ++++
hw/serial.h | 4 ++++
hw/soc_dma.h | 6 ++++++
hw/usb/hcd-ehci.h | 4 ++++
hw/vga_int.h | 4 ++++
hw/xilinx.h | 6 ++++++
iov.h | 5 +++++
linux-user/cris/syscall.h | 5 +++++
linux-user/microblaze/syscall.h | 6 ++++++
linux-user/syscall_defs.h | 6 ++++++
slirp/bootp.h | 4 ++++
slirp/main.h | 4 ++++
slirp/tftp.h | 4 ++++
softmmu-semi.h | 4 ++++
target-cris/crisv32-decode.h | 4 ++++
tcg/arm/tcg-target.h | 3 +++
tcg/hppa/tcg-target.h | 3 +++
tcg/i386/tcg-target.h | 3 +++
tcg/ia64/tcg-target.h | 3 +++
tcg/mips/tcg-target.h | 3 +++
tcg/ppc/tcg-target.h | 3 +++
tcg/ppc64/tcg-target.h | 3 +++
tcg/s390/tcg-target.h | 3 +++
tcg/sparc/tcg-target.h | 3 +++
tests/tcg/cris/crisutils.h | 5 +++++
ui/curses_keys.h | 5 +++++
ui/d3des.h | 4 ++++
50 files changed, 219 insertions(+)
diff --git a/gen-icount.h b/gen-icount.h
index 248cf5b..1541f0b 100644
--- a/gen-icount.h
+++ b/gen-icount.h
@@ -1,3 +1,6 @@
+#ifndef GEN_ICOUNT_H
+#define GEN_ICOUNT_H 1
+
#include "qemu-timer.h"
/* Helpers for instruction counting code generation. */
@@ -46,3 +49,5 @@ static inline void gen_io_end(void)
tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUArchState, can_do_io));
tcg_temp_free_i32(tmp);
}
+
+#endif
diff --git a/host-utils.h b/host-utils.h
index 821db93..a5f8464 100644
--- a/host-utils.h
+++ b/host-utils.h
@@ -22,6 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#ifndef HOST_UTILS_H
+#define HOST_UTILS_H 1
#include "compiler.h" /* QEMU_GNUC_PREREQ */
@@ -234,3 +236,5 @@ static inline int ctpop64(uint64_t val)
return val;
#endif
}
+
+#endif
diff --git a/hw/9pfs/virtio-9p-synth.h b/hw/9pfs/virtio-9p-synth.h
index e03f434..ab05a8e 100644
--- a/hw/9pfs/virtio-9p-synth.h
+++ b/hw/9pfs/virtio-9p-synth.h
@@ -10,6 +10,8 @@
* the COPYING file in the top-level directory.
*
*/
+#ifndef HW_9PFS_VIRTIO9P_SYNTH_H
+#define HW_9PFS_VIRTIO9P_SYNTH_H 1
#include <unistd.h>
#include <sys/types.h>
@@ -48,3 +50,5 @@ extern int qemu_v9fs_synth_mkdir(V9fsSynthNode *parent, int mode,
extern int qemu_v9fs_synth_add_file(V9fsSynthNode *parent, int mode,
const char *name, v9fs_synth_read read,
v9fs_synth_write write, void *arg);
+
+#endif
diff --git a/hw/audiodev.h b/hw/audiodev.h
index ed2790f..428274f 100644
--- a/hw/audiodev.h
+++ b/hw/audiodev.h
@@ -1,3 +1,6 @@
+#ifndef HW_AUDIODEV_H
+#define HW_AUDIODEV_H 1
+
/* es1370.c */
int es1370_init(PCIBus *bus);
@@ -18,3 +21,5 @@ int cs4231a_init(ISABus *bus);
/* intel-hda.c + hda-audio.c */
int intel_hda_and_codec_init(PCIBus *bus);
+
+#endif
diff --git a/hw/baum.h b/hw/baum.h
index 8af710f..7635884 100644
--- a/hw/baum.h
+++ b/hw/baum.h
@@ -21,6 +21,10 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#ifndef HW_BAUM_H
+#define HW_BAUM_H 1
/* char device */
CharDriverState *chr_baum_init(QemuOpts *opts);
+
+#endif
diff --git a/hw/bt.h b/hw/bt.h
index ebf6a37..830af94 100644
--- a/hw/bt.h
+++ b/hw/bt.h
@@ -23,6 +23,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef HW_BT_H
+#define HW_BT_H 1
+
#include "hw/irq.h"
/* BD Address */
@@ -2183,3 +2186,5 @@ enum bt_sdp_attribute_id {
SDP_ATTR_NORMALLY_CONNECTABLE = 0x020d,
SDP_ATTR_BOOT_DEVICE = 0x020e,
};
+
+#endif
diff --git a/hw/cris-boot.h b/hw/cris-boot.h
index 5b17d83..c4d3fa6 100644
--- a/hw/cris-boot.h
+++ b/hw/cris-boot.h
@@ -1,3 +1,5 @@
+#ifndef _CRIS_BOOT_H
+#define HW_CRIS_BOOT_H 1
struct cris_load_info
{
@@ -9,3 +11,5 @@ struct cris_load_info
};
void cris_load_image(CRISCPU *cpu, struct cris_load_info *li);
+
+#endif
diff --git a/hw/empty_slot.h b/hw/empty_slot.h
index 4e9e460..6079602 100644
--- a/hw/empty_slot.h
+++ b/hw/empty_slot.h
@@ -1,2 +1,7 @@
+#ifndef HW_EMPTY_SLOT_H
+#define HW_EMPTY_SLOT_H 1
+
/* empty_slot.c */
void empty_slot_init(hwaddr addr, uint64_t slot_size);
+
+#endif
diff --git a/hw/escc.h b/hw/escc.h
index def2894..bda3213 100644
--- a/hw/escc.h
+++ b/hw/escc.h
@@ -1,3 +1,6 @@
+#ifndef HW_ESCC_H
+#define HW_ESCC_H 1
+
/* escc.c */
#define ESCC_SIZE 4
MemoryRegion *escc_init(hwaddr base, qemu_irq irqA, qemu_irq irqB,
@@ -6,3 +9,5 @@ MemoryRegion *escc_init(hwaddr base, qemu_irq irqA, qemu_irq irqB,
void slavio_serial_ms_kbd_init(hwaddr base, qemu_irq irq,
int disabled, int clock, int it_shift);
+
+#endif
diff --git a/hw/etraxfs.h b/hw/etraxfs.h
index bc60713..cc1d7a1 100644
--- a/hw/etraxfs.h
+++ b/hw/etraxfs.h
@@ -22,6 +22,9 @@
* THE SOFTWARE.
*/
+#ifndef HW_EXTRAXFS_H
+#define HW_EXTRAXFS_H 1
+
#include "net/net.h"
#include "etraxfs_dma.h"
@@ -44,3 +47,5 @@ etraxfs_eth_init(NICInfo *nd, hwaddr base, int phyaddr,
sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
return dev;
}
+
+#endif
diff --git a/hw/etraxfs_dma.h b/hw/etraxfs_dma.h
index 3fef80f..38104a6 100644
--- a/hw/etraxfs_dma.h
+++ b/hw/etraxfs_dma.h
@@ -1,3 +1,6 @@
+#ifndef HW_ETRAXFS_DMA_H
+#define HW_ETRAXFS_DMA_H 1
+
struct dma_context_metadata {
/* data descriptor md */
uint16_t metadata;
@@ -27,3 +30,5 @@ void etraxfs_dmac_connect_client(void *opaque, int c,
struct etraxfs_dma_client *cl);
int etraxfs_dmac_input(struct etraxfs_dma_client *client,
void *buf, int len, int eop);
+
+#endif
diff --git a/hw/flash.h b/hw/flash.h
index d790f3c..bda2158 100644
--- a/hw/flash.h
+++ b/hw/flash.h
@@ -1,3 +1,6 @@
+#ifndef HW_FLASH_H
+#define HW_FLASH_H 1
+
/* NOR flash devices */
#include "memory.h"
@@ -57,3 +60,5 @@ typedef struct {
uint8_t ecc_digest(ECCState *s, uint8_t sample);
void ecc_reset(ECCState *s);
extern VMStateDescription vmstate_ecc_state;
+
+#endif
diff --git a/hw/lm32.h b/hw/lm32.h
index 0a67632..4194c9a 100644
--- a/hw/lm32.h
+++ b/hw/lm32.h
@@ -1,3 +1,6 @@
+#ifndef HW_LM32_H
+#define HW_LM32_H 1
+
#include "qemu-common.h"
@@ -23,3 +26,5 @@ static inline DeviceState *lm32_juart_init(void)
return dev;
}
+
+#endif
diff --git a/hw/mac_dbdma.h b/hw/mac_dbdma.h
index bfdb0dd..e596837 100644
--- a/hw/mac_dbdma.h
+++ b/hw/mac_dbdma.h
@@ -19,6 +19,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#ifndef HW_MAC_DBDMA_H
+#define HW_MAC_DBDMA_H 1
#include "memory.h"
@@ -42,3 +44,5 @@ void DBDMA_register_channel(void *dbdma, int nchan, qemu_irq irq,
DBDMA_rw rw, DBDMA_flush flush,
void *opaque);
void* DBDMA_init (MemoryRegion **dbdma_mem);
+
+#endif
diff --git a/hw/msmouse.h b/hw/msmouse.h
index 456cb21..8cff3a7 100644
--- a/hw/msmouse.h
+++ b/hw/msmouse.h
@@ -1,2 +1,7 @@
+#ifndef HW_MSMOUSE_H
+#define HW_MSMOUSE_H 1
+
/* msmouse.c */
CharDriverState *qemu_chr_open_msmouse(QemuOpts *opts);
+
+#endif
diff --git a/hw/ne2000.h b/hw/ne2000.h
index 1e7ab07..b31ae03 100644
--- a/hw/ne2000.h
+++ b/hw/ne2000.h
@@ -1,3 +1,6 @@
+#ifndef HW_NE2000_H
+#define HW_NE2000_H 1
+
#define NE2000_PMEM_SIZE (32*1024)
#define NE2000_PMEM_START (16*1024)
#define NE2000_PMEM_END (NE2000_PMEM_SIZE+NE2000_PMEM_START)
@@ -33,3 +36,5 @@ extern const VMStateDescription vmstate_ne2000;
void ne2000_reset(NE2000State *s);
int ne2000_can_receive(NetClientState *nc);
ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_);
+
+#endif
diff --git a/hw/pci/pci_ids.h b/hw/pci/pci_ids.h
index 5df7245..271d935 100644
--- a/hw/pci/pci_ids.h
+++ b/hw/pci/pci_ids.h
@@ -7,6 +7,8 @@
*
* QEMU-specific definitions belong in pci.h
*/
+#ifndef HW_PCI_IDS_H
+#define HW_PCI_IDS_H 1
/* Device classes and subclasses */
@@ -145,3 +147,5 @@
#define PCI_VENDOR_ID_NEC 0x1033
#define PCI_DEVICE_ID_NEC_UPD720200 0x0194
+
+#endif
diff --git a/hw/pcmcia.h b/hw/pcmcia.h
index 50648c9..aac1d77 100644
--- a/hw/pcmcia.h
+++ b/hw/pcmcia.h
@@ -1,3 +1,6 @@
+#ifndef HW_PCMCIA_H
+#define HW_PCMCIA_H 1
+
/* PCMCIA/Cardbus */
#include "qemu-common.h"
@@ -49,3 +52,5 @@ struct PCMCIACardState {
/* dscm1xxxx.c */
PCMCIACardState *dscm1xxxx_init(DriveInfo *bdrv);
+
+#endif
diff --git a/hw/pcnet.h b/hw/pcnet.h
index da8c3bd..9664311 100644
--- a/hw/pcnet.h
+++ b/hw/pcnet.h
@@ -1,3 +1,6 @@
+#ifndef HW_PCNET_H
+#define HW_PCNET_H 1
+
#define PCNET_IOPORT_SIZE 0x20
#define PCNET_PNPMMIO_SIZE 0x20
@@ -63,3 +66,5 @@ void pcnet_set_link_status(NetClientState *nc);
void pcnet_common_cleanup(PCNetState *d);
int pcnet_common_init(DeviceState *dev, PCNetState *s, NetClientInfo *info);
extern const VMStateDescription vmstate_pcnet;
+
+#endif
diff --git a/hw/ppc.h b/hw/ppc.h
index 2f3ea27..17005c7 100644
--- a/hw/ppc.h
+++ b/hw/ppc.h
@@ -1,3 +1,6 @@
+#ifndef HW_PPC_H
+#define HW_PPC_H 1
+
void ppc_set_irq (CPUPPCState *env, int n_IRQ, int level);
/* PowerPC hardware exceptions management helpers */
@@ -90,3 +93,5 @@ enum {
/* ppc_booke.c */
void ppc_booke_timers_init(CPUPPCState *env, uint32_t freq, uint32_t flags);
+
+#endif
diff --git a/hw/qdev-addr.h b/hw/qdev-addr.h
index ea5ecb4..79708e6 100644
--- a/hw/qdev-addr.h
+++ b/hw/qdev-addr.h
@@ -1,5 +1,10 @@
+#ifndef HW_QDEV_ADDR_H
+#define HW_QDEV_ADDR_H 1
+
#define DEFINE_PROP_TADDR(_n, _s, _f, _d) \
DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_taddr, hwaddr)
extern PropertyInfo qdev_prop_taddr;
void qdev_prop_set_taddr(DeviceState *dev, const char *name, hwaddr value);
+
+#endif
diff --git a/hw/qxl.h b/hw/qxl.h
index 8433d1a..9130261 100644
--- a/hw/qxl.h
+++ b/hw/qxl.h
@@ -1,3 +1,6 @@
+#ifndef HW_QXL_H
+#define HW_QXL_H 1
+
#include "qemu-common.h"
#include "ui/console.h"
@@ -158,3 +161,5 @@ void qxl_render_update(PCIQXLDevice *qxl);
int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext);
void qxl_render_update_area_done(PCIQXLDevice *qxl, QXLCookie *cookie);
void qxl_render_update_area_bh(void *opaque);
+
+#endif
diff --git a/hw/s390-virtio-bus.h b/hw/s390-virtio-bus.h
index a83afe7..23fedd5 100644
--- a/hw/s390-virtio-bus.h
+++ b/hw/s390-virtio-bus.h
@@ -16,6 +16,8 @@
* 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/>.
*/
+#ifndef HW_S390_VIRTIO_BUS_H
+#define HW_S390_VIRTIO_BUS_H 1
#include "virtio-blk.h"
#include "virtio-net.h"
@@ -100,3 +102,5 @@ VirtIOS390Device *s390_virtio_bus_find_mem(VirtIOS390Bus *bus, ram_addr_t mem);
void s390_virtio_device_sync(VirtIOS390Device *dev);
void s390_virtio_reset_idx(VirtIOS390Device *dev);
+
+#endif
diff --git a/hw/scsi-defs.h b/hw/scsi-defs.h
index d7a4019..9ab045b 100644
--- a/hw/scsi-defs.h
+++ b/hw/scsi-defs.h
@@ -19,6 +19,8 @@
* This header file contains public constants and structures used by
* the scsi code for linux.
*/
+#ifndef HW_SCSI_DEFS_H
+#define HW_SCSI_DEFS_H 1
/*
* SCSI opcodes
@@ -301,3 +303,5 @@
#define MMC_PROFILE_HDDVD_R_DL 0x0058
#define MMC_PROFILE_HDDVD_RW_DL 0x005A
#define MMC_PROFILE_INVALID 0xFFFF
+
+#endif
diff --git a/hw/serial.h b/hw/serial.h
index ed1a5cd..2d7d614 100644
--- a/hw/serial.h
+++ b/hw/serial.h
@@ -22,6 +22,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#ifndef HW_SERIAL_H
+#define HW_SERIAL_H 1
#include "hw.h"
#include "sysemu.h"
@@ -97,3 +99,5 @@ SerialState *serial_mm_init(MemoryRegion *address_space,
/* serial-isa.c */
bool serial_isa_init(ISABus *bus, int index, CharDriverState *chr);
+
+#endif
diff --git a/hw/soc_dma.h b/hw/soc_dma.h
index 5948489..6ca4166 100644
--- a/hw/soc_dma.h
+++ b/hw/soc_dma.h
@@ -18,6 +18,10 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef HW_SOC_DMA_H
+#define HW_SOC_DMA_H 1
+
+
#include "memory.h"
#include "hw/irq.h"
@@ -108,3 +112,5 @@ static inline void soc_dma_port_add_fifo_out(struct soc_dma_s *dma,
{
return soc_dma_port_add_fifo(dma, virt_base, fn, opaque, 1);
}
+
+#endif
diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h
index 772870b..837c63b 100644
--- a/hw/usb/hcd-ehci.h
+++ b/hw/usb/hcd-ehci.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef HW_USB_EHCI_H
+#define HW_USB_EHCI_H 1
#include "hw/hw.h"
#include "qemu-timer.h"
@@ -318,3 +320,5 @@ struct EHCIState {
extern const VMStateDescription vmstate_ehci;
void usb_ehci_initfn(EHCIState *s, DeviceState *dev);
+
+#endif
diff --git a/hw/vga_int.h b/hw/vga_int.h
index bcb738d..ad02404 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -21,6 +21,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#ifndef HW_VGA_INT_H
+#define HW_VGA_INT_H 1
#include <hw/hw.h>
#include "error.h"
@@ -212,3 +214,5 @@ extern const uint8_t gr_mask[16];
#define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin"
extern const MemoryRegionOps vga_mem_ops;
+
+#endif
diff --git a/hw/xilinx.h b/hw/xilinx.h
index 735f8e2..a12eccb 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -1,3 +1,7 @@
+#ifndef HW_XILINX_H
+#define HW_XILINX_H 1
+
+
#include "stream.h"
#include "qemu-common.h"
#include "net/net.h"
@@ -90,3 +94,5 @@ xilinx_axiethernetdma_init(DeviceState *dev, StreamSlave *peer,
sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq);
sysbus_connect_irq(sysbus_from_qdev(dev), 1, irq2);
}
+
+#endif
diff --git a/iov.h b/iov.h
index 34c8ec9..d06f8b9 100644
--- a/iov.h
+++ b/iov.h
@@ -11,6 +11,9 @@
* the COPYING file in the top-level directory.
*/
+#ifndef IOV_H
+#define IOV_H
+
#include "qemu-common.h"
/**
@@ -95,3 +98,5 @@ void iov_hexdump(const struct iovec *iov, const unsigned int iov_cnt,
unsigned iov_copy(struct iovec *dst_iov, unsigned int dst_iov_cnt,
const struct iovec *iov, unsigned int iov_cnt,
size_t offset, size_t bytes);
+
+#endif
diff --git a/linux-user/cris/syscall.h b/linux-user/cris/syscall.h
index 24f92ba..50e50b4 100644
--- a/linux-user/cris/syscall.h
+++ b/linux-user/cris/syscall.h
@@ -1,3 +1,6 @@
+#ifndef CRIS_SYSCALL_H
+#define CRIS_SYSCALL_H 1
+
#define UNAME_MACHINE "cris"
@@ -34,3 +37,5 @@ struct target_pt_regs {
unsigned long exs;
unsigned long eda;
};
+
+#endif
diff --git a/linux-user/microblaze/syscall.h b/linux-user/microblaze/syscall.h
index db1f98a..c3e5c55 100644
--- a/linux-user/microblaze/syscall.h
+++ b/linux-user/microblaze/syscall.h
@@ -1,3 +1,7 @@
+#ifndef MICROBLAZE_SYSCALLS_H
+#define MICROBLAZE_SYSCALLS_H 1
+
+
#define UNAME_MACHINE "microblaze"
/* We use microblaze_reg_t to keep things similar to the kernel sources. */
@@ -43,3 +47,5 @@ struct target_pt_regs {
microblaze_reg_t fsr;
uint32_t kernel_mode;
};
+
+#endif
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index a98cbf7..d4589e7 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -4,6 +4,10 @@
most of them stay the same, so we handle it by putting ifdefs if
necessary */
+#ifndef SYSCALL_DEFS_H
+#define SYSCALL_DEFS_H 1
+
+
#include "syscall_nr.h"
#define SOCKOP_socket 1
@@ -2425,3 +2429,5 @@ struct target_ucred {
uint32_t uid;
uint32_t gid;
};
+
+#endif
diff --git a/slirp/bootp.h b/slirp/bootp.h
index 30c30ab..ec3b687 100644
--- a/slirp/bootp.h
+++ b/slirp/bootp.h
@@ -1,4 +1,6 @@
/* bootp/dhcp defines */
+#ifndef SLIRP_BOOTP_H
+#define SLIRP_BOOTP_H 1
#define BOOTP_SERVER 67
#define BOOTP_CLIENT 68
@@ -120,3 +122,5 @@ typedef struct {
#define NB_BOOTP_CLIENTS 16
void bootp_input(struct mbuf *m);
+
+#endif
diff --git a/slirp/main.h b/slirp/main.h
index 1f3b84d..66e4f92 100644
--- a/slirp/main.h
+++ b/slirp/main.h
@@ -4,6 +4,8 @@
* Please read the file COPYRIGHT for the
* terms and conditions of the copyright.
*/
+#ifndef SLIRP_MAIN_H
+#define SLIRP_MAIN_H 1
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
@@ -45,3 +47,5 @@ extern int tcp_keepintvl;
int if_encap(Slirp *slirp, struct mbuf *ifm);
ssize_t slirp_send(struct socket *so, const void *buf, size_t len, int flags);
+
+#endif
diff --git a/slirp/tftp.h b/slirp/tftp.h
index 51704e4..87adeb5 100644
--- a/slirp/tftp.h
+++ b/slirp/tftp.h
@@ -1,4 +1,6 @@
/* tftp defines */
+#ifndef SLIRP_TFTP_H
+#define SLIRP_TFTP_H 1
#define TFTP_SESSIONS_MAX 3
@@ -43,3 +45,5 @@ struct tftp_session {
};
void tftp_input(struct mbuf *m);
+
+#endif
diff --git a/softmmu-semi.h b/softmmu-semi.h
index bcb979a..93798b9 100644
--- a/softmmu-semi.h
+++ b/softmmu-semi.h
@@ -6,6 +6,8 @@
*
* This code is licensed under the GPL
*/
+#ifndef SOFTMMU_SEMI_H
+#define SOFTMMU_SEMI_H 1
static inline uint32_t softmmu_tget32(CPUArchState *env, uint32_t addr)
{
@@ -71,3 +73,5 @@ static void softmmu_unlock_user(CPUArchState *env, void *p, target_ulong addr,
free(p);
}
#define unlock_user(s, args, len) softmmu_unlock_user(env, s, args, len)
+
+#endif
diff --git a/target-cris/crisv32-decode.h b/target-cris/crisv32-decode.h
index ed141de..cdba377 100644
--- a/target-cris/crisv32-decode.h
+++ b/target-cris/crisv32-decode.h
@@ -17,6 +17,8 @@
* 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/>.
*/
+#ifndef CRISV32_DECODE_H
+#define CRISV32_DECODE_H 1
/* Convenient binary macros. */
#define HEX__(n) 0x##n##LU
@@ -126,3 +128,5 @@
#define DEC_FTAG_FIDX_D_M {B8(10101011), B8(11111111)}
#define DEC_FTAG_FIDX_I_M {B8(11010011), B8(11111111)}
+
+#endif
diff --git a/tcg/arm/tcg-target.h b/tcg/arm/tcg-target.h
index 98fa11b..7083f3a 100644
--- a/tcg/arm/tcg-target.h
+++ b/tcg/arm/tcg-target.h
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#ifndef TCG_TARGET_ARM
#define TCG_TARGET_ARM 1
#undef TCG_TARGET_WORDS_BIGENDIAN
@@ -91,3 +92,5 @@ static inline void flush_icache_range(tcg_target_ulong start,
__asm __volatile__ ("swi 0x9f0002" : : "r" (_beg), "r" (_end), "r" (_flg));
#endif
}
+
+#endif
diff --git a/tcg/hppa/tcg-target.h b/tcg/hppa/tcg-target.h
index f43fb41..e2754fe 100644
--- a/tcg/hppa/tcg-target.h
+++ b/tcg/hppa/tcg-target.h
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#ifndef TCG_TARGET_HPPA
#define TCG_TARGET_HPPA 1
#if TCG_TARGET_REG_BITS != 32
@@ -119,3 +120,5 @@ static inline void flush_icache_range(tcg_target_ulong start,
start += 32;
}
}
+
+#endif
diff --git a/tcg/i386/tcg-target.h b/tcg/i386/tcg-target.h
index dbc6756..5352ac0 100644
--- a/tcg/i386/tcg-target.h
+++ b/tcg/i386/tcg-target.h
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#ifndef TCG_TARGET_I386
#define TCG_TARGET_I386 1
//#define TCG_TARGET_WORDS_BIGENDIAN
@@ -135,3 +136,5 @@ static inline void flush_icache_range(tcg_target_ulong start,
tcg_target_ulong stop)
{
}
+
+#endif
diff --git a/tcg/ia64/tcg-target.h b/tcg/ia64/tcg-target.h
index 91fe7a3..7f3401e 100644
--- a/tcg/ia64/tcg-target.h
+++ b/tcg/ia64/tcg-target.h
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#ifndef TCG_TARGET_IA64
#define TCG_TARGET_IA64 1
/* We only map the first 64 registers */
@@ -158,3 +159,5 @@ static inline void flush_icache_range(tcg_target_ulong start,
}
asm volatile (";;sync.i;;srlz.i;;");
}
+
+#endif
diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h
index 65b5c59..78af664 100644
--- a/tcg/mips/tcg-target.h
+++ b/tcg/mips/tcg-target.h
@@ -23,6 +23,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#ifndef TCG_TARGET_MIPS
#define TCG_TARGET_MIPS 1
#ifdef __MIPSEB__
@@ -127,3 +128,5 @@ static inline void flush_icache_range(tcg_target_ulong start,
{
cacheflush ((void *)start, stop-start, ICACHE);
}
+
+#endif
diff --git a/tcg/ppc/tcg-target.h b/tcg/ppc/tcg-target.h
index ad433ae..ea26769 100644
--- a/tcg/ppc/tcg-target.h
+++ b/tcg/ppc/tcg-target.h
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#ifndef TCG_TARGET_PPC
#define TCG_TARGET_PPC 1
#define TCG_TARGET_WORDS_BIGENDIAN
@@ -99,3 +100,5 @@ typedef enum {
#define tcg_qemu_tb_exec(env, tb_ptr) \
((long __attribute__ ((longcall)) \
(*)(void *, void *))code_gen_prologue)(env, tb_ptr)
+
+#endif
diff --git a/tcg/ppc64/tcg-target.h b/tcg/ppc64/tcg-target.h
index 97fc5c9..9b8e9a0 100644
--- a/tcg/ppc64/tcg-target.h
+++ b/tcg/ppc64/tcg-target.h
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#ifndef TCG_TARGET_PPC64
#define TCG_TARGET_PPC64 1
#define TCG_TARGET_WORDS_BIGENDIAN
@@ -109,3 +110,5 @@ typedef enum {
#define TCG_AREG0 TCG_REG_R27
#define TCG_TARGET_EXTEND_ARGS 1
+
+#endif
diff --git a/tcg/s390/tcg-target.h b/tcg/s390/tcg-target.h
index a0181ae..c87b413 100644
--- a/tcg/s390/tcg-target.h
+++ b/tcg/s390/tcg-target.h
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#ifndef TCG_TARGET_S390
#define TCG_TARGET_S390 1
#define TCG_TARGET_WORDS_BIGENDIAN
@@ -103,3 +104,5 @@ static inline void flush_icache_range(tcg_target_ulong start,
tcg_target_ulong stop)
{
}
+
+#endif
diff --git a/tcg/sparc/tcg-target.h b/tcg/sparc/tcg-target.h
index 0e7d398..256f973 100644
--- a/tcg/sparc/tcg-target.h
+++ b/tcg/sparc/tcg-target.h
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#ifndef TCG_TARGET_SPARC
#define TCG_TARGET_SPARC 1
#define TCG_TARGET_WORDS_BIGENDIAN
@@ -138,3 +139,5 @@ static inline void flush_icache_range(tcg_target_ulong start,
for (; p < stop; p += 8)
__asm__ __volatile__("flush\t%0" : : "r" (p));
}
+
+#endif
diff --git a/tests/tcg/cris/crisutils.h b/tests/tcg/cris/crisutils.h
index 29b71cd..3456b9d 100644
--- a/tests/tcg/cris/crisutils.h
+++ b/tests/tcg/cris/crisutils.h
@@ -1,3 +1,6 @@
+#ifndef CRISUTILS_H
+#define CRISUTILS_H 1
+
static char *tst_cc_loc = NULL;
#define cris_tst_cc_init() \
@@ -69,3 +72,5 @@ static inline void cris_tst_cc(const int n, const int z,
if (c) cris_tst_cc_c1(); else cris_tst_cc_c0();
asm volatile ("" : : "g" (_err));
}
+
+#endif
diff --git a/ui/curses_keys.h b/ui/curses_keys.h
index c0d5eb4..18ce6dc 100644
--- a/ui/curses_keys.h
+++ b/ui/curses_keys.h
@@ -22,6 +22,9 @@
* THE SOFTWARE.
*/
+#ifndef QEMU_CURSES_KEYS_H
+#define QEMU_CURSES_KEYS_H 1
+
#include <curses.h>
#include "keymaps.h"
@@ -507,3 +510,5 @@ static const name2keysym_t name2keysym[] = {
{ NULL, 0 },
};
+
+#endif
diff --git a/ui/d3des.h b/ui/d3des.h
index 78d546f..70cb6b5 100644
--- a/ui/d3des.h
+++ b/ui/d3des.h
@@ -9,6 +9,8 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
+#ifndef D3DES_H
+#define D3DES_H 1
/* d3des.h -
*
@@ -49,3 +51,5 @@ void des(unsigned char *, unsigned char *);
/* d3des.h V5.09 rwo 9208.04 15:06 Graven Imagery
********************************************************************/
+
+#endif
--
1.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 21/32] qapi: move include files to include/qobject/
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (19 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 20/32] janitor: add guards to headers Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 22/32] block: move include files to include/block/ Paolo Bonzini
` (12 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
backends/rng-egd.c | 2 +-
backends/rng-random.c | 2 +-
backends/rng.c | 2 +-
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 ++--
blockdev.h | 2 +-
blockjob.c | 2 +-
dump-stub.c | 2 +-
dump.c | 2 +-
error.c | 8 ++++----
hmp.h | 2 +-
hw/ivshmem.c | 2 +-
hw/mc146818rtc.c | 2 +-
hw/pci/pci-hotplug.c | 2 +-
hw/pci/pcie_aer.c | 2 +-
hw/qdev-addr.c | 2 +-
hw/qdev-core.h | 2 +-
hw/qdev-properties.c | 4 ++--
hw/qdev.c | 4 ++--
hw/vga_int.h | 2 +-
hw/watchdog.c | 2 +-
include/net/net.h | 2 +-
include/net/slirp.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-input-visitor.h | 4 ++--
{qapi => include/qapi}/qmp-output-visitor.h | 4 ++--
qapi/qmp-core.h => include/qapi/qmp/dispatch.h | 6 +++---
json-lexer.h => include/qapi/qmp/json-lexer.h | 4 ++--
json-parser.h => include/qapi/qmp/json-parser.h | 4 ++--
json-streamer.h => include/qapi/qmp/json-streamer.h | 4 ++--
qbool.h => include/qapi/qmp/qbool.h | 2 +-
qdict.h => include/qapi/qmp/qdict.h | 4 ++--
qerror.h => include/qapi/qmp/qerror.h | 6 +++---
qfloat.h => include/qapi/qmp/qfloat.h | 2 +-
qint.h => include/qapi/qmp/qint.h | 2 +-
qjson.h => include/qapi/qmp/qjson.h | 4 ++--
qlist.h => include/qapi/qmp/qlist.h | 2 +-
qobject.h => include/qapi/qmp/qobject.h | 0
qstring.h => include/qapi/qmp/qstring.h | 2 +-
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/qapi-visit-impl.h => include/qapi/visitor-impl.h | 4 ++--
qapi/qapi-visit-core.h => include/qapi/visitor.h | 2 +-
include/qemu/rng.h | 2 +-
include/ui/console.h | 4 ++--
json-lexer.c | 10 +++++-----
json-parser.c | 18 +++++++++---------
json-streamer.c | 10 +++++-----
migration.h | 4 ++--
monitor.c | 16 ++++++++--------
monitor.h | 4 ++--
net/net.c | 2 +-
pixman | 2 +-
qapi/opts-visitor.c | 6 +++---
qapi/qapi-dealloc-visitor.c | 6 +++---
qapi/qapi-visit-core.c | 6 +++---
qapi/qmp-dispatch.c | 10 +++++-----
qapi/qmp-input-visitor.c | 8 ++++----
qapi/qmp-output-visitor.c | 8 ++++----
qapi/qmp-registry.c | 2 +-
qapi/string-input-visitor.c | 6 +++---
qapi/string-output-visitor.c | 6 +++---
qbool.c | 4 ++--
qdict.c | 12 ++++++------
qemu-char.h | 4 ++--
qemu-config.c | 2 +-
qemu-config.h | 2 +-
qemu-img.c | 2 +-
qemu-option.c | 6 +++---
qemu-option.h | 4 ++--
qemu_socket.h | 4 ++--
qerror.c | 4 ++--
qfloat.c | 4 ++--
qga/commands-posix.c | 2 +-
qga/commands-win32.c | 2 +-
qga/commands.c | 2 +-
qga/guest-agent-core.h | 2 +-
qga/main.c | 12 ++++++------
qint.c | 4 ++--
qjson.c | 18 +++++++++---------
qlist.c | 4 ++--
qom/object.c | 12 ++++++------
qom/qom-qobject.c | 2 +-
qstring.c | 4 ++--
scripts/qapi-commands.py | 14 +++++++-------
scripts/qapi-types.py | 2 +-
scripts/qapi-visit.py | 2 +-
stubs/arch-query-cpu-def.c | 2 +-
target-i386/cpu-qom.h | 2 +-
target-i386/cpu.c | 4 ++--
target-openrisc/cpu.h | 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/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 +-
ui/input.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 +-
119 files changed, 242 insertions(+), 242 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-input-visitor.h (91%)
rename {qapi => include/qapi}/qmp-output-visitor.h (91%)
rename qapi/qmp-core.h => include/qapi/qmp/dispatch.h (93%)
rename json-lexer.h => include/qapi/qmp/json-lexer.h (94%)
rename json-parser.h => include/qapi/qmp/json-parser.h (90%)
rename json-streamer.h => include/qapi/qmp/json-streamer.h (93%)
rename qbool.h => include/qapi/qmp/qbool.h (94%)
rename qdict.h => include/qapi/qmp/qdict.h (97%)
rename qerror.h => include/qapi/qmp/qerror.h (99%)
rename qfloat.h => include/qapi/qmp/qfloat.h (94%)
rename qint.h => include/qapi/qmp/qint.h (94%)
rename qjson.h => include/qapi/qmp/qjson.h (91%)
rename qlist.h => include/qapi/qmp/qlist.h (98%)
rename qobject.h => include/qapi/qmp/qobject.h (100%)
rename qstring.h => include/qapi/qmp/qstring.h (96%)
rename qemu-objects.h => include/qapi/qmp/types.h (60%)
rename {qapi => include/qapi}/string-input-visitor.h (95%)
rename {qapi => include/qapi}/string-output-visitor.h (95%)
rename qapi/qapi-visit-impl.h => include/qapi/visitor-impl.h (98%)
rename qapi/qapi-visit-core.h => include/qapi/visitor.h (99%)
diff --git a/backends/rng-egd.c b/backends/rng-egd.c
index ad84737..3a7d1ec 100644
--- a/backends/rng-egd.c
+++ b/backends/rng-egd.c
@@ -12,7 +12,7 @@
#include "qemu/rng.h"
#include "qemu-char.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
#include "hw/qdev.h" /* just for DEFINE_PROP_CHR */
#define TYPE_RNG_EGD "rng-egd"
diff --git a/backends/rng-random.c b/backends/rng-random.c
index 9c9923b..c201953 100644
--- a/backends/rng-random.c
+++ b/backends/rng-random.c
@@ -12,7 +12,7 @@
#include "qemu/rng-random.h"
#include "qemu/rng.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
#include "main-loop.h"
struct RndRandom
diff --git a/backends/rng.c b/backends/rng.c
index 06f2611..48a5840 100644
--- a/backends/rng.c
+++ b/backends/rng.c
@@ -11,7 +11,7 @@
*/
#include "qemu/rng.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
void rng_backend_request_entropy(RngBackend *s, size_t size,
EntropyReceiveFunc *receive_entropy,
diff --git a/balloon.c b/balloon.c
index e02ab1c..610fe6d 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 "qapi/qmp/qjson.h"
static QEMUBalloonEvent *balloon_event_fn;
static QEMUBalloonStatus *balloon_stat_fn;
diff --git a/block.c b/block.c
index 0668c4b..e962a5a 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 "qapi/qmp/qjson.h"
#include "sysemu.h"
#include "notify.h"
#include "qemu-coroutine.h"
diff --git a/block.h b/block.h
index 893448a..0b22892 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 "qapi/qmp/qobject.h"
#include "qapi-types.h"
/* block.c */
diff --git a/block/qcow2.c b/block/qcow2.c
index 8520bda..217b4e4 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 "qapi/qmp/qerror.h"
#include "trace.h"
/*
diff --git a/block/qed.c b/block/qed.c
index 0b5374a..ca1fafb 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 "qapi/qmp/qerror.h"
#include "migration.h"
static void qed_aio_cancel(BlockDriverAIOCB *blockacb)
diff --git a/block_int.h b/block_int.h
index bf3f79b..a748b6c 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 "qapi/qmp/qerror.h"
#include "monitor.h"
#define BLOCK_FLAG_ENCRYPT 1
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index 6b26bbf..a194ecd 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 "qapi/qmp/qerror.h"
#include "sysemu.h"
#include "qmp-commands.h"
#include "trace.h"
diff --git a/blockdev.c b/blockdev.c
index 9a05e57..c85c614 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 "qapi/qmp/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/blockdev.h b/blockdev.h
index d73d552..6e36d9f 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/blockjob.c b/blockjob.c
index cda12c6..8c0a286 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 "qapi/qmp/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..0842e6f 100644
--- a/dump-stub.c
+++ b/dump-stub.c
@@ -13,7 +13,7 @@
#include "qemu-common.h"
#include "dump.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
#include "qmp-commands.h"
/* we need this function in hmp.c */
diff --git a/dump.c b/dump.c
index 5640c2c..7b45b53 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..519f6b6 100644
--- a/error.c
+++ b/error.c
@@ -11,11 +11,11 @@
*/
#include "qemu-common.h"
-#include "error.h"
-#include "qjson.h"
-#include "qdict.h"
+#include "qapi/error.h"
+#include "qapi/qmp/qjson.h"
+#include "qapi/qmp/qdict.h"
#include "qapi-types.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
struct Error
{
diff --git a/hmp.h b/hmp.h
index 0ab03be..21f3e05 100644
--- a/hmp.h
+++ b/hmp.h
@@ -16,7 +16,7 @@
#include "qemu-common.h"
#include "qapi-types.h"
-#include "qdict.h"
+#include "qapi/qmp/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 5c648d9..d15760b 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -22,7 +22,7 @@
#include "pci/msix.h"
#include "kvm.h"
#include "migration.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
#include "event_notifier.h"
#include "qemu-char.h"
diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index c79fca7..2a1278f 100644
--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
@@ -25,7 +25,7 @@
#include "qemu-timer.h"
#include "sysemu.h"
#include "mc146818rtc.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visitor.h"
#ifdef TARGET_I386
#include "apic.h"
diff --git a/hw/pci/pci-hotplug.c b/hw/pci/pci-hotplug.c
index b850400..5ba7558 100644
--- a/hw/pci/pci-hotplug.c
+++ b/hw/pci/pci-hotplug.c
@@ -32,7 +32,7 @@
#include "hw/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/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index 8a2032c..b6f4f85 100644
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -19,7 +19,7 @@
*/
#include "sysemu.h"
-#include "qemu-objects.h"
+#include "qapi/qmp/types.h"
#include "monitor.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pcie.h"
diff --git a/hw/qdev-addr.c b/hw/qdev-addr.c
index ea32c31..552ee21 100644
--- a/hw/qdev-addr.c
+++ b/hw/qdev-addr.c
@@ -1,7 +1,7 @@
#include "qdev.h"
#include "qdev-addr.h"
#include "hwaddr.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visitor.h"
/* --- target physical address --- */
diff --git a/hw/qdev-core.h b/hw/qdev-core.h
index d672cca..506977c 100644
--- a/hw/qdev-core.h
+++ b/hw/qdev-core.h
@@ -6,7 +6,7 @@
#include "qemu-types.h"
#include "qemu/object.h"
#include "hw/irq.h"
-#include "error.h"
+#include "qapi/error.h"
enum DevState {
DEV_STATE_CREATED = 1,
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 7ab55ef..ba6c648 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -1,10 +1,10 @@
#include "net/net.h"
#include "qdev.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
#include "blockdev.h"
#include "hw/block-common.h"
#include "net/hub.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visitor.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 6b91fb9..0a2a32d 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -28,8 +28,8 @@
#include "net/net.h"
#include "qdev.h"
#include "sysemu.h"
-#include "error.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/error.h"
+#include "qapi/visitor.h"
int qdev_hotplug = 0;
static bool qdev_hot_added = false;
diff --git a/hw/vga_int.h b/hw/vga_int.h
index ad02404..5efaee8 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -25,7 +25,7 @@
#define HW_VGA_INT_H 1
#include <hw/hw.h>
-#include "error.h"
+#include "qapi/error.h"
#include "memory.h"
#define ST01_V_RETRACE 0x08
diff --git a/hw/watchdog.c b/hw/watchdog.c
index 5c82c17..f878bec 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..26dd0cf 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 "qapi/qmp/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..ac9d449 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 "qapi/qmp/qdict.h"
#include "qemu-option.h"
#include "qapi-types.h"
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..cf4c36d 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/visitor.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..31fa4c5 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/visitor.h"
#include "qemu-option.h"
typedef struct OptsVisitor OptsVisitor;
diff --git a/qapi/qmp-input-visitor.h b/include/qapi/qmp-input-visitor.h
similarity index 91%
rename from qapi/qmp-input-visitor.h
rename to include/qapi/qmp-input-visitor.h
index e0a48a5..3ed499c 100644
--- a/qapi/qmp-input-visitor.h
+++ b/include/qapi/qmp-input-visitor.h
@@ -14,8 +14,8 @@
#ifndef QMP_INPUT_VISITOR_H
#define QMP_INPUT_VISITOR_H
-#include "qapi-visit-core.h"
-#include "qobject.h"
+#include "qapi/visitor.h"
+#include "qapi/qmp/qobject.h"
typedef struct QmpInputVisitor QmpInputVisitor;
diff --git a/qapi/qmp-output-visitor.h b/include/qapi/qmp-output-visitor.h
similarity index 91%
rename from qapi/qmp-output-visitor.h
rename to include/qapi/qmp-output-visitor.h
index 4a649c2..2266770 100644
--- a/qapi/qmp-output-visitor.h
+++ b/include/qapi/qmp-output-visitor.h
@@ -14,8 +14,8 @@
#ifndef QMP_OUTPUT_VISITOR_H
#define QMP_OUTPUT_VISITOR_H
-#include "qapi-visit-core.h"
-#include "qobject.h"
+#include "qapi/visitor.h"
+#include "qapi/qmp/qobject.h"
typedef struct QmpOutputVisitor QmpOutputVisitor;
diff --git a/qapi/qmp-core.h b/include/qapi/qmp/dispatch.h
similarity index 93%
rename from qapi/qmp-core.h
rename to include/qapi/qmp/dispatch.h
index 00446cf..1ce11f5 100644
--- a/qapi/qmp-core.h
+++ b/include/qapi/qmp/dispatch.h
@@ -14,9 +14,9 @@
#ifndef QMP_CORE_H
#define QMP_CORE_H
-#include "qobject.h"
-#include "qdict.h"
-#include "error.h"
+#include "qapi/qmp/qobject.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/error.h"
typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);
diff --git a/json-lexer.h b/include/qapi/qmp/json-lexer.h
similarity index 94%
rename from json-lexer.h
rename to include/qapi/qmp/json-lexer.h
index 10bc0a7..cdff046 100644
--- a/json-lexer.h
+++ b/include/qapi/qmp/json-lexer.h
@@ -14,8 +14,8 @@
#ifndef QEMU_JSON_LEXER_H
#define QEMU_JSON_LEXER_H
-#include "qstring.h"
-#include "qlist.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qlist.h"
typedef enum json_token_type {
JSON_OPERATOR = 100,
diff --git a/json-parser.h b/include/qapi/qmp/json-parser.h
similarity index 90%
rename from json-parser.h
rename to include/qapi/qmp/json-parser.h
index 8f2b5ec..44d88f3 100644
--- a/json-parser.h
+++ b/include/qapi/qmp/json-parser.h
@@ -15,8 +15,8 @@
#define QEMU_JSON_PARSER_H
#include "qemu-common.h"
-#include "qlist.h"
-#include "error.h"
+#include "qapi/qmp/qlist.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/json-streamer.h b/include/qapi/qmp/json-streamer.h
similarity index 93%
rename from json-streamer.h
rename to include/qapi/qmp/json-streamer.h
index f09bc4d..823f7d7 100644
--- a/json-streamer.h
+++ b/include/qapi/qmp/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 "qapi/qmp/qlist.h"
+#include "qapi/qmp/json-lexer.h"
typedef struct JSONMessageParser
{
diff --git a/qbool.h b/include/qapi/qmp/qbool.h
similarity index 94%
rename from qbool.h
rename to include/qapi/qmp/qbool.h
index fe66fcd..c4eaab9 100644
--- a/qbool.h
+++ b/include/qapi/qmp/qbool.h
@@ -15,7 +15,7 @@
#define QBOOL_H
#include <stdint.h>
-#include "qobject.h"
+#include "qapi/qmp/qobject.h"
typedef struct QBool {
QObject_HEAD;
diff --git a/qdict.h b/include/qapi/qmp/qdict.h
similarity index 97%
rename from qdict.h
rename to include/qapi/qmp/qdict.h
index 929d8d2..c815981 100644
--- a/qdict.h
+++ b/include/qapi/qmp/qdict.h
@@ -13,8 +13,8 @@
#ifndef QDICT_H
#define QDICT_H
-#include "qobject.h"
-#include "qlist.h"
+#include "qapi/qmp/qobject.h"
+#include "qapi/qmp/qlist.h"
#include "qemu-queue.h"
#include <stdint.h>
diff --git a/qerror.h b/include/qapi/qmp/qerror.h
similarity index 99%
rename from qerror.h
rename to include/qapi/qmp/qerror.h
index 8db4309..d912297 100644
--- a/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -12,10 +12,10 @@
#ifndef QERROR_H
#define QERROR_H
-#include "qdict.h"
-#include "qstring.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qstring.h"
#include "qemu-error.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qapi-types.h"
#include <stdarg.h>
diff --git a/qfloat.h b/include/qapi/qmp/qfloat.h
similarity index 94%
rename from qfloat.h
rename to include/qapi/qmp/qfloat.h
index 9d67876..a865844 100644
--- a/qfloat.h
+++ b/include/qapi/qmp/qfloat.h
@@ -15,7 +15,7 @@
#define QFLOAT_H
#include <stdint.h>
-#include "qobject.h"
+#include "qapi/qmp/qobject.h"
typedef struct QFloat {
QObject_HEAD;
diff --git a/qint.h b/include/qapi/qmp/qint.h
similarity index 94%
rename from qint.h
rename to include/qapi/qmp/qint.h
index 6b1a15c..48a41b0 100644
--- a/qint.h
+++ b/include/qapi/qmp/qint.h
@@ -14,7 +14,7 @@
#define QINT_H
#include <stdint.h>
-#include "qobject.h"
+#include "qapi/qmp/qobject.h"
typedef struct QInt {
QObject_HEAD;
diff --git a/qjson.h b/include/qapi/qmp/qjson.h
similarity index 91%
rename from qjson.h
rename to include/qapi/qmp/qjson.h
index 1190d8a..0473374 100644
--- a/qjson.h
+++ b/include/qapi/qmp/qjson.h
@@ -16,8 +16,8 @@
#include <stdarg.h>
#include "compiler.h"
-#include "qobject.h"
-#include "qstring.h"
+#include "qapi/qmp/qobject.h"
+#include "qapi/qmp/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/qapi/qmp/qlist.h
similarity index 98%
rename from qlist.h
rename to include/qapi/qmp/qlist.h
index 7408947..ffa0846 100644
--- a/qlist.h
+++ b/include/qapi/qmp/qlist.h
@@ -13,7 +13,7 @@
#ifndef QLIST_H
#define QLIST_H
-#include "qobject.h"
+#include "qapi/qmp/qobject.h"
#include "qemu-queue.h"
#include "qemu-queue.h"
diff --git a/qobject.h b/include/qapi/qmp/qobject.h
similarity index 100%
rename from qobject.h
rename to include/qapi/qmp/qobject.h
diff --git a/qstring.h b/include/qapi/qmp/qstring.h
similarity index 96%
rename from qstring.h
rename to include/qapi/qmp/qstring.h
index 84ccd96..0e690f4 100644
--- a/qstring.h
+++ b/include/qapi/qmp/qstring.h
@@ -14,7 +14,7 @@
#define QSTRING_H
#include <stdint.h>
-#include "qobject.h"
+#include "qapi/qmp/qobject.h"
typedef struct QString {
QObject_HEAD;
diff --git a/qemu-objects.h b/include/qapi/qmp/types.h
similarity index 60%
rename from qemu-objects.h
rename to include/qapi/qmp/types.h
index c53fbaa..7782ec5 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 "qapi/qmp/qobject.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qfloat.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qjson.h"
#endif /* QEMU_OBJECTS_H */
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..089243c 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/visitor.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..ec81e42 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/visitor.h"
typedef struct StringOutputVisitor StringOutputVisitor;
diff --git a/qapi/qapi-visit-impl.h b/include/qapi/visitor-impl.h
similarity index 98%
rename from qapi/qapi-visit-impl.h
rename to include/qapi/visitor-impl.h
index 9337d62..5159964 100644
--- a/qapi/qapi-visit-impl.h
+++ b/include/qapi/visitor-impl.h
@@ -12,8 +12,8 @@
#ifndef QAPI_VISITOR_IMPL_H
#define QAPI_VISITOR_IMPL_H
-#include "error.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/error.h"
+#include "qapi/visitor.h"
struct Visitor
{
diff --git a/qapi/qapi-visit-core.h b/include/qapi/visitor.h
similarity index 99%
rename from qapi/qapi-visit-core.h
rename to include/qapi/visitor.h
index 602debe..1fef18c 100644
--- a/qapi/qapi-visit-core.h
+++ b/include/qapi/visitor.h
@@ -13,7 +13,7 @@
#ifndef QAPI_VISITOR_CORE_H
#define QAPI_VISITOR_CORE_H
-#include "error.h"
+#include "qapi/error.h"
#include <stdlib.h>
typedef struct GenericList
diff --git a/include/qemu/rng.h b/include/qemu/rng.h
index d094bf8..3791297 100644
--- a/include/qemu/rng.h
+++ b/include/qemu/rng.h
@@ -15,7 +15,7 @@
#include "qemu/object.h"
#include "qemu-common.h"
-#include "error.h"
+#include "qapi/error.h"
#define TYPE_RNG_BACKEND "rng-backend"
#define RNG_BACKEND(obj) \
diff --git a/include/ui/console.h b/include/ui/console.h
index 777881d..eff5cc9 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -2,12 +2,12 @@
#define CONSOLE_H
#include "ui/qemu-pixman.h"
-#include "qdict.h"
+#include "qapi/qmp/qdict.h"
#include "notify.h"
#include "monitor.h"
#include "trace.h"
#include "qapi-types.h"
-#include "error.h"
+#include "qapi/error.h"
/* keyboard/mouse support */
diff --git a/json-lexer.c b/json-lexer.c
index 3cd3285..440df60 100644
--- a/json-lexer.c
+++ b/json-lexer.c
@@ -11,12 +11,12 @@
*
*/
-#include "qstring.h"
-#include "qlist.h"
-#include "qdict.h"
-#include "qint.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qint.h"
#include "qemu-common.h"
-#include "json-lexer.h"
+#include "qapi/qmp/json-lexer.h"
#define MAX_TOKEN_SIZE (64ULL << 20)
diff --git a/json-parser.c b/json-parser.c
index 457291b..05279c1 100644
--- a/json-parser.c
+++ b/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 "qapi/qmp/qstring.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qfloat.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/json-parser.h"
+#include "qapi/qmp/json-lexer.h"
+#include "qapi/qmp/qerror.h"
typedef struct JSONParserContext
{
diff --git a/json-streamer.c b/json-streamer.c
index c255c78..1b2f9b1 100644
--- a/json-streamer.c
+++ b/json-streamer.c
@@ -11,12 +11,12 @@
*
*/
-#include "qlist.h"
-#include "qint.h"
-#include "qdict.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qdict.h"
#include "qemu-common.h"
-#include "json-lexer.h"
-#include "json-streamer.h"
+#include "qapi/qmp/json-lexer.h"
+#include "qapi/qmp/json-streamer.h"
#define MAX_TOKEN_SIZE (64ULL << 20)
#define MAX_NESTING (1ULL << 10)
diff --git a/migration.h b/migration.h
index c3a23cc..af444d4 100644
--- a/migration.h
+++ b/migration.h
@@ -14,10 +14,10 @@
#ifndef QEMU_MIGRATION_H
#define QEMU_MIGRATION_H
-#include "qdict.h"
+#include "qapi/qmp/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/monitor.c b/monitor.c
index 6546f8c..7d5c8a6 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 "qapi/qmp/qint.h"
+#include "qapi/qmp/qfloat.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qjson.h"
+#include "qapi/qmp/json-streamer.h"
+#include "qapi/qmp/json-parser.h"
#include "osdep.h"
#include "cpu.h"
#include "trace.h"
diff --git a/monitor.h b/monitor.h
index 4595c21..7c29d9d 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 "qapi/qmp/qerror.h"
+#include "qapi/qmp/qdict.h"
#include "block.h"
#include "readline.h"
diff --git a/net/net.c b/net/net.c
index a4395be..ead7e96 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/pixman b/pixman
index a5e5179..97336fa 160000
--- a/pixman
+++ b/pixman
@@ -1 +1 @@
-Subproject commit a5e5179b5624c99c812e9bf6e7b907e355a811e8
+Subproject commit 97336fad32acf802003855cd8bd6477fa49a12e3
diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index 6ccb8a1..f8149ce 100644
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -11,11 +11,11 @@
*/
#include "qemu-common.h"
-#include "qerror.h"
-#include "opts-visitor.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/opts-visitor.h"
#include "qemu-queue.h"
#include "qemu-option-internal.h"
-#include "qapi-visit-impl.h"
+#include "qapi/visitor-impl.h"
struct OptsVisitor
diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c
index 7c44042..98f2a58 100644
--- a/qapi/qapi-dealloc-visitor.c
+++ b/qapi/qapi-dealloc-visitor.c
@@ -11,11 +11,11 @@
*
*/
-#include "qapi-dealloc-visitor.h"
+#include "qapi/dealloc-visitor.h"
#include "qemu-queue.h"
#include "qemu-common.h"
-#include "qemu-objects.h"
-#include "qapi-visit-impl.h"
+#include "qapi/qmp/types.h"
+#include "qapi/visitor-impl.h"
typedef struct StackEntry
{
diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
index 4649fb7..401ee6e 100644
--- a/qapi/qapi-visit-core.c
+++ b/qapi/qapi-visit-core.c
@@ -12,9 +12,9 @@
*/
#include "qemu-common.h"
-#include "qerror.h"
-#include "qapi/qapi-visit-core.h"
-#include "qapi/qapi-visit-impl.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/visitor.h"
+#include "qapi/visitor-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..921de33 100644
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -11,12 +11,12 @@
*
*/
-#include "qemu-objects.h"
-#include "qapi/qmp-core.h"
-#include "json-parser.h"
+#include "qapi/qmp/types.h"
+#include "qapi/qmp/dispatch.h"
+#include "qapi/qmp/json-parser.h"
#include "qapi-types.h"
-#include "error.h"
-#include "qerror.h"
+#include "qapi/error.h"
+#include "qapi/qmp/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..8087909 100644
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@@ -11,12 +11,12 @@
*
*/
-#include "qmp-input-visitor.h"
-#include "qapi/qapi-visit-impl.h"
+#include "qapi/qmp-input-visitor.h"
+#include "qapi/visitor-impl.h"
#include "qemu-queue.h"
#include "qemu-common.h"
-#include "qemu-objects.h"
-#include "qerror.h"
+#include "qapi/qmp/types.h"
+#include "qapi/qmp/qerror.h"
#define QIV_STACK_SIZE 1024
diff --git a/qapi/qmp-output-visitor.c b/qapi/qmp-output-visitor.c
index 2bce9d5..8015e3f 100644
--- a/qapi/qmp-output-visitor.c
+++ b/qapi/qmp-output-visitor.c
@@ -11,12 +11,12 @@
*
*/
-#include "qmp-output-visitor.h"
-#include "qapi/qapi-visit-impl.h"
+#include "qapi/qmp-output-visitor.h"
+#include "qapi/visitor-impl.h"
#include "qemu-queue.h"
#include "qemu-common.h"
-#include "qemu-objects.h"
-#include "qerror.h"
+#include "qapi/qmp/types.h"
+#include "qapi/qmp/qerror.h"
typedef struct QStackEntry
{
diff --git a/qapi/qmp-registry.c b/qapi/qmp-registry.c
index c2c31b4..70cdbca 100644
--- a/qapi/qmp-registry.c
+++ b/qapi/qmp-registry.c
@@ -14,7 +14,7 @@
#include <glib.h>
#include <string.h>
-#include "qapi/qmp-core.h"
+#include "qapi/qmp/dispatch.h"
static QTAILQ_HEAD(QmpCommandList, QmpCommand) qmp_commands =
QTAILQ_HEAD_INITIALIZER(qmp_commands);
diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c
index 497eb9a..8f1bc41 100644
--- a/qapi/string-input-visitor.c
+++ b/qapi/string-input-visitor.c
@@ -11,9 +11,9 @@
*/
#include "qemu-common.h"
-#include "string-input-visitor.h"
-#include "qapi/qapi-visit-impl.h"
-#include "qerror.h"
+#include "qapi/string-input-visitor.h"
+#include "qapi/visitor-impl.h"
+#include "qapi/qmp/qerror.h"
struct StringInputVisitor
{
diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.c
index 34e525e..921653d 100644
--- a/qapi/string-output-visitor.c
+++ b/qapi/string-output-visitor.c
@@ -11,9 +11,9 @@
*/
#include "qemu-common.h"
-#include "string-output-visitor.h"
-#include "qapi/qapi-visit-impl.h"
-#include "qerror.h"
+#include "qapi/string-output-visitor.h"
+#include "qapi/visitor-impl.h"
+#include "qapi/qmp/qerror.h"
struct StringOutputVisitor
{
diff --git a/qbool.c b/qbool.c
index 590cd71..a3d2afa 100644
--- a/qbool.c
+++ b/qbool.c
@@ -11,8 +11,8 @@
*
*/
-#include "qbool.h"
-#include "qobject.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qobject.h"
#include "qemu-common.h"
static void qbool_destroy_obj(QObject *obj);
diff --git a/qdict.c b/qdict.c
index 4bf308b..fa7a62c 100644
--- a/qdict.c
+++ b/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 "qapi/qmp/qint.h"
+#include "qapi/qmp/qfloat.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qobject.h"
#include "qemu-queue.h"
#include "qemu-common.h"
diff --git a/qemu-char.h b/qemu-char.h
index a121e04..3e230a1 100644
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -6,8 +6,8 @@
#include "qemu-option.h"
#include "qemu-config.h"
#include "qemu-aio.h"
-#include "qobject.h"
-#include "qstring.h"
+#include "qapi/qmp/qobject.h"
+#include "qapi/qmp/qstring.h"
#include "main-loop.h"
/* character device */
diff --git a/qemu-config.c b/qemu-config.c
index b4ce0d8..ceec6bd 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 eb50eca..584491a 100644
--- a/qemu-config.h
+++ b/qemu-config.h
@@ -3,7 +3,7 @@
#include <stdio.h>
#include "qemu-option.h"
-#include "error.h"
+#include "qapi/error.h"
#include "qemu-option.h"
extern QemuOptsList qemu_fsdev_opts;
diff --git a/qemu-img.c b/qemu-img.c
index c989a52..a13bc78 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 "qapi/qmp/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 94557cf..ebd3537 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 "error.h"
-#include "qerror.h"
+#include "qapi/qmp/types.h"
+#include "qapi/error.h"
+#include "qapi/qmp/qerror.h"
#include "qemu-option-internal.h"
/*
diff --git a/qemu-option.h b/qemu-option.h
index 002dd07..ca0dc04 100644
--- a/qemu-option.h
+++ b/qemu-option.h
@@ -28,8 +28,8 @@
#include <stdint.h>
#include "qemu-queue.h"
-#include "error.h"
-#include "qdict.h"
+#include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
enum QEMUOptionParType {
OPT_FLAG,
diff --git a/qemu_socket.h b/qemu_socket.h
index 02490ad..42899fe 100644
--- a/qemu_socket.h
+++ b/qemu_socket.h
@@ -27,8 +27,8 @@ int inet_aton(const char *cp, struct in_addr *ia);
#endif /* !_WIN32 */
#include "qemu-option.h"
-#include "error.h"
-#include "qerror.h"
+#include "qapi/error.h"
+#include "qapi/qmp/qerror.h"
/* misc helpers */
int qemu_socket(int domain, int type, int protocol);
diff --git a/qerror.c b/qerror.c
index 0818504..8c78104 100644
--- a/qerror.c
+++ b/qerror.c
@@ -11,8 +11,8 @@
*/
#include "monitor.h"
-#include "qjson.h"
-#include "qerror.h"
+#include "qapi/qmp/qjson.h"
+#include "qapi/qmp/qerror.h"
#include "qemu-common.h"
static void qerror_destroy_obj(QObject *obj);
diff --git a/qfloat.c b/qfloat.c
index 98338f3..7de0992 100644
--- a/qfloat.c
+++ b/qfloat.c
@@ -11,8 +11,8 @@
*
*/
-#include "qfloat.h"
-#include "qobject.h"
+#include "qapi/qmp/qfloat.h"
+#include "qapi/qmp/qobject.h"
#include "qemu-common.h"
static void qfloat_destroy_obj(QObject *obj);
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 726930a..cedf2cc 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 "qapi/qmp/qerror.h"
#include "qemu-queue.h"
#include "host-utils.h"
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 5bd8fb2..7e8ecb3 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 "qapi/qmp/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..7ffb35e 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 "qapi/qmp/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/guest-agent-core.h b/qga/guest-agent-core.h
index 49a7abe..8934163 100644
--- a/qga/guest-agent-core.h
+++ b/qga/guest-agent-core.h
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
-#include "qapi/qmp-core.h"
+#include "qapi/qmp/dispatch.h"
#include "qemu-common.h"
#define QGA_READ_COUNT_DEFAULT 4096
diff --git a/qga/main.c b/qga/main.c
index 9b59a52..ead58cc 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -20,15 +20,15 @@
#include <sys/wait.h>
#include <sys/stat.h>
#endif
-#include "json-streamer.h"
-#include "json-parser.h"
-#include "qint.h"
-#include "qjson.h"
+#include "qapi/qmp/json-streamer.h"
+#include "qapi/qmp/json-parser.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qjson.h"
#include "qga/guest-agent-core.h"
#include "module.h"
#include "signal.h"
-#include "qerror.h"
-#include "qapi/qmp-core.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/qmp/dispatch.h"
#include "qga/channel.h"
#ifdef _WIN32
#include "qga/service-win32.h"
diff --git a/qint.c b/qint.c
index ee51804..86b9b04 100644
--- a/qint.c
+++ b/qint.c
@@ -10,8 +10,8 @@
* See the COPYING.LIB file in the top-level directory.
*/
-#include "qint.h"
-#include "qobject.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qobject.h"
#include "qemu-common.h"
static void qint_destroy_obj(QObject *obj);
diff --git a/qjson.c b/qjson.c
index f9c8e77..83a6b4f 100644
--- a/qjson.c
+++ b/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 "qapi/qmp/json-lexer.h"
+#include "qapi/qmp/json-parser.h"
+#include "qapi/qmp/json-streamer.h"
+#include "qapi/qmp/qjson.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qfloat.h"
+#include "qapi/qmp/qdict.h"
typedef struct JSONParsingState
{
diff --git a/qlist.c b/qlist.c
index b48ec5b..c5ac211 100644
--- a/qlist.c
+++ b/qlist.c
@@ -10,8 +10,8 @@
* See the COPYING.LIB file in the top-level directory.
*/
-#include "qlist.h"
-#include "qobject.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qobject.h"
#include "qemu-queue.h"
#include "qemu-common.h"
diff --git a/qom/object.c b/qom/object.c
index 8d3036d..932f8b3 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -12,18 +12,18 @@
#include "qemu/object.h"
#include "qemu-common.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visitor.h"
#include "qapi/string-input-visitor.h"
#include "qapi/string-output-visitor.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
/* 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 "qapi/qmp/qobject.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qstring.h"
#define MAX_INTERFACES 32
diff --git a/qom/qom-qobject.c b/qom/qom-qobject.c
index 0689914..f0fa652 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/visitor.h"
#include "qapi/qmp-input-visitor.h"
#include "qapi/qmp-output-visitor.h"
diff --git a/qstring.c b/qstring.c
index b7e12e4..5f7376c 100644
--- a/qstring.c
+++ b/qstring.c
@@ -10,8 +10,8 @@
* See the COPYING.LIB file in the top-level directory.
*/
-#include "qobject.h"
-#include "qstring.h"
+#include "qapi/qmp/qobject.h"
+#include "qapi/qmp/qstring.h"
#include "qemu-common.h"
static void qstring_destroy_obj(QObject *obj);
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 5d034c2..eccc28d 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -342,8 +342,8 @@ def gen_command_decl_prologue(header, guard, prefix=""):
#define %(guard)s
#include "%(prefix)sqapi-types.h"
-#include "qdict.h"
-#include "error.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/error.h"
''',
header=basename(header), guard=guardname(header), prefix=prefix)
@@ -368,13 +368,13 @@ def gen_command_def_prologue(prefix="", proxy=False):
#include "qemu-common.h"
#include "module.h"
-#include "qerror.h"
-#include "qemu-objects.h"
-#include "qapi/qmp-core.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/qmp/types.h"
+#include "qapi/qmp/dispatch.h"
+#include "qapi/visitor.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 6bc2391..9e19920 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 f1aabb3..a276540 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -322,7 +322,7 @@ fdecl.write(mcgen('''
#ifndef %(guard)s
#define %(guard)s
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visitor.h"
#include "%(prefix)sqapi-types.h"
''',
prefix=prefix, guard=guardname(h_file)))
diff --git a/stubs/arch-query-cpu-def.c b/stubs/arch-query-cpu-def.c
index 47b5246..6eca852 100644
--- a/stubs/arch-query-cpu-def.c
+++ b/stubs/arch-query-cpu-def.c
@@ -1,6 +1,6 @@
#include "qemu-common.h"
#include "arch_init.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)
{
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 e968006..150c4df 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -26,9 +26,9 @@
#include "qemu-option.h"
#include "qemu-config.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
-#include "qapi/qapi-visit-core.h"
+#include "qapi/visitor.h"
#include "arch_init.h"
#include "hyperv.h"
diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h
index ebb5ad3..c7b1750 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/tests/check-qdict.c b/tests/check-qdict.c
index fc0d276..dc5f05a 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 "qapi/qmp/qint.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qstring.h"
#include "qemu-common.h"
/*
diff --git a/tests/check-qfloat.c b/tests/check-qfloat.c
index cdc66ea..6404ac8 100644
--- a/tests/check-qfloat.c
+++ b/tests/check-qfloat.c
@@ -12,7 +12,7 @@
*/
#include <glib.h>
-#include "qfloat.h"
+#include "qapi/qmp/qfloat.h"
#include "qemu-common.h"
/*
diff --git a/tests/check-qint.c b/tests/check-qint.c
index 5a27119..8686884 100644
--- a/tests/check-qint.c
+++ b/tests/check-qint.c
@@ -11,7 +11,7 @@
*/
#include <glib.h>
-#include "qint.h"
+#include "qapi/qmp/qint.h"
#include "qemu-common.h"
/*
diff --git a/tests/check-qjson.c b/tests/check-qjson.c
index 3b896f5..32ffb43 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 "qapi/qmp/qstring.h"
+#include "qapi/qmp/qint.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qfloat.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qjson.h"
#include "qemu-common.h"
diff --git a/tests/check-qlist.c b/tests/check-qlist.c
index 501ba26..b9c05d4 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 "qapi/qmp/qint.h"
+#include "qapi/qmp/qlist.h"
/*
* Public Interface test-cases
diff --git a/tests/check-qstring.c b/tests/check-qstring.c
index addad6c..95dc9e3 100644
--- a/tests/check-qstring.c
+++ b/tests/check-qstring.c
@@ -11,7 +11,7 @@
*/
#include <glib.h>
-#include "qstring.h"
+#include "qapi/qmp/qstring.h"
#include "qemu-common.h"
/*
diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c
index dc3c507..5195f69 100644
--- a/tests/test-qmp-commands.c
+++ b/tests/test-qmp-commands.c
@@ -1,7 +1,7 @@
#include <glib.h>
-#include "qemu-objects.h"
+#include "qapi/qmp/types.h"
#include "test-qmp-commands.h"
-#include "qapi/qmp-core.h"
+#include "qapi/qmp/dispatch.h"
#include "module.h"
#include "qapi/qmp-input-visitor.h"
#include "tests/test-qapi-types.h"
diff --git a/tests/test-qmp-input-strict.c b/tests/test-qmp-input-strict.c
index f6df8cb..19d4990 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..d76df8c 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..7868f56 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..64b10dd 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..238a268 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..906011d 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/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"
diff --git a/ui/spice-core.c b/ui/spice-core.c
index ec925ec..0550805 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 "qapi/qmp/qint.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/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 62d0fde..09199ef 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 "qapi/qmp/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 b82dc5d..bfc7fe6 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 "qapi/qmp/qlist.h"
#include "qemu-queue.h"
#include <stdint.h>
#include <stdbool.h>
diff --git a/ui/vnc.c b/ui/vnc.c
index 04afcff..dad2dde 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 6713220..975767a 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 "qapi/qmp/qjson.h"
#include "qemu-option.h"
#include "qemu-config.h"
#include "qemu-options.h"
--
1.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 22/32] block: move include files to include/block/
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (20 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 21/32] qapi: move include files to include/qobject/ Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 23/32] exec: move include files to include/exec/ Paolo Bonzini
` (11 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
aes.c | 2 +-
aio-posix.c | 2 +-
aio-win32.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/linux-aio.c | 2 +-
block/mirror.c | 4 ++--
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 | 4 ++--
block/raw-win32.c | 4 ++--
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 +-
block/win32-aio.c | 4 ++--
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/hw.h | 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/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
qemu-coroutine-int.h => include/block/coroutine_int.h | 2 +-
nbd.h => include/block/nbd.h | 0
thread-pool.h => include/block/thread-pool.h | 4 ++--
iohandler.c | 2 +-
main-loop.c | 2 +-
main-loop.h | 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 +++---
qemu-char.h | 2 +-
qemu-coroutine-io.c | 2 +-
qemu-coroutine-lock.c | 6 +++---
qemu-coroutine-sleep.c | 2 +-
qemu-coroutine.c | 4 ++--
qemu-img.c | 2 +-
qemu-io.c | 2 +-
qemu-nbd.c | 4 ++--
tests/test-aio.c | 2 +-
tests/test-coroutine.c | 2 +-
tests/test-thread-pool.c | 6 +++---
thread-pool.c | 6 +++---
109 files changed, 134 insertions(+), 134 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%)
rename thread-pool.h => include/block/thread-pool.h (93%)
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-posix.c b/aio-posix.c
index 05cc84e..d1e1bc2 100644
--- a/aio-posix.c
+++ b/aio-posix.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/aio-win32.c b/aio-win32.c
index cec4646..9a26f9c 100644
--- a/aio-win32.c
+++ b/aio-win32.c
@@ -16,7 +16,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 41ae0c1..6df4caf 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"
/***********************************************************/
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 e962a5a..5eab9e2 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 "qapi/qmp/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 65556e7..cd2866e 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 4beede7..cde5098 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 e2bb1e2..61ebdba 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 1179484..47df952 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 1c90174..4cb4e60 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 33b93d8..77e619a 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/linux-aio.c b/block/linux-aio.c
index 91ef863..28e5a04 100644
--- a/block/linux-aio.c
+++ b/block/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-aio.h"
#include "event_notifier.h"
diff --git a/block/mirror.c b/block/mirror.c
index b1f5d4f..8aeacbf 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -12,8 +12,8 @@
*/
#include "trace.h"
-#include "blockjob.h"
-#include "block_int.h"
+#include "block/blockjob.h"
+#include "block/block_int.h"
#include "qemu/ratelimit.h"
enum {
diff --git a/block/nbd.c b/block/nbd.c
index e87c248..38d6b90 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -27,9 +27,9 @@
*/
#include "qemu-common.h"
-#include "nbd.h"
+#include "block/nbd.h"
#include "uri.h"
-#include "block_int.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 468ef1b..56fccf9 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 96224d1..6a95aa6 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 217b4e4..205d910 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 "qapi/qmp/qerror.h"
diff --git a/block/qcow2.h b/block/qcow2.h
index a60fcb4..718b52b 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 48eff2f..4e73885 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -24,10 +24,10 @@
#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 "trace.h"
-#include "thread-pool.h"
+#include "block/thread-pool.h"
#include "iov.h"
#include "raw-aio.h"
diff --git a/block/raw-win32.c b/block/raw-win32.c
index ce207a3..9269fe8 100644
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -23,11 +23,11 @@
*/
#include "qemu-common.h"
#include "qemu-timer.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "module.h"
#include "raw-aio.h"
#include "trace.h"
-#include "thread-pool.h"
+#include "block/thread-pool.h"
#include "iov.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 737bab1..8def2f1 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 a48f58c..da70df2 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 0dcd286..d6df06f 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 c8330b7..dab9cac 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 51398c0..68e50e1 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 566e9a3..aabd712 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"
#if defined(CONFIG_UUID)
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/block/win32-aio.c b/block/win32-aio.c
index 4704ee0..606e4d6 100644
--- a/block/win32-aio.c
+++ b/block/win32-aio.c
@@ -23,10 +23,10 @@
*/
#include "qemu-common.h"
#include "qemu-timer.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "module.h"
#include "qemu-common.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
#include "raw-aio.h"
#include "event_notifier.h"
#include <windows.h>
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index a194ecd..81aa1d3 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 c85c614..ff6b333 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 "qapi/qmp/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 6e36d9f..4134864 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 8c0a286..004480d 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 "qapi/qmp/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 39dbaa5..e37ebac 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 eedf878..4028036 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/hw.h b/hw/hw.h
index f530f6f..003d974 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -10,7 +10,7 @@
#include "ioport.h"
#include "irq.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
#include "qemu-file.h"
#include "vmstate.h"
#include "qemu-log.h"
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 88210ea..f6d15b9 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -26,7 +26,7 @@
#include <hw/pc.h>
#include <hw/pci/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 8e1a48e..3457b98 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -65,7 +65,7 @@
#include <hw/pc.h>
#include <hw/pci/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 d2edcc0..87cbb0c 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 bcb26c8..4044351 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 23a0e23..8821d5c 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -26,7 +26,7 @@
#include <hw/pc.h>
#include <hw/pci/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 8b4a24e..880f61c 100644
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -27,7 +27,7 @@
#include <hw/pc.h>
#include <hw/pci/pci.h>
#include <hw/isa.h>
-#include "block.h"
+#include "block/block.h"
#include "sysemu.h"
#include "dma.h"
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index bab96b2..b46f7fd 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 3f9f171..60f2379 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 d16cd14..d7672e9 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 7d040b5..a2f6360 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 f918e36..beab67f 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"
#include "sysbus.h"
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index 8dc693f..b875e3b 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 169dd46..f7e1939 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 8c724b9..b732bcc 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 607edba..2e54eea 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 d4575d2..1500161 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 0b22892..d49ce4d 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 "qapi/qmp/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 a748b6c..d06de26 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 "qapi/qmp/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 3792b73..c290d07 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/thread-pool.h b/include/block/thread-pool.h
similarity index 93%
rename from thread-pool.h
rename to include/block/thread-pool.h
index 378a4ac..a87b287 100644
--- a/thread-pool.h
+++ b/include/block/thread-pool.h
@@ -21,8 +21,8 @@
#include "qemu-common.h"
#include "qemu-queue.h"
#include "qemu-thread.h"
-#include "qemu-coroutine.h"
-#include "block_int.h"
+#include "block/coroutine.h"
+#include "block/block_int.h"
typedef int ThreadPoolFunc(void *opaque);
diff --git a/iohandler.c b/iohandler.c
index 258f42d..cf8276d 100644
--- a/iohandler.c
+++ b/iohandler.c
@@ -25,7 +25,7 @@
#include "config-host.h"
#include "qemu-common.h"
#include "qemu-queue.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
#include "main-loop.h"
#ifndef _WIN32
diff --git a/main-loop.c b/main-loop.c
index 7dba6f6..f900611 100644
--- a/main-loop.c
+++ b/main-loop.c
@@ -26,7 +26,7 @@
#include "qemu-timer.h"
#include "slirp/slirp.h"
#include "main-loop.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
#ifndef _WIN32
diff --git a/main-loop.h b/main-loop.h
index 326c742..e8059c3 100644
--- a/main-loop.h
+++ b/main-loop.h
@@ -25,7 +25,7 @@
#ifndef QEMU_MAIN_LOOP_H
#define QEMU_MAIN_LOOP_H 1
-#include "qemu-aio.h"
+#include "block/aio.h"
#define SIG_IPI SIGUSR1
diff --git a/migration-exec.c b/migration-exec.c
index b4a3ca3..3e55b77 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 6d42287..e862288 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 a9bb817..07f51f2 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 e58e8bc..1b9c461 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 73ce170..1fce152 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 7c29d9d..9e96e83 100644
--- a/monitor.h
+++ b/monitor.h
@@ -4,7 +4,7 @@
#include "qemu-common.h"
#include "qapi/qmp/qerror.h"
#include "qapi/qmp/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 01976e8..04ff0a1 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/qemu-char.h b/qemu-char.h
index 3e230a1..5ff1b2b 100644
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -5,7 +5,7 @@
#include "qemu-queue.h"
#include "qemu-option.h"
#include "qemu-config.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
#include "qapi/qmp/qobject.h"
#include "qapi/qmp/qstring.h"
#include "main-loop.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 9dda3f8..c3939ac 100644
--- a/qemu-coroutine-lock.c
+++ b/qemu-coroutine-lock.c
@@ -23,10 +23,10 @@
*/
#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 "qemu-aio.h"
+#include "block/aio.h"
#include "trace.h"
static QTAILQ_HEAD(, Coroutine) unlock_bh_queue =
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 a13bc78..2e5ca5c 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 1637773..e0e4742 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 80f08d8..0a6091b 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-aio.c b/tests/test-aio.c
index a8a4f0c..e4ebef7 100644
--- a/tests/test-aio.c
+++ b/tests/test-aio.c
@@ -11,7 +11,7 @@
*/
#include <glib.h>
-#include "qemu-aio.h"
+#include "block/aio.h"
AioContext *ctx;
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
diff --git a/tests/test-thread-pool.c b/tests/test-thread-pool.c
index ea8e676..9998e03 100644
--- a/tests/test-thread-pool.c
+++ b/tests/test-thread-pool.c
@@ -1,8 +1,8 @@
#include <glib.h>
#include "qemu-common.h"
-#include "qemu-aio.h"
-#include "thread-pool.h"
-#include "block.h"
+#include "block/aio.h"
+#include "block/thread-pool.h"
+#include "block/block.h"
static int active;
diff --git a/thread-pool.c b/thread-pool.c
index 204f70b..4c73a7d 100644
--- a/thread-pool.c
+++ b/thread-pool.c
@@ -18,11 +18,11 @@
#include "qemu-queue.h"
#include "qemu-thread.h"
#include "osdep.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
#include "trace.h"
-#include "block_int.h"
+#include "block/block_int.h"
#include "event_notifier.h"
-#include "thread-pool.h"
+#include "block/thread-pool.h"
static void do_spawn_thread(void);
--
1.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 23/32] exec: move include files to include/exec/
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (21 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 22/32] block: move include files to include/block/ Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 24/32] monitor: move include files to include/monitor/ Paolo Bonzini
` (10 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch_init.c | 4 +-
balloon.c | 2 +-
bsd-user/qemu.h | 4 +-
cpus.c | 2 +-
cputlb.c | 18 +++----
dma.h | 2 +-
dump.c | 6 +--
exec.c | 8 +--
gdbstub.c | 2 +-
hw/acpi_ich9.c | 2 +-
hw/acpi_piix4.c | 4 +-
hw/alpha_typhoon.c | 4 +-
hw/an5206.c | 2 +-
hw/apb_pci.c | 2 +-
hw/apic_internal.h | 2 +-
hw/apm.h | 2 +-
hw/arm-misc.h | 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.h | 2 +-
hw/exynos4210_fimd.c | 2 +-
hw/exynos4_boards.c | 2 +-
hw/flash.h | 2 +-
hw/framebuffer.h | 2 +-
hw/gt64xxx.c | 2 +-
hw/gumstix.c | 2 +-
hw/highbank.c | 2 +-
hw/hw.h | 4 +-
hw/ide.h | 2 +-
hw/ide/ahci.c | 2 +-
hw/ide/internal.h | 2 +-
hw/integratorcp.c | 2 +-
hw/ioapic_internal.h | 2 +-
hw/isa-bus.c | 2 +-
hw/isa.h | 4 +-
hw/isa_mmio.c | 2 +-
hw/kzm.c | 2 +-
hw/leon3.c | 2 +-
hw/lm32_boards.c | 2 +-
hw/loader.c | 4 +-
hw/lpc_ich9.c | 2 +-
hw/m48t59.c | 2 +-
hw/mac_dbdma.h | 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.h | 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.h | 2 +-
hw/omap_gpmc.c | 4 +-
hw/omap_sx1.c | 2 +-
hw/omap_uart.c | 2 +-
hw/onenand.c | 4 +-
hw/openrisc_sim.c | 2 +-
hw/palm.c | 2 +-
hw/pam.h | 2 +-
hw/pc.c | 4 +-
hw/pc.h | 6 +--
hw/pc_piix.c | 4 +-
hw/pc_q35.c | 2 +-
hw/pci/pci.c | 2 +-
hw/pci/pci.h | 2 +-
hw/pci/pcie_host.c | 2 +-
hw/pci/pcie_host.h | 2 +-
hw/pci/shpc.h | 2 +-
hw/pci_bridge_dev.c | 2 +-
hw/pcnet.h | 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_mac.h | 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/pxa.h | 2 +-
hw/qdev-addr.c | 2 +-
hw/r2d.c | 2 +-
hw/realview.c | 2 +-
hw/s390-virtio.c | 2 +-
hw/s390x/sclp.c | 2 +-
hw/serial.c | 2 +-
hw/serial.h | 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/soc_dma.h | 2 +-
hw/spapr.c | 2 +-
hw/spapr_iommu.c | 2 +-
hw/spapr_pci.c | 2 +-
hw/spitz.c | 2 +-
hw/stellaris.c | 2 +-
hw/strongarm.h | 2 +-
hw/sun4u.c | 2 +-
hw/sysbus.c | 2 +-
hw/sysbus.h | 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 | 4 +-
hw/vga_int.h | 2 +-
hw/vhost.c | 2 +-
hw/vhost.h | 2 +-
hw/virtex_ml507.c | 2 +-
hw/virtio-balloon.c | 2 +-
hw/vt82c686.c | 2 +-
hw/xen_platform.c | 2 +-
hw/xen_pt.c | 2 +-
hw/xilinx_zynq.c | 2 +-
hw/xtensa_lx60.c | 4 +-
hw/xtensa_sim.c | 4 +-
hw/z2.c | 2 +-
exec-memory.h => include/exec/address-spaces.h | 2 +-
cpu-all.h => include/exec/cpu-all.h | 4 +-
cpu-common.h => include/exec/cpu-common.h | 4 +-
cpu-defs.h => include/exec/cpu-defs.h | 2 +-
cputlb.h => include/exec/cputlb.h | 0
def-helper.h => include/exec/def-helper.h | 0
exec-all.h => include/exec/exec-all.h | 12 ++---
gdbstub.h => include/exec/gdbstub.h | 0
gen-icount.h => include/exec/gen-icount.h | 0
hwaddr.h => include/exec/hwaddr.h | 0
ioport.h => include/exec/ioport.h | 2 +-
iorange.h => include/exec/iorange.h | 0
.../exec/memory-internal.h | 0
memory.h => include/exec/memory.h | 8 +--
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 | 2 +-
qemu-lock.h => include/exec/spinlock.h | 0
qemu-user-types.h => include/exec/user/abitypes.h | 0
thunk.h => include/exec/user/thunk.h | 0
ioport.c | 4 +-
kvm-all.c | 6 +--
kvm-stub.c | 2 +-
linux-user/qemu.h | 6 +--
memory.c | 8 +--
memory_mapping-stub.c | 2 +-
memory_mapping.c | 2 +-
monitor.c | 4 +-
qtest.c | 4 +-
savevm.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/ioport-user.c | 2 +-
target-i386/kvm.c | 4 +-
target-i386/mem_helper.c | 10 ++--
target-i386/misc_helper.c | 4 +-
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/kvm_ppc.h | 2 +-
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 | 4 +-
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 +-
thunk.c | 2 +-
translate-all.c | 6 +--
vl.c | 2 +-
xen-all.c | 2 +-
xen-stub.c | 2 +-
277 files changed, 456 insertions(+), 456 deletions(-)
rename exec-memory.h => include/exec/address-spaces.h (97%)
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 cputlb.h => include/exec/cputlb.h (100%)
rename def-helper.h => include/exec/def-helper.h (100%)
rename exec-all.h => include/exec/exec-all.h (98%)
rename gdbstub.h => include/exec/gdbstub.h (100%)
rename gen-icount.h => include/exec/gen-icount.h (100%)
rename hwaddr.h => include/exec/hwaddr.h (100%)
rename ioport.h => include/exec/ioport.h (99%)
rename iorange.h => include/exec/iorange.h (100%)
rename memory-internal.h => include/exec/memory-internal.h (100%)
rename memory.h => include/exec/memory.h (99%)
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 qemu-user-types.h => include/exec/user/abitypes.h (100%)
rename thunk.h => include/exec/user/thunk.h (100%)
diff --git a/arch_init.c b/arch_init.c
index e479a25..e15ceda 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/address-spaces.h"
#include "hw/pcspk.h"
#include "qemu/page_cache.h"
#include "qemu-config.h"
diff --git a/balloon.c b/balloon.c
index 610fe6d..c24458b 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 d268899..c64c3cc 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -11,7 +11,7 @@
#include <stdlib.h>
#endif /* DEBUG_REMAP */
-#include "qemu-user-types.h"
+#include "exec/user/abitypes.h"
enum BSDType {
target_freebsd,
@@ -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 d9c332f..8926873 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 d6d0372..88239c4 100644
--- a/cputlb.c
+++ b/cputlb.c
@@ -19,13 +19,13 @@
#include "config.h"
#include "cpu.h"
-#include "exec-all.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/exec-all.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
-#include "cputlb.h"
+#include "exec/cputlb.h"
-#include "memory-internal.h"
+#include "exec/memory-internal.h"
//#define DEBUG_TLB
//#define DEBUG_TLB_CHECK
@@ -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/dma.h b/dma.h
index 4028036..fd68f74 100644
--- a/dma.h
+++ b/dma.h
@@ -11,7 +11,7 @@
#define DMA_H
#include <stdio.h>
-#include "memory.h"
+#include "exec/memory.h"
#include "hw/hw.h"
#include "block/block.h"
#include "kvm.h"
diff --git a/dump.c b/dump.c
index 7b45b53..e70e0f3 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 "hwaddr.h"
+#include "exec/cpu-all.h"
+#include "exec/hwaddr.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 9860841..17fc7cf 100644
--- a/exec.c
+++ b/exec.c
@@ -34,9 +34,9 @@
#include "hw/xen.h"
#include "qemu-timer.h"
#include "qemu-config.h"
-#include "memory.h"
+#include "exec/memory.h"
#include "dma.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
#if defined(CONFIG_USER_ONLY)
#include <qemu.h>
#else /* !CONFIG_USER_ONLY */
@@ -44,10 +44,10 @@
#include "trace.h"
#endif
-#include "cputlb.h"
+#include "exec/cputlb.h"
#include "translate-all.h"
-#include "memory-internal.h"
+#include "exec/memory-internal.h"
//#define DEBUG_UNASSIGNED
//#define DEBUG_SUBPAGE
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/acpi_ich9.c b/hw/acpi_ich9.c
index 755fa05..92af3a5 100644
--- a/hw/acpi_ich9.c
+++ b/hw/acpi_ich9.c
@@ -30,7 +30,7 @@
#include "sysemu.h"
#include "acpi.h"
#include "kvm.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
#include "ich9.h"
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 46f9843..4f43f6e 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -26,9 +26,9 @@
#include "acpi.h"
#include "sysemu.h"
#include "range.h"
-#include "ioport.h"
+#include "exec/ioport.h"
#include "fw_cfg.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
//#define DEBUG
diff --git a/hw/alpha_typhoon.c b/hw/alpha_typhoon.c
index 9b16d96..d61b2f4 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/address-spaces.h"
#define TYPE_TYPHOON_PCI_HOST_BRIDGE "typhoon-pcihost"
diff --git a/hw/an5206.c b/hw/an5206.c
index d887c0e..dcfe34b 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/address-spaces.h"
#define KERNEL_LOAD_ADDR 0x10000
#define AN5206_MBAR_ADDR 0x10000000
diff --git a/hw/apb_pci.c b/hw/apb_pci.c
index fb7a07d..144a7cc 100644
--- a/hw/apb_pci.c
+++ b/hw/apb_pci.c
@@ -33,7 +33,7 @@
#include "pci/pci_bus.h"
#include "apb_pci.h"
#include "sysemu.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
/* debug APB */
//#define DEBUG_APB
diff --git a/hw/apic_internal.h b/hw/apic_internal.h
index 79e2de2..fea9565 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 "exec/memory.h"
#include "sysbus.h"
#include "qemu-timer.h"
diff --git a/hw/apm.h b/hw/apm.h
index 5431b6d..9abb47f 100644
--- a/hw/apm.h
+++ b/hw/apm.h
@@ -4,7 +4,7 @@
#include <stdint.h>
#include "qemu-common.h"
#include "hw.h"
-#include "memory.h"
+#include "exec/memory.h"
typedef void (*apm_ctrl_changed_t)(uint32_t val, void *arg);
diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index d129678..cba7553 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 "exec/memory.h"
#include "hw/irq.h"
/* The CPU is also modeled as an interrupt controller. */
diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c
index 4963678..270c307 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/address-spaces.h"
#include "arm_gic_internal.h"
typedef struct {
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index 50ddbc9..e537aec 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/address-spaces.h"
#define D(x)
#define DNAND(x)
diff --git a/hw/bonito.c b/hw/bonito.c
index a1fc38c..78e264c 100644
--- a/hw/bonito.c
+++ b/hw/bonito.c
@@ -45,7 +45,7 @@
#include "mips.h"
#include "pci/pci_host.h"
#include "sysemu.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
//#define DEBUG_BONITO
diff --git a/hw/collie.c b/hw/collie.c
index 695982a..faf5ac9 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/address-spaces.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 20f790b..7878cc3 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/address-spaces.h"
#define KERNEL_LOAD_ADDR 0x10000
diff --git a/hw/etraxfs_dma.c b/hw/etraxfs_dma.c
index 49221ab..089267f 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/address-spaces.h"
#include "qemu-common.h"
#include "sysemu.h"
diff --git a/hw/exynos4210.h b/hw/exynos4210.h
index 777f0f5..bb9a1dd 100644
--- a/hw/exynos4210.h
+++ b/hw/exynos4210.h
@@ -27,7 +27,7 @@
#define EXYNOS4210_H_
#include "qemu-common.h"
-#include "memory.h"
+#include "exec/memory.h"
#define EXYNOS4210_NCPUS 2
diff --git a/hw/exynos4210_fimd.c b/hw/exynos4210_fimd.c
index 3ef0847..cfca72a 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 "ui/pixel_ops.h"
diff --git a/hw/exynos4_boards.c b/hw/exynos4_boards.c
index c375f16..5dd2961 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/address-spaces.h"
#include "exynos4210.h"
#include "boards.h"
diff --git a/hw/flash.h b/hw/flash.h
index bda2158..920d759 100644
--- a/hw/flash.h
+++ b/hw/flash.h
@@ -3,7 +3,7 @@
/* NOR flash devices */
-#include "memory.h"
+#include "exec/memory.h"
typedef struct pflash_t pflash_t;
diff --git a/hw/framebuffer.h b/hw/framebuffer.h
index 46e375b..11f53ed 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 "exec/memory.h"
/* Framebuffer device helper routines. */
diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c
index 5aa49c6..977a2c5 100644
--- a/hw/gt64xxx.c
+++ b/hw/gt64xxx.c
@@ -27,7 +27,7 @@
#include "pci/pci.h"
#include "pci/pci_host.h"
#include "pc.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
//#define DEBUG
diff --git a/hw/gumstix.c b/hw/gumstix.c
index 545b92f..4acb32c 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/address-spaces.h"
static const int sector_len = 128 * 1024;
diff --git a/hw/highbank.c b/hw/highbank.c
index 90f7cb5..6f5f2a9 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/address-spaces.h"
#define SMP_BOOT_ADDR 0x100
#define SMP_BOOT_REG 0x40
diff --git a/hw/hw.h b/hw/hw.h
index 003d974..7368470 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -5,10 +5,10 @@
#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"
+#include "exec/ioport.h"
#include "irq.h"
#include "block/aio.h"
#include "qemu-file.h"
diff --git a/hw/ide.h b/hw/ide.h
index 081c710..7e23cda 100644
--- a/hw/ide.h
+++ b/hw/ide.h
@@ -3,7 +3,7 @@
#include "isa.h"
#include "pci/pci.h"
-#include "memory.h"
+#include "exec/memory.h"
#define MAX_IDE_DEVS 2
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 2ea64bd..f32a847 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/ide/internal.h b/hw/ide/internal.h
index bf7d313..c5016f0 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -8,7 +8,7 @@
*/
#include <hw/ide.h>
#include <hw/isa.h>
-#include "iorange.h"
+#include "exec/iorange.h"
#include "dma.h"
#include "sysemu.h"
#include "hw/block-common.h"
diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index 2b59fea..c995dc7 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/address-spaces.h"
#include "sysemu.h"
typedef struct {
diff --git a/hw/ioapic_internal.h b/hw/ioapic_internal.h
index e04c9f3..c8447d7 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 "exec/memory.h"
#include "sysbus.h"
#define MAX_IOAPICS 1
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 144a88e..8f40974 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/address-spaces.h"
static ISABus *isabus;
hwaddr isa_mem_base = 0;
diff --git a/hw/isa.h b/hw/isa.h
index 9d719fa..62e89d3 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -3,8 +3,8 @@
/* ISA bus */
-#include "ioport.h"
-#include "memory.h"
+#include "exec/ioport.h"
+#include "exec/memory.h"
#include "qdev.h"
#define ISA_NUM_IRQS 16
diff --git a/hw/isa_mmio.c b/hw/isa_mmio.c
index 1405396..487cf6a 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/address-spaces.h"
static void isa_mmio_writeb (void *opaque, hwaddr addr,
uint32_t val)
diff --git a/hw/kzm.c b/hw/kzm.c
index a27ecbb..9f92d30 100644
--- a/hw/kzm.c
+++ b/hw/kzm.c
@@ -14,7 +14,7 @@
*/
#include "sysbus.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
#include "hw.h"
#include "arm-misc.h"
#include "devices.h"
diff --git a/hw/leon3.c b/hw/leon3.c
index ef83dff..e8d54e5 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/address-spaces.h"
#include "grlib.h"
diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c
index f59d3bf..81afdf6 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/address-spaces.h"
typedef struct {
LM32CPU *cpu;
diff --git a/hw/loader.c b/hw/loader.c
index 52f0940..03f0318 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -49,8 +49,8 @@
#include "uboot_image.h"
#include "loader.h"
#include "fw_cfg.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
#include <zlib.h>
diff --git a/hw/lpc_ich9.c b/hw/lpc_ich9.c
index 3050578..e225693 100644
--- a/hw/lpc_ich9.c
+++ b/hw/lpc_ich9.c
@@ -43,7 +43,7 @@
#include "acpi_ich9.h"
#include "pam.h"
#include "pci/pci_bus.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
#include "sysemu.h"
static int ich9_lpc_sci_irq(ICH9LPCState *lpc);
diff --git a/hw/m48t59.c b/hw/m48t59.c
index 7da7e7c..491d433 100644
--- a/hw/m48t59.c
+++ b/hw/m48t59.c
@@ -27,7 +27,7 @@
#include "sysemu.h"
#include "sysbus.h"
#include "isa.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
//#define DEBUG_NVRAM
diff --git a/hw/mac_dbdma.h b/hw/mac_dbdma.h
index e596837..691263e 100644
--- a/hw/mac_dbdma.h
+++ b/hw/mac_dbdma.h
@@ -22,7 +22,7 @@
#ifndef HW_MAC_DBDMA_H
#define HW_MAC_DBDMA_H 1
-#include "memory.h"
+#include "exec/memory.h"
typedef struct DBDMA_io DBDMA_io;
diff --git a/hw/mainstone.c b/hw/mainstone.c
index 58c8b07..80d6a9d 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/address-spaces.h"
/* Device addresses */
#define MST_FPGA_PHYS 0x08000000
diff --git a/hw/mcf5206.c b/hw/mcf5206.c
index 510d770..5edc931 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/address-spaces.h"
/* General purpose timer module. */
typedef struct {
diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index 6326624..997b348 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/address-spaces.h"
#define SYS_FREQ 66000000
diff --git a/hw/mcf_fec.c b/hw/mcf_fec.c
index b5fb18f..2423f64 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/address-spaces.h"
//#define DEBUG_FEC 1
diff --git a/hw/mcf_intc.c b/hw/mcf_intc.c
index 6ef6dac..3bed3a2 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/address-spaces.h"
typedef struct {
MemoryRegion iomem;
diff --git a/hw/mcf_uart.c b/hw/mcf_uart.c
index d1655f8..2eca2c6 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/address-spaces.h"
typedef struct {
MemoryRegion iomem;
diff --git a/hw/milkymist.c b/hw/milkymist.c
index c26ea4a..5885222 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/address-spaces.h"
#define BIOS_FILENAME "mmone-bios.bin"
#define BIOS_OFFSET 0x00860000
diff --git a/hw/mips.h b/hw/mips.h
index f7e9b7e..291e85f 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 "exec/memory.h"
/* gt64xxx.c */
PCIBus *gt64120_register(qemu_irq *pic);
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index b46f7fd..34619b7 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/address-spaces.h"
#define DEBUG_FULONG2E_INIT
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 8e5e8ef..0befc99 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/address-spaces.h"
enum jazz_model_e
{
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 60f2379..d65d125 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/address-spaces.h"
#include "sysbus.h" /* SysBusDevice */
//#define DEBUG_BOARD_INIT
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index 7831742..ac7dfa9 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/address-spaces.h"
static struct _loaderparams {
int ram_size;
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index ec99d7d..05494b9 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/address-spaces.h"
#define MAX_IDE_BUS 2
diff --git a/hw/musicpal.c b/hw/musicpal.c
index d7672e9..436b3f7 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/address-spaces.h"
#include "ui/pixel_ops.h"
#define MP_MISC_BASE 0x80002000
diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c
index 99477a4..c2c00c2 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/address-spaces.h"
typedef struct ISANE2000State {
ISADevice dev;
diff --git a/hw/nseries.c b/hw/nseries.c
index dcd3dc9..83adb97 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/address-spaces.h"
/* Nokia N8x0 support */
struct n800_s {
diff --git a/hw/omap.h b/hw/omap.h
index 2b383ff..188cda8 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 "exec/memory.h"
# define hw_omap_h "omap.h"
#include "hw/irq.h"
diff --git a/hw/omap_gpmc.c b/hw/omap_gpmc.c
index 1f7c5bc..02ab0ab 100644
--- a/hw/omap_gpmc.c
+++ b/hw/omap_gpmc.c
@@ -21,8 +21,8 @@
#include "hw.h"
#include "flash.h"
#include "omap.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
/* General-Purpose Memory Controller */
struct omap_gpmc_s {
diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index 918a6f6..ca6eb9d 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/address-spaces.h"
/*****************************************************************************/
/* Siemens SX1 Cellphone V1 */
diff --git a/hw/omap_uart.c b/hw/omap_uart.c
index 92f2702..159b2d1 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/address-spaces.h"
/* UARTs */
struct omap_uart_s {
diff --git a/hw/onenand.c b/hw/onenand.c
index 1803e4c..7d255c5 100644
--- a/hw/onenand.c
+++ b/hw/onenand.c
@@ -23,8 +23,8 @@
#include "flash.h"
#include "irq.h"
#include "blockdev.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
#include "sysbus.h"
#include "qemu-error.h"
diff --git a/hw/openrisc_sim.c b/hw/openrisc_sim.c
index a879fb0..c12097e 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/address-spaces.h"
#include "sysemu.h"
#include "sysbus.h"
#include "qtest.h"
diff --git a/hw/palm.c b/hw/palm.c
index 5aaeb07..e091bbc 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/address-spaces.h"
static uint32_t static_readb(void *opaque, hwaddr offset)
{
diff --git a/hw/pam.h b/hw/pam.h
index 2d77ebe..8e9e349 100644
--- a/hw/pam.h
+++ b/hw/pam.h
@@ -51,7 +51,7 @@
*/
#include "qemu-common.h"
-#include "memory.h"
+#include "exec/memory.h"
#define SMRAM_C_BASE 0xa0000
#define SMRAM_C_END 0xc0000
diff --git a/hw/pc.c b/hw/pc.c
index d1b102c..2452fd4 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -47,8 +47,8 @@
#include "blockdev.h"
#include "hw/block-common.h"
#include "ui/qemu-spice.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
#include "arch_init.h"
#include "bitmap.h"
diff --git a/hw/pc.h b/hw/pc.h
index 5e4d103..a73e3e7 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 "exec/memory.h"
+#include "exec/ioport.h"
#include "isa.h"
#include "fdc.h"
#include "net/net.h"
-#include "memory.h"
+#include "exec/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 7268dcd..0d01134 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -41,8 +41,8 @@
#include "blockdev.h"
#include "smbus.h"
#include "xen.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
#include "cpu.h"
#ifdef CONFIG_XEN
# include <xen/hvm/hvm_info_table.h>
diff --git a/hw/pc_q35.c b/hw/pc_q35.c
index 3429a9a..2580d5f 100644
--- a/hw/pc_q35.c
+++ b/hw/pc_q35.c
@@ -36,7 +36,7 @@
#include "kvm.h"
#include "kvm/clock.h"
#include "q35.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
#include "ich9.h"
#include "hw/ide/pci.h"
#include "hw/ide/ahci.h"
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 105fe95..fa0f08e 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -33,7 +33,7 @@
#include "qmp-commands.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
//#define DEBUG_PCI
#ifdef DEBUG_PCI
diff --git a/hw/pci/pci.h b/hw/pci/pci.h
index 41e5ddd..d6ef4f6 100644
--- a/hw/pci/pci.h
+++ b/hw/pci/pci.h
@@ -4,7 +4,7 @@
#include "qemu-common.h"
#include "hw/qdev.h"
-#include "memory.h"
+#include "exec/memory.h"
#include "dma.h"
/* PCI includes legacy ISA access. */
diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c
index ab8d251..b2d942b 100644
--- a/hw/pci/pcie_host.c
+++ b/hw/pci/pcie_host.c
@@ -22,7 +22,7 @@
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/pcie_host.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
/*
* PCI express mmcfig address
diff --git a/hw/pci/pcie_host.h b/hw/pci/pcie_host.h
index 150bef9..1228e36 100644
--- a/hw/pci/pcie_host.h
+++ b/hw/pci/pcie_host.h
@@ -22,7 +22,7 @@
#define PCIE_HOST_H
#include "hw/pci/pci_host.h"
-#include "memory.h"
+#include "exec/memory.h"
#define TYPE_PCIE_HOST_BRIDGE "pcie-host-bridge"
#define PCIE_HOST_BRIDGE(obj) \
diff --git a/hw/pci/shpc.h b/hw/pci/shpc.h
index 130b71d..6374e68 100644
--- a/hw/pci/shpc.h
+++ b/hw/pci/shpc.h
@@ -2,7 +2,7 @@
#define SHPC_H
#include "qemu-common.h"
-#include "memory.h"
+#include "exec/memory.h"
#include "vmstate.h"
struct SHPCDevice {
diff --git a/hw/pci_bridge_dev.c b/hw/pci_bridge_dev.c
index dbb4b3b..7818dcc 100644
--- a/hw/pci_bridge_dev.c
+++ b/hw/pci_bridge_dev.c
@@ -24,7 +24,7 @@
#include "pci/msi.h"
#include "pci/shpc.h"
#include "pci/slotid_cap.h"
-#include "memory.h"
+#include "exec/memory.h"
#include "pci/pci_bus.h"
#define REDHAT_PCI_VENDOR_ID 0x1b36
diff --git a/hw/pcnet.h b/hw/pcnet.h
index 9664311..9dee6f3 100644
--- a/hw/pcnet.h
+++ b/hw/pcnet.h
@@ -7,7 +7,7 @@
#define PCNET_LOOPTEST_CRC 1
#define PCNET_LOOPTEST_NOCRC 2
-#include "memory.h"
+#include "exec/memory.h"
/* BUS CONFIGURATION REGISTERS */
#define BCR_MSRDA 0
diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c
index df51a74..4eab0f2 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/address-spaces.h"
#include "ssi.h"
#include "microblaze_boot.h"
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index 37b0d55..124a88e 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/address-spaces.h"
#include "microblaze_boot.h"
#include "microblaze_pic_cpu.h"
diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index a2f6360..36af464 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/address-spaces.h"
#include "host-utils.h"
#include "sysbus.h"
diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c
index beab67f..c689cc9 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/address-spaces.h"
#include "host-utils.h"
#include "sysbus.h"
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 8fab508..99ef54d 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -32,7 +32,7 @@
#include "hw/loader.h"
#include "elf.h"
#include "hw/sysbus.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
#include "host-utils.h"
#include "hw/ppce500_pci.h"
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index b875e3b..5a0e026 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/address-spaces.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 0f458ef..aabb2ef 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/address-spaces.h"
#define DEBUG_OPBA
#define DEBUG_SDRAM
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 5193a0c..591d7b0 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/address-spaces.h"
#include "serial.h"
#include "ppc.h"
#include "ppc405.h"
diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c
index bac8d87..3b9dc06 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/address-spaces.h"
//#define DEBUG_MMIO
//#define DEBUG_UNASSIGNED
diff --git a/hw/ppc4xx_pci.c b/hw/ppc4xx_pci.c
index 3e8af11..ba2d669 100644
--- a/hw/ppc4xx_pci.c
+++ b/hw/ppc4xx_pci.c
@@ -24,7 +24,7 @@
#include "ppc4xx.h"
#include "pci/pci.h"
#include "pci/pci_host.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
#undef DEBUG
#ifdef DEBUG
diff --git a/hw/ppc_mac.h b/hw/ppc_mac.h
index 524b236..89c7d66 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 "exec/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 657f405..b2d02ea 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/address-spaces.h"
#include "sysbus.h"
#define MAX_IDE_BUS 2
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index a149306..7a8a039 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/address-spaces.h"
#define MAX_IDE_BUS 2
#define CFG_ADDR 0xf0000510
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 25cc049..aa46cc6 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/address-spaces.h"
//#define HARD_DEBUG_PPC_IO
//#define DEBUG_PPC_IO
diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c
index 9bffbb9..feefc65 100644
--- a/hw/ppce500_pci.c
+++ b/hw/ppce500_pci.c
@@ -317,7 +317,7 @@ static const VMStateDescription vmstate_ppce500_pci = {
}
};
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
static int e500_pcihost_bridge_initfn(PCIDevice *d)
{
diff --git a/hw/prep_pci.c b/hw/prep_pci.c
index 5f22de6..212a2ac 100644
--- a/hw/prep_pci.c
+++ b/hw/prep_pci.c
@@ -26,7 +26,7 @@
#include "pci/pci.h"
#include "pci/pci_host.h"
#include "pc.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
#define TYPE_RAVEN_PCI_HOST_BRIDGE "raven-pcihost"
diff --git a/hw/puv3.c b/hw/puv3.c
index 9f8e294..7814bc5 100644
--- a/hw/puv3.c
+++ b/hw/puv3.c
@@ -12,7 +12,7 @@
#include "qemu-common.h"
#include "ui/console.h"
#include "elf.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
#include "sysbus.h"
#include "boards.h"
#include "loader.h"
diff --git a/hw/pxa.h b/hw/pxa.h
index 49ac820..c2577d1 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 "exec/memory.h"
/* Interrupt numbers */
# define PXA2XX_PIC_SSP3 0
diff --git a/hw/qdev-addr.c b/hw/qdev-addr.c
index 552ee21..3bfe101 100644
--- a/hw/qdev-addr.c
+++ b/hw/qdev-addr.c
@@ -1,6 +1,6 @@
#include "qdev.h"
#include "qdev-addr.h"
-#include "hwaddr.h"
+#include "exec/hwaddr.h"
#include "qapi/visitor.h"
/* --- target physical address --- */
diff --git a/hw/r2d.c b/hw/r2d.c
index b1c278f..d7a26bf 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/address-spaces.h"
#define FLASH_BASE 0x00000000
#define FLASH_SIZE 0x02000000
diff --git a/hw/realview.c b/hw/realview.c
index 17d1ba2..9c55bf2 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/address-spaces.h"
#define SMP_BOOT_ADDR 0xe0000000
#define SMP_BOOTREG_ADDR 0x10000030
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index b732bcc..0a15625 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/address-spaces.h"
#include "hw/s390-virtio-bus.h"
#include "hw/s390x/sclp.h"
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index 5c274fa..bc9b0ae 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -14,7 +14,7 @@
#include "cpu.h"
#include "kvm.h"
-#include "memory.h"
+#include "exec/memory.h"
#include "sclp.h"
diff --git a/hw/serial.c b/hw/serial.c
index 07a2a11..3968c4f 100644
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -26,7 +26,7 @@
#include "serial.h"
#include "qemu-char.h"
#include "qemu-timer.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
//#define DEBUG_SERIAL
diff --git a/hw/serial.h b/hw/serial.h
index 2d7d614..5722f8a 100644
--- a/hw/serial.h
+++ b/hw/serial.h
@@ -27,7 +27,7 @@
#include "hw.h"
#include "sysemu.h"
-#include "memory.h"
+#include "exec/memory.h"
#define UART_FIFO_LENGTH 16 /* 16550A Fifo Length */
diff --git a/hw/sh7750.c b/hw/sh7750.c
index 8bcf0df..0894575 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/address-spaces.h"
#define NB_DEVICES 4
diff --git a/hw/sh_intc.h b/hw/sh_intc.h
index 80c9430..6f11bee 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/address-spaces.h"
typedef unsigned char intc_enum;
diff --git a/hw/sh_pci.c b/hw/sh_pci.c
index 9ea08c8..d521842 100644
--- a/hw/sh_pci.c
+++ b/hw/sh_pci.c
@@ -26,7 +26,7 @@
#include "pci/pci.h"
#include "pci/pci_host.h"
#include "bswap.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
typedef struct SHPCIState {
SysBusDevice busdev;
diff --git a/hw/sh_serial.c b/hw/sh_serial.c
index 9da5d08..6372349 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/address-spaces.h"
//#define DEBUG_SERIAL
diff --git a/hw/sh_timer.c b/hw/sh_timer.c
index c0365b1..da6689f 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/address-spaces.h"
#include "ptimer.h"
//#define DEBUG_TIMER
diff --git a/hw/shix.c b/hw/shix.c
index b56dd54..821196e 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/address-spaces.h"
#define BIOS_FILENAME "shix_bios.bin"
#define BIOS_ADDRESS 0xA0000000
diff --git a/hw/soc_dma.h b/hw/soc_dma.h
index 6ca4166..7379731 100644
--- a/hw/soc_dma.h
+++ b/hw/soc_dma.h
@@ -22,7 +22,7 @@
#define HW_SOC_DMA_H 1
-#include "memory.h"
+#include "exec/memory.h"
#include "hw/irq.h"
struct soc_dma_s;
diff --git a/hw/spapr.c b/hw/spapr.c
index 767d065..a859d08 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -47,7 +47,7 @@
#include "kvm_ppc.h"
#include "pci/pci.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
#include "hw/usb.h"
#include <libfdt.h>
diff --git a/hw/spapr_iommu.c b/hw/spapr_iommu.c
index 3011b25..fb968b2 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/address-spaces.h"
#include "hw/spapr.h"
diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c
index 786f6f4..27b3ad3 100644
--- a/hw/spapr_pci.c
+++ b/hw/spapr_pci.c
@@ -29,7 +29,7 @@
#include "pci/pci_host.h"
#include "hw/spapr.h"
#include "hw/spapr_pci.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
#include <libfdt.h>
#include "trace.h"
diff --git a/hw/spitz.c b/hw/spitz.c
index 1500161..48668a0 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/address-spaces.h"
#undef REG_FMT
#define REG_FMT "0x%02lx"
diff --git a/hw/stellaris.c b/hw/stellaris.c
index f3eb4bb..368f8a5 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/address-spaces.h"
#define GPIO_A 0
#define GPIO_B 1
diff --git a/hw/strongarm.h b/hw/strongarm.h
index d30dd6a..2893f94 100644
--- a/hw/strongarm.h
+++ b/hw/strongarm.h
@@ -1,7 +1,7 @@
#ifndef _STRONGARM_H
#define _STRONGARM_H
-#include "memory.h"
+#include "exec/memory.h"
#define SA_CS0 0x00000000
#define SA_CS1 0x08000000
diff --git a/hw/sun4u.c b/hw/sun4u.c
index d9e752f..000f611 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/address-spaces.h"
//#define DEBUG_IRQ
//#define DEBUG_EBUS
diff --git a/hw/sysbus.c b/hw/sysbus.c
index ef8ffb6..7ab2504 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/address-spaces.h"
static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent);
static char *sysbus_get_fw_dev_path(DeviceState *dev);
diff --git a/hw/sysbus.h b/hw/sysbus.h
index e58baaa..669cf87 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 "exec/memory.h"
#define QDEV_MAX_MMIO 32
#define QDEV_MAX_PIO 32
diff --git a/hw/tosa.c b/hw/tosa.c
index 3991a90..6fdbec5 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/address-spaces.h"
#define TOSA_RAM 0x04000000
#define TOSA_ROM 0x00800000
diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c
index 24d3cad..672d7a5 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 7a543b4..1f4d669 100644
--- a/hw/versatile_pci.c
+++ b/hw/versatile_pci.c
@@ -10,7 +10,7 @@
#include "sysbus.h"
#include "pci/pci.h"
#include "pci/pci_host.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
typedef struct {
SysBusDevice busdev;
diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index af398d9..bd9c015 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/address-spaces.h"
#include "flash.h"
#define VERSATILE_FLASH_ADDR 0x34000000
diff --git a/hw/vexpress.c b/hw/vexpress.c
index 5c9c08b..e7b9e93 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/address-spaces.h"
#include "blockdev.h"
#include "flash.h"
diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c
index 264e58a..096621c 100644
--- a/hw/vfio_pci.c
+++ b/hw/vfio_pci.c
@@ -28,9 +28,9 @@
#include "config.h"
#include "event_notifier.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
#include "kvm.h"
-#include "memory.h"
+#include "exec/memory.h"
#include "pci/msi.h"
#include "pci/msix.h"
#include "pci/pci.h"
diff --git a/hw/vga_int.h b/hw/vga_int.h
index 5efaee8..8d496ea 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -26,7 +26,7 @@
#include <hw/hw.h>
#include "qapi/error.h"
-#include "memory.h"
+#include "exec/memory.h"
#define ST01_V_RETRACE 0x08
#define ST01_DISP_ENABLE 0x01
diff --git a/hw/vhost.c b/hw/vhost.c
index 16322a1..feaff64 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/address-spaces.h"
static void vhost_dev_sync_region(struct vhost_dev *dev,
MemoryRegionSection *section,
diff --git a/hw/vhost.h b/hw/vhost.h
index 0c47229..6f6a906 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 "exec/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 1fdbc49..0f27c2b 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/address-spaces.h"
#include "ppc.h"
#include "ppc4xx.h"
diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c
index dd1a650..97d3a93 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/address-spaces.h"
#if defined(__linux__)
#include <sys/mman.h>
diff --git a/hw/vt82c686.c b/hw/vt82c686.c
index f963912..edceb5a 100644
--- a/hw/vt82c686.c
+++ b/hw/vt82c686.c
@@ -24,7 +24,7 @@
#include "pm_smbus.h"
#include "sysemu.h"
#include "qemu-timer.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
typedef uint32_t pci_addr_t;
#include "pci/pci_host.h"
diff --git a/hw/xen_platform.c b/hw/xen_platform.c
index 023499e..e7611bb 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/address-spaces.h"
#include <xenguest.h>
diff --git a/hw/xen_pt.c b/hw/xen_pt.c
index c782cdb..5c50d56 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/address-spaces.h"
#define XEN_PT_NR_IRQS (256)
static uint8_t xen_pt_mapped_machine_irq[XEN_PT_NR_IRQS] = {0};
diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c
index 67adc52..156648a 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/address-spaces.h"
#include "sysemu.h"
#include "boards.h"
#include "flash.h"
diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index 0399de7..c6c880e 100644
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -29,8 +29,8 @@
#include "boards.h"
#include "loader.h"
#include "elf.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
#include "serial.h"
#include "net/net.h"
#include "sysbus.h"
diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c
index 0d633e4..29b5f22 100644
--- a/hw/xtensa_sim.c
+++ b/hw/xtensa_sim.c
@@ -29,8 +29,8 @@
#include "boards.h"
#include "loader.h"
#include "elf.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
static uint64_t translate_phys_addr(void *env, uint64_t addr)
{
diff --git a/hw/z2.c b/hw/z2.c
index d461864..ec35f3e 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/address-spaces.h"
#ifdef DEBUG_Z2
#define DPRINTF(fmt, ...) \
diff --git a/exec-memory.h b/include/exec/address-spaces.h
similarity index 97%
rename from exec-memory.h
rename to include/exec/address-spaces.h
index ac1d07d..3d12cdd 100644
--- a/exec-memory.h
+++ b/include/exec/address-spaces.h
@@ -19,7 +19,7 @@
* you're one of them.
*/
-#include "memory.h"
+#include "exec/memory.h"
#ifndef CONFIG_USER_ONLY
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 d6b2b19..bec04e2 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:
*
@@ -180,7 +180,7 @@ static inline void tswap64s(uint64_t *s)
#if defined(CONFIG_USER_ONLY)
#include <assert.h>
-#include "qemu-user-types.h"
+#include "exec/user/abitypes.h"
/* On some host systems the guest address space is reserved on the host.
* This allows the guest address space to be offset to a convenient location.
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 d2fbafa..f83d618 100644
--- a/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -3,10 +3,10 @@
/* CPU interfaces that are target independent. */
-#include "hwaddr.h"
+#include "exec/hwaddr.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 3669241..8d2230e 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 "hwaddr.h"
+#include "exec/hwaddr.h"
#ifndef TARGET_LONG_BITS
#error TARGET_LONG_BITS must be defined before including this header
diff --git a/cputlb.h b/include/exec/cputlb.h
similarity index 100%
rename from cputlb.h
rename to include/exec/cputlb.h
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 e9b07cd..2ae8aae 100644
--- a/exec-all.h
+++ b/include/exec/exec-all.h
@@ -275,7 +275,7 @@ static inline void tb_add_jump(TranslationBlock *tb, int n,
}
}
-#include "qemu-lock.h"
+#include "exec/spinlock.h"
extern spinlock_t tb_lock;
@@ -353,22 +353,22 @@ void io_mem_write(struct MemoryRegion *mr, hwaddr 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/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/hwaddr.h b/include/exec/hwaddr.h
similarity index 100%
rename from hwaddr.h
rename to include/exec/hwaddr.h
diff --git a/ioport.h b/include/exec/ioport.h
similarity index 99%
rename from ioport.h
rename to include/exec/ioport.h
index 23441cb..fc28350 100644
--- a/ioport.h
+++ b/include/exec/ioport.h
@@ -25,7 +25,7 @@
#define IOPORT_H
#include "qemu-common.h"
-#include "iorange.h"
+#include "exec/iorange.h"
typedef uint32_t pio_addr_t;
#define FMT_pioaddr PRIx32
diff --git a/iorange.h b/include/exec/iorange.h
similarity index 100%
rename from iorange.h
rename to include/exec/iorange.h
diff --git a/memory-internal.h b/include/exec/memory-internal.h
similarity index 100%
rename from memory-internal.h
rename to include/exec/memory-internal.h
diff --git a/memory.h b/include/exec/memory.h
similarity index 99%
rename from memory.h
rename to include/exec/memory.h
index 9462bfd..b0c4745 100644
--- a/memory.h
+++ b/include/exec/memory.h
@@ -19,11 +19,11 @@
#include <stdint.h>
#include <stdbool.h>
#include "qemu-common.h"
-#include "cpu-common.h"
-#include "hwaddr.h"
+#include "exec/cpu-common.h"
+#include "exec/hwaddr.h"
#include "qemu-queue.h"
-#include "iorange.h"
-#include "ioport.h"
+#include "exec/iorange.h"
+#include "exec/ioport.h"
#include "int128.h"
typedef struct MemoryRegionOps MemoryRegionOps;
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 99%
rename from softmmu_template.h
rename to include/exec/softmmu_template.h
index ce30d8b..15d4c51 100644
--- a/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 "exec/memory.h"
#define DATA_SIZE (1 << SHIFT)
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/qemu-user-types.h b/include/exec/user/abitypes.h
similarity index 100%
rename from qemu-user-types.h
rename to include/exec/user/abitypes.h
diff --git a/thunk.h b/include/exec/user/thunk.h
similarity index 100%
rename from thunk.h
rename to include/exec/user/thunk.h
diff --git a/ioport.c b/ioport.c
index 6e4ca0d..a0ac2a0 100644
--- a/ioport.c
+++ b/ioport.c
@@ -25,9 +25,9 @@
* splitted out ioport related stuffs from vl.c.
*/
-#include "ioport.h"
+#include "exec/ioport.h"
#include "trace.h"
-#include "memory.h"
+#include "exec/memory.h"
/***********************************************************/
/* IO Port */
diff --git a/kvm-all.c b/kvm-all.c
index 759ef17..c258859 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -27,11 +27,11 @@
#include "sysemu.h"
#include "hw/hw.h"
#include "hw/pci/msi.h"
-#include "gdbstub.h"
+#include "exec/gdbstub.h"
#include "kvm.h"
#include "bswap.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.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 d65fd04..8de8ebd 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -14,7 +14,7 @@
#include "hw/hw.h"
#include "hw/pci/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 ceddb3c..2af883b 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -11,13 +11,13 @@
#include <stdlib.h>
#endif /* DEBUG_REMAP */
-#include "qemu-user-types.h"
+#include "exec/user/abitypes.h"
-#include "thunk.h"
+#include "exec/user/thunk.h"
#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 7419853..d40193d 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 "exec-memory.h"
-#include "ioport.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
+#include "exec/ioport.h"
#include "bitops.h"
#include "kvm.h"
#include <assert.h>
-#include "memory-internal.h"
+#include "exec/memory-internal.h"
static unsigned memory_region_transaction_depth;
static bool memory_region_update_pending;
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 a82e190..c829a9f 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 7d5c8a6..a3e0109 100644
--- a/monitor.c
+++ b/monitor.c
@@ -30,7 +30,7 @@
#include "hw/pci/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"
@@ -63,7 +63,7 @@
#include "trace/simple.h"
#endif
#include "ui/qemu-spice.h"
-#include "memory.h"
+#include "exec/memory.h"
#include "qmp-commands.h"
#include "hmp.h"
#include "qemu-thread.h"
diff --git a/qtest.c b/qtest.c
index fbfab4e..ebe3963 100644
--- a/qtest.c
+++ b/qtest.c
@@ -14,8 +14,8 @@
#include "qtest.h"
#include "hw/qdev.h"
#include "qemu-char.h"
-#include "ioport.h"
-#include "memory.h"
+#include "exec/ioport.h"
+#include "exec/memory.h"
#include "hw/irq.h"
#include "sysemu.h"
#include "cpus.h"
diff --git a/savevm.c b/savevm.c
index ae87878..cb33501 100644
--- a/savevm.c
+++ b/savevm.c
@@ -82,7 +82,7 @@
#include "qemu-queue.h"
#include "qemu-timer.h"
#include "cpus.h"
-#include "memory.h"
+#include "exec/memory.h"
#include "qmp-commands.h"
#include "trace.h"
#include "bitops.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 9939d61..137703f 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"
@@ -295,7 +295,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 {
@@ -520,7 +520,7 @@ static inline bool cpu_has_work(CPUState *cpu)
| 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 dd55f89..eac3041 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_NO_RWG_SE, i64, env)
@@ -119,4 +119,4 @@ DEF_HELPER_FLAGS_0(get_time, TCG_CALL_NO_RWG, i64)
DEF_HELPER_FLAGS_2(set_alarm, TCG_CALL_NO_RWG, 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 64b33f6..3d2cd61 100644
--- a/target-alpha/mem_helper.c
+++ b/target-alpha/mem_helper.c
@@ -117,22 +117,22 @@ void cpu_unassigned_access(CPUAlphaState *env, hwaddr 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 f57c8fd..2d0d891 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 7743d67..847318d 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 e4ff918..7f87efa 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
@@ -726,7 +726,7 @@ static inline bool cpu_has_work(CPUState *cpu)
(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 ab8b734..1f7a3c0 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 3d23ceb..8544f82 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_NO_RWG_SE, i32, i32)
DEF_HELPER_FLAGS_1(sxtb16, TCG_CALL_NO_RWG_SE, i32, i32)
@@ -463,4 +463,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 89280b6..b028cc2 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 1fcc975..99610d7 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 10c548d..988b542 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 2c27506..63e6234 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)
@@ -292,7 +292,7 @@ static inline bool cpu_has_work(CPUState *cpu)
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 fe12083..8e8365c 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_NO_SE, 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 31db424..cd0e17e 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 2a92727..09e6011 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 41f9d1c..6dfb0f3 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 386c4f6..f3f50a0 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"
@@ -1117,7 +1117,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)
@@ -1137,7 +1137,7 @@ static inline bool cpu_has_work(CPUState *cpu)
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 970fcd9..9ed720d 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_NO_SE, i32, env, int)
DEF_HELPER_FLAGS_2(cc_compute_c, TCG_CALL_NO_SE, 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/ioport-user.c b/target-i386/ioport-user.c
index 03fac22..f7636e0 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 "exec/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 824930c..f7c95d5 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -25,12 +25,12 @@
#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"
#include "hw/apic.h"
-#include "ioport.h"
+#include "exec/ioport.h"
#include "hyperv.h"
#include "hw/pci/pci.h"
diff --git a/target-i386/mem_helper.c b/target-i386/mem_helper.c
index d0be77b..6cf9ba0 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..db3126b 100644
--- a/target-i386/misc_helper.c
+++ b/target-i386/misc_helper.c
@@ -18,11 +18,11 @@
*/
#include "cpu.h"
-#include "ioport.h"
+#include "exec/ioport.h"
#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 a238d95..3f246e9 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 026201e..32d21f5 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 7243b4f..4e202db 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)
{
@@ -260,7 +260,7 @@ static inline bool cpu_has_work(CPUState *cpu)
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 97b9625..27b3cef 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 9683b9a..6b87340 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 f4fcdee..b37af1f 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"
@@ -242,7 +242,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)
@@ -261,7 +261,7 @@ static inline bool cpu_has_work(CPUState *cpu)
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 a5d0100..a9a2778 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 9f7a24c..e6c7dd2 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 b97ba5e..16df24c 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 d955c7a..1c9b5ec 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 585bbd6..5358941 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)
{
@@ -381,7 +381,7 @@ static inline bool cpu_has_work(CPUState *cpu)
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 a667122..4e51429 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 7593517..343dcc1 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 5946a5b..58ce712 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 aebb2d5..183ba9f 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;
@@ -560,7 +560,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.
@@ -738,7 +738,7 @@ static inline bool cpu_has_work(CPUState *cpu)
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 acf9ebd..9ea60ec 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)
@@ -707,4 +707,4 @@ DEF_HELPER_FLAGS_2(rddsp, 0, tl, tl, env)
-#include "def-helper.h"
+#include "exec/def-helper.h"
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index 2972ae3..157f59e 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
@@ -2116,16 +2116,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 44e7617..e81ff38 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -1017,7 +1017,7 @@ static TCGv_i64 fpu_f64[32];
static uint32_t gen_opc_hflags[OPC_BUF_SIZE];
static target_ulong gen_opc_btarget[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 c7b1750..8dc56c2 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"
@@ -398,7 +398,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,
@@ -427,7 +427,7 @@ static inline bool cpu_has_work(CPUState *cpu)
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 f2a6523..4eee444 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 d2edebc..e46b092 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 2cb9d69..5883347 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 742d4f8..610bcd5 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"
@@ -1251,7 +1251,7 @@ static inline void cpu_clone_regs(CPUPPCState *env, target_ulong newsp)
}
#endif
-#include "cpu-all.h"
+#include "exec/cpu-all.h"
/*****************************************************************************/
/* CRF definitions */
@@ -2224,7 +2224,7 @@ static inline bool cpu_has_work(CPUState *cpu)
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 e588370..d2e9a55 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/kvm_ppc.h b/target-ppc/kvm_ppc.h
index baad6eb..83f9872 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 "exec/memory.h"
void kvmppc_init(void);
diff --git a/target-ppc/mem_helper.c b/target-ppc/mem_helper.c
index 04c0144..2d7a349 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 8a53105..a74d76b 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -71,7 +71,7 @@ static TCGv cpu_reserve;
static TCGv 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 984ca9f..cca63ab 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 0f9a1f7..acb8c73 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 b7b812a..6e9b209 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 ac44eab..c4926c5 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_NO_RWG_SE,
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 91b25e3..bed21e6 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 38d8f2a..a3336e1 100644
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -19,7 +19,7 @@
*/
#include "cpu.h"
-#include "memory.h"
+#include "exec/memory.h"
#include "host-utils.h"
#include "helper.h"
#include <string.h>
@@ -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 6e144a6..28e61c5 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 9a0e72b..7c50c79 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 {
@@ -378,7 +378,7 @@ static inline bool cpu_has_work(CPUState *cpu)
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 304b77b..7162448 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 e8e87f5..09e3d23 100644
--- a/target-sh4/op_helper.c
+++ b/target-sh4/op_helper.c
@@ -22,21 +22,21 @@
#include "helper.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(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 41d53e5..260aaab 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 013ecbd..0ed511a 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"
@@ -701,7 +701,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 */
@@ -767,7 +767,7 @@ static inline bool cpu_has_work(CPUState *cpu)
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 098c482..cfcdab1 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 8d815e5..cf1bddf 100644
--- a/target-sparc/ldst_helper.c
+++ b/target-sparc/ldst_helper.c
@@ -68,21 +68,21 @@
static void QEMU_NORETURN do_unaligned_access(CPUSPARCState *env,
target_ulong addr, int is_write,
int is_user, uintptr_t retaddr);
-#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 2c89b20..a9649ae 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/address-spaces.h"
/* Sparc MMU emulation */
diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index 88802b8..ca75e1a 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 676c5d9..cd8f730 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 b8172ba..6443ffe 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 8c49f4d..218e95e 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 08fd5bc..5acf78c 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
@@ -512,8 +512,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(CPUState *cpu)
{
diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c
index bf05575..3d7a399 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 5b4cd27..38d7157 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)
@@ -58,4 +58,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 84f0449..a93abcb 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_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 4e81cbd..3c2d185 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"
typedef struct XtensaReg {
const char *name;
diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c
index 47612fe..c3ac85e 100644
--- a/tcg/arm/tcg-target.c
+++ b/tcg/arm/tcg-target.c
@@ -992,7 +992,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 6f3ad3c..ae82746 100644
--- a/tcg/i386/tcg-target.c
+++ b/tcg/i386/tcg-target.c
@@ -982,7 +982,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 ae2b274..bd8c858 100644
--- a/tcg/mips/tcg-target.c
+++ b/tcg/mips/tcg-target.c
@@ -920,7 +920,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 d72d396..29ca934 100644
--- a/tcg/ppc/tcg-target.c
+++ b/tcg/ppc/tcg-target.c
@@ -549,7 +549,7 @@ static void add_qemu_ldst_label (TCGContext *s,
label->label_ptr[0] = label_ptr;
}
-#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 54cf1d9..2b2c11f 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/thunk.c b/thunk.c
index 8ebbbb4..3cca047 100644
--- a/thunk.c
+++ b/thunk.c
@@ -21,7 +21,7 @@
#include <stdarg.h>
#include "qemu.h"
-#include "thunk.h"
+#include "exec/user/thunk.h"
//#define DEBUG
diff --git a/translate-all.c b/translate-all.c
index bbe06db..e0cdad3 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -36,8 +36,8 @@
#include "disas/disas.h"
#include "tcg.h"
#include "qemu-timer.h"
-#include "memory.h"
-#include "exec-memory.h"
+#include "exec/memory.h"
+#include "exec/address-spaces.h"
#if defined(CONFIG_USER_ONLY)
#include "qemu.h"
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
@@ -57,7 +57,7 @@
#endif
#endif
-#include "cputlb.h"
+#include "exec/cputlb.h"
#include "translate-all.h"
//#define DEBUG_TB_INVALIDATE
diff --git a/vl.c b/vl.c
index 975767a..015f0a4 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 e3a51cc..95d383f 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/address-spaces.h"
#include <xen/hvm/ioreq.h>
#include <xen/hvm/params.h>
diff --git a/xen-stub.c b/xen-stub.c
index 9214392..1ee8411 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 "exec/memory.h"
#include "qmp-commands.h"
void xenstore_store_pv_console_info(int i, CharDriverState *chr)
--
1.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 24/32] monitor: move include files to include/monitor/
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (22 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 23/32] exec: move include files to include/exec/ Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 25/32] migration: move include files to include/migration/ Paolo Bonzini
` (9 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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/pci-hotplug.c | 2 +-
hw/pci/pci-stub.c | 2 +-
hw/pci/pci.c | 2 +-
hw/pci/pcie_aer.c | 2 +-
hw/qdev-monitor.c | 2 +-
hw/qdev-monitor.h | 2 +-
hw/qxl.c | 2 +-
hw/s390-virtio-bus.c | 2 +-
hw/s390-virtio.c | 2 +-
hw/s390x/event-facility.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.h | 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 +-
qerror.c | 2 +-
readline.c | 4 ++--
savevm.c | 2 +-
slirp/misc.c | 4 ++--
stubs/fdset-add-fd.c | 2 +-
stubs/fdset-find-fd.c | 2 +-
stubs/fdset-get-fd.c | 2 +-
stubs/fdset-remove-fd.c | 2 +-
stubs/get-fd.c | 2 +-
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 +-
84 files changed, 87 insertions(+), 87 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 e15ceda..93d1e52 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 1c77389..a0cc727 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -23,7 +23,7 @@
*/
#include "hw/hw.h"
#include "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 4f785f5..9d94623 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.h"
typedef struct {
diff --git a/balloon.c b/balloon.c
index c24458b..d1de435 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 5eab9e2..0e7f18c 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 81aa1d3..596b474 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 "qapi/qmp/qerror.h"
#include "sysemu.h"
#include "qmp-commands.h"
diff --git a/blockdev.c b/blockdev.c
index ff6b333..a2308fa 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 "qapi/qmp/qerror.h"
#include "qemu-option.h"
#include "qemu-config.h"
diff --git a/blockjob.c b/blockjob.c
index 004480d..4bc60c7 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 8926873..3a66401 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 8157b96..a46faee 100644
--- a/disas.c
+++ b/disas.c
@@ -374,7 +374,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;
diff --git a/dump.c b/dump.c
index e70e0f3..871ee17 100644
--- a/dump.c
+++ b/dump.c
@@ -16,7 +16,7 @@
#include "cpu.h"
#include "exec/cpu-all.h"
#include "exec/hwaddr.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 f235134..a76a8f0 100644
--- a/hmp.c
+++ b/hmp.c
@@ -20,7 +20,7 @@
#include "qemu-timer.h"
#include "qmp-commands.h"
#include "qemu_socket.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 ae29a59..fe9b76a 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 336ffc2..809a598 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 af0ba4d..5e935e7 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 f32a847..d38c6e4 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -27,7 +27,7 @@
#include <hw/pci/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 8f40974..a2be67d 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 2629775..ff0dc0d 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/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 03f0318..f5ef575 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 2452fd4..7aaff0f 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -28,7 +28,7 @@
#include "fdc.h"
#include "ide.h"
#include "pci/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/pci-hotplug.c b/hw/pci/pci-hotplug.c
index 5ba7558..e5e8a7a 100644
--- a/hw/pci/pci-hotplug.c
+++ b/hw/pci/pci-hotplug.c
@@ -27,7 +27,7 @@
#include "hw/pci/pci.h"
#include "net/net.h"
#include "hw/pc.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "hw/scsi.h"
#include "hw/virtio-blk.h"
#include "qemu-config.h"
diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c
index b5c43a9..5891dc9 100644
--- a/hw/pci/pci-stub.c
+++ b/hw/pci/pci-stub.c
@@ -19,7 +19,7 @@
*/
#include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "hw/pci/pci.h"
#include "qmp-commands.h"
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index fa0f08e..e062f66 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -25,7 +25,7 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pci_bus.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "net/net.h"
#include "sysemu.h"
#include "hw/loader.h"
diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index b6f4f85..f7f3633 100644
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -20,7 +20,7 @@
#include "sysemu.h"
#include "qapi/qmp/types.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pcie.h"
#include "hw/pci/msix.h"
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
index 5aaf74b..207282c 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/qdev-monitor.h b/hw/qdev-monitor.h
index 220ceba..fae1b1e 100644
--- a/hw/qdev-monitor.h
+++ b/hw/qdev-monitor.h
@@ -2,7 +2,7 @@
#define QEMU_QDEV_MONITOR_H
#include "qdev-core.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
/*** monitor commands ***/
diff --git a/hw/qxl.c b/hw/qxl.c
index 96887c4..ad02148 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 f7e1939..769015c 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 0a15625..7dfe87a 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/s390x/event-facility.c b/hw/s390x/event-facility.c
index bc9cea9..748118d 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -15,7 +15,7 @@
*
*/
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "sysemu.h"
#include "sclp.h"
diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c
index 6aafa8b..a44ce95 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 1f19fed..fdf8db9 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 702e9f5..b78d54f 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 7ab2504..49a4177 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/address-spaces.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 8264c24..74728c9 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 de955b7..3862c9b 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 de56fea..0d7597b 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.h b/hw/usb/hcd-ehci.h
index 837c63b..740f730 100644
--- a/hw/usb/hcd-ehci.h
+++ b/hw/usb/hcd-ehci.h
@@ -20,7 +20,7 @@
#include "hw/hw.h"
#include "qemu-timer.h"
#include "hw/usb.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 dae0009..340c21a 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 bdafb6b..5a56e99 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 9e7f645..3621076 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 "iov.h"
diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index 155da58..5559518 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 f878bec..623b299 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 d06de26..14c57af 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 "qapi/qmp/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 9e96e83..87fb49c 100644
--- a/monitor.h
+++ b/include/monitor/monitor.h
@@ -5,7 +5,7 @@
#include "qapi/qmp/qerror.h"
#include "qapi/qmp/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 eff5cc9..3db6635 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -4,7 +4,7 @@
#include "ui/qemu-pixman.h"
#include "qapi/qmp/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 e862288..73a1dfc 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 1fce152..27a272e 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 a3e0109..94c6bb6 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 ead7e96..e4d85a9 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 5a11ac5..c37a5ef 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 8430f1a..bc2b951 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 f8cabc4..9a677e9 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 3a63d26..807e90c 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 bc53d09..16021c5 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 c52a40a..cea0a4b 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 5a99403..8e0dccc 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 b46631e..40453fd 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 08ccb0f..f8b450c 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/qerror.c b/qerror.c
index 8c78104..3aee1cf 100644
--- a/qerror.c
+++ b/qerror.c
@@ -10,7 +10,7 @@
* See the COPYING.LIB file in the top-level directory.
*/
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "qapi/qmp/qjson.h"
#include "qapi/qmp/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 cb33501..bf341bb 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 664532a..d4df972 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -8,7 +8,7 @@
#include <slirp.h>
#include <libslirp.h>
-#include "monitor.h"
+#include "monitor/monitor.h"
#ifdef DEBUG
int slirp_debug = DBG_CALL|DBG_MISC|DBG_ERROR;
@@ -242,7 +242,7 @@ strdup(str)
}
#endif
-#include "monitor.h"
+#include "monitor/monitor.h"
void lprint(const char *format, ...)
{
diff --git a/stubs/fdset-add-fd.c b/stubs/fdset-add-fd.c
index 09fe2a8..ee16437 100644
--- a/stubs/fdset-add-fd.c
+++ b/stubs/fdset-add-fd.c
@@ -1,5 +1,5 @@
#include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd)
{
diff --git a/stubs/fdset-find-fd.c b/stubs/fdset-find-fd.c
index f82baa0..4f18344 100644
--- a/stubs/fdset-find-fd.c
+++ b/stubs/fdset-find-fd.c
@@ -1,5 +1,5 @@
#include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
int monitor_fdset_dup_fd_find(int dup_fd)
{
diff --git a/stubs/fdset-get-fd.c b/stubs/fdset-get-fd.c
index 4106cf9..7112c15 100644
--- a/stubs/fdset-get-fd.c
+++ b/stubs/fdset-get-fd.c
@@ -1,5 +1,5 @@
#include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
int monitor_fdset_get_fd(int64_t fdset_id, int flags)
{
diff --git a/stubs/fdset-remove-fd.c b/stubs/fdset-remove-fd.c
index 861b312..b3886d9 100644
--- a/stubs/fdset-remove-fd.c
+++ b/stubs/fdset-remove-fd.c
@@ -1,5 +1,5 @@
#include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
int monitor_fdset_dup_fd_remove(int dupfd)
{
diff --git a/stubs/get-fd.c b/stubs/get-fd.c
index 3561ab6..9f2c65c 100644
--- a/stubs/get-fd.c
+++ b/stubs/get-fd.c
@@ -1,5 +1,5 @@
#include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
int monitor_get_fd(Monitor *mon, const char *name, Error **errp)
{
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 00341c5..bd47b8e 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 0550805..3796775 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -35,7 +35,7 @@
#include "qapi/qmp/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 681fe32..56ebf80 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 7ec1833..e5c043f 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 015f0a4..9adaf28 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 25/32] migration: move include files to include/migration/
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (23 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 24/32] monitor: move include files to include/monitor/ Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 26/32] qom: move include files to include/qom/ Paolo Bonzini
` (8 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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/pci/shpc.h | 2 +-
hw/ptimer.h | 2 +-
block-migration.h => include/migration/block.h | 0
migration.h => include/migration/migration.h | 2 +-
include/{qemu => migration}/page_cache.h | 0
qemu-file.h => include/migration/qemu-file.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 migration.h => include/migration/migration.h (99%)
rename include/{qemu => migration}/page_cache.h (100%)
rename qemu-file.h => include/migration/qemu-file.h (100%)
rename vmstate.h => include/migration/vmstate.h (100%)
diff --git a/arch_init.c b/arch_init.c
index 93d1e52..f627253 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -39,12 +39,12 @@
#include "hw/pci/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/address-spaces.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 ca1fafb..10d0827 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -16,7 +16,7 @@
#include "trace.h"
#include "qed.h"
#include "qapi/qmp/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 dab9cac..b1d199a 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 68e50e1..77a1a67 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 aabd712..47b5518 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"
#if defined(CONFIG_UUID)
#include <uuid/uuid.h>
#endif
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 7368470..883ddb6 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -11,8 +11,8 @@
#include "exec/ioport.h"
#include "irq.h"
#include "block/aio.h"
-#include "qemu-file.h"
-#include "vmstate.h"
+#include "migration/qemu-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 d15760b..d5b91dd 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -21,7 +21,7 @@
#include "pci/pci.h"
#include "pci/msix.h"
#include "kvm.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "qapi/qmp/qerror.h"
#include "event_notifier.h"
#include "qemu-char.h"
diff --git a/hw/pci/shpc.h b/hw/pci/shpc.h
index 6374e68..467911a 100644
--- a/hw/pci/shpc.h
+++ b/hw/pci/shpc.h
@@ -3,7 +3,7 @@
#include "qemu-common.h"
#include "exec/memory.h"
-#include "vmstate.h"
+#include "migration/vmstate.h"
struct SHPCDevice {
/* Capability offset in device's config space */
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/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/migration.h b/include/migration/migration.h
similarity index 99%
rename from migration.h
rename to include/migration/migration.h
index af444d4..a95f761 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/qemu-file.h b/include/migration/qemu-file.h
similarity index 100%
rename from qemu-file.h
rename to include/migration/qemu-file.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 26dd0cf..41d3729 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -6,7 +6,7 @@
#include "qapi/qmp/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 3e55b77..784486d 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 73a1dfc..ab5abe2 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 07f51f2..a36e637 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 1b9c461..9debc95 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 27a272e..0456983 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 94c6bb6..46fdc00 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 "qapi/qmp/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 40453fd..d1f4622 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 bf341bb..a5205a0 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 3796775..962475d 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -34,7 +34,7 @@
#include "qapi/qmp/qstring.h"
#include "qapi/qmp/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 9adaf28..2debde0 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 "qapi/qmp/qjson.h"
#include "qemu-option.h"
--
1.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 26/32] qom: move include files to include/qom/
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (24 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 25/32] migration: move include files to include/migration/ Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 27/32] misc: move include files to include/qemu/ Paolo Bonzini
` (7 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/qdev-core.h | 2 +-
hw/stream.h | 2 +-
include/qemu/rng-random.h | 2 +-
include/qemu/rng.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 +-
27 files changed, 28 insertions(+), 28 deletions(-)
rename include/{qemu => qom}/cpu.h (99%)
rename include/{qemu => qom}/object.h (100%)
rename include/{qemu => qom}/qom-qobject.h (97%)
diff --git a/hw/qdev-core.h b/hw/qdev-core.h
index 506977c..93a3a2a 100644
--- a/hw/qdev-core.h
+++ b/hw/qdev-core.h
@@ -4,7 +4,7 @@
#include "qemu-queue.h"
#include "qemu-option.h"
#include "qemu-types.h"
-#include "qemu/object.h"
+#include "qom/object.h"
#include "hw/irq.h"
#include "qapi/error.h"
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/rng-random.h b/include/qemu/rng-random.h
index 6249290..4332772 100644
--- a/include/qemu/rng-random.h
+++ b/include/qemu/rng-random.h
@@ -12,7 +12,7 @@
#ifndef QEMU_RNG_RANDOM_H
#define QEMU_RNG_RANDOM_H
-#include "qemu/object.h"
+#include "qom/object.h"
#define TYPE_RNG_RANDOM "rng-random"
#define RNG_RANDOM(obj) OBJECT_CHECK(RndRandom, (obj), TYPE_RNG_RANDOM)
diff --git a/include/qemu/rng.h b/include/qemu/rng.h
index 3791297..509abd0 100644
--- a/include/qemu/rng.h
+++ b/include/qemu/rng.h
@@ -13,7 +13,7 @@
#ifndef QEMU_RNG_H
#define QEMU_RNG_H
-#include "qemu/object.h"
+#include "qom/object.h"
#include "qemu-common.h"
#include "qapi/error.h"
diff --git a/include/qemu/cpu.h b/include/qom/cpu.h
similarity index 99%
rename from include/qemu/cpu.h
rename to include/qom/cpu.h
index 61b7698..9682dd5 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 e873f0a..5b3a5d7 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 932f8b3..351b88c 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/visitor.h"
#include "qapi/string-input-visitor.h"
@@ -19,7 +19,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 "qapi/qmp/qobject.h"
#include "qapi/qmp/qbool.h"
#include "qapi/qmp/qint.h"
diff --git a/qom/qom-qobject.c b/qom/qom-qobject.c
index f0fa652..6384b8e 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/visitor.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 8dc56c2..876b386 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 27/32] misc: move include files to include/qemu/
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (25 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 26/32] qom: move include files to include/qom/ Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 28/32] softmmu: move include files to include/sysemu/ Paolo Bonzini
` (6 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
acl.c | 2 +-
aio-posix.c | 4 ++--
aio-win32.c | 4 ++--
arch_init.c | 6 +++---
async.c | 2 +-
audio/alsaaudio.c | 2 +-
audio/audio.c | 2 +-
audio/audio.h | 2 +-
audio/noaudio.c | 2 +-
audio/ossaudio.c | 4 ++--
audio/spiceaudio.c | 2 +-
audio/wavaudio.c | 2 +-
backends/rng-random.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/linux-aio.c | 4 ++--
block/nbd.c | 6 +++---
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 | 8 ++++----
block/raw-win32.c | 6 +++---
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 +-
block/win32-aio.c | 6 +++---
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-posix.c | 4 ++--
event_notifier-win32.c | 4 ++--
exec.c | 6 +++---
fpu/softfloat.h | 2 +-
fsdev/qemu-fsdev-dummy.c | 4 ++--
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 | 6 +++---
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_ich9.c | 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/ich9.h | 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/lpc_ich9.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/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/msi.c | 2 +-
hw/pci/msix.c | 2 +-
hw/pci/pci-hotplug.c | 2 +-
hw/pci/pci.c | 2 +-
hw/pci/pci_bridge.c | 2 +-
hw/pci/pcie.c | 2 +-
hw/pci/shpc.c | 4 ++--
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/q35.h | 2 +-
hw/qdev-core.h | 6 +++---
hw/qdev-monitor.c | 2 +-
hw/qxl-logger.c | 2 +-
hw/qxl.c | 4 ++--
hw/qxl.h | 2 +-
hw/rc4030.c | 2 +-
hw/rtl8139.c | 4 ++--
hw/s390x/event-facility.h | 2 +-
hw/s390x/sclpconsole.c | 2 +-
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/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/combined-packet.c | 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-pci.c | 2 +-
hw/usb/hcd-ehci.h | 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 | 4 ++--
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-rng.c | 2 +-
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 | 4 ++--
hw/xilinx_timer.c | 2 +-
hw/xtensa_pic.c | 4 ++--
hw/zynq_slcr.c | 2 +-
include/block/aio.h | 4 ++--
include/block/block.h | 2 +-
include/block/block_int.h | 6 +++---
include/block/coroutine.h | 4 ++--
include/block/coroutine_int.h | 2 +-
include/block/thread-pool.h | 4 ++--
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/memory.h | 4 ++--
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 +-
include/qapi/qmp/qdict.h | 2 +-
include/qapi/qmp/qerror.h | 2 +-
include/qapi/qmp/qjson.h | 2 +-
include/qapi/qmp/qlist.h | 4 ++--
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 | 4 ++--
envlist.h => include/qemu/envlist.h | 0
qemu-error.h => include/qemu/error-report.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-internal.h => include/qemu/option_int.h | 4 ++--
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
qemu-types.h => include/qemu/typedefs.h | 0
uri.h => include/qemu/uri.h | 0
qemu-xattr.h => include/qemu/xattr.h | 0
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-user/main.c | 6 +++---
linux-user/qemu.h | 4 ++--
linux-user/syscall.c | 2 +-
main-loop.c | 6 +++---
memory.c | 2 +-
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 ++--
qapi/opts-visitor.c | 4 ++--
qapi/qapi-dealloc-visitor.c | 2 +-
qapi/qmp-input-visitor.c | 2 +-
qapi/qmp-output-visitor.c | 2 +-
qdict.c | 2 +-
qemu-bridge-helper.c | 2 +-
qemu-char.c | 4 ++--
qemu-char.h | 8 ++++----
qemu-common.h | 10 +++++-----
qemu-config.c | 6 +++---
qemu-coroutine-io.c | 4 ++--
qemu-coroutine-lock.c | 2 +-
qemu-coroutine-sleep.c | 2 +-
qemu-img.c | 6 +++---
qemu-io.c | 2 +-
qemu-log.c | 2 +-
qemu-option.c | 4 ++--
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 | 4 ++--
qga/commands-posix.c | 4 ++--
qga/main.c | 2 +-
qlist.c | 2 +-
qom/container.c | 2 +-
savevm.c | 10 +++++-----
scripts/qapi-commands.py | 2 +-
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 +-
stubs/fd-register.c | 2 +-
stubs/set-fd-handler.c | 2 +-
sysemu.h | 12 ++++++------
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-fprem.c | 4 ++--
tests/tcg/test-i386.c | 2 +-
tests/test-iov.c | 4 ++--
tests/test-qmp-commands.c | 2 +-
thread-pool.c | 8 ++++----
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 +-
495 files changed, 671 insertions(+), 671 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 (94%)
rename envlist.h => include/qemu/envlist.h (100%)
rename qemu-error.h => include/qemu/error-report.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 (96%)
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 (96%)
rename qemu-timer.h => include/qemu/timer.h (99%)
rename qemu-tls.h => include/qemu/tls.h (100%)
rename qemu-types.h => include/qemu/typedefs.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-posix.c b/aio-posix.c
index d1e1bc2..88d09e1 100644
--- a/aio-posix.c
+++ b/aio-posix.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"
struct AioHandler
{
diff --git a/aio-win32.c b/aio-win32.c
index 9a26f9c..f5ea027 100644
--- a/aio-win32.c
+++ b/aio-win32.c
@@ -17,8 +17,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"
struct AioHandler {
EventNotifier *e;
diff --git a/arch_init.c b/arch_init.c
index f627253..9dacf56 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/address-spaces.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 6df4caf..72d268a 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"
/***********************************************************/
/* bottom halves (can be seen as timers which expire ASAP) */
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index cd553c2..e4e5442 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.h"
#if QEMU_GNUC_PREREQ(4, 3)
diff --git a/audio/audio.c b/audio/audio.c
index a0cc727..eb2222c 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "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/audio.h b/audio/audio.h
index a70fda9..e7ea397 100644
--- a/audio/audio.h
+++ b/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/audio/noaudio.c b/audio/noaudio.c
index 54958f8..9f23aa2 100644
--- a/audio/noaudio.c
+++ b/audio/noaudio.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "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 8249a00..00be9c9 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.h"
#define AUDIO_CAP "oss"
diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index 6f15591..bc24557 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 a449b51..950fa8f 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.h"
#define AUDIO_CAP "wav"
diff --git a/backends/rng-random.c b/backends/rng-random.c
index c201953..d479ce8 100644
--- a/backends/rng-random.c
+++ b/backends/rng-random.c
@@ -13,7 +13,7 @@
#include "qemu/rng-random.h"
#include "qemu/rng.h"
#include "qapi/qmp/qerror.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
struct RndRandom
{
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 0e7f18c..1af4b99 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 "qapi/qmp/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 cd2866e..6f74637 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 cde5098..a7dd459 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 4cb4e60..0f2c32a 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 77e619a..041ee07 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-report.h"
#include "block/block_int.h"
#include "trace.h"
#include "hw/scsi-defs.h"
diff --git a/block/linux-aio.c b/block/linux-aio.c
index 28e5a04..ee0f8d1 100644
--- a/block/linux-aio.c
+++ b/block/linux-aio.c
@@ -9,9 +9,9 @@
*/
#include "qemu-common.h"
#include "block/aio.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "block/raw-aio.h"
-#include "event_notifier.h"
+#include "qemu/event_notifier.h"
#include <libaio.h>
diff --git a/block/nbd.c b/block/nbd.c
index 38d6b90..a581294 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -28,10 +28,10 @@
#include "qemu-common.h"
#include "block/nbd.h"
-#include "uri.h"
+#include "qemu/uri.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 205d910..d603f98 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-report.h"
#include "qapi/qmp/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 10d0827..cf85d8f 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 "qapi/qmp/qerror.h"
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 4e73885..91159c7 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -22,13 +22,13 @@
* 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 "trace.h"
#include "block/thread-pool.h"
-#include "iov.h"
+#include "qemu/iov.h"
#include "raw-aio.h"
#if defined(__APPLE__) && (__MACH__)
diff --git a/block/raw-win32.c b/block/raw-win32.c
index 9269fe8..f58334b 100644
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -22,13 +22,13 @@
* 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 "raw-aio.h"
#include "trace.h"
#include "block/thread-pool.h"
-#include "iov.h"
+#include "qemu/iov.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 8def2f1..8cd10a7 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-report.h"
#include "block/block_int.h"
#include <rbd/librbd.h>
diff --git a/block/sheepdog.c b/block/sheepdog.c
index da70df2..13dc023 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-report.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 b1d199a..7b62319 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 77a1a67..19298c2 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 47b5518..7948609 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"
#if defined(CONFIG_UUID)
#include <uuid/uuid.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/block/win32-aio.c b/block/win32-aio.c
index 606e4d6..46a5db7 100644
--- a/block/win32-aio.c
+++ b/block/win32-aio.c
@@ -22,13 +22,13 @@
* 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 "qemu-common.h"
#include "block/aio.h"
#include "raw-aio.h"
-#include "event_notifier.h"
+#include "qemu/event_notifier.h"
#include <windows.h>
#include <winioctl.h>
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index 596b474..95b6216 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 a2308fa..3ebff44 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -12,8 +12,8 @@
#include "block/blockjob.h"
#include "monitor/monitor.h"
#include "qapi/qmp/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 4134864..1fe5332 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 4bc60c7..ca80df1 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -33,7 +33,7 @@
#include "qapi/qmp/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 c64c3cc..a826086 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 f13443e..27627a1 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 b5a32b8..54e62ed 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 3a66401..036418d 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 4f0692f..d06590b 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 4f5fb64..e6a6dd8 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-posix.c b/event_notifier-posix.c
index f0bd839..a53b956 100644
--- a/event_notifier-posix.c
+++ b/event_notifier-posix.c
@@ -11,9 +11,9 @@
*/
#include "qemu-common.h"
-#include "event_notifier.h"
+#include "qemu/event_notifier.h"
#include "qemu-char.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
#ifdef CONFIG_EVENTFD
#include <sys/eventfd.h>
diff --git a/event_notifier-win32.c b/event_notifier-win32.c
index 4ed21c2..6dbb530 100644
--- a/event_notifier-win32.c
+++ b/event_notifier-win32.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"
int event_notifier_init(EventNotifier *e, int active)
{
diff --git a/exec.c b/exec.c
index 17fc7cf..917bec0 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 "exec/memory.h"
#include "dma.h"
#include "exec/address-spaces.h"
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 300f275..4bcf38f 100644
--- a/fsdev/qemu-fsdev-dummy.c
+++ b/fsdev/qemu-fsdev-dummy.c
@@ -13,8 +13,8 @@
#include <stdio.h>
#include <string.h>
#include "qemu-fsdev.h"
-#include "qemu-config.h"
-#include "module.h"
+#include "qemu/config-file.h"
+#include "qemu/module.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 df2a939..6b9afd3 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 a76a8f0..3d056b0 100644
--- a/hmp.c
+++ b/hmp.c
@@ -16,10 +16,10 @@
#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 "qemu_socket.h"
+#include "qemu/sockets.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 afda153..c3628d0 100644
--- a/hw/acpi.h
+++ b/hw/acpi.h
@@ -127,7 +127,7 @@ void acpi_pm_tmr_init(ACPIREGS *ar, acpi_update_sci_fn update_sci,
MemoryRegion *parent);
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_ich9.c b/hw/acpi_ich9.c
index 92af3a5..8d1a689 100644
--- a/hw/acpi_ich9.c
+++ b/hw/acpi_ich9.c
@@ -26,7 +26,7 @@
#include "hw.h"
#include "pc.h"
#include "pci/pci.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "sysemu.h"
#include "acpi.h"
#include "kvm.h"
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 4f43f6e..ebd015d 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -25,7 +25,7 @@
#include "pci/pci.h"
#include "acpi.h"
#include "sysemu.h"
-#include "range.h"
+#include "qemu/range.h"
#include "exec/ioport.h"
#include "fw_cfg.h"
#include "exec/address-spaces.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 7e7b1d2..78d93e5 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 d66a476..81b82f6 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 "pci/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 fea9565..dcbbfd4 100644
--- a/hw/apic_internal.h
+++ b/hw/apic_internal.h
@@ -22,7 +22,7 @@
#include "exec/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 640ed20..0933311 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 63ff559..bb9889f 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 6790832..1febaeb 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 58eb982..0884f62 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 af339d3..37e28e9 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 270c307..0907e42 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/address-spaces.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..c24208e 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-report.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 ec78a52..9e1cb1f 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 686e617..f34acc8 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 0257fd8..9d528c4 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 f1f408b..cf83956 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 809a598..3454378 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 364f54d..0634baa 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 d59b611..b501450 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 d433473..c949e6e 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 6d01624..0e4e430 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 ee0d72b..59cb7d2 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 f5601dc..cc8b327 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 cfca72a..5c29b5d 100644
--- a/hw/exynos4210_fimd.c
+++ b/hw/exynos4210_fimd.c
@@ -27,7 +27,7 @@
#include "sysbus.h"
#include "ui/console.h"
#include "ui/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 1e11d9b..cefd736 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 37dbda9..41cd142 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 5e2872f..3a3eb8c 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 c4fbd49..6ebc9b1 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 29b5449..b67d3a5 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-report.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 7b0e50f..2a00163 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-report.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 2fdccfb..252ba89 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 49e1b63..78c0662 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 883ddb6..dfced97 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -13,7 +13,7 @@
#include "block/aio.h"
#include "migration/qemu-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 bea5f92..7c2aa62 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 5e935e7..8fc6339 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/ich9.h b/hw/ich9.h
index 5c73f94..b8d8e6d 100644
--- a/hw/ich9.h
+++ b/hw/ich9.h
@@ -2,7 +2,7 @@
#define HW_ICH9_H
#include "hw.h"
-#include "range.h"
+#include "qemu/range.h"
#include "isa.h"
#include "sysbus.h"
#include "pc.h"
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 0e5bc7f..bf65cb4 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -26,8 +26,8 @@
#include <hw/pc.h>
#include <hw/pci/pci.h>
#include <hw/isa.h>
-#include "qemu-error.h"
-#include "qemu-timer.h"
+#include "qemu/error-report.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..c85e1ac 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-report.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 8109793..f1f066c 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 33f33fb..e924c74 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 c21bf72..7ef3a15 100644
--- a/hw/intel-hda.c
+++ b/hw/intel-hda.c
@@ -20,7 +20,7 @@
#include "hw.h"
#include "pci/pci.h"
#include "pci/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 d5b91dd..af34f3b 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -23,7 +23,7 @@
#include "kvm.h"
#include "migration/migration.h"
#include "qapi/qmp/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 ff0dc0d..2f06c27 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-report.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/pci.h"
#include "hw/pci/msi.h"
diff --git a/hw/lance.c b/hw/lance.c
index a384676..b7265c0 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 e8d54e5..776ab97 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 a7887d1..b335089 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-report.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 a8be9cc..bd4c346 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-report.h"
#define DEFAULT_FREQUENCY (50*1000000)
diff --git a/hw/lm32_uart.c b/hw/lm32_uart.c
index adb9287..bf2f507 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-report.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/lpc_ich9.c b/hw/lpc_ich9.c
index e225693..76217a7 100644
--- a/hw/lpc_ich9.c
+++ b/hw/lpc_ich9.c
@@ -29,7 +29,7 @@
*/
#include "qemu-common.h"
#include "hw.h"
-#include "range.h"
+#include "qemu/range.h"
#include "isa.h"
#include "sysbus.h"
#include "pc.h"
diff --git a/hw/m48t59.c b/hw/m48t59.c
index 491d433..301b10c 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 41eee50..b894ab2 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 2a1278f..fba7502 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"
#include "qapi/visitor.h"
diff --git a/hw/mcf5206.c b/hw/mcf5206.c
index 5edc931..fbc806a 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/address-spaces.h"
diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index 997b348..fea8a69 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 f4fbe97..e80c0d1 100644
--- a/hw/megasas.c
+++ b/hw/megasas.c
@@ -22,7 +22,7 @@
#include "pci/pci.h"
#include "dma.h"
#include "pci/msix.h"
-#include "iov.h"
+#include "qemu/iov.h"
#include "scsi.h"
#include "scsi-defs.h"
#include "trace.h"
diff --git a/hw/microblaze_boot.c b/hw/microblaze_boot.c
index 02c349c..76d3302 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 d87656c..f46af1c 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-report.h"
enum {
R_AC97_CTRL = 0,
diff --git a/hw/milkymist-hpdmc.c b/hw/milkymist-hpdmc.c
index 5d120a4..fd54d31 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-report.h"
enum {
R_SYSTEM = 0,
diff --git a/hw/milkymist-memcard.c b/hw/milkymist-memcard.c
index ca5df56..5dc30ac 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-report.h"
#include "blockdev.h"
#include "sd.h"
diff --git a/hw/milkymist-minimac2.c b/hw/milkymist-minimac2.c
index 926f7f9..4e92ac3 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-report.h"
#include "qdev-addr.h"
#include <zlib.h>
diff --git a/hw/milkymist-pfpu.c b/hw/milkymist-pfpu.c
index 450bab9..0521829 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-report.h"
#include <math.h>
/* #define TRACE_EXEC */
diff --git a/hw/milkymist-softusb.c b/hw/milkymist-softusb.c
index 0743668..b7beb4b 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-report.h"
enum {
R_CTRL = 0,
diff --git a/hw/milkymist-sysctl.c b/hw/milkymist-sysctl.c
index f951ef9..519462a 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-report.h"
enum {
CTRL_ENABLE = (1<<0),
diff --git a/hw/milkymist-tmu2.c b/hw/milkymist-tmu2.c
index 3f9a684..a11772a 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-report.h"
#include <X11/Xlib.h>
#include <GL/gl.h>
diff --git a/hw/milkymist-uart.c b/hw/milkymist-uart.c
index aefa8c7..ef5518e 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-report.h"
enum {
R_RXTX = 0,
diff --git a/hw/milkymist-vgafb.c b/hw/milkymist-vgafb.c
index c347131..5612851 100644
--- a/hw/milkymist-vgafb.c
+++ b/hw/milkymist-vgafb.c
@@ -28,7 +28,7 @@
#include "ui/console.h"
#include "framebuffer.h"
#include "ui/pixel_ops.h"
-#include "qemu-error.h"
+#include "qemu/error-report.h"
#define BITS 8
#include "milkymist-vgafb_template.h"
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index 34619b7..60dd8c6 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 d65d125..04c7a26 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 05494b9..511e1e4 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/musicpal.c b/hw/musicpal.c
index 436b3f7..5a7bf8b 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..a73205d 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-report.h"
# define NAND_CMD_READ0 0x00
# define NAND_CMD_READ1 0x01
diff --git a/hw/omap1.c b/hw/omap1.c
index 4d5815e..50c4570 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 96aba71..7ccee69 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 e619c7b..aec5874 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 e39da74..a5db710 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 7031a88..945711e 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 7d255c5..2e26e3a 100644
--- a/hw/onenand.c
+++ b/hw/onenand.c
@@ -26,7 +26,7 @@
#include "exec/memory.h"
#include "exec/address-spaces.h"
#include "sysbus.h"
-#include "qemu-error.h"
+#include "qemu/error-report.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 7aaff0f..0a92ea6 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -50,7 +50,7 @@
#include "exec/memory.h"
#include "exec/address-spaces.h"
#include "arch_init.h"
-#include "bitmap.h"
+#include "qemu/bitmap.h"
/* debug PC/ISA interrupts */
//#define DEBUG_IRQ
diff --git a/hw/pci/msi.c b/hw/pci/msi.c
index 680e463..2a04d18 100644
--- a/hw/pci/msi.c
+++ b/hw/pci/msi.c
@@ -19,7 +19,7 @@
*/
#include "hw/pci/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/pci/msix.c b/hw/pci/msix.c
index a6a401e..073e22c 100644
--- a/hw/pci/msix.c
+++ b/hw/pci/msix.c
@@ -18,7 +18,7 @@
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
#include "hw/pci/pci.h"
-#include "range.h"
+#include "qemu/range.h"
#define MSIX_CAP_LENGTH 12
diff --git a/hw/pci/pci-hotplug.c b/hw/pci/pci-hotplug.c
index e5e8a7a..2bc02e3 100644
--- a/hw/pci/pci-hotplug.c
+++ b/hw/pci/pci-hotplug.c
@@ -30,7 +30,7 @@
#include "monitor/monitor.h"
#include "hw/scsi.h"
#include "hw/virtio-blk.h"
-#include "qemu-config.h"
+#include "qemu/config-file.h"
#include "blockdev.h"
#include "qapi/error.h"
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index e062f66..c9ed95b 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -29,7 +29,7 @@
#include "net/net.h"
#include "sysemu.h"
#include "hw/loader.h"
-#include "range.h"
+#include "qemu/range.h"
#include "qmp-commands.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
index 1310914..995842a 100644
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -31,7 +31,7 @@
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pci_bus.h"
-#include "range.h"
+#include "qemu/range.h"
/* PCI bridge subsystem vendor ID helper functions */
#define PCI_SSVID_SIZEOF 8
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index b60a6fa..6c916d1 100644
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -25,7 +25,7 @@
#include "hw/pci/msi.h"
#include "hw/pci/pci_bus.h"
#include "hw/pci/pcie_regs.h"
-#include "range.h"
+#include "qemu/range.h"
//#define DEBUG_PCIE
#ifdef DEBUG_PCIE
diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c
index 18b1512..f07266d 100644
--- a/hw/pci/shpc.c
+++ b/hw/pci/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 "hw/pci/shpc.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c
index c6768bc..5e8eed3 100644
--- a/hw/pcnet-pci.c
+++ b/hw/pcnet-pci.c
@@ -30,7 +30,7 @@
#include "pci/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 5b03ede..8773654 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 ad6491b..6d55ebe 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 36af464..59982dc 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/address-spaces.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "sysbus.h"
#define PFLASH_BUG(fmt, ...) \
diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c
index c689cc9..6924f06 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/address-spaces.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "sysbus.h"
//#define PFLASH_DEBUG
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index b5ea68b..3d79c73 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -28,7 +28,7 @@
#include "pci/pci_host.h"
#include "isa.h"
#include "sysbus.h"
-#include "range.h"
+#include "qemu/range.h"
#include "xen.h"
#include "pam.h"
diff --git a/hw/pl031.c b/hw/pl031.c
index 8bf0183..834a20c 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 11fd199..f066367 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 99ef54d..6112063 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -33,7 +33,7 @@
#include "elf.h"
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
#include "hw/ppce500_pci.h"
#define BINARY_DEVICE_TREE_FILE "mpc8544ds.dtb"
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index 5a0e026..31bcc4b 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/address-spaces.h"
diff --git a/hw/ppc405_uc.c b/hw/ppc405_uc.c
index aabb2ef..b1ed883 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/address-spaces.h"
#define DEBUG_OPBA
diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c
index 3b9dc06..d1fb157 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/address-spaces.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 aa46cc6..0725352 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -33,7 +33,7 @@
#include "pci/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 feefc65..1e1ade3 100644
--- a/hw/ppce500_pci.c
+++ b/hw/ppce500_pci.c
@@ -18,7 +18,7 @@
#include "hw/ppc/e500-ccsr.h"
#include "pci/pci.h"
#include "pci/pci_host.h"
-#include "bswap.h"
+#include "qemu/bswap.h"
#include "ppce500_pci.h"
#ifdef DEBUG_PCI
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 8242d26..1481c6d 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/q35.h b/hw/q35.h
index 2f951c8..246c12c 100644
--- a/hw/q35.h
+++ b/hw/q35.h
@@ -23,7 +23,7 @@
#define HW_Q35_H
#include "hw.h"
-#include "range.h"
+#include "qemu/range.h"
#include "isa.h"
#include "sysbus.h"
#include "pc.h"
diff --git a/hw/qdev-core.h b/hw/qdev-core.h
index 93a3a2a..fdf14ec 100644
--- a/hw/qdev-core.h
+++ b/hw/qdev-core.h
@@ -1,9 +1,9 @@
#ifndef QDEV_CORE_H
#define QDEV_CORE_H
-#include "qemu-queue.h"
-#include "qemu-option.h"
-#include "qemu-types.h"
+#include "qemu/queue.h"
+#include "qemu/option.h"
+#include "qemu/typedefs.h"
#include "qom/object.h"
#include "hw/irq.h"
#include "qapi/error.h"
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
index 207282c..1c6712e 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/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 ad02148..b88a39c 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 9130261..f867a1d 100644
--- a/hw/qxl.h
+++ b/hw/qxl.h
@@ -7,7 +7,7 @@
#include "hw.h"
#include "pci/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 e0024c8..a0358a3 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 e024520..19c31a0 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -54,11 +54,11 @@
#include "hw.h"
#include "pci/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/s390x/event-facility.h b/hw/s390x/event-facility.h
index 30af0a7..791ab2a 100644
--- a/hw/s390x/event-facility.h
+++ b/hw/s390x/event-facility.h
@@ -16,7 +16,7 @@
#define HW_S390_SCLP_EVENT_FACILITY_H
#include <hw/qdev.h>
-#include "qemu-thread.h"
+#include "qemu/thread.h"
/* SCLP event types */
#define SCLP_EVENT_ASCII_CONSOLE_DATA 0x1a
diff --git a/hw/s390x/sclpconsole.c b/hw/s390x/sclpconsole.c
index 9ad297c..ca78d67 100644
--- a/hw/s390x/sclpconsole.c
+++ b/hw/s390x/sclpconsole.c
@@ -13,7 +13,7 @@
*/
#include <hw/qdev.h>
-#include "qemu-thread.h"
+#include "qemu/thread.h"
#include "sclp.h"
#include "event-facility.h"
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..5dc9f51 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-report.h"
#include "scsi.h"
#include "scsi-defs.h"
#include "qdev.h"
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 49b5686..c65da4a 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-report.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..faeb61e 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-report.h"
#include "scsi.h"
#include "blockdev.h"
diff --git a/hw/sd.c b/hw/sd.c
index 2e54eea..428bd78 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 3968c4f..2cbb544 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"
#include "exec/address-spaces.h"
//#define DEBUG_SERIAL
diff --git a/hw/sh_pci.c b/hw/sh_pci.c
index d521842..018b1c1 100644
--- a/hw/sh_pci.c
+++ b/hw/sh_pci.c
@@ -25,7 +25,7 @@
#include "sh.h"
#include "pci/pci.h"
#include "pci/pci_host.h"
-#include "bswap.h"
+#include "qemu/bswap.h"
#include "exec/address-spaces.h"
typedef struct SHPCIState {
diff --git a/hw/sh_timer.c b/hw/sh_timer.c
index da6689f..64ea23f 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/address-spaces.h"
#include "ptimer.h"
diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c
index c07ceb1..584629f 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 714aca0..dd186aa 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"
#include "ui/pixel_ops.h"
/*
diff --git a/hw/soc_dma.c b/hw/soc_dma.c
index 50d5f84..64e8ee1 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 48668a0..1259e32 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 368f8a5..26da3c7 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 44bec34..f776fee 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-report.h"
#include "arm-misc.h"
#include "qemu-char.h"
#include "sysemu.h"
diff --git a/hw/sun4m.c b/hw/sun4m.c
index 9a784df..4245854 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 000f611..8bca4fd 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 325200b..990d506 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 efae65d..81e265c 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/combined-packet.c b/hw/usb/combined-packet.c
index 4a0c299..13f6602 100644
--- a/hw/usb/combined-packet.c
+++ b/hw/usb/combined-packet.c
@@ -21,7 +21,7 @@
*/
#include "qemu-common.h"
#include "hw/usb.h"
-#include "iov.h"
+#include "qemu/iov.h"
#include "trace.h"
static void usb_combined_packet_add(USBCombinedPacket *combined, USBPacket *p)
diff --git a/hw/usb/core.c b/hw/usb/core.c
index 8e360d3..e315fc1 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 6953f2e..ce38fef 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 bf289ff..e8ada9f 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 99b19df..2ff4fe2 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-report.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 3862c9b..f26bb34 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-report.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 0d7597b..6d27bac 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 a21b2ba..9a00889 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-pci.c b/hw/usb/hcd-ehci-pci.c
index 8b04396..ee77d41 100644
--- a/hw/usb/hcd-ehci-pci.c
+++ b/hw/usb/hcd-ehci-pci.c
@@ -17,7 +17,7 @@
#include "hw/usb/hcd-ehci.h"
#include "hw/pci/pci.h"
-#include "range.h"
+#include "qemu/range.h"
typedef struct EHCIPCIState {
PCIDevice pcidev;
diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h
index 740f730..5bc8003 100644
--- a/hw/usb/hcd-ehci.h
+++ b/hw/usb/hcd-ehci.h
@@ -18,7 +18,7 @@
#define HW_USB_EHCI_H 1
#include "hw/hw.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "hw/usb.h"
#include "monitor/monitor.h"
#include "trace.h"
diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c
index c707f7a..64e9e83 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 4faf8e1..052c4a3 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/pci.h"
#include "hw/sysbus.h"
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index 04c9446..c9b8a31 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/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 220c3b5..e2de71e 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/pci.h"
#include "hw/pci/msi.h"
diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c
index 5a56e99..9a8c26c 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 3621076..31e5f27 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -26,10 +26,10 @@
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "monitor/monitor.h"
#include "sysemu.h"
-#include "iov.h"
+#include "qemu/iov.h"
#include <dirent.h>
#include <sys/ioctl.h>
diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c
index 096621c..9f204bc 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/address-spaces.h"
#include "kvm.h"
#include "exec/memory.h"
@@ -35,9 +35,9 @@
#include "pci/msix.h"
#include "pci/pci.h"
#include "qemu-common.h"
-#include "qemu-error.h"
-#include "qemu-queue.h"
-#include "range.h"
+#include "qemu/error-report.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 008703f..311c966 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 "ui/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 d1d5b11..cbe7b05 100644
--- a/hw/vga-isa.c
+++ b/hw/vga-isa.c
@@ -28,7 +28,7 @@
#include "pc.h"
#include "vga_int.h"
#include "ui/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 fe3a3d4..87c7c06 100644
--- a/hw/vga-pci.c
+++ b/hw/vga-pci.c
@@ -28,7 +28,7 @@
#include "pci/pci.h"
#include "vga_int.h"
#include "ui/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 4007116..e2ba7f2 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -28,7 +28,7 @@
#include "pci/pci.h"
#include "vga_int.h"
#include "ui/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 feaff64..4e1cb47 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/address-spaces.h"
diff --git a/hw/vhost_net.c b/hw/vhost_net.c
index 93ad89a..ae2785d 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-report.h"
#include "config.h"
diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index 0f27c2b..5134e2f 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/address-spaces.h"
#include "ppc.h"
diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c
index 97d3a93..2eb709b 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..208caa2 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-report.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..df0951e 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-report.h"
#include "trace.h"
#include "virtio-serial.h"
diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index dc7c6d6..5d03b31 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-report.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 a2355dc..f58917f 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/pci.h"
-#include "qemu-error.h"
+#include "qemu/error-report.h"
#include "pci/msi.h"
#include "pci/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-rng.c b/hw/virtio-rng.c
index a73ef8e..e063127 100644
--- a/hw/virtio-rng.c
+++ b/hw/virtio-rng.c
@@ -9,7 +9,7 @@
* top-level directory.
*/
-#include "iov.h"
+#include "qemu/iov.h"
#include "qdev.h"
#include "virtio.h"
#include "virtio-rng.h"
diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index 5559518..fc5cb32 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 f40a8c5..0455a9e 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-report.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 cdcb490..511a169 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 edceb5a..a18aaed 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"
#include "exec/address-spaces.h"
typedef uint32_t pci_addr_t;
diff --git a/hw/watchdog.c b/hw/watchdog.c
index 623b299..5b04215 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 1817742..54f0665 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/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 5c50d56..9ebd028 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/address-spaces.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 d0d510e..acc3d37 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 2fd6068..ce02764 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 35979e6..09e49b0 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 0390274..4eed182 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 ee7656d..ebe375e 100644
--- a/hw/xilinx_spips.c
+++ b/hw/xilinx_spips.c
@@ -25,10 +25,10 @@
#include "sysbus.h"
#include "sysemu.h"
#include "ptimer.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
#include "fifo.h"
#include "ssi.h"
-#include "bitops.h"
+#include "qemu/bitops.h"
#ifdef XILINX_SPIPS_ERR_DEBUG
#define DB_PRINT(...) do { \
diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c
index 2b01dc2..69294bb 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 1ec70cd..97d36be 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 dde4306..c7ce51f 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/block/aio.h b/include/block/aio.h
index 31884a8..0933f05 100644
--- a/include/block/aio.h
+++ b/include/block/aio.h
@@ -15,8 +15,8 @@
#define QEMU_AIO_H
#include "qemu-common.h"
-#include "qemu-queue.h"
-#include "event_notifier.h"
+#include "qemu/queue.h"
+#include "qemu/event_notifier.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 d49ce4d..b81d200 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 "qapi/qmp/qobject.h"
#include "qapi-types.h"
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 14c57af..f83ffb8 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 "qapi/qmp/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/block/thread-pool.h b/include/block/thread-pool.h
index a87b287..200703e 100644
--- a/include/block/thread-pool.h
+++ b/include/block/thread-pool.h
@@ -19,8 +19,8 @@
#define QEMU_THREAD_POOL_H 1
#include "qemu-common.h"
-#include "qemu-queue.h"
-#include "qemu-thread.h"
+#include "qemu/queue.h"
+#include "qemu/thread.h"
#include "block/coroutine.h"
#include "block/block_int.h"
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index bec04e2..c12e35f 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 f83d618..4d4f8d4 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 8d2230e..aea0ece 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/hwaddr.h"
#ifndef TARGET_LONG_BITS
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 2ae8aae..46dca74 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -70,7 +70,7 @@ typedef struct TranslationBlock TranslationBlock;
#define OPPARAM_BUF_SIZE (OPC_BUF_SIZE * MAX_OPC_PARAM)
-#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 1541f0b..8043b3b 100644
--- a/include/exec/gen-icount.h
+++ b/include/exec/gen-icount.h
@@ -1,7 +1,7 @@
#ifndef GEN_ICOUNT_H
#define GEN_ICOUNT_H 1
-#include "qemu-timer.h"
+#include "qemu/timer.h"
/* Helpers for instruction counting code generation. */
diff --git a/include/exec/memory.h b/include/exec/memory.h
index b0c4745..aada969 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -21,10 +21,10 @@
#include "qemu-common.h"
#include "exec/cpu-common.h"
#include "exec/hwaddr.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "exec/iorange.h"
#include "exec/ioport.h"
-#include "int128.h"
+#include "qemu/int128.h"
typedef struct MemoryRegionOps MemoryRegionOps;
typedef struct MemoryRegion MemoryRegion;
diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_template.h
index 15d4c51..b219191 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 "exec/memory.h"
#define DATA_SIZE (1 << SHIFT)
diff --git a/include/migration/migration.h b/include/migration/migration.h
index a95f761..8b7af61 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -16,7 +16,7 @@
#include "qapi/qmp/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 41d3729..de42dd7 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 "qapi/qmp/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 ac9d449..54b655c 100644
--- a/include/net/slirp.h
+++ b/include/net/slirp.h
@@ -26,7 +26,7 @@
#include "qemu-common.h"
#include "qapi/qmp/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 31fa4c5..5939eee 100644
--- a/include/qapi/opts-visitor.h
+++ b/include/qapi/opts-visitor.h
@@ -14,7 +14,7 @@
#define OPTS_VISITOR_H
#include "qapi/visitor.h"
-#include "qemu-option.h"
+#include "qemu/option.h"
typedef struct OptsVisitor OptsVisitor;
diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h
index c815981..6d9a4be 100644
--- a/include/qapi/qmp/qdict.h
+++ b/include/qapi/qmp/qdict.h
@@ -15,7 +15,7 @@
#include "qapi/qmp/qobject.h"
#include "qapi/qmp/qlist.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include <stdint.h>
#define QDICT_BUCKET_MAX 512
diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index d912297..6c0a18d 100644
--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -14,7 +14,7 @@
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qstring.h"
-#include "qemu-error.h"
+#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qapi-types.h"
#include <stdarg.h>
diff --git a/include/qapi/qmp/qjson.h b/include/qapi/qmp/qjson.h
index 0473374..73351ed 100644
--- a/include/qapi/qmp/qjson.h
+++ b/include/qapi/qmp/qjson.h
@@ -15,7 +15,7 @@
#define QJSON_H
#include <stdarg.h>
-#include "compiler.h"
+#include "qemu/compiler.h"
#include "qapi/qmp/qobject.h"
#include "qapi/qmp/qstring.h"
diff --git a/include/qapi/qmp/qlist.h b/include/qapi/qmp/qlist.h
index ffa0846..382f04c 100644
--- a/include/qapi/qmp/qlist.h
+++ b/include/qapi/qmp/qlist.h
@@ -14,8 +14,8 @@
#define QLIST_H
#include "qapi/qmp/qobject.h"
-#include "qemu-queue.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
+#include "qemu/queue.h"
typedef struct QListEntry {
QObject *value;
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 94%
rename from qemu-config.h
rename to include/qemu/config-file.h
index 584491a..486c77c 100644
--- a/qemu-config.h
+++ b/include/qemu/config-file.h
@@ -2,9 +2,9 @@
#define QEMU_CONFIG_H
#include <stdio.h>
-#include "qemu-option.h"
+#include "qemu/option.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-report.h
similarity index 100%
rename from qemu-error.h
rename to include/qemu/error-report.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 a5f8464..81c9a75 100644
--- a/host-utils.h
+++ b/include/qemu/host-utils.h
@@ -25,7 +25,7 @@
#ifndef HOST_UTILS_H
#define HOST_UTILS_H 1
-#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 ca0dc04..ba197cd 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 "qapi/qmp/qdict.h"
diff --git a/qemu-option-internal.h b/include/qemu/option_int.h
similarity index 96%
rename from qemu-option-internal.h
rename to include/qemu/option_int.h
index 77899b0..8212fa4 100644
--- a/qemu-option-internal.h
+++ b/include/qemu/option_int.h
@@ -26,8 +26,8 @@
#ifndef QEMU_OPTIONS_INTERNAL_H
#define QEMU_OPTIONS_INTERNAL_H
-#include "qemu-option.h"
-#include "qemu-error.h"
+#include "qemu/option.h"
+#include "qemu/error-report.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 42899fe..803ae17 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 "qapi/qmp/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 96%
rename from qemu-thread.h
rename to include/qemu/thread.h
index 3ee2f6b..c02404b 100644
--- a/qemu-thread.h
+++ b/include/qemu/thread.h
@@ -10,9 +10,9 @@ typedef struct QemuSemaphore QemuSemaphore;
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/qemu-types.h b/include/qemu/typedefs.h
similarity index 100%
rename from qemu-types.h
rename to include/qemu/typedefs.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/qom/cpu.h b/include/qom/cpu.h
index 9682dd5..9e9d044 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 ed1f47f..abe9691 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 3db6635..fc23baa 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -3,7 +3,7 @@
#include "ui/qemu-pixman.h"
#include "qapi/qmp/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 928e0a1..a0d1a50 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/qemu-pixman.h"
#include "sysemu.h"
diff --git a/iohandler.c b/iohandler.c
index cf8276d..2523adc 100644
--- a/iohandler.c
+++ b/iohandler.c
@@ -24,9 +24,9 @@
#include "config-host.h"
#include "qemu-common.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "block/aio.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
#ifndef _WIN32
#include <sys/wait.h>
diff --git a/iov.c b/iov.c
index a81eedc..419e419 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 c258859..41ea3aa 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/pci/msi.h"
#include "exec/gdbstub.h"
#include "kvm.h"
-#include "bswap.h"
+#include "qemu/bswap.h"
#include "exec/memory.h"
#include "exec/address-spaces.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 72d866a..131d2bd 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-user/main.c b/linux-user/main.c
index 25e35cd..f6c4c8d 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 2af883b..8a3538c 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 31d5276..7c304e9 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 f900611..54f38ae 100644
--- a/main-loop.c
+++ b/main-loop.c
@@ -23,14 +23,14 @@
*/
#include "qemu-common.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "slirp/slirp.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
#include "block/aio.h"
#ifndef _WIN32
-#include "compatfd.h"
+#include "qemu/compatfd.h"
/* If we have signalfd, we mask out the signals we want to handle and then
* use signalfd to listen for them. We rely on whatever the current signal
diff --git a/memory.c b/memory.c
index d40193d..d442003 100644
--- a/memory.c
+++ b/memory.c
@@ -16,7 +16,7 @@
#include "exec/memory.h"
#include "exec/address-spaces.h"
#include "exec/ioport.h"
-#include "bitops.h"
+#include "qemu/bitops.h"
#include "kvm.h"
#include <assert.h>
diff --git a/memory_mapping.h b/memory_mapping.h
index d5ba46c..1256125 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 784486d..68f36f4 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 ab5abe2..ea121bc 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 a36e637..3c4c315 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 9debc95..d5f9868 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 0456983..8c5c567 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 46fdc00..878b231 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 "qapi/qmp/qint.h"
#include "qapi/qmp/qfloat.h"
#include "qapi/qmp/qlist.h"
@@ -55,7 +55,7 @@
#include "qapi/qmp/qjson.h"
#include "qapi/qmp/json-streamer.h"
#include "qapi/qmp/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 "exec/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 04ff0a1..0698a02 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..4119721 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-report.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 e4d85a9..dbf3e1b 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 c37a5ef..87bdc9d 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 bc2b951..396dc8c 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-report.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..b48182f 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-report.h"
#ifdef __NetBSD__
#include <sys/ioctl.h>
diff --git a/net/tap-linux.c b/net/tap-linux.c
index 3de7b3b..dd4b915 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-report.h"
#define PATH_NET_TUN "/dev/net/tun"
diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index f228fff..3d5fee5 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-report.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 e37d8ee..1ddd6fa 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-report.h"
#include <stdio.h>
#include <windows.h>
#include <winioctl.h>
diff --git a/net/tap.c b/net/tap.c
index 9a677e9..d34ff13 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-report.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 807e90c..5b51a03 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 9db9c3d..a737d6e 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/qapi/opts-visitor.c b/qapi/opts-visitor.c
index f8149ce..174bd8b 100644
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -13,8 +13,8 @@
#include "qemu-common.h"
#include "qapi/qmp/qerror.h"
#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/visitor-impl.h"
diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c
index 98f2a58..1334de3 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"
#include "qapi/visitor-impl.h"
diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index 8087909..67fb127 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/visitor-impl.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu-common.h"
#include "qapi/qmp/types.h"
#include "qapi/qmp/qerror.h"
diff --git a/qapi/qmp-output-visitor.c b/qapi/qmp-output-visitor.c
index 8015e3f..74a5684 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/visitor-impl.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu-common.h"
#include "qapi/qmp/types.h"
#include "qapi/qmp/qerror.h"
diff --git a/qdict.c b/qdict.c
index fa7a62c..7543ccc 100644
--- a/qdict.c
+++ b/qdict.c
@@ -16,7 +16,7 @@
#include "qapi/qmp/qbool.h"
#include "qapi/qmp/qstring.h"
#include "qapi/qmp/qobject.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu-common.h"
static void qdict_destroy_obj(QObject *obj);
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 16021c5..5a8d8f7 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 5ff1b2b..baa5d03 100644
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -2,13 +2,13 @@
#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 "block/aio.h"
#include "qapi/qmp/qobject.h"
#include "qapi/qmp/qstring.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
/* character device */
diff --git a/qemu-common.h b/qemu-common.h
index e674786..40cd198 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -12,9 +12,9 @@
#ifndef QEMU_COMMON_H
#define QEMU_COMMON_H
-#include "compiler.h"
+#include "qemu/compiler.h"
#include "config-host.h"
-#include "qemu-types.h"
+#include "qemu/typedefs.h"
#if defined(__arm__) || defined(__sparc__) || defined(__mips__) || defined(__hppa__) || defined(__ia64__)
#define WORDS_ALIGNED
@@ -122,8 +122,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
@@ -408,7 +408,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 ceec6bd..2188c3e 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-report.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 c3939ac..97ef01c 100644
--- a/qemu-coroutine-lock.c
+++ b/qemu-coroutine-lock.c
@@ -25,7 +25,7 @@
#include "qemu-common.h"
#include "block/coroutine.h"
#include "block/coroutine_int.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "block/aio.h"
#include "trace.h"
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 2e5ca5c..4c8e2f3 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -25,9 +25,9 @@
#include "qapi/qmp-output-visitor.h"
#include "qapi/qmp/qjson.h"
#include "qemu-common.h"
-#include "qemu-option.h"
-#include "qemu-error.h"
-#include "osdep.h"
+#include "qemu/option.h"
+#include "qemu/error-report.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 e0e4742..6188093 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 ebd3537..f532b76 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-report.h"
#include "qapi/qmp/types.h"
#include "qapi/error.h"
#include "qapi/qmp/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-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 cea0a4b..3537bf3 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 4ef9c7b..7be292e 100644
--- a/qemu-thread-posix.c
+++ b/qemu-thread-posix.c
@@ -20,7 +20,7 @@
#include <limits.h>
#include <unistd.h>
#include <sys/time.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 4b3db60..8037b39 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 8e0dccc..80b3f2e 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 CONFIG_POSIX
#include <pthread.h>
#endif
@@ -477,7 +477,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 d1f4622..8ac45ff 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 769a559..d4fd628 100644
--- a/qga/channel-posix.c
+++ b/qga/channel-posix.c
@@ -4,8 +4,8 @@
#include <unistd.h>
#include <fcntl.h>
#include <stdlib.h>
-#include "osdep.h"
-#include "qemu_socket.h"
+#include "qemu/osdep.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 cedf2cc..a657201 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 "qapi/qmp/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 ead58cc..ba5fa1c 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -25,7 +25,7 @@
#include "qapi/qmp/qint.h"
#include "qapi/qmp/qjson.h"
#include "qga/guest-agent-core.h"
-#include "module.h"
+#include "qemu/module.h"
#include "signal.h"
#include "qapi/qmp/qerror.h"
#include "qapi/qmp/dispatch.h"
diff --git a/qlist.c b/qlist.c
index c5ac211..1ced0de 100644
--- a/qlist.c
+++ b/qlist.c
@@ -12,7 +12,7 @@
#include "qapi/qmp/qlist.h"
#include "qapi/qmp/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 a5205a0..ea01e9b 100644
--- a/savevm.c
+++ b/savevm.c
@@ -75,17 +75,17 @@
#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 "exec/memory.h"
#include "qmp-commands.h"
#include "trace.h"
-#include "bitops.h"
+#include "qemu/bitops.h"
#define SELF_ANNOUNCE_ROUNDS 5
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index eccc28d..e06332b 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -367,7 +367,7 @@ def gen_command_def_prologue(prefix="", proxy=False):
*/
#include "qemu-common.h"
-#include "module.h"
+#include "qemu/module.h"
#include "qapi/qmp/qerror.h"
#include "qapi/qmp/types.h"
#include "qapi/qmp/dispatch.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 3395d50..4b51a67 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 0107b07..dfc3e3a 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -133,8 +133,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 "libslirp.h"
#include "ip.h"
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 5f95c93..41b1657 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -5,7 +5,7 @@
#include <spice.h>
#include <spice-experimental.h>
-#include "osdep.h"
+#include "qemu/osdep.h"
#define dprintf(_scd, _level, _fmt, ...) \
do { \
diff --git a/stubs/fd-register.c b/stubs/fd-register.c
index 813b6dd..d0c34fd 100644
--- a/stubs/fd-register.c
+++ b/stubs/fd-register.c
@@ -1,5 +1,5 @@
#include "qemu-common.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
void qemu_fd_register(int fd)
{
diff --git a/stubs/set-fd-handler.c b/stubs/set-fd-handler.c
index 4807b5d..fc874d3 100644
--- a/stubs/set-fd-handler.c
+++ b/stubs/set-fd-handler.c
@@ -1,5 +1,5 @@
#include "qemu-common.h"
-#include "main-loop.h"
+#include "qemu/main-loop.h"
int qemu_set_fd_handler2(int fd,
IOCanReadHandler *fd_read_poll,
diff --git a/sysemu.h b/sysemu.h
index 1b6add2..8eaa470 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -2,13 +2,13 @@
#define SYSEMU_H
/* Misc. things related to the system emulator. */
-#include "qemu-types.h"
-#include "qemu-option.h"
-#include "qemu-queue.h"
-#include "qemu-timer.h"
+#include "qemu/typedefs.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 2d0d891..c941267 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 1f7a3c0..eef2acd 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 988b542..724e00f 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 324fe05..8407a6d 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 cd0e17e..79bff38 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 150c4df..8abc556 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/qmp/qerror.h"
#include "qapi/visitor.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 f7c95d5..340ed3f 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 "exec/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 0ed7cfd..d76ea3f 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 27b3cef..53410b1 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 1c9b5ec..e763195 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 530e0b5..97aedc5 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 343dcc1..1c62f3c 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 157f59e..e85edce 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 4eee444..8364652 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 5883347..1e1b30c 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 3f5df57..2546c57 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 2d7a349..902b1cd 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 a74d76b..798b7ac 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 6e9b209..8e13545 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 94de764..dc70699 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 a3336e1..2e73d30 100644
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -20,11 +20,11 @@
#include "cpu.h"
#include "exec/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 28e61c5..9e34741 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 0ed511a..04b6659 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 3c8e865..e0d78f3 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 218e95e..f4498bc 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 3d7a399..94c03a1 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 a93abcb..3813a72 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 3c2d185..f61a497 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 851ff54..5fe0361 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 cb193f2..ede51a3 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-fprem.c b/tests/tcg/test-i386-fprem.c
index 8c7a4d1..e91fb1a 100644
--- a/tests/tcg/test-i386-fprem.c
+++ b/tests/tcg/test-i386-fprem.c
@@ -22,8 +22,8 @@
* 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 "compiler.h"
-#include "osdep.h"
+#include "qemu/compiler.h"
+#include "qemu/osdep.h"
#include <stdio.h>
#include <inttypes.h>
diff --git a/tests/tcg/test-i386.c b/tests/tcg/test-i386.c
index 40392ac..6dc730d 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 5195f69..120f200 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/dispatch.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/thread-pool.c b/thread-pool.c
index 4c73a7d..e3ca64d 100644
--- a/thread-pool.c
+++ b/thread-pool.c
@@ -15,13 +15,13 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
-#include "qemu-queue.h"
-#include "qemu-thread.h"
-#include "osdep.h"
+#include "qemu/queue.h"
+#include "qemu/thread.h"
+#include "qemu/osdep.h"
#include "block/coroutine.h"
#include "trace.h"
#include "block/block_int.h"
-#include "event_notifier.h"
+#include "qemu/event_notifier.h"
#include "block/thread-pool.h"
static void do_spawn_thread(void);
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 e0cdad3..b621748 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -35,7 +35,7 @@
#include "cpu.h"
#include "disas/disas.h"
#include "tcg.h"
-#include "qemu-timer.h"
+#include "qemu/timer.h"
#include "exec/memory.h"
#include "exec/address-spaces.h"
#if defined(CONFIG_USER_ONLY)
diff --git a/ui/console.c b/ui/console.c
index 60bfb72..a4bff8c 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 962475d..8727bf4 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 "qapi/qmp/qint.h"
#include "qapi/qmp/qbool.h"
#include "qapi/qmp/qstring.h"
#include "qapi/qmp/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 56ebf80..a19b3d9 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 09199ef..4ddea7d 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 "qapi/qmp/qint.h"
#include "vnc.h"
#include "vnc-enc-tight.h"
diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
index 57c0916..0bfc0c5 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 bfc7fe6..d02f023 100644
--- a/ui/vnc-palette.h
+++ b/ui/vnc-palette.h
@@ -30,7 +30,7 @@
#define VNC_PALETTE_H
#include "qapi/qmp/qlist.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include <stdint.h>
#include <stdbool.h>
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 dad2dde..d9e5315 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 e5c043f..8b40f09 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 138547b..4238729 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 2debde0..9b80e7a 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 "qapi/qmp/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"
#include "qapi/string-input-visitor.h"
diff --git a/xen-all.c b/xen-all.c
index 95d383f..6965626 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/address-spaces.h"
diff --git a/xen-mapcache.c b/xen-mapcache.c
index 31c06dc..8f4648c 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 28/32] softmmu: move include files to include/sysemu/
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (26 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 27/32] misc: move include files to include/qemu/ Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 29/32] softmmu: move remaining include files to include/ subdirectories Paolo Bonzini
` (5 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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 +++++-----
device_tree.c | 2 +-
dma-helpers.c | 2 +-
dump-stub.c | 2 +-
dump.c | 8 ++++----
exec.c | 6 +++---
gdbstub.c | 4 ++--
hw/ac97.c | 2 +-
hw/acpi.c | 2 +-
hw/acpi_ich9.c | 4 ++--
hw/acpi_piix4.c | 2 +-
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/arm_boot.c | 4 ++--
hw/arm_sysctl.c | 2 +-
hw/axis_dev88.c | 2 +-
hw/block-common.c | 2 +-
hw/boards.h | 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_rtc.c | 2 +-
hw/exynos4210_uart.c | 2 +-
hw/exynos4_boards.c | 2 +-
hw/fdc.c | 4 ++--
hw/fw_cfg.c | 2 +-
hw/gumstix.c | 2 +-
hw/highbank.c | 4 ++--
hw/ide/ahci.c | 2 +-
hw/ide/cmd646.c | 4 ++--
hw/ide/core.c | 6 +++---
hw/ide/ich.c | 2 +-
hw/ide/internal.h | 4 ++--
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/isa-bus.c | 2 +-
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 | 2 +-
hw/lpc_ich9.c | 2 +-
hw/lsi53c895a.c | 2 +-
hw/m25p80.c | 2 +-
hw/m48t59.c | 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_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/omap1.c | 4 ++--
hw/omap2.c | 4 ++--
hw/omap_sx1.c | 2 +-
hw/onenand.c | 2 +-
hw/opencores_eth.c | 2 +-
hw/openrisc_sim.c | 4 ++--
hw/palm.c | 2 +-
hw/pam.c | 2 +-
hw/parallel.c | 2 +-
hw/pc.c | 8 ++++----
hw/pc_piix.c | 8 ++++----
hw/pc_q35.c | 4 ++--
hw/pc_sysfw.c | 6 +++---
hw/pci/pci-hotplug.c | 2 +-
hw/pci/pci-stub.c | 2 +-
hw/pci/pci.c | 2 +-
hw/pci/pci.h | 2 +-
hw/pci/pcie_aer.c | 2 +-
hw/pckbd.c | 2 +-
hw/pcnet-pci.c | 2 +-
hw/pcnet.c | 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_newworld.c | 6 +++---
hw/ppc_oldworld.c | 6 +++---
hw/ppc_prep.c | 6 +++---
hw/ppce500_spin.c | 4 ++--
hw/ps2.c | 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/s390x/event-facility.c | 2 +-
hw/s390x/sclp.c | 2 +-
hw/s390x/sclpquiesce.c | 2 +-
hw/scsi-bus.c | 4 ++--
hw/scsi-disk.c | 6 +++---
hw/scsi-generic.c | 2 +-
hw/scsi.h | 2 +-
hw/serial.h | 2 +-
hw/sga.c | 2 +-
hw/sh7750.c | 2 +-
hw/shix.c | 2 +-
hw/slavio_misc.c | 2 +-
hw/smbios.c | 2 +-
hw/smbus_ich9.c | 2 +-
hw/spapr.c | 10 +++++-----
hw/spapr.h | 2 +-
hw/spapr_events.c | 4 ++--
hw/spapr_hcall.c | 4 ++--
hw/spapr_iommu.c | 4 ++--
hw/spapr_nvram.c | 2 +-
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/sun4m.c | 4 ++--
hw/sun4u.c | 4 ++--
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.h | 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 | 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 | 4 ++--
hw/xtensa_sim.c | 2 +-
hw/z2.c | 4 ++--
hw/zynq_slcr.c | 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
device_tree.h => include/sysemu/device_tree.h | 0
dma.h => include/sysemu/dma.h | 2 +-
dump.h => include/sysemu/dump.h | 0
kvm.h => include/sysemu/kvm.h | 0
memory_mapping.h => include/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 +-
kvm-all.c | 4 ++--
kvm-stub.c | 2 +-
memory.c | 2 +-
memory_mapping-stub.c | 2 +-
memory_mapping.c | 2 +-
migration.c | 2 +-
monitor.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 +-
os-posix.c | 2 +-
os-win32.c | 2 +-
oslib-posix.c | 2 +-
oslib-win32.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 | 6 +++---
savevm.c | 4 ++--
stubs/arch-query-cpu-def.c | 2 +-
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 | 6 +++---
target-i386/excp_helper.c | 2 +-
target-i386/helper.c | 4 ++--
target-i386/kvm.c | 4 ++--
target-i386/kvm_i386.h | 2 +-
target-i386/machine.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/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 | 4 ++--
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 ++--
296 files changed, 420 insertions(+), 420 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 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 kvm.h => include/sysemu/kvm.h (100%)
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 9dacf56..a8b6541 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/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 eb2222c..1510b59 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -25,7 +25,7 @@
#include "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 72babbf..8dbd145 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.h"
#define AUDIO_CAP "winwave"
diff --git a/balloon.c b/balloon.c
index d1de435..e321f2c 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 "qapi/qmp/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 1af4b99..4e28c55 100644
--- a/block.c
+++ b/block.c
@@ -29,7 +29,7 @@
#include "block/blockjob.h"
#include "qemu/module.h"
#include "qapi/qmp/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 7b62319..021abaa 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];
#endif
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index 95b6216..dc4e9a2 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 "qapi/qmp/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 3ebff44..d724e2d 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 54e62ed..19ebb4a 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 036418d..4a7782a 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/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 e6a6dd8..272632f 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 0842e6f..a9d0b3c 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 "qapi/qmp/qerror.h"
#include "qmp-commands.h"
diff --git a/dump.c b/dump.c
index 871ee17..a26b1a5 100644
--- a/dump.c
+++ b/dump.c
@@ -17,10 +17,10 @@
#include "exec/cpu-all.h"
#include "exec/hwaddr.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 917bec0..28abd7e 100644
--- a/exec.c
+++ b/exec.c
@@ -30,17 +30,17 @@
#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 "exec/memory.h"
-#include "dma.h"
+#include "sysemu/dma.h"
#include "exec/address-spaces.h"
#if defined(CONFIG_USER_ONLY)
#include <qemu.h>
#else /* !CONFIG_USER_ONLY */
-#include "xen-mapcache.h"
+#include "sysemu/xen-mapcache.h"
#include "trace.h"
#endif
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 3e659b3..5cd19c1 100644
--- a/hw/ac97.c
+++ b/hw/ac97.c
@@ -21,7 +21,7 @@
#include "audiodev.h"
#include "audio/audio.h"
#include "pci/pci.h"
-#include "dma.h"
+#include "sysemu/dma.h"
enum {
AC97_Reset = 0x00,
diff --git a/hw/acpi.c b/hw/acpi.c
index fe9b76a..97617c4 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_ich9.c b/hw/acpi_ich9.c
index 8d1a689..37a50e6 100644
--- a/hw/acpi_ich9.c
+++ b/hw/acpi_ich9.c
@@ -27,9 +27,9 @@
#include "pc.h"
#include "pci/pci.h"
#include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "acpi.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "exec/address-spaces.h"
#include "ich9.h"
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index ebd015d..f53b969 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -24,7 +24,7 @@
#include "pm_smbus.h"
#include "pci/pci.h"
#include "acpi.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/range.h"
#include "exec/ioport.h"
#include "fw_cfg.h"
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 78d93e5..7327d48 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 d61b2f4..9f233d9 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/address-spaces.h"
diff --git a/hw/apb_pci.c b/hw/apb_pci.c
index 144a7cc..c22e2b0 100644
--- a/hw/apb_pci.c
+++ b/hw/apb_pci.c
@@ -32,7 +32,7 @@
#include "pci/pci_bridge.h"
#include "pci/pci_bus.h"
#include "apb_pci.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "exec/address-spaces.h"
/* debug APB */
diff --git a/hw/apic_common.c b/hw/apic_common.c
index 5f54276..0658be9 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/arm_boot.c b/hw/arm_boot.c
index bb9889f..115f583 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 0884f62..b733617 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 e537aec..2ca606b 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/address-spaces.h"
#define D(x)
diff --git a/hw/block-common.c b/hw/block-common.c
index c24208e..0f1b64e 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-report.h"
diff --git a/hw/boards.h b/hw/boards.h
index c66fa16..4540e95 100644
--- a/hw/boards.h
+++ b/hw/boards.h
@@ -3,7 +3,7 @@
#ifndef HW_BOARDS_H
#define HW_BOARDS_H
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "qdev.h"
typedef struct QEMUMachineInitArgs {
diff --git a/hw/bonito.c b/hw/bonito.c
index 78e264c..0498c9b 100644
--- a/hw/bonito.c
+++ b/hw/bonito.c
@@ -44,7 +44,7 @@
#include "pc.h"
#include "mips.h"
#include "pci/pci_host.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "exec/address-spaces.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 faf5ac9..804d61a 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/address-spaces.h"
static struct arm_boot_info collie_binfo = {
diff --git a/hw/cuda.c b/hw/cuda.c
index cf83956..d59e0ae 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 3454378..88da145 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 aeee3e6..92fb00a 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 9e2be4e..6bbefb5 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -45,8 +45,8 @@
#include "pci/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 6536578..59c3f23 100644
--- a/hw/es1370.c
+++ b/hw/es1370.c
@@ -30,7 +30,7 @@
#include "audiodev.h"
#include "audio/audio.h"
#include "pci/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 089267f..d415003 100644
--- a/hw/etraxfs_dma.c
+++ b/hw/etraxfs_dma.c
@@ -26,7 +26,7 @@
#include "hw.h"
#include "exec/address-spaces.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 cc8b327..e9273cd 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 22148cd..a7b84d6 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_rtc.c b/hw/exynos4210_rtc.c
index 6ebc9b1..5694a62 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 20dcd9f..8950891 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 5dd2961..b267968 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 b67d3a5..ddc0cc3 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/fw_cfg.c b/hw/fw_cfg.c
index 2a00163..26f7125 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 4acb32c..6fb0683 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/address-spaces.h"
static const int sector_len = 128 * 1024;
diff --git a/hw/highbank.c b/hw/highbank.c
index 6f5f2a9..6005622 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/address-spaces.h"
#define SMP_BOOT_ADDR 0x100
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index d38c6e4..d072449 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 f6d15b9..ee855b6 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -27,8 +27,8 @@
#include <hw/pci/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 bf65cb4..6f1938a 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -28,10 +28,10 @@
#include <hw/isa.h>
#include "qemu/error-report.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 3457b98..de39b30 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -66,7 +66,7 @@
#include <hw/pci/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 c5016f0..d80360e 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -9,8 +9,8 @@
#include <hw/ide.h>
#include <hw/isa.h>
#include "exec/iorange.h"
-#include "dma.h"
-#include "sysemu.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 87cbb0c..d8f9b4b 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 4044351..eb59976 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 8821d5c..e6226e3 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -27,7 +27,7 @@
#include <hw/pci/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 5cf39cf..df95aec 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -27,9 +27,9 @@
#include <hw/pc.h>
#include <hw/pci/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 c85e1ac..d2fe773 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-report.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 880f61c..14acb3a 100644
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -28,8 +28,8 @@
#include <hw/pci/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 f2e623c..46962e4 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 dcd125f..e56e3ea 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 c995dc7..47fc9cb 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -13,7 +13,7 @@
#include "arm-misc.h"
#include "net/net.h"
#include "exec/address-spaces.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 7ef3a15..98ff936 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/isa-bus.c b/hw/isa-bus.c
index a2be67d..86b0bbd 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/address-spaces.h"
diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index af34f3b..567c9a7 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -20,7 +20,7 @@
#include "pc.h"
#include "pci/pci.h"
#include "pci/msix.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "migration/migration.h"
#include "qapi/qmp/qerror.h"
#include "qemu/event_notifier.h"
diff --git a/hw/kvm/apic.c b/hw/kvm/apic.c
index beb418d..dad2f21 100644
--- a/hw/kvm/apic.c
+++ b/hw/kvm/apic.c
@@ -11,7 +11,7 @@
*/
#include "hw/apic_internal.h"
#include "hw/pci/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 f95c157..30db623 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"
/* PC Utility function */
void kvm_pc_setup_irq_routing(bool pci_enabled)
diff --git a/hw/kvm/pci-assign.c b/hw/kvm/pci-assign.c
index 2f06c27..410b6c6 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/pci.h"
#include "hw/pci/msi.h"
#include "kvm_i386.h"
diff --git a/hw/kvmvapic.c b/hw/kvmvapic.c
index 60c8fc4..81f4bcf 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 9f92d30..fd00af9 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 4c72d0d..5adf911 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 776ab97..d1d4541 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 81afdf6..42e8b6b 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 b335089..e3a9db9 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-report.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "qemu/log.h"
enum {
diff --git a/hw/loader.c b/hw/loader.c
index f5ef575..3f59fcd 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -45,7 +45,7 @@
#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"
diff --git a/hw/lpc_ich9.c b/hw/lpc_ich9.c
index 76217a7..a068715 100644
--- a/hw/lpc_ich9.c
+++ b/hw/lpc_ich9.c
@@ -44,7 +44,7 @@
#include "pam.h"
#include "pci/pci_bus.h"
#include "exec/address-spaces.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
static int ich9_lpc_sci_irq(ICH9LPCState *lpc);
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 4aac9a0..0aafb00 100644
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -15,7 +15,7 @@
#include "hw.h"
#include "pci/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 3895e73..d392656 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 301b10c..393c5c0 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"
#include "exec/address-spaces.h"
diff --git a/hw/mac_nvram.c b/hw/mac_nvram.c
index a0d14dd..71093c2 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 80d6a9d..a5ddbef 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/address-spaces.h"
diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index fba7502..2ddd7de 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"
#include "qapi/visitor.h"
diff --git a/hw/mcf5206.c b/hw/mcf5206.c
index fbc806a..fe7a488 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/address-spaces.h"
/* General purpose timer module. */
diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index fea8a69..c1816cc 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 e80c0d1..eb191f5 100644
--- a/hw/megasas.c
+++ b/hw/megasas.c
@@ -20,7 +20,7 @@
#include "hw.h"
#include "pci/pci.h"
-#include "dma.h"
+#include "sysemu/dma.h"
#include "pci/msix.h"
#include "qemu/iov.h"
#include "scsi.h"
diff --git a/hw/microblaze_boot.c b/hw/microblaze_boot.c
index 76d3302..3ec5c0f 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 5dc30ac..f80befc 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-report.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 519462a..796e795 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 5885222..0c23b67 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/address-spaces.h"
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index 60dd8c6..e7eeda3 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -31,7 +31,7 @@
#include "mips_cpudevs.h"
#include "pci/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/address-spaces.h"
#define DEBUG_FULONG2E_INIT
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 0befc99..63df2a7 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/address-spaces.h"
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 04c7a26..bd31ced 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -35,8 +35,8 @@
#include "mips_cpudevs.h"
#include "pci/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/address-spaces.h"
#include "sysbus.h" /* SysBusDevice */
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index ac7dfa9..67066c0 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 511e1e4..59c43e5 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/address-spaces.h"
#define MAX_IDE_BUS 2
diff --git a/hw/mpc8544_guts.c b/hw/mpc8544_guts.c
index 873cb8c..84522e9 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 09ec5b2..c4ec2e3 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 5a7bf8b..77a585e 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/address-spaces.h"
#include "ui/pixel_ops.h"
diff --git a/hw/nand.c b/hw/nand.c
index a73205d..16950c5 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-report.h"
diff --git a/hw/ne2000.c b/hw/ne2000.c
index 2001264..00efa74 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 83adb97..d96b750 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/address-spaces.h"
diff --git a/hw/omap1.c b/hw/omap1.c
index 50c4570..8536e96 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 7ccee69..dc6867c 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_sx1.c b/hw/omap_sx1.c
index ca6eb9d..0f03121 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/address-spaces.h"
/*****************************************************************************/
diff --git a/hw/onenand.c b/hw/onenand.c
index 2e26e3a..26bf991 100644
--- a/hw/onenand.c
+++ b/hw/onenand.c
@@ -22,7 +22,7 @@
#include "hw.h"
#include "flash.h"
#include "irq.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/memory.h"
#include "exec/address-spaces.h"
#include "sysbus.h"
diff --git a/hw/opencores_eth.c b/hw/opencores_eth.c
index fd2f0f6..a0dfdce 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 c12097e..d2b2379 100644
--- a/hw/openrisc_sim.c
+++ b/hw/openrisc_sim.c
@@ -25,9 +25,9 @@
#include "net/net.h"
#include "loader.h"
#include "exec/address-spaces.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 e091bbc..5219e37 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/pam.c b/hw/pam.c
index a95e2cf..1d72e88 100644
--- a/hw/pam.c
+++ b/hw/pam.c
@@ -26,7 +26,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "pam.h"
void smram_update(MemoryRegion *smram_region, uint8_t smram,
diff --git a/hw/parallel.c b/hw/parallel.c
index c4705bc..56b3760 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 0a92ea6..71902e2 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -40,16 +40,16 @@
#include "pcspk.h"
#include "pci/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 "exec/memory.h"
#include "exec/address-spaces.h"
-#include "arch_init.h"
+#include "sysemu/arch_init.h"
#include "qemu/bitmap.h"
/* debug PC/ISA interrupts */
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 0d01134..99747a7 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -33,12 +33,12 @@
#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 "exec/memory.h"
diff --git a/hw/pc_q35.c b/hw/pc_q35.c
index 2580d5f..c7262d6 100644
--- a/hw/pc_q35.c
+++ b/hw/pc_q35.c
@@ -28,12 +28,12 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "arch_init.h"
+#include "sysemu/arch_init.h"
#include "smbus.h"
#include "boards.h"
#include "mc146818rtc.h"
#include "xen.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "kvm/clock.h"
#include "q35.h"
#include "exec/address-spaces.h"
diff --git a/hw/pc_sysfw.c b/hw/pc_sysfw.c
index d7ea3a5..87e1fa9 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/pci-hotplug.c b/hw/pci/pci-hotplug.c
index 2bc02e3..f38df30 100644
--- a/hw/pci/pci-hotplug.c
+++ b/hw/pci/pci-hotplug.c
@@ -31,7 +31,7 @@
#include "hw/scsi.h"
#include "hw/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/pci-stub.c b/hw/pci/pci-stub.c
index 5891dc9..1dda89b 100644
--- a/hw/pci/pci-stub.c
+++ b/hw/pci/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 "hw/pci/pci.h"
#include "qmp-commands.h"
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index c9ed95b..94840c4 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -27,7 +27,7 @@
#include "hw/pci/pci_bus.h"
#include "monitor/monitor.h"
#include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "hw/loader.h"
#include "qemu/range.h"
#include "qmp-commands.h"
diff --git a/hw/pci/pci.h b/hw/pci/pci.h
index d6ef4f6..3152050 100644
--- a/hw/pci/pci.h
+++ b/hw/pci/pci.h
@@ -5,7 +5,7 @@
#include "hw/qdev.h"
#include "exec/memory.h"
-#include "dma.h"
+#include "sysemu/dma.h"
/* PCI includes legacy ISA access. */
#include "hw/isa.h"
diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index f7f3633..1ce72ce 100644
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/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 "hw/pci/pci_bridge.h"
diff --git a/hw/pckbd.c b/hw/pckbd.c
index 5bb3e0a..6db7bbc 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 5e8eed3..40a0e6e 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 8773654..30f1000 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/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c
index 4eab0f2..1cfdb2f 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/address-spaces.h"
#include "ssi.h"
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index 124a88e..27ecfe7 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/address-spaces.h"
#include "microblaze_boot.h"
diff --git a/hw/pl031.c b/hw/pl031.c
index 834a20c..3a23ecd 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 8a2895c..cbddb74 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 f066367..1559982 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 6112063..5b16096 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -23,10 +23,10 @@
#include "hw/serial.h"
#include "hw/pci/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 2992bd9..ea4134c 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"
#include "hw/pci.h"
static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c
index 7e1761d..f9ae20f 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 31bcc4b..8f7f0d0 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/address-spaces.h"
#define BIOS_FILENAME "ppc405_rom.bin"
diff --git a/hw/ppc405_uc.c b/hw/ppc405_uc.c
index b1ed883..7e56ecb 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/address-spaces.h"
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 591d7b0..4f1b734 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -17,16 +17,16 @@
#include "hw.h"
#include "pci/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/address-spaces.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_newworld.c b/hw/ppc_newworld.c
index b2d02ea..fabcc08 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -54,7 +54,7 @@
#include "nvram.h"
#include "pci/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/address-spaces.h"
#include "sysbus.h"
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index 7a8a039..fff5129 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/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/address-spaces.h"
#define MAX_IDE_BUS 2
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 0725352..9c78c86 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/pci.h"
#include "pci/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/address-spaces.h"
//#define HARD_DEBUG_PPC_IO
diff --git a/hw/ppce500_spin.c b/hw/ppce500_spin.c
index c1a155b..177aa2d 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/pxa2xx.c b/hw/pxa2xx.c
index e616979..936e9f8 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 {
hwaddr io_base;
diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c
index b5efd4d..512a27e 100644
--- a/hw/pxa2xx_lcd.c
+++ b/hw/pxa2xx_lcd.c
@@ -15,7 +15,7 @@
#include "pxa.h"
#include "ui/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 1481c6d..e4ffb15 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 1c6712e..b739867 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 ba6c648..1cb97ea 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -1,7 +1,7 @@
#include "net/net.h"
#include "qdev.h"
#include "qapi/qmp/qerror.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "hw/block-common.h"
#include "net/hub.h"
#include "qapi/visitor.h"
diff --git a/hw/qdev.c b/hw/qdev.c
index 0a2a32d..c4a9857 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"
#include "qapi/visitor.h"
diff --git a/hw/qxl.c b/hw/qxl.c
index b88a39c..d08b9bd 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 d7a26bf..7cf1893 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/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/address-spaces.h"
#define FLASH_BASE 0x00000000
diff --git a/hw/realview.c b/hw/realview.c
index 9c55bf2..872b3b4 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -13,10 +13,10 @@
#include "devices.h"
#include "pci/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/address-spaces.h"
#define SMP_BOOT_ADDR 0xe0000000
diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index 19c31a0..c59ec6b 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -53,11 +53,11 @@
#include "hw.h"
#include "pci/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 769015c..963b4f0 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"
@@ -29,7 +29,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 7dfe87a..2082776 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/address-spaces.h"
#include "hw/s390-virtio-bus.h"
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 748118d..89b1b66 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -16,7 +16,7 @@
*/
#include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "sclp.h"
#include "event-facility.h"
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index bc9b0ae..7ad791d 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -13,7 +13,7 @@
*/
#include "cpu.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "exec/memory.h"
#include "sclp.h"
diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c
index 9a773b8..6e6f562 100644
--- a/hw/s390x/sclpquiesce.c
+++ b/hw/s390x/sclpquiesce.c
@@ -12,7 +12,7 @@
*
*/
#include <hw/qdev.h>
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "sclp.h"
#include "event-facility.h"
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 5dc9f51..970c1fc 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 c65da4a..a69735b 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-report.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 faeb61e..4c702be 100644
--- a/hw/scsi-generic.c
+++ b/hw/scsi-generic.c
@@ -14,7 +14,7 @@
#include "qemu-common.h"
#include "qemu/error-report.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 5722f8a..98ee424 100644
--- a/hw/serial.h
+++ b/hw/serial.h
@@ -26,7 +26,7 @@
#define HW_SERIAL_H 1
#include "hw.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "exec/memory.h"
#define UART_FIFO_LENGTH 16 /* 16550A Fifo Length */
diff --git a/hw/sga.c b/hw/sga.c
index 5d80efd..d5c91ed 100644
--- a/hw/sga.c
+++ b/hw/sga.c
@@ -27,7 +27,7 @@
#include "pci/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 0894575..666f865 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 821196e..86d703a 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/address-spaces.h"
diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c
index 682fb45..704f2b1 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/smbus_ich9.c b/hw/smbus_ich9.c
index b7bddc8..16db3a7 100644
--- a/hw/smbus_ich9.c
+++ b/hw/smbus_ich9.c
@@ -28,7 +28,7 @@
#include "pc.h"
#include "pm_smbus.h"
#include "pci/pci.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#include "i2c.h"
#include "smbus.h"
diff --git a/hw/spapr.c b/hw/spapr.c
index a859d08..071cf41 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/pci/msi.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "kvm_ppc.h"
#include "pci/pci.h"
diff --git a/hw/spapr.h b/hw/spapr.h
index 600722f..3a1f69f 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_events.c b/hw/spapr_events.c
index 18ccd4a..7956601 100644
--- a/hw/spapr_events.c
+++ b/hw/spapr_events.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_hcall.c b/hw/spapr_hcall.c
index 1fac362..afb1297 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 fb968b2..d8a098c 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/address-spaces.h"
#include "hw/spapr.h"
diff --git a/hw/spapr_nvram.c b/hw/spapr_nvram.c
index 512bb8d..f20f6b4 100644
--- a/hw/spapr_nvram.c
+++ b/hw/spapr_nvram.c
@@ -24,7 +24,7 @@
#include <sys/mman.h>
#include <libfdt.h>
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
#include "hw/sysbus.h"
#include "hw/spapr.h"
#include "hw/spapr_vio.h"
diff --git a/hw/spapr_rtas.c b/hw/spapr_rtas.c
index e618c2d..d297362 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 fdf8db9..a58621d 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 1259e32..8e1be7f 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/address-spaces.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 f776fee..5d5f454 100644
--- a/hw/strongarm.c
+++ b/hw/strongarm.c
@@ -31,7 +31,7 @@
#include "qemu/error-report.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/sun4m.c b/hw/sun4m.c
index 4245854..0d84b37 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 8bca4fd..cbfd217 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/address-spaces.h"
//#define DEBUG_IRQ
diff --git a/hw/tc6393xb.c b/hw/tc6393xb.c
index edf7681..e815f83 100644
--- a/hw/tc6393xb.c
+++ b/hw/tc6393xb.c
@@ -15,7 +15,7 @@
#include "flash.h"
#include "ui/console.h"
#include "ui/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 6fdbec5..6ee4693 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/address-spaces.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 74728c9..10260a1 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 e8ada9f..1c54863 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 6d27bac..5025597 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.h b/hw/usb/hcd-ehci.h
index 5bc8003..e35144d 100644
--- a/hw/usb/hcd-ehci.h
+++ b/hw/usb/hcd-ehci.h
@@ -22,8 +22,8 @@
#include "hw/usb.h"
#include "monitor/monitor.h"
#include "trace.h"
-#include "dma.h"
-#include "sysemu.h"
+#include "sysemu/dma.h"
+#include "sysemu/sysemu.h"
#ifndef EHCI_DEBUG
#define EHCI_DEBUG 0
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index c9b8a31..2af754b 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -30,7 +30,7 @@
#include "hw/pci/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 9a8c26c..669fbd2 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 672d7a5..75f022f 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 31e5f27..b65e868 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 "qemu/iov.h"
#include <dirent.h>
diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index bd9c015..5e89e74 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/pci.h"
#include "i2c.h"
#include "boards.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
#include "flash.h"
diff --git a/hw/vexpress.c b/hw/vexpress.c
index e7b9e93..93c3176 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/address-spaces.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 9f204bc..41fb7ad 100644
--- a/hw/vfio_pci.c
+++ b/hw/vfio_pci.c
@@ -29,7 +29,7 @@
#include "config.h"
#include "qemu/event_notifier.h"
#include "exec/address-spaces.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "exec/memory.h"
#include "pci/msi.h"
#include "pci/msix.h"
diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index 5134e2f..5238c7c 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 2eb709b..3040bc6 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/address-spaces.h"
#if defined(__linux__)
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index 208caa2..90cfa24 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -15,7 +15,7 @@
#include "qemu/error-report.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 f58917f..d2d2454 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -27,8 +27,8 @@
#include "pci/msi.h"
#include "pci/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 511a169..5416004 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 3ab3a14..7d42523 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 a18aaed..d3469d4 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"
#include "exec/address-spaces.h"
diff --git a/hw/watchdog.c b/hw/watchdog.c
index 5b04215..072d256 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 4eed182..77f9178 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 ebe375e..42e019d 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 156648a..da0a7d0 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/address-spaces.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 c6c880e..9c7bb75 100644
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -25,7 +25,7 @@
* 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"
@@ -35,7 +35,7 @@
#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 29b5f22..14fe85b 100644
--- a/hw/xtensa_sim.c
+++ b/hw/xtensa_sim.c
@@ -25,7 +25,7 @@
* 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"
diff --git a/hw/z2.c b/hw/z2.c
index ec35f3e..09b0368 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/address-spaces.h"
diff --git a/hw/zynq_slcr.c b/hw/zynq_slcr.c
index c7ce51f..97ec578 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/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/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 fd68f74..a52c93a 100644
--- a/dma.h
+++ b/include/sysemu/dma.h
@@ -14,7 +14,7 @@
#include "exec/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/kvm.h b/include/sysemu/kvm.h
similarity index 100%
rename from kvm.h
rename to include/sysemu/kvm.h
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 a0d1a50..8b192e9 100644
--- a/include/ui/spice-display.h
+++ b/include/ui/spice-display.h
@@ -21,7 +21,7 @@
#include "qemu/thread.h"
#include "ui/qemu-pixman.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#define NUM_MEMSLOTS 8
#define MEMSLOT_GENERATION_BITS 8
diff --git a/kvm-all.c b/kvm-all.c
index 41ea3aa..5aa65c4 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -24,11 +24,11 @@
#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/pci/msi.h"
#include "exec/gdbstub.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "qemu/bswap.h"
#include "exec/memory.h"
#include "exec/address-spaces.h"
diff --git a/kvm-stub.c b/kvm-stub.c
index 8de8ebd..5b97152 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -15,7 +15,7 @@
#include "hw/pci/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 d442003..35e6122 100644
--- a/memory.c
+++ b/memory.c
@@ -17,7 +17,7 @@
#include "exec/address-spaces.h"
#include "exec/ioport.h"
#include "qemu/bitops.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include <assert.h>
#include "exec/memory-internal.h"
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 c829a9f..530f1d6 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 8c5c567..810f25e 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 878b231..200bef4 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 "qapi/qmp/qint.h"
#include "qapi/qmp/qfloat.h"
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index b48182f..01c705b 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-report.h"
#ifdef __NetBSD__
diff --git a/net/tap-linux.c b/net/tap-linux.c
index dd4b915..059f5f3 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-report.h"
diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index 3d5fee5..486a7ea 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 1ddd6fa..0c63cbd 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-report.h"
#include <stdio.h>
#include <windows.h>
diff --git a/net/tap.c b/net/tap.c
index d34ff13..eb40c42 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-report.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 a737d6e..4f5ec67 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/qemu-char.c b/qemu-char.c
index 5a8d8f7..0cbe853 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 40cd198..6871cab 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -43,11 +43,11 @@
#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 4c8e2f3..69cc028 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -28,7 +28,7 @@
#include "qemu/option.h"
#include "qemu/error-report.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 2a71d6f..031da1d 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 80b3f2e..8fb5c75 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 8ac45ff..1a474c4 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 5b3a5d7..be63fe1 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 ebe3963..468c921 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 "exec/ioport.h"
#include "exec/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 ea01e9b..b2a844f 100644
--- a/savevm.c
+++ b/savevm.c
@@ -74,14 +74,14 @@
#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 "sysemu/cpus.h"
#include "exec/memory.h"
#include "qmp-commands.h"
#include "trace.h"
diff --git a/stubs/arch-query-cpu-def.c b/stubs/arch-query-cpu-def.c
index 6eca852..fa67895 100644
--- a/stubs/arch-query-cpu-def.c
+++ b/stubs/arch-query-cpu-def.c
@@ -1,5 +1,5 @@
#include "qemu-common.h"
-#include "arch_init.h"
+#include "sysemu/arch_init.h"
#include "qapi/qmp/qerror.h"
CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)
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 eef2acd..e343fac 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 6dfb0f3..c6c7874 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, hwaddr pte_start_addr,
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 8abc556..1837f5a 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -22,14 +22,14 @@
#include <inttypes.h>
#include "cpu.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
#include "qapi/qmp/qerror.h"
#include "qapi/visitor.h"
-#include "arch_init.h"
+#include "sysemu/arch_init.h"
#include "hyperv.h"
@@ -38,7 +38,7 @@
#include <linux/kvm_para.h>
#endif
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
#ifndef CONFIG_USER_ONLY
#include "hw/xen.h"
#include "hw/sysbus.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 bd47b8e..dca1360 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/kvm.c b/target-i386/kvm.c
index 340ed3f..f63b1fb 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"
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-m68k/m68k-semi.c b/target-m68k/m68k-semi.c
index e6c7dd2..239fadb 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 2546c57..88650d4 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/machine.c b/target-ppc/machine.c
index 5e7bc00..e014c0c 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 318ce92..0aee7a9 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 cca63ab..42ed748 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 8e13545..42e06eb 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 dc70699..762231d 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 2e73d30..e521ed5 100644
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -23,7 +23,7 @@
#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 e0d78f3..91ecfc7 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 f61a497..0a03729 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 0afa6f8..3bf1c6e 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 5d15e9e..d78e378 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -30,7 +30,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 bcbf89d..1657848 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 8727bf4..5fe3e0e 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 a19b3d9..dc7e58d 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 d9e5315..8912b78 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 9b80e7a..75a30a1 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 "qapi/qmp/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 6965626..b659321 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/address-spaces.h"
diff --git a/xen-mapcache.c b/xen-mapcache.c
index 8f4648c..dc6d1fa 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"
--
1.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 29/32] softmmu: move remaining include files to include/ subdirectories
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (27 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 28/32] softmmu: move include files to include/sysemu/ Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 30/32] fpu: move public header file to include/fpu Paolo Bonzini
` (4 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
backends/rng-egd.c | 2 +-
bt-host.c | 2 +-
bt-vhci.c | 2 +-
event_notifier-posix.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/s390x/sclpconsole.c | 2 +-
hw/serial.c | 2 +-
hw/sh_serial.c | 2 +-
hw/spapr_events.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 +-
spice-qemu-char.c | 2 +-
ui/console.c | 2 +-
vl.c | 4 ++--
61 files changed, 61 insertions(+), 61 deletions(-)
rename bt-host.h => include/bt/bt.h (100%)
rename qemu-char.h => include/char/char.h (100%)
diff --git a/backends/rng-egd.c b/backends/rng-egd.c
index 3a7d1ec..fd41b53 100644
--- a/backends/rng-egd.c
+++ b/backends/rng-egd.c
@@ -11,7 +11,7 @@
*/
#include "qemu/rng.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "qapi/qmp/qerror.h"
#include "hw/qdev.h" /* just for DEFINE_PROP_CHR */
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/event_notifier-posix.c b/event_notifier-posix.c
index a53b956..713d756 100644
--- a/event_notifier-posix.c
+++ b/event_notifier-posix.c
@@ -12,7 +12,7 @@
#include "qemu-common.h"
#include "qemu/event_notifier.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include "qemu/main-loop.h"
#ifdef CONFIG_EVENTFD
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 3d056b0..9e9e624 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 f34acc8..7dd2fe5 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 38e8164..f09904a 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 59cb7d2..7bde800 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 8950891..4f23079 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 0865764..88c4678 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 e56e3ea..124dbb2 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 567c9a7..fcf5d05 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -24,7 +24,7 @@
#include "migration/migration.h"
#include "qapi/qmp/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 d1d4541..79b3a41 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 bf2f507..89605b8 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-report.h"
enum {
diff --git a/hw/mcf_uart.c b/hw/mcf_uart.c
index 2eca2c6..c443443 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/address-spaces.h"
typedef struct {
diff --git a/hw/milkymist-uart.c b/hw/milkymist-uart.c
index ef5518e..19e9dbd 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-report.h"
enum {
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index e7eeda3..4d8ee8c 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -30,7 +30,7 @@
#include "mips.h"
#include "mips_cpudevs.h"
#include "pci/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 bd31ced..635143d 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -34,7 +34,7 @@
#include "mips.h"
#include "mips_cpudevs.h"
#include "pci/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 dc6867c..c835850 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 159b2d1..0ebfbf8 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 56b3760..64a46c6 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 1f7ce2f..35835f3 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 936e9f8..3c51bc8 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 1cb97ea..04d605d 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -5,7 +5,7 @@
#include "hw/block-common.h"
#include "net/hub.h"
#include "qapi/visitor.h"
-#include "qemu-char.h"
+#include "char/char.h"
void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
{
diff --git a/hw/s390x/sclpconsole.c b/hw/s390x/sclpconsole.c
index ca78d67..aa70e16 100644
--- a/hw/s390x/sclpconsole.c
+++ b/hw/s390x/sclpconsole.c
@@ -17,7 +17,7 @@
#include "sclp.h"
#include "event-facility.h"
-#include "qemu-char.h"
+#include "char/char.h"
typedef struct ASCIIConsoleData {
EventBufferHeader ebh;
diff --git a/hw/serial.c b/hw/serial.c
index 2cbb544..a5b2a0c 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"
#include "exec/address-spaces.h"
diff --git a/hw/sh_serial.c b/hw/sh_serial.c
index 6372349..21c5b13 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/address-spaces.h"
//#define DEBUG_SERIAL
diff --git a/hw/spapr_events.c b/hw/spapr_events.c
index 7956601..ce78f09 100644
--- a/hw/spapr_events.c
+++ b/hw/spapr_events.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_rtas.c b/hw/spapr_rtas.c
index d297362..81eecd0 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 14f862f..ec81a7e 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 5d5f454..804c1a3 100644
--- a/hw/strongarm.c
+++ b/hw/strongarm.c
@@ -30,7 +30,7 @@
#include "strongarm.h"
#include "qemu/error-report.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 4a37442..a0d7a88 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 2ff4fe2..20cf533 100644
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -12,7 +12,7 @@
#include "qemu/error-report.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
-#include "qemu-char.h"
+#include "char/char.h"
//#define DEBUG_Serial
diff --git a/hw/virtio-console.c b/hw/virtio-console.c
index df0951e..002b028 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-report.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 b1122bd..903efd3 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 acc3d37..9639b61 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 02c5850..abd256a 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 9c7bb75..0b9a528 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 200bef4..9cf419b 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 87bdc9d..c14259f 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 0cbe853..e39e6f1 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 be63fe1..55b056b 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 468c921..c9b58ce 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 "exec/ioport.h"
#include "exec/memory.h"
#include "hw/irq.h"
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 4b51a67..e93b578 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/spice-qemu-char.c b/spice-qemu-char.c
index 41b1657..4b03143 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -1,7 +1,7 @@
#include "config-host.h"
#include "trace.h"
#include "ui/qemu-spice.h"
-#include "qemu-char.h"
+#include "char/char.h"
#include <spice.h>
#include <spice-experimental.h>
diff --git a/ui/console.c b/ui/console.c
index a4bff8c..d880ebf 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 75a30a1..e6a8d89 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 30/32] fpu: move public header file to include/fpu
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (28 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 29/32] softmmu: move remaining include files to include/ subdirectories Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 31/32] hw: move executable format header files to hw/ Paolo Bonzini
` (3 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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 4d0e116..c989fec 100755
--- a/configure
+++ b/configure
@@ -278,7 +278,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 137703f..b75c856 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 2430f70..22c9c6e 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 c941267..3afc3c6 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 7f87efa..ffddfcb 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 f3f50a0..0709780 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 b37af1f..adaf56c 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 5358941..4de2226 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 183ba9f..31602ac 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 876b386..3beab45 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 610bcd5..e88ebe0 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 acb8c73..dda0b9a 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 7c50c79..34e9b0a 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 04b6659..7389b03 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 cd8f730..509ce7c 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 31/32] hw: move executable format header files to hw/
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (29 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 30/32] fpu: move public header file to include/fpu Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 32/32] janitor: move remaining public headers to include/ Paolo Bonzini
` (2 subsequent siblings)
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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, 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.8.0.2
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [Qemu-devel] [PATCH 32/32] janitor: move remaining public headers to include/
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (30 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 31/32] hw: move executable format header files to hw/ Paolo Bonzini
@ 2012-12-17 18:17 ` Paolo Bonzini
2012-12-18 20:59 ` [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Anthony Liguori
2012-12-20 0:54 ` Anthony Liguori
33 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-17 18:17 UTC (permalink / raw)
To: qemu-devel
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.8.0.2
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (31 preceding siblings ...)
2012-12-17 18:17 ` [Qemu-devel] [PATCH 32/32] janitor: move remaining public headers to include/ Paolo Bonzini
@ 2012-12-18 20:59 ` Anthony Liguori
2012-12-18 21:11 ` Paolo Bonzini
2012-12-20 0:54 ` Anthony Liguori
33 siblings, 1 reply; 54+ messages in thread
From: Anthony Liguori @ 2012-12-18 20:59 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: Michael S. Tsirkin
Paolo Bonzini <pbonzini@redhat.com> writes:
> Anthony,
>
> The following changes since commit a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0:
>
> exec: refactor cpu_restore_state (2012-12-16 08:35:24 +0000)
>
> are available in the git repository at:
>
> git://github.com/bonzini/qemu.git header-dirs
>
> for you to fetch changes up to 394394a788cec72682750f855e5182de156026b4:
>
> janitor: move remaining public headers to include/ (2012-12-17
> 18:56:58 +0100)
A couple issues here. It conflicts with Alex's recent pull request but
this is unavoidable. I was going to repair this in the merge commit as
it's basically a merge conflict.
But this series breaks the build of make check. It's not just one test
case but almost every single one. I think you must have eliminated an
implicit include of qemu-common.h which makes PRId64 et al all
undeclared.
I started fixing this too but it became too much for a merge commit
since it affects almost all tests.
Can you fixup make check and send this series out? I'll make sure to
check tomorrow and merge your pull request if I see it tomorrow.
Otherwise, let me know when you plan on sending it and I'll make sure to
be available to merge it.
Regards,
Anthony Liguori
>
> ----------------------------------------------------------------
> Jason Baron (1):
> Fixup q35/ich9 Licenses
>
> Michael S. Tsirkin (12):
> tap: reset vnet header size on open
> get_maintainer.pl: update from linix 3.8
> pci: prepare makefiles for pci code reorganization
> MAINTAINERS: add hw/pci/ to list of PCI files
> pci: move pci core code to hw/pci
> pci: update all users to look in pci/
> pci: fix path for local includes
> Revert "pci: prepare makefiles for pci code reorganization"
> pci: rename pci_internals.h pci_bus.h
> pci_bus: update comment
> pci_bus.h: tweak include guards
> kvm: do not flush after deleting gsi
>
> Paolo Bonzini (33):
> Merge commit '1dd3a74d2ee2d873cde0b390b536e45420b3fe05' into HEAD
> 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: do not rely on indirect inclusions of or 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/
> qapi: move inclusions of qemu-common.h from headers to .c files
> qapi: remove qapi/qapi-types-core.h
> qapi: make struct Visitor opaque
> janitor: add guards to headers
> qapi: move include files to 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 +
> MAINTAINERS | 1 +
> Makefile | 47 +--
> Makefile.dis | 20 -
> Makefile.objs | 32 +-
> Makefile.target | 8 +-
> Makefile.user | 24 --
> a.out.h | 430 ---------------------
> acl.c | 2 +-
> aes.c | 2 +-
> aio-posix.c | 6 +-
> aio-win32.c | 6 +-
> arch_init.c | 24 +-
> async.c | 4 +-
> audio/Makefile.objs | 3 +
> audio/alsaaudio.c | 2 +-
> audio/audio.c | 6 +-
> audio/audio.h | 2 +-
> audio/noaudio.c | 2 +-
> audio/ossaudio.c | 4 +-
> audio/spiceaudio.c | 2 +-
> audio/wavaudio.c | 2 +-
> audio/wavcapture.c | 2 +-
> audio/winwaveaudio.c | 2 +-
> backends/rng-egd.c | 4 +-
> backends/rng-random.c | 4 +-
> backends/rng.c | 2 +-
> 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/linux-aio.c | 6 +-
> block/mirror.c | 4 +-
> block/nbd.c | 10 +-
> 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 | 13 +-
> block/raw-win32.c | 10 +-
> 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 +-
> block/win32-aio.c | 10 +-
> blockdev-nbd.c | 12 +-
> blockdev.c | 20 +-
> blockjob.c | 14 +-
> bsd-user/elfload.c | 2 +-
> bsd-user/main.c | 4 +-
> bsd-user/qemu.h | 6 +-
> 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 | 6 +-
> 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-posix.c | 5 +-
> event_notifier-win32.c | 4 +-
> exec.c | 19 +-
> fpu/softfloat.c | 2 +-
> fsdev/qemu-fsdev-dummy.c | 4 +-
> 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 | 13 +-
> 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-synth.h | 4 +
> hw/9pfs/virtio-9p-xattr.h | 2 +-
> hw/9pfs/virtio-9p.c | 4 +-
> hw/9pfs/virtio-9p.h | 4 +-
> hw/Makefile.objs | 15 +-
> hw/ac97.c | 4 +-
> hw/acpi.c | 4 +-
> hw/acpi.h | 2 +-
> hw/acpi_ich9.c | 23 +-
> hw/acpi_piix4.c | 10 +-
> 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 | 5 +-
> hw/alpha_typhoon.c | 6 +-
> hw/an5206.c | 2 +-
> hw/apb_pci.c | 12 +-
> hw/apic.c | 6 +-
> hw/apic_common.c | 2 +-
> hw/apic_internal.h | 4 +-
> hw/apm.c | 2 +-
> hw/apm.h | 2 +-
> 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/audiodev.h | 5 +
> hw/axis_dev88.c | 6 +-
> hw/baum.c | 4 +-
> hw/baum.h | 4 +
> hw/blizzard.c | 4 +-
> hw/block-common.c | 4 +-
> hw/boards.h | 2 +-
> hw/bonito.c | 8 +-
> 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/bt.h | 5 +
> 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 | 4 +-
> hw/collie.c | 4 +-
> hw/cris-boot.h | 4 +
> hw/cs4231a.c | 2 +-
> hw/cuda.c | 4 +-
> hw/debugcon.c | 2 +-
> hw/dec_pci.c | 8 +-
> hw/device-hotplug.c | 9 +-
> hw/dma.c | 1 +
> hw/dp8393x.c | 4 +-
> hw/dummy_m68k.c | 2 +-
> hw/e1000.c | 8 +-
> hw/eepro100.c | 8 +-
> hw/empty_slot.h | 5 +
> hw/es1370.c | 4 +-
> hw/escc.c | 4 +-
> hw/escc.h | 5 +
> hw/esp-pci.c | 4 +-
> hw/esp.c | 2 +-
> hw/etraxfs.h | 7 +-
> hw/etraxfs_dma.c | 4 +-
> hw/etraxfs_dma.h | 5 +
> 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 | 8 +-
> 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 | 7 +-
> hw/framebuffer.c | 2 +-
> hw/framebuffer.h | 2 +-
> hw/fw_cfg.c | 5 +-
> hw/g364fb.c | 4 +-
> hw/grackle_pci.c | 4 +-
> hw/grlib_apbuart.c | 2 +-
> hw/grlib_gptimer.c | 2 +-
> hw/gt64xxx.c | 6 +-
> hw/gumstix.c | 6 +-
> hw/hd-geometry.c | 2 +-
> hw/hda-audio.c | 2 +-
> hw/hid.c | 4 +-
> hw/hid.h | 2 +-
> hw/highbank.c | 8 +-
> hw/hpet.c | 4 +-
> hw/hw.h | 12 +-
> hw/i386/Makefile.objs | 2 +-
> hw/i82378.c | 2 +-
> hw/i8254.c | 2 +-
> hw/i8254_common.c | 2 +-
> hw/i8259.c | 4 +-
> hw/i82801b11.c | 2 +-
> hw/ich9.h | 10 +-
> hw/ide.h | 4 +-
> hw/ide/ahci.c | 10 +-
> hw/ide/cmd646.c | 8 +-
> hw/ide/core.c | 12 +-
> hw/ide/ich.c | 8 +-
> 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 | 6 +-
> hw/ide/piix.c | 8 +-
> hw/ide/qdev.c | 8 +-
> hw/ide/via.c | 8 +-
> 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 | 8 +-
> hw/ioapic_internal.h | 2 +-
> hw/ioh3420.c | 6 +-
> hw/ioh3420.h | 2 +-
> hw/isa-bus.c | 6 +-
> hw/isa.h | 4 +-
> hw/isa_mmio.c | 2 +-
> hw/ivshmem.c | 13 +-
> hw/jazz_led.c | 5 +-
> hw/kvm/apic.c | 4 +-
> 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 | 14 +-
> hw/kvmvapic.c | 6 +-
> hw/kzm.c | 6 +-
> hw/lan9118.c | 4 +-
> hw/lance.c | 6 +-
> hw/leon3.c | 8 +-
> hw/lm32.h | 5 +
> 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/lpc_ich9.c | 46 +--
> hw/lsi53c895a.c | 4 +-
> hw/m25p80.c | 2 +-
> hw/m48t59.c | 6 +-
> hw/mac_dbdma.c | 1 +
> hw/mac_dbdma.h | 6 +-
> hw/mac_nvram.c | 2 +-
> hw/macio.c | 2 +-
> hw/mainstone.c | 6 +-
> hw/mc146818rtc.c | 6 +-
> 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 | 8 +-
> 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 | 6 +-
> hw/milkymist.c | 7 +-
> hw/mips.h | 2 +-
> hw/mips_fulong2e.c | 16 +-
> hw/mips_jazz.c | 10 +-
> hw/mips_malta.c | 18 +-
> 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/msmouse.c | 6 +-
> hw/msmouse.h | 5 +
> hw/multiboot.c | 2 +-
> hw/musicpal.c | 17 +-
> hw/nand.c | 4 +-
> hw/ne2000-isa.c | 4 +-
> hw/ne2000.c | 6 +-
> hw/ne2000.h | 5 +
> 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 | 5 +-
> 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/openpic.c | 4 +-
> hw/openrisc_sim.c | 8 +-
> hw/openrisc_timer.c | 2 +-
> hw/palm.c | 6 +-
> hw/pam.c | 2 +-
> hw/pam.h | 2 +-
> hw/parallel.c | 4 +-
> hw/pc.c | 20 +-
> hw/pc.h | 8 +-
> hw/pc_piix.c | 18 +-
> hw/pc_q35.c | 6 +-
> hw/pc_sysfw.c | 6 +-
> hw/pci/Makefile.objs | 9 +
> hw/{ => pci}/msi.c | 4 +-
> hw/{ => pci}/msi.h | 2 +-
> hw/{ => pci}/msix.c | 10 +-
> hw/{ => pci}/msix.h | 2 +-
> hw/{ => pci}/pci-hotplug.c | 22 +-
> hw/{ => pci}/pci-stub.c | 6 +-
> hw/{ => pci}/pci.c | 24 +-
> hw/{ => pci}/pci.h | 14 +-
> hw/{ => pci}/pci_bridge.c | 6 +-
> hw/{ => pci}/pci_bridge.h | 2 +-
> hw/{pci_internals.h => pci/pci_bus.h} | 16 +-
> hw/{ => pci}/pci_host.c | 4 +-
> hw/{ => pci}/pci_host.h | 2 +-
> hw/{ => pci}/pci_ids.h | 4 +
> hw/{ => pci}/pci_regs.h | 0
> hw/{ => pci}/pcie.c | 14 +-
> hw/{ => pci}/pcie.h | 8 +-
> hw/{ => pci}/pcie_aer.c | 18 +-
> hw/{ => pci}/pcie_aer.h | 2 +-
> hw/{ => pci}/pcie_host.c | 8 +-
> hw/{ => pci}/pcie_host.h | 4 +-
> hw/{ => pci}/pcie_port.c | 2 +-
> hw/{ => pci}/pcie_port.h | 4 +-
> hw/{ => pci}/pcie_regs.h | 0
> hw/{ => pci}/shpc.c | 12 +-
> hw/{ => pci}/shpc.h | 4 +-
> hw/{ => pci}/slotid_cap.c | 4 +-
> hw/{ => pci}/slotid_cap.h | 0
> hw/pci_bridge_dev.c | 14 +-
> hw/pckbd.c | 2 +-
> hw/pcmcia.h | 5 +
> hw/pcnet-pci.c | 8 +-
> hw/pcnet.c | 8 +-
> hw/pcnet.h | 7 +-
> 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/piix4.c | 2 +-
> hw/piix_pci.c | 6 +-
> hw/pl011.c | 2 +-
> hw/pl031.c | 4 +-
> hw/pl110.c | 5 +-
> hw/pl181.c | 2 +-
> hw/ppc.c | 8 +-
> hw/ppc.h | 5 +
> hw/ppc/Makefile.objs | 2 +-
> hw/ppc/e500.c | 12 +-
> hw/ppc/e500plat.c | 2 +-
> hw/ppc/mpc8544ds.c | 2 +-
> hw/ppc405_boards.c | 10 +-
> hw/ppc405_uc.c | 8 +-
> hw/ppc440_bamboo.c | 12 +-
> hw/ppc4xx.h | 2 +-
> hw/ppc4xx_devs.c | 4 +-
> hw/ppc4xx_pci.c | 6 +-
> hw/ppc_booke.c | 6 +-
> hw/ppc_mac.h | 2 +-
> hw/ppc_newworld.c | 12 +-
> hw/ppc_oldworld.c | 12 +-
> hw/ppc_prep.c | 16 +-
> hw/ppce500_pci.c | 8 +-
> hw/ppce500_spin.c | 4 +-
> hw/prep_pci.c | 6 +-
> hw/ps2.c | 4 +-
> hw/ptimer.c | 4 +-
> hw/ptimer.h | 4 +-
> hw/puv3.c | 6 +-
> hw/pxa.h | 2 +-
> hw/pxa2xx.c | 6 +-
> hw/pxa2xx_keypad.c | 2 +-
> hw/pxa2xx_lcd.c | 6 +-
> hw/pxa2xx_timer.c | 4 +-
> hw/q35.h | 6 +-
> hw/qdev-addr.c | 4 +-
> hw/qdev-addr.h | 5 +
> hw/qdev-core.h | 10 +-
> hw/qdev-monitor.c | 5 +-
> hw/qdev-monitor.h | 2 +-
> hw/qdev-properties.c | 9 +-
> hw/qdev.c | 8 +-
> hw/qxl-logger.c | 2 +-
> hw/qxl.c | 8 +-
> hw/qxl.h | 11 +-
> hw/r2d.c | 10 +-
> hw/rc4030.c | 2 +-
> hw/realview.c | 10 +-
> hw/rtl8139.c | 12 +-
> hw/s390-virtio-bus.c | 9 +-
> hw/s390-virtio-bus.h | 4 +
> hw/s390-virtio.c | 14 +-
> hw/s390x/event-facility.c | 4 +-
> hw/s390x/event-facility.h | 2 +-
> hw/s390x/sclp.c | 4 +-
> hw/s390x/sclpconsole.c | 3 +-
> hw/s390x/sclpquiesce.c | 2 +-
> hw/sb16.c | 4 +-
> hw/scsi-bus.c | 6 +-
> hw/scsi-defs.h | 4 +
> hw/scsi-disk.c | 8 +-
> hw/scsi-generic.c | 4 +-
> hw/scsi.h | 4 +-
> hw/sd.c | 4 +-
> hw/serial-pci.c | 2 +-
> hw/serial.c | 6 +-
> hw/serial.h | 8 +-
> hw/sga.c | 4 +-
> hw/sh7750.c | 4 +-
> hw/sh_intc.h | 2 +-
> hw/sh_pci.c | 8 +-
> hw/sh_serial.c | 4 +-
> hw/sh_timer.c | 4 +-
> hw/shix.c | 4 +-
> hw/slavio_intctl.c | 2 +-
> hw/slavio_misc.c | 2 +-
> hw/slavio_timer.c | 2 +-
> hw/sm501.c | 7 +-
> hw/smbios.c | 2 +-
> hw/smbus_ich9.c | 18 +-
> hw/smc91c111.c | 2 +-
> hw/soc_dma.c | 2 +-
> hw/soc_dma.h | 8 +-
> hw/spapr.c | 18 +-
> hw/spapr.h | 2 +-
> hw/spapr_events.c | 6 +-
> hw/spapr_hcall.c | 6 +-
> hw/spapr_iommu.c | 6 +-
> hw/spapr_llan.c | 2 +-
> hw/spapr_nvram.c | 2 +-
> hw/spapr_pci.c | 12 +-
> hw/spapr_pci.h | 4 +-
> 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 | 12 +-
> hw/sysbus.c | 4 +-
> hw/sysbus.h | 2 +-
> hw/tc6393xb.c | 6 +-
> hw/tcx.c | 5 +-
> 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/unin_pci.c | 4 +-
> hw/usb.h | 2 +-
> hw/usb/bus.c | 4 +-
> hw/usb/combined-packet.c | 2 +-
> 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-pci.c | 4 +-
> hw/usb/hcd-ehci.h | 12 +-
> hw/usb/hcd-musb.c | 2 +-
> hw/usb/hcd-ohci.c | 4 +-
> hw/usb/hcd-uhci.c | 8 +-
> hw/usb/hcd-xhci.c | 8 +-
> 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 | 8 +-
> hw/versatile_pci.c | 6 +-
> hw/versatilepb.c | 10 +-
> hw/vexpress.c | 8 +-
> hw/vfio_pci.c | 20 +-
> hw/vga-isa-mm.c | 6 +-
> hw/vga-isa.c | 6 +-
> hw/vga-pci.c | 8 +-
> hw/vga.c | 8 +-
> hw/vga_int.h | 8 +-
> 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-balloon.h | 2 +-
> hw/virtio-blk.c | 4 +-
> hw/virtio-console.c | 4 +-
> hw/virtio-net.c | 8 +-
> hw/virtio-net.h | 30 +-
> hw/virtio-pci.c | 15 +-
> hw/virtio-rng.c | 2 +-
> hw/virtio-scsi.h | 3 +-
> 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 | 4 +-
> hw/vt82c686.c | 10 +-
> hw/watchdog.c | 12 +-
> hw/watchdog.h | 2 +-
> hw/wdt_i6300esb.c | 4 +-
> hw/wdt_ib700.c | 2 +-
> hw/xen-host-pci-device.h | 2 +-
> hw/xen_apic.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 | 5 +-
> hw/xen_pt.c | 6 +-
> hw/xen_pt.h | 2 +-
> hw/xen_pt_config_init.c | 2 +-
> hw/xenfb.c | 4 +-
> hw/xgmac.c | 6 +-
> hw/xilinx.h | 8 +-
> hw/xilinx_axidma.c | 5 +-
> hw/xilinx_axienet.c | 5 +-
> hw/xilinx_ethlite.c | 2 +-
> hw/xilinx_spi.c | 4 +-
> hw/xilinx_spips.c | 6 +-
> hw/xilinx_timer.c | 2 +-
> hw/xilinx_uartlite.c | 2 +-
> hw/xilinx_zynq.c | 8 +-
> hw/xio3130_downstream.c | 6 +-
> hw/xio3130_downstream.h | 2 +-
> hw/xio3130_upstream.c | 6 +-
> hw/xio3130_upstream.h | 2 +-
> hw/xtensa_lx60.c | 11 +-
> hw/xtensa_pic.c | 4 +-
> hw/xtensa_sim.c | 6 +-
> hw/z2.c | 8 +-
> hw/zynq_slcr.c | 4 +-
> aes.h => include/block/aes.h | 0
> qemu-aio.h => include/block/aio.h | 4 +-
> 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
> thread-pool.h => include/block/thread-pool.h | 8 +-
> include/bt/bt.h | 20 +
> qemu-char.h => include/char/char.h | 14 +-
> 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
> exec-memory.h => include/exec/address-spaces.h | 2 +-
> cpu-all.h => include/exec/cpu-all.h | 6 +-
> cpu-common.h => include/exec/cpu-common.h | 8 +-
> cpu-defs.h => include/exec/cpu-defs.h | 6 +-
> cputlb.h => include/exec/cputlb.h | 0
> def-helper.h => include/exec/def-helper.h | 0
> exec-all.h => include/exec/exec-all.h | 14 +-
> gdbstub.h => include/exec/gdbstub.h | 0
> gen-icount.h => include/exec/gen-icount.h | 7 +-
> hwaddr.h => include/exec/hwaddr.h | 0
> ioport.h => include/exec/ioport.h | 2 +-
> iorange.h => include/exec/iorange.h | 0
> .../exec/memory-internal.h | 0
> memory.h => include/exec/memory.h | 12 +-
> poison.h => include/exec/poison.h | 0
> softmmu-semi.h => include/exec/softmmu-semi.h | 4 +
> 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
> qemu-user-types.h => include/exec/user/abitypes.h | 0
> thunk.h => include/exec/user/thunk.h | 0
> {fpu => include/fpu}/softfloat.h | 2 +-
> libfdt_env.h => include/libfdt_env.h | 2 +-
> block-migration.h => include/migration/block.h | 0
> migration.h => include/migration/migration.h | 8 +-
> include/{qemu => migration}/page_cache.h | 0
> qemu-file.h => include/migration/qemu-file.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 +-
> include/net/tap.h | 67 ++++
> .../qapi/dealloc-visitor.h | 2 +-
> error.h => include/qapi/error.h | 2 +-
> {qapi => include/qapi}/opts-visitor.h | 4 +-
> {qapi => include/qapi}/qmp-input-visitor.h | 4 +-
> {qapi => include/qapi}/qmp-output-visitor.h | 4 +-
> qapi/qmp-core.h => include/qapi/qmp/dispatch.h | 6 +-
> json-lexer.h => include/qapi/qmp/json-lexer.h | 4 +-
> json-parser.h => include/qapi/qmp/json-parser.h | 4 +-
> .../qapi/qmp/json-streamer.h | 4 +-
> qbool.h => include/qapi/qmp/qbool.h | 2 +-
> qdict.h => include/qapi/qmp/qdict.h | 6 +-
> qerror.h => include/qapi/qmp/qerror.h | 8 +-
> qfloat.h => include/qapi/qmp/qfloat.h | 2 +-
> qint.h => include/qapi/qmp/qint.h | 2 +-
> qjson.h => include/qapi/qmp/qjson.h | 6 +-
> qlist.h => include/qapi/qmp/qlist.h | 6 +-
> qobject.h => include/qapi/qmp/qobject.h | 0
> qstring.h => include/qapi/qmp/qstring.h | 2 +-
> 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 +-
> include/qapi/visitor-impl.h | 63 +++
> qapi/qapi-visit-core.h => include/qapi/visitor.h | 42 +-
> qemu-common.h => include/qemu-common.h | 14 +-
> 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 | 5 +-
> envlist.h => include/qemu/envlist.h | 0
> qemu-error.h => include/qemu/error-report.h | 0
> event_notifier.h => include/qemu/event_notifier.h | 0
> host-utils.h => include/qemu/host-utils.h | 6 +-
> int128.h => include/qemu/int128.h | 0
> iov.h => include/qemu/iov.h | 5 +
> qemu-log.h => include/qemu/log.h | 2 +-
> main-loop.h => include/qemu/main-loop.h | 2 +-
> 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 | 3 +-
> osdep.h => include/qemu/osdep.h | 0
> qemu-queue.h => include/qemu/queue.h | 2 +-
> range.h => include/qemu/range.h | 0
> include/qemu/rng-random.h | 2 +-
> include/qemu/rng.h | 4 +-
> 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
> qemu-types.h => include/qemu/typedefs.h | 0
> uri.h => include/qemu/uri.h | 0
> qemu-xattr.h => include/qemu/xattr.h | 0
> include/{qemu => qom}/cpu.h | 4 +-
> include/{qemu => qom}/object.h | 2 +-
> include/{qemu => qom}/qom-qobject.h | 2 +-
> 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
> device_tree.h => include/sysemu/device_tree.h | 0
> dma.h => include/sysemu/dma.h | 6 +-
> dump.h => include/sysemu/dump.h | 0
> kvm.h => include/sysemu/kvm.h | 2 +-
> .../sysemu/memory_mapping.h | 2 +-
> 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 | 2 +-
> sysemu.h => include/sysemu/sysemu.h | 12 +-
> xen-mapcache.h => include/sysemu/xen-mapcache.h | 0
> console.h => include/ui/console.h | 11 +-
> {hw => include/ui}/pixel_ops.h | 0
> qemu-pixman.h => include/ui/qemu-pixman.h | 0
> {ui => include/ui}/qemu-spice.h | 9 +-
> {ui => include/ui}/spice-display.h | 6 +-
> iohandler.c | 7 +-
> ioport.c | 4 +-
> iov.c | 2 +-
> json-lexer.c | 10 +-
> json-parser.c | 18 +-
> json-streamer.c | 10 +-
> kvm-all.c | 24 +-
> kvm-stub.c | 6 +-
> 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-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/cris/syscall.h | 5 +
> linux-user/elfload.c | 2 +-
> linux-user/main.c | 6 +-
> linux-user/microblaze/syscall.h | 6 +
> linux-user/qemu.h | 10 +-
> linux-user/syscall.c | 2 +-
> linux-user/syscall_defs.h | 6 +
> 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 | 52 +--
> 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 | 15 +-
> 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 +-
> pixman | 2 +-
> qapi/opts-visitor.c | 10 +-
> qapi/qapi-dealloc-visitor.c | 7 +-
> qapi/qapi-types-core.h | 21 -
> qapi/qapi-visit-core.c | 6 +-
> qapi/qapi-visit-impl.h | 23 --
> qapi/qmp-dispatch.c | 10 +-
> qapi/qmp-input-visitor.c | 10 +-
> qapi/qmp-output-visitor.c | 10 +-
> qapi/qmp-registry.c | 2 +-
> qapi/string-input-visitor.c | 6 +-
> qapi/string-output-visitor.c | 6 +-
> qbool.c | 4 +-
> qdict.c | 14 +-
> 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 +-
> qerror.c | 6 +-
> qfloat.c | 4 +-
> qga/Makefile.objs | 2 +-
> qga/channel-posix.c | 4 +-
> qga/commands-posix.c | 6 +-
> qga/commands-win32.c | 2 +-
> qga/commands.c | 2 +-
> qga/guest-agent-core.h | 2 +-
> qemu-ga.c => qga/main.c | 14 +-
> qapi-schema-guest.json => qga/qapi-schema.json | 0
> qint.c | 4 +-
> qjson.c | 18 +-
> qlist.c | 6 +-
> qmp.c | 11 +-
> qom/container.c | 4 +-
> qom/cpu.c | 2 +-
> qom/object.c | 15 +-
> qom/qom-qobject.c | 6 +-
> qstring.c | 4 +-
> qtest.c | 12 +-
> readline.c | 4 +-
> rules.mak | 5 +-
> savevm.c | 23 +-
> scripts/feature_to_c.sh | 2 +-
> scripts/get_maintainer.pl | 25 +-
> scripts/qapi-commands.py | 15 +-
> scripts/qapi-types.py | 2 +-
> scripts/qapi-visit.py | 3 +-
> slirp/bootp.h | 4 +
> slirp/if.c | 2 +-
> slirp/ip_input.c | 2 +-
> slirp/main.h | 4 +
> slirp/misc.c | 4 +-
> slirp/sbuf.c | 2 +-
> slirp/slirp.c | 4 +-
> slirp/slirp.h | 4 +-
> slirp/tftp.h | 4 +
> spice-qemu-char.c | 3 +-
> stubs/arch-query-cpu-def.c | 4 +-
> stubs/fd-register.c | 2 +-
> stubs/fdset-add-fd.c | 2 +-
> stubs/fdset-find-fd.c | 2 +-
> stubs/fdset-get-fd.c | 2 +-
> stubs/fdset-remove-fd.c | 2 +-
> stubs/get-fd.c | 2 +-
> stubs/set-fd-handler.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/crisv32-decode.h | 4 +
> 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 | 13 +-
> 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 | 13 +-
> 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/arm/tcg-target.h | 3 +
> tcg/hppa/tcg-target.c | 2 +-
> tcg/hppa/tcg-target.h | 3 +
> tcg/i386/tcg-target.c | 2 +-
> tcg/i386/tcg-target.h | 3 +
> tcg/ia64/tcg-target.c | 2 +-
> tcg/ia64/tcg-target.h | 3 +
> tcg/mips/tcg-target.c | 2 +-
> tcg/mips/tcg-target.h | 3 +
> tcg/ppc/tcg-target.c | 2 +-
> tcg/ppc/tcg-target.h | 3 +
> tcg/ppc64/tcg-target.c | 2 +-
> tcg/ppc64/tcg-target.h | 3 +
> tcg/s390/tcg-target.c | 2 +-
> tcg/s390/tcg-target.h | 3 +
> tcg/sparc/tcg-target.c | 2 +-
> tcg/sparc/tcg-target.h | 3 +
> 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/cris/crisutils.h | 5 +
> tests/tcg/test-i386-fprem.c | 4 +-
> tests/tcg/test-i386.c | 2 +-
> tests/test-aio.c | 2 +-
> tests/test-coroutine.c | 2 +-
> tests/test-iov.c | 4 +-
> tests/test-qmp-commands.c | 6 +-
> 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-thread-pool.c | 6 +-
> tests/test-visitor-serialization.c | 2 +-
> thread-pool.c | 14 +-
> thunk.c | 2 +-
> trace/simple.c | 2 +-
> translate-all.c | 10 +-
> ui/Makefile.objs | 7 +-
> ui/cocoa.m | 4 +-
> console.c => ui/console.c | 5 +-
> ui/curses.c | 4 +-
> ui/curses_keys.h | 5 +
> cursor.c => ui/cursor.c | 2 +-
> cursor_hidden.xpm => ui/cursor_hidden.xpm | 0
> cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm | 0
> ui/d3des.h | 4 +
> input.c => ui/input.c | 9 +-
> ui/keymaps.c | 2 +-
> qemu-pixman.c => ui/qemu-pixman.c | 2 +-
> 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 | 8 +-
> xen-mapcache.c | 6 +-
> xen-stub.c | 2 +-
> 1124 files changed, 3142 insertions(+), 3427 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%)
> create mode 100644 hw/pci/Makefile.objs
> rename hw/{ => pci}/msi.c (99%)
> rename hw/{ => pci}/msi.h (98%)
> rename hw/{ => pci}/msix.c (99%)
> rename hw/{ => pci}/msix.h (98%)
> rename hw/{ => pci}/pci-hotplug.c (96%)
> rename hw/{ => pci}/pci-stub.c (94%)
> rename hw/{ => pci}/pci.c (99%)
> rename hw/{ => pci}/pci.h (99%)
> rename hw/{ => pci}/pci_bridge.c (99%)
> rename hw/{ => pci}/pci_bridge.h (98%)
> rename hw/{pci_internals.h => pci/pci_bus.h} (79%)
> rename hw/{ => pci}/pci_host.c (99%)
> rename hw/{ => pci}/pci_host.h (99%)
> rename hw/{ => pci}/pci_ids.h (98%)
> rename hw/{ => pci}/pci_regs.h (100%)
> rename hw/{ => pci}/pcie.c (99%)
> rename hw/{ => pci}/pcie.h (98%)
> rename hw/{ => pci}/pcie_aer.c (99%)
> rename hw/{ => pci}/pcie_aer.h (99%)
> rename hw/{ => pci}/pcie_host.c (97%)
> rename hw/{ => pci}/pcie_host.h (96%)
> rename hw/{ => pci}/pcie_port.c (99%)
> rename hw/{ => pci}/pcie_port.h (96%)
> rename hw/{ => pci}/pcie_regs.h (100%)
> rename hw/{ => pci}/shpc.c (99%)
> rename hw/{ => pci}/shpc.h (95%)
> rename hw/{ => pci}/slotid_cap.c (95%)
> rename hw/{ => pci}/slotid_cap.h (100%)
> rename uboot_image.h => hw/uboot_image.h (100%)
> rename aes.h => include/block/aes.h (100%)
> rename qemu-aio.h => include/block/aio.h (99%)
> 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%)
> rename thread-pool.h => include/block/thread-pool.h (88%)
> 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 exec-memory.h => include/exec/address-spaces.h (97%)
> 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 cputlb.h => include/exec/cputlb.h (100%)
> rename def-helper.h => include/exec/def-helper.h (100%)
> rename exec-all.h => include/exec/exec-all.h (98%)
> rename gdbstub.h => include/exec/gdbstub.h (100%)
> rename gen-icount.h => include/exec/gen-icount.h (94%)
> rename hwaddr.h => include/exec/hwaddr.h (100%)
> rename ioport.h => include/exec/ioport.h (99%)
> rename iorange.h => include/exec/iorange.h (100%)
> rename memory-internal.h => include/exec/memory-internal.h (100%)
> rename memory.h => include/exec/memory.h (99%)
> rename poison.h => include/exec/poison.h (100%)
> rename softmmu-semi.h => include/exec/softmmu-semi.h (97%)
> 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 qemu-user-types.h => include/exec/user/abitypes.h (100%)
> rename thunk.h => include/exec/user/thunk.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 migration.h => include/migration/migration.h (97%)
> rename include/{qemu => migration}/page_cache.h (100%)
> rename qemu-file.h => include/migration/qemu-file.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%)
> create mode 100644 include/net/tap.h
> 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-input-visitor.h (91%)
> rename {qapi => include/qapi}/qmp-output-visitor.h (91%)
> rename qapi/qmp-core.h => include/qapi/qmp/dispatch.h (93%)
> rename json-lexer.h => include/qapi/qmp/json-lexer.h (94%)
> rename json-parser.h => include/qapi/qmp/json-parser.h (90%)
> rename json-streamer.h => include/qapi/qmp/json-streamer.h (93%)
> rename qbool.h => include/qapi/qmp/qbool.h (94%)
> rename qdict.h => include/qapi/qmp/qdict.h (96%)
> rename qerror.h => include/qapi/qmp/qerror.h (98%)
> rename qfloat.h => include/qapi/qmp/qfloat.h (94%)
> rename qint.h => include/qapi/qmp/qint.h (94%)
> rename qjson.h => include/qapi/qmp/qjson.h (88%)
> rename qlist.h => include/qapi/qmp/qlist.h (95%)
> rename qobject.h => include/qapi/qmp/qobject.h (100%)
> rename qstring.h => include/qapi/qmp/qstring.h (96%)
> rename qemu-objects.h => include/qapi/qmp/types.h (60%)
> rename {qapi => include/qapi}/string-input-visitor.h (95%)
> rename {qapi => include/qapi}/string-output-visitor.h (95%)
> create mode 100644 include/qapi/visitor-impl.h
> rename qapi/qapi-visit-core.h => include/qapi/visitor.h (52%)
> 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 (91%)
> rename envlist.h => include/qemu/envlist.h (100%)
> rename qemu-error.h => include/qemu/error-report.h (100%)
> rename event_notifier.h => include/qemu/event_notifier.h (100%)
> rename host-utils.h => include/qemu/host-utils.h (98%)
> rename int128.h => include/qemu/int128.h (100%)
> rename iov.h => include/qemu/iov.h (99%)
> rename qemu-log.h => include/qemu/log.h (99%)
> rename main-loop.h => include/qemu/main-loop.h (99%)
> 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 (96%)
> 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 (96%)
> rename qemu-timer.h => include/qemu/timer.h (99%)
> rename qemu-tls.h => include/qemu/tls.h (100%)
> rename qemu-types.h => include/qemu/typedefs.h (100%)
> rename uri.h => include/qemu/uri.h (100%)
> rename qemu-xattr.h => include/qemu/xattr.h (100%)
> rename include/{qemu => qom}/cpu.h (98%)
> rename include/{qemu => qom}/object.h (99%)
> rename include/{qemu => qom}/qom-qobject.h (97%)
> 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 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 kvm.h => include/sysemu/kvm.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 (100%)
> 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 {hw => include/ui}/pixel_ops.h (100%)
> rename qemu-pixman.h => include/ui/qemu-pixman.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%)
> delete mode 100644 qapi/qapi-types-core.h
> delete mode 100644 qapi/qapi-visit-impl.h
> rename qemu-ga.c => qga/main.c (99%)
> rename qapi-schema-guest.json => qga/qapi-schema.json (100%)
> 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 qemu-pixman.c => ui/qemu-pixman.c (98%)
> rename qemu-x509.h => ui/qemu-x509.h (100%)
> rename vgafont.h => ui/vgafont.h (100%)
> ---
> 1.8.0.2
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-18 20:59 ` [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Anthony Liguori
@ 2012-12-18 21:11 ` Paolo Bonzini
2012-12-18 21:56 ` Paolo Bonzini
2012-12-18 22:01 ` Paolo Bonzini
0 siblings, 2 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-18 21:11 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Michael S. Tsirkin
Il 18/12/2012 21:59, Anthony Liguori ha scritto:
> But this series breaks the build of make check. It's not just one test
> case but almost every single one. I think you must have eliminated an
> implicit include of qemu-common.h which makes PRId64 et al all
> undeclared.
>
> I started fixing this too but it became too much for a merge commit
> since it affects almost all tests.
>
> Can you fixup make check and send this series out? I'll make sure to
> check tomorrow and merge your pull request if I see it tomorrow.
> Otherwise, let me know when you plan on sending it and I'll make sure to
> be available to merge it.
Hmm, I must have pushed the wrong branch because I remember this failure.
Paolo
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-18 21:11 ` Paolo Bonzini
@ 2012-12-18 21:56 ` Paolo Bonzini
2012-12-18 22:35 ` Anthony Liguori
2012-12-18 22:01 ` Paolo Bonzini
1 sibling, 1 reply; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-18 21:56 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Michael S. Tsirkin
[-- Attachment #1.1: Type: text/plain, Size: 1036 bytes --]
Ok... I had really merged the wrong branch with mst's. I fixed it up and
pushed again to the same place; it's now commit 6cdf60e, "make check"
builds and passes.
Here is the diff, sorry for the mistake.
Paolo
On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 18/12/2012 21:59, Anthony Liguori ha scritto:
> > But this series breaks the build of make check. It's not just one test
> > case but almost every single one. I think you must have eliminated an
> > implicit include of qemu-common.h which makes PRId64 et al all
> > undeclared.
> >
> > I started fixing this too but it became too much for a merge commit
> > since it affects almost all tests.
> >
> > Can you fixup make check and send this series out? I'll make sure to
> > check tomorrow and merge your pull request if I see it tomorrow.
> > Otherwise, let me know when you plan on sending it and I'll make sure to
> > be available to merge it.
>
> Hmm, I must have pushed the wrong branch because I remember this failure.
>
> Paolo
>
[-- Attachment #1.2: Type: text/html, Size: 1531 bytes --]
[-- Attachment #2: header-dirs-diff.patch --]
[-- Type: application/octet-stream, Size: 2913 bytes --]
diff --git a/include/qemu/error-report.h b/include/qemu/error-report.h
index 93d74b4..c902cc1 100644
--- a/include/qemu/error-report.h
+++ b/include/qemu/error-report.h
@@ -13,6 +13,8 @@
#ifndef QEMU_ERROR_H
#define QEMU_ERROR_H
+#include <stdarg.h>
+
typedef struct Location {
/* all members are private to qemu-error.c */
enum { LOC_NONE, LOC_CMDLINE, LOC_FILE } kind;
diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c
index 120f200..5a3e82a 100644
--- a/tests/test-qmp-commands.c
+++ b/tests/test-qmp-commands.c
@@ -1,4 +1,5 @@
#include <glib.h>
+#include "qemu-common.h"
#include "qapi/qmp/types.h"
#include "test-qmp-commands.h"
#include "qapi/qmp/dispatch.h"
diff --git a/tests/test-qmp-input-strict.c b/tests/test-qmp-input-strict.c
index 19d4990..6f68963 100644
--- a/tests/test-qmp-input-strict.c
+++ b/tests/test-qmp-input-strict.c
@@ -14,6 +14,7 @@
#include <glib.h>
#include <stdarg.h>
+#include "qemu-common.h"
#include "qapi/qmp-input-visitor.h"
#include "test-qapi-types.h"
#include "test-qapi-visit.h"
diff --git a/tests/test-qmp-input-visitor.c b/tests/test-qmp-input-visitor.c
index d76df8c..955a4c0 100644
--- a/tests/test-qmp-input-visitor.c
+++ b/tests/test-qmp-input-visitor.c
@@ -13,6 +13,7 @@
#include <glib.h>
#include <stdarg.h>
+#include "qemu-common.h"
#include "qapi/qmp-input-visitor.h"
#include "test-qapi-types.h"
#include "test-qapi-visit.h"
diff --git a/tests/test-qmp-output-visitor.c b/tests/test-qmp-output-visitor.c
index 7868f56..71367e6 100644
--- a/tests/test-qmp-output-visitor.c
+++ b/tests/test-qmp-output-visitor.c
@@ -12,6 +12,7 @@
#include <glib.h>
+#include "qemu-common.h"
#include "qapi/qmp-output-visitor.h"
#include "test-qapi-types.h"
#include "test-qapi-visit.h"
diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c
index 64b10dd..899feda 100644
--- a/tests/test-string-input-visitor.c
+++ b/tests/test-string-input-visitor.c
@@ -13,6 +13,7 @@
#include <glib.h>
#include <stdarg.h>
+#include "qemu-common.h"
#include "qapi/string-input-visitor.h"
#include "test-qapi-types.h"
#include "test-qapi-visit.h"
diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-visitor.c
index 238a268..79d815f 100644
--- a/tests/test-string-output-visitor.c
+++ b/tests/test-string-output-visitor.c
@@ -12,6 +12,7 @@
#include <glib.h>
+#include "qemu-common.h"
#include "qapi/string-output-visitor.h"
#include "test-qapi-types.h"
#include "test-qapi-visit.h"
diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c
index 906011d..3c6b8df 100644
--- a/tests/test-visitor-serialization.c
+++ b/tests/test-visitor-serialization.c
@@ -14,6 +14,8 @@
#include <stdlib.h>
#include <stdint.h>
#include <float.h>
+
+#include "qemu-common.h"
#include "test-qapi-types.h"
#include "test-qapi-visit.h"
#include "qapi/qmp/types.h"
^ permalink raw reply related [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-18 21:11 ` Paolo Bonzini
2012-12-18 21:56 ` Paolo Bonzini
@ 2012-12-18 22:01 ` Paolo Bonzini
2012-12-18 22:39 ` Anthony Liguori
2012-12-19 0:13 ` Anthony Liguori
1 sibling, 2 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-18 22:01 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Michael S. Tsirkin
[-- Attachment #1: Type: text/plain, Size: 1038 bytes --]
And how does it conflicts with Alex's ppc pull request? It is a fast
forward from origin/master as of now (commit a8a826a, exec: refactor
cpu_restore_state, 2012-12-04), and that includes Alex's commits...
Paolo
On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 18/12/2012 21:59, Anthony Liguori ha scritto:
> > But this series breaks the build of make check. It's not just one test
> > case but almost every single one. I think you must have eliminated an
> > implicit include of qemu-common.h which makes PRId64 et al all
> > undeclared.
> >
> > I started fixing this too but it became too much for a merge commit
> > since it affects almost all tests.
> >
> > Can you fixup make check and send this series out? I'll make sure to
> > check tomorrow and merge your pull request if I see it tomorrow.
> > Otherwise, let me know when you plan on sending it and I'll make sure to
> > be available to merge it.
>
> Hmm, I must have pushed the wrong branch because I remember this failure.
>
> Paolo
>
[-- Attachment #2: Type: text/html, Size: 1520 bytes --]
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-18 21:56 ` Paolo Bonzini
@ 2012-12-18 22:35 ` Anthony Liguori
2012-12-18 22:47 ` Michael S. Tsirkin
0 siblings, 1 reply; 54+ messages in thread
From: Anthony Liguori @ 2012-12-18 22:35 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel, Michael S. Tsirkin
Paolo Bonzini <pbonzini@redhat.com> writes:
> Ok... I had really merged the wrong branch with mst's. I fixed it up and
> pushed again to the same place; it's now commit 6cdf60e, "make check"
> builds and passes.
>
> Here is the diff, sorry for the mistake.
No problem. I'm processing other pull requests now but will merged this
one tonight after I push the others.
Michael, I'll still plan on merging your changes through this request so
I won't be processing your pinged pull request since Paolo's contains yours.
Regards,
Anthony Liguori
>
> Paolo
>
>
> On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>> Il 18/12/2012 21:59, Anthony Liguori ha scritto:
>> > But this series breaks the build of make check. It's not just one test
>> > case but almost every single one. I think you must have eliminated an
>> > implicit include of qemu-common.h which makes PRId64 et al all
>> > undeclared.
>> >
>> > I started fixing this too but it became too much for a merge commit
>> > since it affects almost all tests.
>> >
>> > Can you fixup make check and send this series out? I'll make sure to
>> > check tomorrow and merge your pull request if I see it tomorrow.
>> > Otherwise, let me know when you plan on sending it and I'll make sure to
>> > be available to merge it.
>>
>> Hmm, I must have pushed the wrong branch because I remember this failure.
>>
>> Paolo
>>
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-18 22:01 ` Paolo Bonzini
@ 2012-12-18 22:39 ` Anthony Liguori
2012-12-19 15:32 ` Paolo Bonzini
2012-12-19 0:13 ` Anthony Liguori
1 sibling, 1 reply; 54+ messages in thread
From: Anthony Liguori @ 2012-12-18 22:39 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel, Michael S. Tsirkin
Paolo Bonzini <pbonzini@redhat.com> writes:
> And how does it conflicts with Alex's ppc pull request? It is a fast
> forward from origin/master as of now (commit a8a826a, exec: refactor
> cpu_restore_state, 2012-12-04), and that includes Alex's commits...
Something from the e500 changes because hw/ppc/e500.c and
hw/ppc/e500plat.c broke after the merge.
But since it was the wrong tree, maybe your new branch will not have
this problem.
It was easy to fix, so don't worry about it. I can resolve as a merge
conflict if needed.
Regards,
Anthony Liguori
>
> Paolo
>
>
>
> On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>> Il 18/12/2012 21:59, Anthony Liguori ha scritto:
>> > But this series breaks the build of make check. It's not just one test
>> > case but almost every single one. I think you must have eliminated an
>> > implicit include of qemu-common.h which makes PRId64 et al all
>> > undeclared.
>> >
>> > I started fixing this too but it became too much for a merge commit
>> > since it affects almost all tests.
>> >
>> > Can you fixup make check and send this series out? I'll make sure to
>> > check tomorrow and merge your pull request if I see it tomorrow.
>> > Otherwise, let me know when you plan on sending it and I'll make sure to
>> > be available to merge it.
>>
>> Hmm, I must have pushed the wrong branch because I remember this failure.
>>
>> Paolo
>>
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-18 22:35 ` Anthony Liguori
@ 2012-12-18 22:47 ` Michael S. Tsirkin
2012-12-18 23:36 ` Anthony Liguori
0 siblings, 1 reply; 54+ messages in thread
From: Michael S. Tsirkin @ 2012-12-18 22:47 UTC (permalink / raw)
To: Anthony Liguori; +Cc: Paolo Bonzini, qemu-devel
On Tue, Dec 18, 2012 at 04:35:53PM -0600, Anthony Liguori wrote:
> Paolo Bonzini <pbonzini@redhat.com> writes:
>
> > Ok... I had really merged the wrong branch with mst's. I fixed it up and
> > pushed again to the same place; it's now commit 6cdf60e, "make check"
> > builds and passes.
> >
> > Here is the diff, sorry for the mistake.
>
> No problem. I'm processing other pull requests now but will merged this
> one tonight after I push the others.
>
> Michael, I'll still plan on merging your changes through this request so
> I won't be processing your pinged pull request since Paolo's contains yours.
>
> Regards,
>
> Anthony Liguori
This is painful - I hoped for fast merge to reduce conflicts :(.
I already got some patches submitted on list that don't apply on my tree.
> >
> > Paolo
> >
> >
> > On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> >
> >> Il 18/12/2012 21:59, Anthony Liguori ha scritto:
> >> > But this series breaks the build of make check. It's not just one test
> >> > case but almost every single one. I think you must have eliminated an
> >> > implicit include of qemu-common.h which makes PRId64 et al all
> >> > undeclared.
> >> >
> >> > I started fixing this too but it became too much for a merge commit
> >> > since it affects almost all tests.
> >> >
> >> > Can you fixup make check and send this series out? I'll make sure to
> >> > check tomorrow and merge your pull request if I see it tomorrow.
> >> > Otherwise, let me know when you plan on sending it and I'll make sure to
> >> > be available to merge it.
> >>
> >> Hmm, I must have pushed the wrong branch because I remember this failure.
> >>
> >> Paolo
> >>
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-18 22:47 ` Michael S. Tsirkin
@ 2012-12-18 23:36 ` Anthony Liguori
0 siblings, 0 replies; 54+ messages in thread
From: Anthony Liguori @ 2012-12-18 23:36 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: Paolo Bonzini, qemu-devel
"Michael S. Tsirkin" <mst@redhat.com> writes:
> On Tue, Dec 18, 2012 at 04:35:53PM -0600, Anthony Liguori wrote:
>> Paolo Bonzini <pbonzini@redhat.com> writes:
>>
>> > Ok... I had really merged the wrong branch with mst's. I fixed it up and
>> > pushed again to the same place; it's now commit 6cdf60e, "make check"
>> > builds and passes.
>> >
>> > Here is the diff, sorry for the mistake.
>>
>> No problem. I'm processing other pull requests now but will merged this
>> one tonight after I push the others.
>>
>> Michael, I'll still plan on merging your changes through this request so
>> I won't be processing your pinged pull request since Paolo's contains yours.
>>
>> Regards,
>>
>> Anthony Liguori
>
> This is painful - I hoped for fast merge to reduce conflicts :(.
Uh, your pull request didn't build so that pretty much eliminates the
possibility of a fast merge.
It'll get pushed today. It's next inline after the current test run
completes.
Regards,
Anthony Liguori
> I already got some patches submitted on list that don't apply on my tree.
>
>> >
>> > Paolo
>> >
>> >
>> > On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> >
>> >> Il 18/12/2012 21:59, Anthony Liguori ha scritto:
>> >> > But this series breaks the build of make check. It's not just one test
>> >> > case but almost every single one. I think you must have eliminated an
>> >> > implicit include of qemu-common.h which makes PRId64 et al all
>> >> > undeclared.
>> >> >
>> >> > I started fixing this too but it became too much for a merge commit
>> >> > since it affects almost all tests.
>> >> >
>> >> > Can you fixup make check and send this series out? I'll make sure to
>> >> > check tomorrow and merge your pull request if I see it tomorrow.
>> >> > Otherwise, let me know when you plan on sending it and I'll make sure to
>> >> > be available to merge it.
>> >>
>> >> Hmm, I must have pushed the wrong branch because I remember this failure.
>> >>
>> >> Paolo
>> >>
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-18 22:01 ` Paolo Bonzini
2012-12-18 22:39 ` Anthony Liguori
@ 2012-12-19 0:13 ` Anthony Liguori
2012-12-19 2:00 ` Anthony Liguori
2012-12-19 6:14 ` Michael S. Tsirkin
1 sibling, 2 replies; 54+ messages in thread
From: Anthony Liguori @ 2012-12-19 0:13 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Alex Graf, David Gibson, qemu-devel, Michael S. Tsirkin
Paolo Bonzini <pbonzini@redhat.com> writes:
> And how does it conflicts with Alex's ppc pull request? It is a fast
> forward from origin/master as of now (commit a8a826a, exec: refactor
> cpu_restore_state, 2012-12-04), and that includes Alex's commits...
It's not a conflict. You both have problems with your pull requests
because I assume neither of you have libfdt installed which means a
bunch of ppc is not being built.
We really ought to pull in fdt as a submodule to prevent this type of
thing...
Paolo, you need to incorporate:
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 5b16096..aa54fd8 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -18,7 +18,8 @@
#include "qemu-common.h"
#include "e500.h"
#include "e500-ccsr.h"
-#include "net.h"
+#include "net/net.h"
+#include "qemu/config-file.h"
#include "hw/hw.h"
#include "hw/serial.h"
#include "hw/pci/pci.h"
diff --git a/hw/spapr.c b/hw/spapr.c
index 071cf41..fdd1eb6 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -49,6 +49,7 @@
#include "exec/address-spaces.h"
#include "hw/usb.h"
+#include "qemu/config-file.h"
#include <libfdt.h>
Michael, you need to incorporate:
diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
index ea4134c..4deb02a 100644
--- a/hw/ppc/e500plat.c
+++ b/hw/ppc/e500plat.c
@@ -14,7 +14,7 @@
#include "e500.h"
#include "../boards.h"
#include "sysemu/device_tree.h"
-#include "hw/pci.h"
+#include "hw/pci/pci.h"
static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
{
I can't do this through a merge commit because the branches being merged
aren't bisectable so please update and resend. It's probably easiest to
do it all through Paolo's branch to make sure there are no conflicts
between the two branches.
Regards,
Anthony Liguori
>
> Paolo
>
>
>
> On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>> Il 18/12/2012 21:59, Anthony Liguori ha scritto:
>> > But this series breaks the build of make check. It's not just one test
>> > case but almost every single one. I think you must have eliminated an
>> > implicit include of qemu-common.h which makes PRId64 et al all
>> > undeclared.
>> >
>> > I started fixing this too but it became too much for a merge commit
>> > since it affects almost all tests.
>> >
>> > Can you fixup make check and send this series out? I'll make sure to
>> > check tomorrow and merge your pull request if I see it tomorrow.
>> > Otherwise, let me know when you plan on sending it and I'll make sure to
>> > be available to merge it.
>>
>> Hmm, I must have pushed the wrong branch because I remember this failure.
>>
>> Paolo
>>
^ permalink raw reply related [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-19 0:13 ` Anthony Liguori
@ 2012-12-19 2:00 ` Anthony Liguori
2012-12-19 2:13 ` Alexander Graf
2012-12-19 19:45 ` Michael S. Tsirkin
2012-12-19 6:14 ` Michael S. Tsirkin
1 sibling, 2 replies; 54+ messages in thread
From: Anthony Liguori @ 2012-12-19 2:00 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Alex Graf, David Gibson, qemu-devel, Michael S. Tsirkin
Anthony Liguori <aliguori@us.ibm.com> writes:
> Paolo Bonzini <pbonzini@redhat.com> writes:
>
>> And how does it conflicts with Alex's ppc pull request? It is a fast
>> forward from origin/master as of now (commit a8a826a, exec: refactor
>> cpu_restore_state, 2012-12-04), and that includes Alex's commits...
>
> It's not a conflict. You both have problems with your pull requests
> because I assume neither of you have libfdt installed which means a
> bunch of ppc is not being built.
>
> We really ought to pull in fdt as a submodule to prevent this type of
> thing...
We the patches below, the changes pass all my tests so as soon as you
make these changes, it'll go in.
Regards,
Anthony Liguori
>
> Paolo, you need to incorporate:
>
> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> index 5b16096..aa54fd8 100644
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -18,7 +18,8 @@
> #include "qemu-common.h"
> #include "e500.h"
> #include "e500-ccsr.h"
> -#include "net.h"
> +#include "net/net.h"
> +#include "qemu/config-file.h"
> #include "hw/hw.h"
> #include "hw/serial.h"
> #include "hw/pci/pci.h"
>
> diff --git a/hw/spapr.c b/hw/spapr.c
> index 071cf41..fdd1eb6 100644
> --- a/hw/spapr.c
> +++ b/hw/spapr.c
> @@ -49,6 +49,7 @@
>
> #include "exec/address-spaces.h"
> #include "hw/usb.h"
> +#include "qemu/config-file.h"
>
> #include <libfdt.h>
>
> Michael, you need to incorporate:
>
> diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
> index ea4134c..4deb02a 100644
> --- a/hw/ppc/e500plat.c
> +++ b/hw/ppc/e500plat.c
> @@ -14,7 +14,7 @@
> #include "e500.h"
> #include "../boards.h"
> #include "sysemu/device_tree.h"
> -#include "hw/pci.h"
> +#include "hw/pci/pci.h"
>
> static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
> {
>
> I can't do this through a merge commit because the branches being merged
> aren't bisectable so please update and resend. It's probably easiest to
> do it all through Paolo's branch to make sure there are no conflicts
> between the two branches.
>
> Regards,
>
> Anthony Liguori
>
>>
>> Paolo
>>
>>
>>
>> On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
>>
>>> Il 18/12/2012 21:59, Anthony Liguori ha scritto:
>>> > But this series breaks the build of make check. It's not just one test
>>> > case but almost every single one. I think you must have eliminated an
>>> > implicit include of qemu-common.h which makes PRId64 et al all
>>> > undeclared.
>>> >
>>> > I started fixing this too but it became too much for a merge commit
>>> > since it affects almost all tests.
>>> >
>>> > Can you fixup make check and send this series out? I'll make sure to
>>> > check tomorrow and merge your pull request if I see it tomorrow.
>>> > Otherwise, let me know when you plan on sending it and I'll make sure to
>>> > be available to merge it.
>>>
>>> Hmm, I must have pushed the wrong branch because I remember this failure.
>>>
>>> Paolo
>>>
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-19 2:00 ` Anthony Liguori
@ 2012-12-19 2:13 ` Alexander Graf
2012-12-19 2:18 ` David Gibson
2012-12-19 8:35 ` Paolo Bonzini
2012-12-19 19:45 ` Michael S. Tsirkin
1 sibling, 2 replies; 54+ messages in thread
From: Alexander Graf @ 2012-12-19 2:13 UTC (permalink / raw)
To: Anthony Liguori
Cc: Paolo Bonzini, David Gibson, qemu-devel, Michael S. Tsirkin
On 19.12.2012, at 03:00, Anthony Liguori wrote:
> Anthony Liguori <aliguori@us.ibm.com> writes:
>
>> Paolo Bonzini <pbonzini@redhat.com> writes:
>>
>>> And how does it conflicts with Alex's ppc pull request? It is a fast
>>> forward from origin/master as of now (commit a8a826a, exec: refactor
>>> cpu_restore_state, 2012-12-04), and that includes Alex's commits...
>>
>> It's not a conflict. You both have problems with your pull requests
>> because I assume neither of you have libfdt installed which means a
>> bunch of ppc is not being built.
>>
>> We really ought to pull in fdt as a submodule to prevent this type of
>> thing...
Does making libfdt a submodule really change things? Developers would still have to init the submodule. They could just as well install the libfdt-devel packet from their distro of choice instead :).
Alex
>
> We the patches below, the changes pass all my tests so as soon as you
> make these changes, it'll go in.
>
> Regards,
>
> Anthony Liguori
>
>>
>> Paolo, you need to incorporate:
>>
>> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
>> index 5b16096..aa54fd8 100644
>> --- a/hw/ppc/e500.c
>> +++ b/hw/ppc/e500.c
>> @@ -18,7 +18,8 @@
>> #include "qemu-common.h"
>> #include "e500.h"
>> #include "e500-ccsr.h"
>> -#include "net.h"
>> +#include "net/net.h"
>> +#include "qemu/config-file.h"
>> #include "hw/hw.h"
>> #include "hw/serial.h"
>> #include "hw/pci/pci.h"
>>
>> diff --git a/hw/spapr.c b/hw/spapr.c
>> index 071cf41..fdd1eb6 100644
>> --- a/hw/spapr.c
>> +++ b/hw/spapr.c
>> @@ -49,6 +49,7 @@
>>
>> #include "exec/address-spaces.h"
>> #include "hw/usb.h"
>> +#include "qemu/config-file.h"
>>
>> #include <libfdt.h>
>>
>> Michael, you need to incorporate:
>>
>> diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
>> index ea4134c..4deb02a 100644
>> --- a/hw/ppc/e500plat.c
>> +++ b/hw/ppc/e500plat.c
>> @@ -14,7 +14,7 @@
>> #include "e500.h"
>> #include "../boards.h"
>> #include "sysemu/device_tree.h"
>> -#include "hw/pci.h"
>> +#include "hw/pci/pci.h"
>>
>> static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
>> {
>>
>> I can't do this through a merge commit because the branches being merged
>> aren't bisectable so please update and resend. It's probably easiest to
>> do it all through Paolo's branch to make sure there are no conflicts
>> between the two branches.
>>
>> Regards,
>>
>> Anthony Liguori
>>
>>>
>>> Paolo
>>>
>>>
>>>
>>> On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
>>>
>>>> Il 18/12/2012 21:59, Anthony Liguori ha scritto:
>>>>> But this series breaks the build of make check. It's not just one test
>>>>> case but almost every single one. I think you must have eliminated an
>>>>> implicit include of qemu-common.h which makes PRId64 et al all
>>>>> undeclared.
>>>>>
>>>>> I started fixing this too but it became too much for a merge commit
>>>>> since it affects almost all tests.
>>>>>
>>>>> Can you fixup make check and send this series out? I'll make sure to
>>>>> check tomorrow and merge your pull request if I see it tomorrow.
>>>>> Otherwise, let me know when you plan on sending it and I'll make sure to
>>>>> be available to merge it.
>>>>
>>>> Hmm, I must have pushed the wrong branch because I remember this failure.
>>>>
>>>> Paolo
>>>>
>
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-19 2:13 ` Alexander Graf
@ 2012-12-19 2:18 ` David Gibson
2012-12-19 8:35 ` Paolo Bonzini
1 sibling, 0 replies; 54+ messages in thread
From: David Gibson @ 2012-12-19 2:18 UTC (permalink / raw)
To: Alexander Graf
Cc: Paolo Bonzini, Anthony Liguori, qemu-devel, Michael S. Tsirkin
On Wed, Dec 19, 2012 at 03:13:10AM +0100, Alexander Graf wrote:
>
> On 19.12.2012, at 03:00, Anthony Liguori wrote:
>
> > Anthony Liguori <aliguori@us.ibm.com> writes:
> >
> >> Paolo Bonzini <pbonzini@redhat.com> writes:
> >>
> >>> And how does it conflicts with Alex's ppc pull request? It is a fast
> >>> forward from origin/master as of now (commit a8a826a, exec: refactor
> >>> cpu_restore_state, 2012-12-04), and that includes Alex's commits...
> >>
> >> It's not a conflict. You both have problems with your pull requests
> >> because I assume neither of you have libfdt installed which means a
> >> bunch of ppc is not being built.
> >>
> >> We really ought to pull in fdt as a submodule to prevent this type of
> >> thing...
>
> Does making libfdt a submodule really change things? Developers
> would still have to init the submodule. They could just as well
> install the libfdt-devel packet from their distro of choice instead
> :).
Presumably adding the submodule would go along with changes to
configure to make libfdt always selected.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-19 0:13 ` Anthony Liguori
2012-12-19 2:00 ` Anthony Liguori
@ 2012-12-19 6:14 ` Michael S. Tsirkin
1 sibling, 0 replies; 54+ messages in thread
From: Michael S. Tsirkin @ 2012-12-19 6:14 UTC (permalink / raw)
To: Anthony Liguori; +Cc: Paolo Bonzini, David Gibson, qemu-devel, Alex Graf
On Tue, Dec 18, 2012 at 06:13:11PM -0600, Anthony Liguori wrote:
> Paolo Bonzini <pbonzini@redhat.com> writes:
>
> > And how does it conflicts with Alex's ppc pull request? It is a fast
> > forward from origin/master as of now (commit a8a826a, exec: refactor
> > cpu_restore_state, 2012-12-04), and that includes Alex's commits...
>
> It's not a conflict. You both have problems with your pull requests
> because I assume neither of you have libfdt installed which means a
> bunch of ppc is not being built.
>
> We really ought to pull in fdt as a submodule to prevent this type of
> thing...
Same applies to any library. How about an in-tree script
with configure flags that we want tested instead?
Then it would fail instead of disabling silently.
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-19 2:13 ` Alexander Graf
2012-12-19 2:18 ` David Gibson
@ 2012-12-19 8:35 ` Paolo Bonzini
2012-12-19 20:02 ` Blue Swirl
1 sibling, 1 reply; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-19 8:35 UTC (permalink / raw)
To: Alexander Graf
Cc: Anthony Liguori, Michael S. Tsirkin, qemu-devel, David Gibson
Il 19/12/2012 03:13, Alexander Graf ha scritto:
> Does making libfdt a submodule really change things? Developers would
> still have to init the submodule. They could just as well install the
> libfdt-devel packet from their distro of choice instead :).
RHEL does not have it unfortunately. I requested it to be added to EPEL
so that us Red Hatters can do more comprehensive testing even when
running on the "enterprise" distro. :)
Paolo
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-18 22:39 ` Anthony Liguori
@ 2012-12-19 15:32 ` Paolo Bonzini
0 siblings, 0 replies; 54+ messages in thread
From: Paolo Bonzini @ 2012-12-19 15:32 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Michael S. Tsirkin
Il 18/12/2012 23:39, Anthony Liguori ha scritto:
>> > And how does it conflicts with Alex's ppc pull request? It is a fast
>> > forward from origin/master as of now (commit a8a826a, exec: refactor
>> > cpu_restore_state, 2012-12-04), and that includes Alex's commits...
> Something from the e500 changes because hw/ppc/e500.c and
> hw/ppc/e500plat.c broke after the merge.
>
> But since it was the wrong tree, maybe your new branch will not have
> this problem.
>
> It was easy to fix, so don't worry about it. I can resolve as a merge
> conflict if needed.
Pushed.
Paolo
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-19 2:00 ` Anthony Liguori
2012-12-19 2:13 ` Alexander Graf
@ 2012-12-19 19:45 ` Michael S. Tsirkin
1 sibling, 0 replies; 54+ messages in thread
From: Michael S. Tsirkin @ 2012-12-19 19:45 UTC (permalink / raw)
To: Anthony Liguori; +Cc: Paolo Bonzini, David Gibson, qemu-devel, Alex Graf
On Tue, Dec 18, 2012 at 08:00:58PM -0600, Anthony Liguori wrote:
> Anthony Liguori <aliguori@us.ibm.com> writes:
>
> > Paolo Bonzini <pbonzini@redhat.com> writes:
> >
> >> And how does it conflicts with Alex's ppc pull request? It is a fast
> >> forward from origin/master as of now (commit a8a826a, exec: refactor
> >> cpu_restore_state, 2012-12-04), and that includes Alex's commits...
> >
> > It's not a conflict. You both have problems with your pull requests
> > because I assume neither of you have libfdt installed which means a
> > bunch of ppc is not being built.
> >
> > We really ought to pull in fdt as a submodule to prevent this type of
> > thing...
>
> We the patches below, the changes pass all my tests so as soon as you
> make these changes, it'll go in.
>
> Regards,
>
> Anthony Liguori
I do have fdt actually, but build still passed for me.
And I touched hw/ppc/e500plat.c and checked that it does
get compiled.
In my tree hw/ppc/e500plat.c did not include hw/pci.c
so it's something to do with the merge.
Maybe after all you could merge the pci tree?
If Paolo merges it too it will be trivial to
merge his ...
> >
> > Paolo, you need to incorporate:
> >
> > diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> > index 5b16096..aa54fd8 100644
> > --- a/hw/ppc/e500.c
> > +++ b/hw/ppc/e500.c
> > @@ -18,7 +18,8 @@
> > #include "qemu-common.h"
> > #include "e500.h"
> > #include "e500-ccsr.h"
> > -#include "net.h"
> > +#include "net/net.h"
> > +#include "qemu/config-file.h"
> > #include "hw/hw.h"
> > #include "hw/serial.h"
> > #include "hw/pci/pci.h"
> >
> > diff --git a/hw/spapr.c b/hw/spapr.c
> > index 071cf41..fdd1eb6 100644
> > --- a/hw/spapr.c
> > +++ b/hw/spapr.c
> > @@ -49,6 +49,7 @@
> >
> > #include "exec/address-spaces.h"
> > #include "hw/usb.h"
> > +#include "qemu/config-file.h"
> >
> > #include <libfdt.h>
> >
> > Michael, you need to incorporate:
> >
> > diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
> > index ea4134c..4deb02a 100644
> > --- a/hw/ppc/e500plat.c
> > +++ b/hw/ppc/e500plat.c
> > @@ -14,7 +14,7 @@
> > #include "e500.h"
> > #include "../boards.h"
> > #include "sysemu/device_tree.h"
> > -#include "hw/pci.h"
> > +#include "hw/pci/pci.h"
> >
> > static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
> > {
> >
> > I can't do this through a merge commit because the branches being merged
> > aren't bisectable so please update and resend. It's probably easiest to
> > do it all through Paolo's branch to make sure there are no conflicts
> > between the two branches.
> >
> > Regards,
> >
> > Anthony Liguori
> >
> >>
> >> Paolo
> >>
> >>
> >>
> >> On Tue, Dec 18, 2012 at 10:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> >>
> >>> Il 18/12/2012 21:59, Anthony Liguori ha scritto:
> >>> > But this series breaks the build of make check. It's not just one test
> >>> > case but almost every single one. I think you must have eliminated an
> >>> > implicit include of qemu-common.h which makes PRId64 et al all
> >>> > undeclared.
> >>> >
> >>> > I started fixing this too but it became too much for a merge commit
> >>> > since it affects almost all tests.
> >>> >
> >>> > Can you fixup make check and send this series out? I'll make sure to
> >>> > check tomorrow and merge your pull request if I see it tomorrow.
> >>> > Otherwise, let me know when you plan on sending it and I'll make sure to
> >>> > be available to merge it.
> >>>
> >>> Hmm, I must have pushed the wrong branch because I remember this failure.
> >>>
> >>> Paolo
> >>>
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-19 8:35 ` Paolo Bonzini
@ 2012-12-19 20:02 ` Blue Swirl
0 siblings, 0 replies; 54+ messages in thread
From: Blue Swirl @ 2012-12-19 20:02 UTC (permalink / raw)
To: Paolo Bonzini
Cc: qemu-devel, Anthony Liguori, David Gibson, Alexander Graf,
Michael S. Tsirkin
On Wed, Dec 19, 2012 at 8:35 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 19/12/2012 03:13, Alexander Graf ha scritto:
>> Does making libfdt a submodule really change things? Developers would
>> still have to init the submodule. They could just as well install the
>> libfdt-devel packet from their distro of choice instead :).
>
> RHEL does not have it unfortunately. I requested it to be added to EPEL
> so that us Red Hatters can do more comprehensive testing even when
> running on the "enterprise" distro. :)
It's also not available on Debian, I don't think the BSDs or Windows
have it either.
>
> Paolo
>
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
` (32 preceding siblings ...)
2012-12-18 20:59 ` [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Anthony Liguori
@ 2012-12-20 0:54 ` Anthony Liguori
2012-12-20 11:12 ` Peter Maydell
33 siblings, 1 reply; 54+ messages in thread
From: Anthony Liguori @ 2012-12-20 0:54 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: Michael S. Tsirkin
Paolo Bonzini <pbonzini@redhat.com> writes:
> Anthony,
>
> The following changes since commit a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0:
>
> exec: refactor cpu_restore_state (2012-12-16 08:35:24 +0000)
>
> are available in the git repository at:
>
> git://github.com/bonzini/qemu.git header-dirs
>
> for you to fetch changes up to 394394a788cec72682750f855e5182de156026b4:
>
> janitor: move remaining public headers to include/ (2012-12-17
> 18:56:58 +0100)
Pulled. Thanks.
Regards,
Anthony Liguori
>
> ----------------------------------------------------------------
> Jason Baron (1):
> Fixup q35/ich9 Licenses
>
> Michael S. Tsirkin (12):
> tap: reset vnet header size on open
> get_maintainer.pl: update from linix 3.8
> pci: prepare makefiles for pci code reorganization
> MAINTAINERS: add hw/pci/ to list of PCI files
> pci: move pci core code to hw/pci
> pci: update all users to look in pci/
> pci: fix path for local includes
> Revert "pci: prepare makefiles for pci code reorganization"
> pci: rename pci_internals.h pci_bus.h
> pci_bus: update comment
> pci_bus.h: tweak include guards
> kvm: do not flush after deleting gsi
>
> Paolo Bonzini (33):
> Merge commit '1dd3a74d2ee2d873cde0b390b536e45420b3fe05' into HEAD
> 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: do not rely on indirect inclusions of or 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/
> qapi: move inclusions of qemu-common.h from headers to .c files
> qapi: remove qapi/qapi-types-core.h
> qapi: make struct Visitor opaque
> janitor: add guards to headers
> qapi: move include files to 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 +
> MAINTAINERS | 1 +
> Makefile | 47 +--
> Makefile.dis | 20 -
> Makefile.objs | 32 +-
> Makefile.target | 8 +-
> Makefile.user | 24 --
> a.out.h | 430 ---------------------
> acl.c | 2 +-
> aes.c | 2 +-
> aio-posix.c | 6 +-
> aio-win32.c | 6 +-
> arch_init.c | 24 +-
> async.c | 4 +-
> audio/Makefile.objs | 3 +
> audio/alsaaudio.c | 2 +-
> audio/audio.c | 6 +-
> audio/audio.h | 2 +-
> audio/noaudio.c | 2 +-
> audio/ossaudio.c | 4 +-
> audio/spiceaudio.c | 2 +-
> audio/wavaudio.c | 2 +-
> audio/wavcapture.c | 2 +-
> audio/winwaveaudio.c | 2 +-
> backends/rng-egd.c | 4 +-
> backends/rng-random.c | 4 +-
> backends/rng.c | 2 +-
> 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/linux-aio.c | 6 +-
> block/mirror.c | 4 +-
> block/nbd.c | 10 +-
> 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 | 13 +-
> block/raw-win32.c | 10 +-
> 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 +-
> block/win32-aio.c | 10 +-
> blockdev-nbd.c | 12 +-
> blockdev.c | 20 +-
> blockjob.c | 14 +-
> bsd-user/elfload.c | 2 +-
> bsd-user/main.c | 4 +-
> bsd-user/qemu.h | 6 +-
> 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 | 6 +-
> 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-posix.c | 5 +-
> event_notifier-win32.c | 4 +-
> exec.c | 19 +-
> fpu/softfloat.c | 2 +-
> fsdev/qemu-fsdev-dummy.c | 4 +-
> 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 | 13 +-
> 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-synth.h | 4 +
> hw/9pfs/virtio-9p-xattr.h | 2 +-
> hw/9pfs/virtio-9p.c | 4 +-
> hw/9pfs/virtio-9p.h | 4 +-
> hw/Makefile.objs | 15 +-
> hw/ac97.c | 4 +-
> hw/acpi.c | 4 +-
> hw/acpi.h | 2 +-
> hw/acpi_ich9.c | 23 +-
> hw/acpi_piix4.c | 10 +-
> 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 | 5 +-
> hw/alpha_typhoon.c | 6 +-
> hw/an5206.c | 2 +-
> hw/apb_pci.c | 12 +-
> hw/apic.c | 6 +-
> hw/apic_common.c | 2 +-
> hw/apic_internal.h | 4 +-
> hw/apm.c | 2 +-
> hw/apm.h | 2 +-
> 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/audiodev.h | 5 +
> hw/axis_dev88.c | 6 +-
> hw/baum.c | 4 +-
> hw/baum.h | 4 +
> hw/blizzard.c | 4 +-
> hw/block-common.c | 4 +-
> hw/boards.h | 2 +-
> hw/bonito.c | 8 +-
> 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/bt.h | 5 +
> 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 | 4 +-
> hw/collie.c | 4 +-
> hw/cris-boot.h | 4 +
> hw/cs4231a.c | 2 +-
> hw/cuda.c | 4 +-
> hw/debugcon.c | 2 +-
> hw/dec_pci.c | 8 +-
> hw/device-hotplug.c | 9 +-
> hw/dma.c | 1 +
> hw/dp8393x.c | 4 +-
> hw/dummy_m68k.c | 2 +-
> hw/e1000.c | 8 +-
> hw/eepro100.c | 8 +-
> hw/empty_slot.h | 5 +
> hw/es1370.c | 4 +-
> hw/escc.c | 4 +-
> hw/escc.h | 5 +
> hw/esp-pci.c | 4 +-
> hw/esp.c | 2 +-
> hw/etraxfs.h | 7 +-
> hw/etraxfs_dma.c | 4 +-
> hw/etraxfs_dma.h | 5 +
> 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 | 8 +-
> 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 | 7 +-
> hw/framebuffer.c | 2 +-
> hw/framebuffer.h | 2 +-
> hw/fw_cfg.c | 5 +-
> hw/g364fb.c | 4 +-
> hw/grackle_pci.c | 4 +-
> hw/grlib_apbuart.c | 2 +-
> hw/grlib_gptimer.c | 2 +-
> hw/gt64xxx.c | 6 +-
> hw/gumstix.c | 6 +-
> hw/hd-geometry.c | 2 +-
> hw/hda-audio.c | 2 +-
> hw/hid.c | 4 +-
> hw/hid.h | 2 +-
> hw/highbank.c | 8 +-
> hw/hpet.c | 4 +-
> hw/hw.h | 12 +-
> hw/i386/Makefile.objs | 2 +-
> hw/i82378.c | 2 +-
> hw/i8254.c | 2 +-
> hw/i8254_common.c | 2 +-
> hw/i8259.c | 4 +-
> hw/i82801b11.c | 2 +-
> hw/ich9.h | 10 +-
> hw/ide.h | 4 +-
> hw/ide/ahci.c | 10 +-
> hw/ide/cmd646.c | 8 +-
> hw/ide/core.c | 12 +-
> hw/ide/ich.c | 8 +-
> 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 | 6 +-
> hw/ide/piix.c | 8 +-
> hw/ide/qdev.c | 8 +-
> hw/ide/via.c | 8 +-
> 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 | 8 +-
> hw/ioapic_internal.h | 2 +-
> hw/ioh3420.c | 6 +-
> hw/ioh3420.h | 2 +-
> hw/isa-bus.c | 6 +-
> hw/isa.h | 4 +-
> hw/isa_mmio.c | 2 +-
> hw/ivshmem.c | 13 +-
> hw/jazz_led.c | 5 +-
> hw/kvm/apic.c | 4 +-
> 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 | 14 +-
> hw/kvmvapic.c | 6 +-
> hw/kzm.c | 6 +-
> hw/lan9118.c | 4 +-
> hw/lance.c | 6 +-
> hw/leon3.c | 8 +-
> hw/lm32.h | 5 +
> 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/lpc_ich9.c | 46 +--
> hw/lsi53c895a.c | 4 +-
> hw/m25p80.c | 2 +-
> hw/m48t59.c | 6 +-
> hw/mac_dbdma.c | 1 +
> hw/mac_dbdma.h | 6 +-
> hw/mac_nvram.c | 2 +-
> hw/macio.c | 2 +-
> hw/mainstone.c | 6 +-
> hw/mc146818rtc.c | 6 +-
> 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 | 8 +-
> 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 | 6 +-
> hw/milkymist.c | 7 +-
> hw/mips.h | 2 +-
> hw/mips_fulong2e.c | 16 +-
> hw/mips_jazz.c | 10 +-
> hw/mips_malta.c | 18 +-
> 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/msmouse.c | 6 +-
> hw/msmouse.h | 5 +
> hw/multiboot.c | 2 +-
> hw/musicpal.c | 17 +-
> hw/nand.c | 4 +-
> hw/ne2000-isa.c | 4 +-
> hw/ne2000.c | 6 +-
> hw/ne2000.h | 5 +
> 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 | 5 +-
> 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/openpic.c | 4 +-
> hw/openrisc_sim.c | 8 +-
> hw/openrisc_timer.c | 2 +-
> hw/palm.c | 6 +-
> hw/pam.c | 2 +-
> hw/pam.h | 2 +-
> hw/parallel.c | 4 +-
> hw/pc.c | 20 +-
> hw/pc.h | 8 +-
> hw/pc_piix.c | 18 +-
> hw/pc_q35.c | 6 +-
> hw/pc_sysfw.c | 6 +-
> hw/pci/Makefile.objs | 9 +
> hw/{ => pci}/msi.c | 4 +-
> hw/{ => pci}/msi.h | 2 +-
> hw/{ => pci}/msix.c | 10 +-
> hw/{ => pci}/msix.h | 2 +-
> hw/{ => pci}/pci-hotplug.c | 22 +-
> hw/{ => pci}/pci-stub.c | 6 +-
> hw/{ => pci}/pci.c | 24 +-
> hw/{ => pci}/pci.h | 14 +-
> hw/{ => pci}/pci_bridge.c | 6 +-
> hw/{ => pci}/pci_bridge.h | 2 +-
> hw/{pci_internals.h => pci/pci_bus.h} | 16 +-
> hw/{ => pci}/pci_host.c | 4 +-
> hw/{ => pci}/pci_host.h | 2 +-
> hw/{ => pci}/pci_ids.h | 4 +
> hw/{ => pci}/pci_regs.h | 0
> hw/{ => pci}/pcie.c | 14 +-
> hw/{ => pci}/pcie.h | 8 +-
> hw/{ => pci}/pcie_aer.c | 18 +-
> hw/{ => pci}/pcie_aer.h | 2 +-
> hw/{ => pci}/pcie_host.c | 8 +-
> hw/{ => pci}/pcie_host.h | 4 +-
> hw/{ => pci}/pcie_port.c | 2 +-
> hw/{ => pci}/pcie_port.h | 4 +-
> hw/{ => pci}/pcie_regs.h | 0
> hw/{ => pci}/shpc.c | 12 +-
> hw/{ => pci}/shpc.h | 4 +-
> hw/{ => pci}/slotid_cap.c | 4 +-
> hw/{ => pci}/slotid_cap.h | 0
> hw/pci_bridge_dev.c | 14 +-
> hw/pckbd.c | 2 +-
> hw/pcmcia.h | 5 +
> hw/pcnet-pci.c | 8 +-
> hw/pcnet.c | 8 +-
> hw/pcnet.h | 7 +-
> 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/piix4.c | 2 +-
> hw/piix_pci.c | 6 +-
> hw/pl011.c | 2 +-
> hw/pl031.c | 4 +-
> hw/pl110.c | 5 +-
> hw/pl181.c | 2 +-
> hw/ppc.c | 8 +-
> hw/ppc.h | 5 +
> hw/ppc/Makefile.objs | 2 +-
> hw/ppc/e500.c | 12 +-
> hw/ppc/e500plat.c | 2 +-
> hw/ppc/mpc8544ds.c | 2 +-
> hw/ppc405_boards.c | 10 +-
> hw/ppc405_uc.c | 8 +-
> hw/ppc440_bamboo.c | 12 +-
> hw/ppc4xx.h | 2 +-
> hw/ppc4xx_devs.c | 4 +-
> hw/ppc4xx_pci.c | 6 +-
> hw/ppc_booke.c | 6 +-
> hw/ppc_mac.h | 2 +-
> hw/ppc_newworld.c | 12 +-
> hw/ppc_oldworld.c | 12 +-
> hw/ppc_prep.c | 16 +-
> hw/ppce500_pci.c | 8 +-
> hw/ppce500_spin.c | 4 +-
> hw/prep_pci.c | 6 +-
> hw/ps2.c | 4 +-
> hw/ptimer.c | 4 +-
> hw/ptimer.h | 4 +-
> hw/puv3.c | 6 +-
> hw/pxa.h | 2 +-
> hw/pxa2xx.c | 6 +-
> hw/pxa2xx_keypad.c | 2 +-
> hw/pxa2xx_lcd.c | 6 +-
> hw/pxa2xx_timer.c | 4 +-
> hw/q35.h | 6 +-
> hw/qdev-addr.c | 4 +-
> hw/qdev-addr.h | 5 +
> hw/qdev-core.h | 10 +-
> hw/qdev-monitor.c | 5 +-
> hw/qdev-monitor.h | 2 +-
> hw/qdev-properties.c | 9 +-
> hw/qdev.c | 8 +-
> hw/qxl-logger.c | 2 +-
> hw/qxl.c | 8 +-
> hw/qxl.h | 11 +-
> hw/r2d.c | 10 +-
> hw/rc4030.c | 2 +-
> hw/realview.c | 10 +-
> hw/rtl8139.c | 12 +-
> hw/s390-virtio-bus.c | 9 +-
> hw/s390-virtio-bus.h | 4 +
> hw/s390-virtio.c | 14 +-
> hw/s390x/event-facility.c | 4 +-
> hw/s390x/event-facility.h | 2 +-
> hw/s390x/sclp.c | 4 +-
> hw/s390x/sclpconsole.c | 3 +-
> hw/s390x/sclpquiesce.c | 2 +-
> hw/sb16.c | 4 +-
> hw/scsi-bus.c | 6 +-
> hw/scsi-defs.h | 4 +
> hw/scsi-disk.c | 8 +-
> hw/scsi-generic.c | 4 +-
> hw/scsi.h | 4 +-
> hw/sd.c | 4 +-
> hw/serial-pci.c | 2 +-
> hw/serial.c | 6 +-
> hw/serial.h | 8 +-
> hw/sga.c | 4 +-
> hw/sh7750.c | 4 +-
> hw/sh_intc.h | 2 +-
> hw/sh_pci.c | 8 +-
> hw/sh_serial.c | 4 +-
> hw/sh_timer.c | 4 +-
> hw/shix.c | 4 +-
> hw/slavio_intctl.c | 2 +-
> hw/slavio_misc.c | 2 +-
> hw/slavio_timer.c | 2 +-
> hw/sm501.c | 7 +-
> hw/smbios.c | 2 +-
> hw/smbus_ich9.c | 18 +-
> hw/smc91c111.c | 2 +-
> hw/soc_dma.c | 2 +-
> hw/soc_dma.h | 8 +-
> hw/spapr.c | 18 +-
> hw/spapr.h | 2 +-
> hw/spapr_events.c | 6 +-
> hw/spapr_hcall.c | 6 +-
> hw/spapr_iommu.c | 6 +-
> hw/spapr_llan.c | 2 +-
> hw/spapr_nvram.c | 2 +-
> hw/spapr_pci.c | 12 +-
> hw/spapr_pci.h | 4 +-
> 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 | 12 +-
> hw/sysbus.c | 4 +-
> hw/sysbus.h | 2 +-
> hw/tc6393xb.c | 6 +-
> hw/tcx.c | 5 +-
> 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/unin_pci.c | 4 +-
> hw/usb.h | 2 +-
> hw/usb/bus.c | 4 +-
> hw/usb/combined-packet.c | 2 +-
> 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-pci.c | 4 +-
> hw/usb/hcd-ehci.h | 12 +-
> hw/usb/hcd-musb.c | 2 +-
> hw/usb/hcd-ohci.c | 4 +-
> hw/usb/hcd-uhci.c | 8 +-
> hw/usb/hcd-xhci.c | 8 +-
> 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 | 8 +-
> hw/versatile_pci.c | 6 +-
> hw/versatilepb.c | 10 +-
> hw/vexpress.c | 8 +-
> hw/vfio_pci.c | 20 +-
> hw/vga-isa-mm.c | 6 +-
> hw/vga-isa.c | 6 +-
> hw/vga-pci.c | 8 +-
> hw/vga.c | 8 +-
> hw/vga_int.h | 8 +-
> 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-balloon.h | 2 +-
> hw/virtio-blk.c | 4 +-
> hw/virtio-console.c | 4 +-
> hw/virtio-net.c | 8 +-
> hw/virtio-net.h | 30 +-
> hw/virtio-pci.c | 15 +-
> hw/virtio-rng.c | 2 +-
> hw/virtio-scsi.h | 3 +-
> 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 | 4 +-
> hw/vt82c686.c | 10 +-
> hw/watchdog.c | 12 +-
> hw/watchdog.h | 2 +-
> hw/wdt_i6300esb.c | 4 +-
> hw/wdt_ib700.c | 2 +-
> hw/xen-host-pci-device.h | 2 +-
> hw/xen_apic.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 | 5 +-
> hw/xen_pt.c | 6 +-
> hw/xen_pt.h | 2 +-
> hw/xen_pt_config_init.c | 2 +-
> hw/xenfb.c | 4 +-
> hw/xgmac.c | 6 +-
> hw/xilinx.h | 8 +-
> hw/xilinx_axidma.c | 5 +-
> hw/xilinx_axienet.c | 5 +-
> hw/xilinx_ethlite.c | 2 +-
> hw/xilinx_spi.c | 4 +-
> hw/xilinx_spips.c | 6 +-
> hw/xilinx_timer.c | 2 +-
> hw/xilinx_uartlite.c | 2 +-
> hw/xilinx_zynq.c | 8 +-
> hw/xio3130_downstream.c | 6 +-
> hw/xio3130_downstream.h | 2 +-
> hw/xio3130_upstream.c | 6 +-
> hw/xio3130_upstream.h | 2 +-
> hw/xtensa_lx60.c | 11 +-
> hw/xtensa_pic.c | 4 +-
> hw/xtensa_sim.c | 6 +-
> hw/z2.c | 8 +-
> hw/zynq_slcr.c | 4 +-
> aes.h => include/block/aes.h | 0
> qemu-aio.h => include/block/aio.h | 4 +-
> 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
> thread-pool.h => include/block/thread-pool.h | 8 +-
> include/bt/bt.h | 20 +
> qemu-char.h => include/char/char.h | 14 +-
> 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
> exec-memory.h => include/exec/address-spaces.h | 2 +-
> cpu-all.h => include/exec/cpu-all.h | 6 +-
> cpu-common.h => include/exec/cpu-common.h | 8 +-
> cpu-defs.h => include/exec/cpu-defs.h | 6 +-
> cputlb.h => include/exec/cputlb.h | 0
> def-helper.h => include/exec/def-helper.h | 0
> exec-all.h => include/exec/exec-all.h | 14 +-
> gdbstub.h => include/exec/gdbstub.h | 0
> gen-icount.h => include/exec/gen-icount.h | 7 +-
> hwaddr.h => include/exec/hwaddr.h | 0
> ioport.h => include/exec/ioport.h | 2 +-
> iorange.h => include/exec/iorange.h | 0
> .../exec/memory-internal.h | 0
> memory.h => include/exec/memory.h | 12 +-
> poison.h => include/exec/poison.h | 0
> softmmu-semi.h => include/exec/softmmu-semi.h | 4 +
> 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
> qemu-user-types.h => include/exec/user/abitypes.h | 0
> thunk.h => include/exec/user/thunk.h | 0
> {fpu => include/fpu}/softfloat.h | 2 +-
> libfdt_env.h => include/libfdt_env.h | 2 +-
> block-migration.h => include/migration/block.h | 0
> migration.h => include/migration/migration.h | 8 +-
> include/{qemu => migration}/page_cache.h | 0
> qemu-file.h => include/migration/qemu-file.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 +-
> include/net/tap.h | 67 ++++
> .../qapi/dealloc-visitor.h | 2 +-
> error.h => include/qapi/error.h | 2 +-
> {qapi => include/qapi}/opts-visitor.h | 4 +-
> {qapi => include/qapi}/qmp-input-visitor.h | 4 +-
> {qapi => include/qapi}/qmp-output-visitor.h | 4 +-
> qapi/qmp-core.h => include/qapi/qmp/dispatch.h | 6 +-
> json-lexer.h => include/qapi/qmp/json-lexer.h | 4 +-
> json-parser.h => include/qapi/qmp/json-parser.h | 4 +-
> .../qapi/qmp/json-streamer.h | 4 +-
> qbool.h => include/qapi/qmp/qbool.h | 2 +-
> qdict.h => include/qapi/qmp/qdict.h | 6 +-
> qerror.h => include/qapi/qmp/qerror.h | 8 +-
> qfloat.h => include/qapi/qmp/qfloat.h | 2 +-
> qint.h => include/qapi/qmp/qint.h | 2 +-
> qjson.h => include/qapi/qmp/qjson.h | 6 +-
> qlist.h => include/qapi/qmp/qlist.h | 6 +-
> qobject.h => include/qapi/qmp/qobject.h | 0
> qstring.h => include/qapi/qmp/qstring.h | 2 +-
> 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 +-
> include/qapi/visitor-impl.h | 63 +++
> qapi/qapi-visit-core.h => include/qapi/visitor.h | 42 +-
> qemu-common.h => include/qemu-common.h | 14 +-
> 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 | 5 +-
> envlist.h => include/qemu/envlist.h | 0
> qemu-error.h => include/qemu/error-report.h | 0
> event_notifier.h => include/qemu/event_notifier.h | 0
> host-utils.h => include/qemu/host-utils.h | 6 +-
> int128.h => include/qemu/int128.h | 0
> iov.h => include/qemu/iov.h | 5 +
> qemu-log.h => include/qemu/log.h | 2 +-
> main-loop.h => include/qemu/main-loop.h | 2 +-
> 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 | 3 +-
> osdep.h => include/qemu/osdep.h | 0
> qemu-queue.h => include/qemu/queue.h | 2 +-
> range.h => include/qemu/range.h | 0
> include/qemu/rng-random.h | 2 +-
> include/qemu/rng.h | 4 +-
> 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
> qemu-types.h => include/qemu/typedefs.h | 0
> uri.h => include/qemu/uri.h | 0
> qemu-xattr.h => include/qemu/xattr.h | 0
> include/{qemu => qom}/cpu.h | 4 +-
> include/{qemu => qom}/object.h | 2 +-
> include/{qemu => qom}/qom-qobject.h | 2 +-
> 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
> device_tree.h => include/sysemu/device_tree.h | 0
> dma.h => include/sysemu/dma.h | 6 +-
> dump.h => include/sysemu/dump.h | 0
> kvm.h => include/sysemu/kvm.h | 2 +-
> .../sysemu/memory_mapping.h | 2 +-
> 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 | 2 +-
> sysemu.h => include/sysemu/sysemu.h | 12 +-
> xen-mapcache.h => include/sysemu/xen-mapcache.h | 0
> console.h => include/ui/console.h | 11 +-
> {hw => include/ui}/pixel_ops.h | 0
> qemu-pixman.h => include/ui/qemu-pixman.h | 0
> {ui => include/ui}/qemu-spice.h | 9 +-
> {ui => include/ui}/spice-display.h | 6 +-
> iohandler.c | 7 +-
> ioport.c | 4 +-
> iov.c | 2 +-
> json-lexer.c | 10 +-
> json-parser.c | 18 +-
> json-streamer.c | 10 +-
> kvm-all.c | 24 +-
> kvm-stub.c | 6 +-
> 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-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/cris/syscall.h | 5 +
> linux-user/elfload.c | 2 +-
> linux-user/main.c | 6 +-
> linux-user/microblaze/syscall.h | 6 +
> linux-user/qemu.h | 10 +-
> linux-user/syscall.c | 2 +-
> linux-user/syscall_defs.h | 6 +
> 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 | 52 +--
> 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 | 15 +-
> 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 +-
> pixman | 2 +-
> qapi/opts-visitor.c | 10 +-
> qapi/qapi-dealloc-visitor.c | 7 +-
> qapi/qapi-types-core.h | 21 -
> qapi/qapi-visit-core.c | 6 +-
> qapi/qapi-visit-impl.h | 23 --
> qapi/qmp-dispatch.c | 10 +-
> qapi/qmp-input-visitor.c | 10 +-
> qapi/qmp-output-visitor.c | 10 +-
> qapi/qmp-registry.c | 2 +-
> qapi/string-input-visitor.c | 6 +-
> qapi/string-output-visitor.c | 6 +-
> qbool.c | 4 +-
> qdict.c | 14 +-
> 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 +-
> qerror.c | 6 +-
> qfloat.c | 4 +-
> qga/Makefile.objs | 2 +-
> qga/channel-posix.c | 4 +-
> qga/commands-posix.c | 6 +-
> qga/commands-win32.c | 2 +-
> qga/commands.c | 2 +-
> qga/guest-agent-core.h | 2 +-
> qemu-ga.c => qga/main.c | 14 +-
> qapi-schema-guest.json => qga/qapi-schema.json | 0
> qint.c | 4 +-
> qjson.c | 18 +-
> qlist.c | 6 +-
> qmp.c | 11 +-
> qom/container.c | 4 +-
> qom/cpu.c | 2 +-
> qom/object.c | 15 +-
> qom/qom-qobject.c | 6 +-
> qstring.c | 4 +-
> qtest.c | 12 +-
> readline.c | 4 +-
> rules.mak | 5 +-
> savevm.c | 23 +-
> scripts/feature_to_c.sh | 2 +-
> scripts/get_maintainer.pl | 25 +-
> scripts/qapi-commands.py | 15 +-
> scripts/qapi-types.py | 2 +-
> scripts/qapi-visit.py | 3 +-
> slirp/bootp.h | 4 +
> slirp/if.c | 2 +-
> slirp/ip_input.c | 2 +-
> slirp/main.h | 4 +
> slirp/misc.c | 4 +-
> slirp/sbuf.c | 2 +-
> slirp/slirp.c | 4 +-
> slirp/slirp.h | 4 +-
> slirp/tftp.h | 4 +
> spice-qemu-char.c | 3 +-
> stubs/arch-query-cpu-def.c | 4 +-
> stubs/fd-register.c | 2 +-
> stubs/fdset-add-fd.c | 2 +-
> stubs/fdset-find-fd.c | 2 +-
> stubs/fdset-get-fd.c | 2 +-
> stubs/fdset-remove-fd.c | 2 +-
> stubs/get-fd.c | 2 +-
> stubs/set-fd-handler.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/crisv32-decode.h | 4 +
> 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 | 13 +-
> 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 | 13 +-
> 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/arm/tcg-target.h | 3 +
> tcg/hppa/tcg-target.c | 2 +-
> tcg/hppa/tcg-target.h | 3 +
> tcg/i386/tcg-target.c | 2 +-
> tcg/i386/tcg-target.h | 3 +
> tcg/ia64/tcg-target.c | 2 +-
> tcg/ia64/tcg-target.h | 3 +
> tcg/mips/tcg-target.c | 2 +-
> tcg/mips/tcg-target.h | 3 +
> tcg/ppc/tcg-target.c | 2 +-
> tcg/ppc/tcg-target.h | 3 +
> tcg/ppc64/tcg-target.c | 2 +-
> tcg/ppc64/tcg-target.h | 3 +
> tcg/s390/tcg-target.c | 2 +-
> tcg/s390/tcg-target.h | 3 +
> tcg/sparc/tcg-target.c | 2 +-
> tcg/sparc/tcg-target.h | 3 +
> 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/cris/crisutils.h | 5 +
> tests/tcg/test-i386-fprem.c | 4 +-
> tests/tcg/test-i386.c | 2 +-
> tests/test-aio.c | 2 +-
> tests/test-coroutine.c | 2 +-
> tests/test-iov.c | 4 +-
> tests/test-qmp-commands.c | 6 +-
> 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-thread-pool.c | 6 +-
> tests/test-visitor-serialization.c | 2 +-
> thread-pool.c | 14 +-
> thunk.c | 2 +-
> trace/simple.c | 2 +-
> translate-all.c | 10 +-
> ui/Makefile.objs | 7 +-
> ui/cocoa.m | 4 +-
> console.c => ui/console.c | 5 +-
> ui/curses.c | 4 +-
> ui/curses_keys.h | 5 +
> cursor.c => ui/cursor.c | 2 +-
> cursor_hidden.xpm => ui/cursor_hidden.xpm | 0
> cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm | 0
> ui/d3des.h | 4 +
> input.c => ui/input.c | 9 +-
> ui/keymaps.c | 2 +-
> qemu-pixman.c => ui/qemu-pixman.c | 2 +-
> 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 | 8 +-
> xen-mapcache.c | 6 +-
> xen-stub.c | 2 +-
> 1124 files changed, 3142 insertions(+), 3427 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%)
> create mode 100644 hw/pci/Makefile.objs
> rename hw/{ => pci}/msi.c (99%)
> rename hw/{ => pci}/msi.h (98%)
> rename hw/{ => pci}/msix.c (99%)
> rename hw/{ => pci}/msix.h (98%)
> rename hw/{ => pci}/pci-hotplug.c (96%)
> rename hw/{ => pci}/pci-stub.c (94%)
> rename hw/{ => pci}/pci.c (99%)
> rename hw/{ => pci}/pci.h (99%)
> rename hw/{ => pci}/pci_bridge.c (99%)
> rename hw/{ => pci}/pci_bridge.h (98%)
> rename hw/{pci_internals.h => pci/pci_bus.h} (79%)
> rename hw/{ => pci}/pci_host.c (99%)
> rename hw/{ => pci}/pci_host.h (99%)
> rename hw/{ => pci}/pci_ids.h (98%)
> rename hw/{ => pci}/pci_regs.h (100%)
> rename hw/{ => pci}/pcie.c (99%)
> rename hw/{ => pci}/pcie.h (98%)
> rename hw/{ => pci}/pcie_aer.c (99%)
> rename hw/{ => pci}/pcie_aer.h (99%)
> rename hw/{ => pci}/pcie_host.c (97%)
> rename hw/{ => pci}/pcie_host.h (96%)
> rename hw/{ => pci}/pcie_port.c (99%)
> rename hw/{ => pci}/pcie_port.h (96%)
> rename hw/{ => pci}/pcie_regs.h (100%)
> rename hw/{ => pci}/shpc.c (99%)
> rename hw/{ => pci}/shpc.h (95%)
> rename hw/{ => pci}/slotid_cap.c (95%)
> rename hw/{ => pci}/slotid_cap.h (100%)
> rename uboot_image.h => hw/uboot_image.h (100%)
> rename aes.h => include/block/aes.h (100%)
> rename qemu-aio.h => include/block/aio.h (99%)
> 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%)
> rename thread-pool.h => include/block/thread-pool.h (88%)
> 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 exec-memory.h => include/exec/address-spaces.h (97%)
> 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 cputlb.h => include/exec/cputlb.h (100%)
> rename def-helper.h => include/exec/def-helper.h (100%)
> rename exec-all.h => include/exec/exec-all.h (98%)
> rename gdbstub.h => include/exec/gdbstub.h (100%)
> rename gen-icount.h => include/exec/gen-icount.h (94%)
> rename hwaddr.h => include/exec/hwaddr.h (100%)
> rename ioport.h => include/exec/ioport.h (99%)
> rename iorange.h => include/exec/iorange.h (100%)
> rename memory-internal.h => include/exec/memory-internal.h (100%)
> rename memory.h => include/exec/memory.h (99%)
> rename poison.h => include/exec/poison.h (100%)
> rename softmmu-semi.h => include/exec/softmmu-semi.h (97%)
> 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 qemu-user-types.h => include/exec/user/abitypes.h (100%)
> rename thunk.h => include/exec/user/thunk.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 migration.h => include/migration/migration.h (97%)
> rename include/{qemu => migration}/page_cache.h (100%)
> rename qemu-file.h => include/migration/qemu-file.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%)
> create mode 100644 include/net/tap.h
> 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-input-visitor.h (91%)
> rename {qapi => include/qapi}/qmp-output-visitor.h (91%)
> rename qapi/qmp-core.h => include/qapi/qmp/dispatch.h (93%)
> rename json-lexer.h => include/qapi/qmp/json-lexer.h (94%)
> rename json-parser.h => include/qapi/qmp/json-parser.h (90%)
> rename json-streamer.h => include/qapi/qmp/json-streamer.h (93%)
> rename qbool.h => include/qapi/qmp/qbool.h (94%)
> rename qdict.h => include/qapi/qmp/qdict.h (96%)
> rename qerror.h => include/qapi/qmp/qerror.h (98%)
> rename qfloat.h => include/qapi/qmp/qfloat.h (94%)
> rename qint.h => include/qapi/qmp/qint.h (94%)
> rename qjson.h => include/qapi/qmp/qjson.h (88%)
> rename qlist.h => include/qapi/qmp/qlist.h (95%)
> rename qobject.h => include/qapi/qmp/qobject.h (100%)
> rename qstring.h => include/qapi/qmp/qstring.h (96%)
> rename qemu-objects.h => include/qapi/qmp/types.h (60%)
> rename {qapi => include/qapi}/string-input-visitor.h (95%)
> rename {qapi => include/qapi}/string-output-visitor.h (95%)
> create mode 100644 include/qapi/visitor-impl.h
> rename qapi/qapi-visit-core.h => include/qapi/visitor.h (52%)
> 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 (91%)
> rename envlist.h => include/qemu/envlist.h (100%)
> rename qemu-error.h => include/qemu/error-report.h (100%)
> rename event_notifier.h => include/qemu/event_notifier.h (100%)
> rename host-utils.h => include/qemu/host-utils.h (98%)
> rename int128.h => include/qemu/int128.h (100%)
> rename iov.h => include/qemu/iov.h (99%)
> rename qemu-log.h => include/qemu/log.h (99%)
> rename main-loop.h => include/qemu/main-loop.h (99%)
> 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 (96%)
> 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 (96%)
> rename qemu-timer.h => include/qemu/timer.h (99%)
> rename qemu-tls.h => include/qemu/tls.h (100%)
> rename qemu-types.h => include/qemu/typedefs.h (100%)
> rename uri.h => include/qemu/uri.h (100%)
> rename qemu-xattr.h => include/qemu/xattr.h (100%)
> rename include/{qemu => qom}/cpu.h (98%)
> rename include/{qemu => qom}/object.h (99%)
> rename include/{qemu => qom}/qom-qobject.h (97%)
> 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 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 kvm.h => include/sysemu/kvm.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 (100%)
> 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 {hw => include/ui}/pixel_ops.h (100%)
> rename qemu-pixman.h => include/ui/qemu-pixman.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%)
> delete mode 100644 qapi/qapi-types-core.h
> delete mode 100644 qapi/qapi-visit-impl.h
> rename qemu-ga.c => qga/main.c (99%)
> rename qapi-schema-guest.json => qga/qapi-schema.json (100%)
> 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 qemu-pixman.c => ui/qemu-pixman.c (98%)
> rename qemu-x509.h => ui/qemu-x509.h (100%)
> rename vgafont.h => ui/vgafont.h (100%)
> ---
> 1.8.0.2
^ permalink raw reply [flat|nested] 54+ messages in thread
* Re: [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue
2012-12-20 0:54 ` Anthony Liguori
@ 2012-12-20 11:12 ` Peter Maydell
0 siblings, 0 replies; 54+ messages in thread
From: Peter Maydell @ 2012-12-20 11:12 UTC (permalink / raw)
To: Anthony Liguori; +Cc: Paolo Bonzini, qemu-devel, Michael S. Tsirkin
On 20 December 2012 00:54, Anthony Liguori <anthony@codemonkey.ws> wrote:
> Paolo Bonzini <pbonzini@redhat.com> writes:
>
>> Anthony,
>>
>> The following changes since commit a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0:
>>
>> exec: refactor cpu_restore_state (2012-12-16 08:35:24 +0000)
>>
>> are available in the git repository at:
>>
>> git://github.com/bonzini/qemu.git header-dirs
>>
>> for you to fetch changes up to 394394a788cec72682750f855e5182de156026b4:
>>
>> janitor: move remaining public headers to include/ (2012-12-17
>> 18:56:58 +0100)
>
> Pulled. Thanks.
This breaks building on my macos box, because qmp.o is no longer
built with the necessary include flags to pick up the gnutls includes.
Old build:
cc -I/Users/pm215/src/qemu/slirp -I. -I/Users/pm215/src/qemu
-I/Users/pm215/src/qemu/fpu -m64 -DOS_OBJECT_USE_OBJC=0 -arch x86_64
-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings
-Wmissing-prototypes -fno-strict-aliasing -Wno-initializer-overrides
-fstack-protector-all -Wendif-labels -Wmissing-include-dirs
-Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k
-Winit-self -Wignored-qualifiers -Wold-style-definition -Wtype-limits
-I/sw/include/libpng15 -I/opt/X11/include/pixman-1
-I/sw/include/glib-2.0 -I/sw/lib/glib-2.0/include -I/sw/include
-I/Users/pm215/src/qemu/include -MMD -MP -MT qmp.o -MF ./qmp.d -O2
-D_FORTIFY_SOURCE=2 -g -c -o qmp.o qmp.c
New build:
cc -I. -I/Users/pm215/src/qemu -I/Users/pm215/src/qemu/include -m64
-DOS_OBJECT_USE_OBJC=0 -arch x86_64 -D_GNU_SOURCE
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes
-Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes
-fno-strict-aliasing -Wno-initializer-overrides -fstack-protector-all
-Wendif-labels -Wmissing-include-dirs -Wempty-body -Wnested-externs
-Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers
-Wold-style-definition -Wtype-limits -I/sw/include/libpng15
-I/opt/X11/include/pixman-1 -I. -I. -I/sw/include/glib-2.0
-I/sw/lib/glib-2.0/include -MMD -MP -MT qmp.o -MF ./qmp.d -O2
-D_FORTIFY_SOURCE=2 -g -c -o qmp.o qmp.c
In file included from qmp.c:21:
In file included from ./ui/vnc.h:96:
./ui/vnc-tls.h:31:10: fatal error: 'gnutls/gnutls.h' file not found
#include <gnutls/gnutls.h>
^
1 error generated.
(-I/sw/include is missing, this is VNC_TLS_CFLAGS).
-- PMM
^ permalink raw reply [flat|nested] 54+ messages in thread
end of thread, other threads:[~2012-12-20 12:37 UTC | newest]
Thread overview: 54+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-17 18:17 [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 01/32] libcacard: simplify rules for recursive build Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 02/32] vscclient: use per-target variables Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 03/32] build: adjust setting of QEMU_INCLUDES Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 05/32] build: move rules from Makefile to */Makefile.objs Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 06/32] build: create ldscripts/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 07/32] build: kill libdis, move disassemblers to disas/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 08/32] build: kill libuser Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 09/32] janitor: do not rely on indirect inclusions of or from qemu-char.h Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 10/32] janitor: do not include qemu-char everywhere Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 11/32] net: move Bluetooth stuff out of net.h Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 12/32] net: do not include net.h everywhere Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 13/32] net: move net.c to net/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 14/32] net: reorganize headers Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 15/32] qemu-ga: move qemu-ga files to qga/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 16/32] ui: move files to ui/ and include/ui/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 17/32] qapi: move inclusions of qemu-common.h from headers to .c files Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 18/32] qapi: remove qapi/qapi-types-core.h Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 19/32] qapi: make struct Visitor opaque Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 20/32] janitor: add guards to headers Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 21/32] qapi: move include files to include/qobject/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 22/32] block: move include files to include/block/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 23/32] exec: move include files to include/exec/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 24/32] monitor: move include files to include/monitor/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 25/32] migration: move include files to include/migration/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 26/32] qom: move include files to include/qom/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 27/32] misc: move include files to include/qemu/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 28/32] softmmu: move include files to include/sysemu/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 29/32] softmmu: move remaining include files to include/ subdirectories Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 30/32] fpu: move public header file to include/fpu Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 31/32] hw: move executable format header files to hw/ Paolo Bonzini
2012-12-17 18:17 ` [Qemu-devel] [PATCH 32/32] janitor: move remaining public headers to include/ Paolo Bonzini
2012-12-18 20:59 ` [Qemu-devel] [PULL 00/45] Include reorganization + PCI patch queue Anthony Liguori
2012-12-18 21:11 ` Paolo Bonzini
2012-12-18 21:56 ` Paolo Bonzini
2012-12-18 22:35 ` Anthony Liguori
2012-12-18 22:47 ` Michael S. Tsirkin
2012-12-18 23:36 ` Anthony Liguori
2012-12-18 22:01 ` Paolo Bonzini
2012-12-18 22:39 ` Anthony Liguori
2012-12-19 15:32 ` Paolo Bonzini
2012-12-19 0:13 ` Anthony Liguori
2012-12-19 2:00 ` Anthony Liguori
2012-12-19 2:13 ` Alexander Graf
2012-12-19 2:18 ` David Gibson
2012-12-19 8:35 ` Paolo Bonzini
2012-12-19 20:02 ` Blue Swirl
2012-12-19 19:45 ` Michael S. Tsirkin
2012-12-19 6:14 ` Michael S. Tsirkin
2012-12-20 0:54 ` Anthony Liguori
2012-12-20 11:12 ` Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2012-12-06 13:06 [Qemu-devel] [PATCH 00/32] Build cleanups and header file movement to include/ Paolo Bonzini
2012-12-06 13:06 ` [Qemu-devel] [PATCH 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines Paolo Bonzini
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 04/32] build: add $(TARGET_DIR) to "GEN config-target.h" lines Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).