Move qemu-queue.h -> include/qemu/queue.h
Change-Id: I2ef2c4aea2cdf73e834b013a11fb63a0eb720262
diff --git a/aio-android.c b/aio-android.c
index 3e39280..5735136 100644
--- a/aio-android.c
+++ b/aio-android.c
@@ -13,7 +13,7 @@
#include "qemu-common.h"
#include "block/block.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu_socket.h"
#include "android/iolooper.h"
diff --git a/aio.c b/aio.c
index 1d13179..ee4a9d6 100644
--- a/aio.c
+++ b/aio.c
@@ -13,7 +13,7 @@
#include "qemu-common.h"
#include "block/block.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu_socket.h"
typedef struct AioHandler AioHandler;
diff --git a/audio/audio.h b/audio/audio.h
index ebac629..cde7cca 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"
#include "qemu-common.h" /* For QEMUTimer */
typedef void (*audio_callback_fn) (void *opaque, int avail);
diff --git a/hw/qdev.h b/hw/qdev.h
index 6dc9dcb..f44ea66 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -2,7 +2,7 @@
#define QDEV_H
#include "hw.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
typedef struct DeviceType DeviceType;
diff --git a/hw/watchdog.c b/hw/watchdog.c
index 36ba4b4..0d31ae8 100644
--- a/hw/watchdog.c
+++ b/hw/watchdog.c
@@ -20,7 +20,7 @@
*/
#include "qemu-common.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "sysemu/sysemu.h"
#include "hw/watchdog.h"
diff --git a/include/block/block_int.h b/include/block/block_int.h
index f0445a5..d91fcc1 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -26,7 +26,7 @@
#include "block/block.h"
#include "qemu-option.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#define BLOCK_FLAG_ENCRYPT 1
#define BLOCK_FLAG_COMPRESS 2
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index 74a5a76..96b87b6 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -16,7 +16,7 @@
#endif
#include "qemu/bswap.h"
-#include "qemu-queue.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 e5969bf..7a786d5 100644
--- a/include/exec/cpu-defs.h
+++ b/include/exec/cpu-defs.h
@@ -28,7 +28,7 @@
#include <inttypes.h>
#include <signal.h>
#include "qemu/osdep.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "targphys.h"
#ifndef TARGET_LONG_BITS
diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h
index c815981d..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/qlist.h b/include/qapi/qmp/qlist.h
index 3925e7d..08eaea1 100644
--- a/include/qapi/qmp/qlist.h
+++ b/include/qapi/qmp/qlist.h
@@ -14,7 +14,7 @@
#define QLIST_H
#include "qapi/qmp/qobject.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu-common.h"
typedef struct QListEntry {
diff --git a/include/qemu/acl.h b/include/qemu/acl.h
index 0ef7804..116487e 100644
--- a/include/qemu/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/include/qemu/notify.h b/include/qemu/notify.h
index b40522f..f3e4faa 100644
--- a/include/qemu/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-queue.h b/include/qemu/queue.h
similarity index 100%
rename from qemu-queue.h
rename to include/qemu/queue.h
diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h
index cc7f9d8..017a722 100644
--- a/include/sysemu/blockdev.h
+++ b/include/sysemu/blockdev.h
@@ -11,7 +11,7 @@
#define BLOCKDEV_H
#include "block/block.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/include/sysemu/char.h b/include/sysemu/char.h
index ab29cbb..a657cfc 100644
--- a/include/sysemu/char.h
+++ b/include/sysemu/char.h
@@ -2,7 +2,7 @@
#define QEMU_CHAR_H
#include "qemu-common.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu-option.h"
#include "qemu/config-file.h"
#include "qapi/qmp/qobject.h"
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 5e95655..47a2e1f 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -15,7 +15,7 @@
#define QEMU_KVM_H
#include "config.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#ifdef CONFIG_KVM
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 48ce618..4af05ea 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -4,7 +4,7 @@
#include "qemu-common.h"
#include "qemu-option.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu/timer.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
diff --git a/iohandler.c b/iohandler.c
index 20129ed..8fc0e11 100644
--- a/iohandler.c
+++ b/iohandler.c
@@ -25,7 +25,7 @@
#include "config-host.h"
#include "qemu-common.h"
#include "sysemu/char.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#ifndef _WIN32
#include <sys/wait.h>
diff --git a/memcheck/memcheck.c b/memcheck/memcheck.c
index d853b50..0865052 100644
--- a/memcheck/memcheck.c
+++ b/memcheck/memcheck.c
@@ -14,7 +14,7 @@
* Contains implementation of memory checking framework in the emulator.
*/
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "migration/qemu-file.h"
#include "elff_api.h"
#include "memcheck.h"
diff --git a/memcheck/memcheck_proc_management.h b/memcheck/memcheck_proc_management.h
index 7f489cf4..91dcf56 100644
--- a/memcheck/memcheck_proc_management.h
+++ b/memcheck/memcheck_proc_management.h
@@ -18,7 +18,7 @@
#ifndef QEMU_MEMCHECK_MEMCHECK_PROC_MANAGEMENT_H
#define QEMU_MEMCHECK_MEMCHECK_PROC_MANAGEMENT_H
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "memcheck_common.h"
#include "memcheck_malloc_map.h"
#include "memcheck_mmrange_map.h"
diff --git a/posix-aio-compat.c b/posix-aio-compat.c
index f88af0f..d1a50a5 100644
--- a/posix-aio-compat.c
+++ b/posix-aio-compat.c
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "qemu-common.h"
diff --git a/qemu-option.h b/qemu-option.h
index e2d1a63..6a70604 100644
--- a/qemu-option.h
+++ b/qemu-option.h
@@ -27,7 +27,7 @@
#define QEMU_OPTIONS_H
#include <stdint.h>
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qapi/qmp/qdict.h"
enum QEMUOptionParType {
diff --git a/qobject/qdict.c b/qobject/qdict.c
index edc0186..f1faccd 100644
--- a/qobject/qdict.c
+++ b/qobject/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/qobject/qlist.c b/qobject/qlist.c
index ef852d8..f7b3897 100644
--- a/qobject/qlist.c
+++ b/qobject/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/savevm.c b/savevm.c
index 6d1df7d..0ecedb97 100644
--- a/savevm.c
+++ b/savevm.c
@@ -82,7 +82,7 @@
#include "audio/audio.h"
#include "migration/migration.h"
#include "qemu_socket.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "migration/qemu-file.h"
#include "android/snapshot.h"
diff --git a/slirp-android/slirp.c b/slirp-android/slirp.c
index 2de6b64..2b66779 100644
--- a/slirp-android/slirp.c
+++ b/slirp-android/slirp.c
@@ -32,7 +32,7 @@
#include "android/android.h"
#include "android/sockets.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
/* proto types */
static void slirp_net_forward_init(void);
diff --git a/util/envlist.c b/util/envlist.c
index 894602c..ff99fc4 100644
--- a/util/envlist.c
+++ b/util/envlist.c
@@ -4,7 +4,7 @@
#include <string.h>
#include <unistd.h>
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu/envlist.h"
struct envlist_entry {
diff --git a/util/module.c b/util/module.c
index 465ef12..0b3664e 100644
--- a/util/module.c
+++ b/util/module.c
@@ -12,7 +12,7 @@
*/
#include "qemu-common.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
#include "qemu/module.h"
typedef struct ModuleEntry
