misc: move include files to include/qemu/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2012-12-17 18:20:00 +01:00 · 2012-12-17 18:20:00 +01:00 · 1de7afc984
parent 14cccb6185
commit 1de7afc984
496 changed files with 673 additions and 673 deletions
--- 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>
--- 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
 {
--- 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;
--- 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"

--- 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) */
--- 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)
--- 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"
--- 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);

--- 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"
--- 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"
--- 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"
--- 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"
--- 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
 {
--- 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
--- 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)

--- 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"
--- 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>
--- 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;
--- 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 {
--- 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"

 /**************************************************************/

--- 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 {
--- 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 */
--- 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 {
--- 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;
--- 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"
--- 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>

--- 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>
--- 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"

 /**************************************************************/

--- 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"
--- 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"

--- 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 {
--- 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"
--- 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__)
--- 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>

--- 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)
 {
--- 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>
--- 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

--- 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)
--- 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>

--- 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>
--- 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
--- 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>

--- 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;

--- 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"
--- 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);
--- 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,
--- 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"

--- 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
--- 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>
--- 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"
--- 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
--- 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 = {
--- 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 */

--- 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>
--- 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;
--- 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
--- 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)
 {
--- 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>

--- 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 */

--- 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 */
--- 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>
--- 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)
 {
--- 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"
--- 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
--- 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)
 {
--- 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);
--- 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"


--- 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"
--- 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)
 {
--- 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
--- 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"

--- 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

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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>
--- 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"
--- 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
--- 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
--- 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"
--- 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
 {
--- 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"
--- 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"


--- 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,
--- 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"
--- 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"
--- 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__)
--- 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"


--- 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"
--- 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
--- 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 */

--- 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.  */

--- 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
--- 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.
--- 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"
--- 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"
--- 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"
--- 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>
--- a/Show More
+++ b/Show More