AIO_WAIT_WHILE is used even outside the block layer; move the header file
out of block/ just like the implementation is in util/.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
MAINTAINERS | 2 +-
include/block/block-io.h | 2 +-
include/{block => qemu}/aio-wait.h | 0
block/io.c | 2 +-
blockjob.c | 2 +-
io/channel.c | 2 +-
job.c | 2 +-
net/colo-compare.c | 2 +-
net/filter-mirror.c | 2 +-
util/aio-wait.c | 2 +-
util/vhost-user-server.c | 2 +-
hw/display/apple-gfx-mmio.m | 2 +-
hw/display/apple-gfx.m | 2 +-
13 files changed, 12 insertions(+), 12 deletions(-)
rename include/{block => qemu}/aio-wait.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 24cf2946e77..4582c5f72a9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3072,7 +3072,7 @@ F: util/defer-call.c
F: util/fdmon-*.c
F: block/io.c
F: include/qemu/aio.h
-F: include/block/aio-wait.h
+F: include/qemu/aio-wait.h
F: include/qemu/defer-call.h
F: scripts/qemugdb/aio.py
F: tests/unit/test-fdmon-epoll.c
diff --git a/include/block/block-io.h b/include/block/block-io.h
index 7925e2241e6..d34d846bb2a 100644
--- a/include/block/block-io.h
+++ b/include/block/block-io.h
@@ -25,7 +25,7 @@
#define BLOCK_IO_H
#include "qemu/aiocb.h"
-#include "block/aio-wait.h"
+#include "qemu/aio-wait.h"
#include "block/block-common.h"
#include "block/graph-lock.h"
#include "qemu/coroutine.h"
diff --git a/include/block/aio-wait.h b/include/qemu/aio-wait.h
similarity index 100%
rename from include/block/aio-wait.h
rename to include/qemu/aio-wait.h
diff --git a/block/io.c b/block/io.c
index c4a43013210..cace297f226 100644
--- a/block/io.c
+++ b/block/io.c
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include "trace.h"
#include "system/block-backend.h"
-#include "block/aio-wait.h"
+#include "qemu/aio-wait.h"
#include "block/blockjob.h"
#include "block/blockjob_int.h"
#include "block/block_int.h"
diff --git a/blockjob.c b/blockjob.c
index db7c3a69a0c..f3b11cc7a19 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -24,7 +24,7 @@
*/
#include "qemu/osdep.h"
-#include "block/aio-wait.h"
+#include "qemu/aio-wait.h"
#include "block/block.h"
#include "block/blockjob_int.h"
#include "block/block_int.h"
diff --git a/io/channel.c b/io/channel.c
index b7966abc4f0..cc02d997a4d 100644
--- a/io/channel.c
+++ b/io/channel.c
@@ -19,7 +19,7 @@
*/
#include "qemu/osdep.h"
-#include "block/aio-wait.h"
+#include "qemu/aio-wait.h"
#include "io/channel.h"
#include "qapi/error.h"
#include "qemu/main-loop.h"
diff --git a/job.c b/job.c
index 0653bc2ba69..e7479084726 100644
--- a/job.c
+++ b/job.c
@@ -28,7 +28,7 @@
#include "qemu/job.h"
#include "qemu/id.h"
#include "qemu/main-loop.h"
-#include "block/aio-wait.h"
+#include "qemu/aio-wait.h"
#include "trace/trace-root.h"
#include "qapi/qapi-events-job.h"
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 95018b47049..c356419d6a8 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -30,7 +30,7 @@
#include "migration/colo.h"
#include "util.h"
-#include "block/aio-wait.h"
+#include "qemu/aio-wait.h"
#include "qemu/coroutine.h"
#define TYPE_COLO_COMPARE "colo-compare"
diff --git a/net/filter-mirror.c b/net/filter-mirror.c
index 8e01e98f405..d2bfde42e85 100644
--- a/net/filter-mirror.c
+++ b/net/filter-mirror.c
@@ -20,7 +20,7 @@
#include "chardev/char-fe.h"
#include "qemu/iov.h"
#include "qemu/sockets.h"
-#include "block/aio-wait.h"
+#include "qemu/aio-wait.h"
#define TYPE_FILTER_MIRROR "filter-mirror"
typedef struct MirrorState MirrorState;
diff --git a/util/aio-wait.c b/util/aio-wait.c
index b5336cf5fd2..53913c4bd1b 100644
--- a/util/aio-wait.c
+++ b/util/aio-wait.c
@@ -24,7 +24,7 @@
#include "qemu/osdep.h"
#include "qemu/main-loop.h"
-#include "block/aio-wait.h"
+#include "qemu/aio-wait.h"
AioWait global_aio_wait;
diff --git a/util/vhost-user-server.c b/util/vhost-user-server.c
index 1dbe409f829..1536d97baf8 100644
--- a/util/vhost-user-server.c
+++ b/util/vhost-user-server.c
@@ -11,7 +11,7 @@
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/vhost-user-server.h"
-#include "block/aio-wait.h"
+#include "qemu/aio-wait.h"
/*
* Theory of operation:
diff --git a/hw/display/apple-gfx-mmio.m b/hw/display/apple-gfx-mmio.m
index 983fc1724a0..58beaadd1f1 100644
--- a/hw/display/apple-gfx-mmio.m
+++ b/hw/display/apple-gfx-mmio.m
@@ -14,7 +14,7 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
-#include "block/aio-wait.h"
+#include "qemu/aio-wait.h"
#include "hw/core/sysbus.h"
#include "hw/core/irq.h"
#include "apple-gfx.h"
diff --git a/hw/display/apple-gfx.m b/hw/display/apple-gfx.m
index 174d56ae05b..e0a765fcb1f 100644
--- a/hw/display/apple-gfx.m
+++ b/hw/display/apple-gfx.m
@@ -17,7 +17,7 @@
#include "qemu/log.h"
#include "qapi/visitor.h"
#include "qapi/error.h"
-#include "block/aio-wait.h"
+#include "qemu/aio-wait.h"
#include "system/address-spaces.h"
#include "system/dma.h"
#include "migration/blocker.h"
--
2.52.0