block: rename block/aio-wait.h to qemu/aio-wait.h

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>

diff --git a/MAINTAINERS b/MAINTAINERS
index efceed9fe52e6f93c65d46a1360e94b1a41e799b..2f34b921784a74b63bf46d5ad304714f45baa607 100644 (file)
--- 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/block/io.c b/block/io.c
index c4a43013210336536a26197b018bd5d150ac5a35..cace297f226075a808e46318e2db02df6d77d794 100644 (file)
--- 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 db7c3a69a0cf29dd82f5b310141a8c8eab056d23..f3b11cc7a1942d9ae1daba58f25db4c7e96c72b6 100644 (file)
--- 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/hw/display/apple-gfx-mmio.m b/hw/display/apple-gfx-mmio.m
index 983fc1724a0ac20b2d20f161262fdaf6fcf1f42e..58beaadd1f108baa9cd0b500cd26c3281f416c4e 100644 (file)
--- 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 174d56ae05bc3f8214327c64f6d52091ccb8c55d..e0a765fcb1fe75a3374539df7d304bd10de0c40e 100644 (file)
--- 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"

diff --git a/include/block/block-io.h b/include/block/block-io.h
index 7925e2241e69f40163cecaeb6a31413b470f16e2..d34d846bb2a3ab5287cb2eb31196eb63039873f1 100644 (file)
--- 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/io/channel.c b/io/channel.c
index b7966abc4f04100166b397fa0dbc0773b0dcd559..cc02d997a4dae475759b228f41c29e51d73fb676 100644 (file)
--- 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 0653bc2ba699302f0fa680dd9fb543dbd33ed528..e7479084726c661e75447fd1330ee7cdba888e88 100644 (file)
--- 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 95018b470490621942ba5f70ce16bcca3fb03a34..c356419d6a8e3a403f5c8dbc9c3d9ec1c92db4ac 100644 (file)
--- 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 8e01e98f40573d94db599bfdd075fa8e4e641cf8..d2bfde42e85db5b8c497115ae9c98d5c3eb0d212 100644 (file)
--- 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 b5336cf5fd2932dd0f54d98c96c68a4a16231bd7..53913c4bd1bab0323524719e22bf265c2c698112 100644 (file)
--- 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 1dbe409f82938d829755c5b68fafdf5a383f2226..1536d97baf80e808f1cd388477ed23eaf3f71d75 100644 (file)
--- 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: