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

AioContexts are used as a generic event loop 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 81f48f0709cc46ee246035d557f1dc58975bd5fb..efceed9fe52e6f93c65d46a1360e94b1a41e799b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3071,7 +3071,7 @@ F: util/aio-*.h
 F: util/defer-call.c
 F: util/fdmon-*.c
 F: block/io.c
-F: include/block/aio.h
+F: include/qemu/aio.h
 F: include/block/aio-wait.h
 F: include/qemu/defer-call.h
 F: scripts/qemugdb/aio.py

diff --git a/block/aio_task.c b/block/aio_task.c
index bb5c05f455d315a3d62714b0ee4969a01bf84fcb..21b68a9fc02f22c0ea57a5b1422736d81e85a4c5 100644 (file)
--- a/block/aio_task.c
+++ b/block/aio_task.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "block/aio_task.h"
 
 struct AioTaskPool {

diff --git a/block/export/fuse.c b/block/export/fuse.c
index 465cc9891d6016566c887af0bc608060bec68b59..8cf4572f78d5b2aac74410d21caa367ed331492f 100644 (file)
--- a/block/export/fuse.c
+++ b/block/export/fuse.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/memalign.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "block/block_int-common.h"
 #include "block/export.h"
 #include "block/fuse.h"

diff --git a/block/io_uring.c b/block/io_uring.c
index f1514cf024a0a041b1cd23a05588fcd0ec8bab12..cb131d3b8b5bc38c4fec7327963550b1c785740b 100644 (file)
--- a/block/io_uring.c
+++ b/block/io_uring.c
@@ -10,7 +10,7 @@
  */
 #include "qemu/osdep.h"
 #include <liburing.h>
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "block/block.h"
 #include "block/raw-aio.h"
 #include "qemu/coroutine.h"

diff --git a/block/linux-aio.c b/block/linux-aio.c
index c200e7ad20f70851b2f16140f19f6009faba99b4..53c3e9af8aef5f11de56ffc864dd6bc28511ca76 100644 (file)
--- 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/osdep.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "qemu/queue.h"
 #include "block/block.h"
 #include "block/raw-aio.h"

diff --git a/block/win32-aio.c b/block/win32-aio.c
index 539f1c81c657074e1a336074b7b62fe3931ac4cb..6e1b34fb95f6005f0c5ab5164e8fe727ebd15861 100644 (file)
--- a/block/win32-aio.c
+++ b/block/win32-aio.c
@@ -26,7 +26,7 @@
 #include "qemu/timer.h"
 #include "block/block-io.h"
 #include "block/block_int.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "block/raw-aio.h"
 #include "qemu/aiocb.h"
 #include "qemu/event_notifier.h"

diff --git a/docs/devel/multiple-iothreads.rst b/docs/devel/multiple-iothreads.rst
index d1f3fc4510a8fb66541cc8a704293e2bd6c2586f..a6eb04626732f68ff316da54990a203dbffbe5ef 100644 (file)
--- a/docs/devel/multiple-iothreads.rst
+++ b/docs/devel/multiple-iothreads.rst
@@ -52,7 +52,7 @@ How to program for ``IOThread``\ s
 ----------------------------------
 The main difference between legacy code and new code that can run in an
 ``IOThread`` is dealing explicitly with the event loop object, ``AioContext``
-(see ``include/block/aio.h``).  Code that only works in the main loop
+(see ``include/qemu/aio.h``).  Code that only works in the main loop
 implicitly uses the main loop's ``AioContext``.  Code that supports running
 in ``IOThread``\ s must be aware of its ``AioContext``.
 
@@ -74,7 +74,7 @@ Since they implicitly work on the main loop they cannot be used in code that
 runs in an ``IOThread``.  They might cause a crash or deadlock if called from an
 ``IOThread`` since the BQL is not held.
 
-Instead, use the ``AioContext`` functions directly (see ``include/block/aio.h``):
+Instead, use the ``AioContext`` functions directly (see ``include/qemu/aio.h``):
  * ``aio_set_fd_handler()`` - monitor a file descriptor
  * ``aio_set_event_notifier()`` - monitor an event notifier
  * ``aio_timer_new()`` - create a timer

diff --git a/include/block/aio-wait.h b/include/block/aio-wait.h
index cf5e8bde1ca298c6254888295758c6206061eac0..57ebe21b31f47d4dafc7fce394e52f3603d3a3af 100644 (file)
--- a/include/block/aio-wait.h
+++ b/include/block/aio-wait.h
@@ -25,7 +25,7 @@
 #ifndef QEMU_AIO_WAIT_H
 #define QEMU_AIO_WAIT_H
 
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "qemu/main-loop.h"
 
 /**

diff --git a/include/block/raw-aio.h b/include/block/raw-aio.h
index d568b887f1cb65662c042ecebe796e7a30fcc2ac..256d0468a8811c89ab060d9d9fec52561e46f79f 100644 (file)
--- a/include/block/raw-aio.h
+++ b/include/block/raw-aio.h
@@ -17,7 +17,7 @@
 #define QEMU_RAW_AIO_H
 
 #include "qemu/aiocb.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "block/block-common.h"
 #include "qemu/iov.h"
 

diff --git a/include/block/thread-pool.h b/include/block/thread-pool.h
index 65cabfc13886868bc10b825e14bc9046dc194805..e9ddb2b6d3c0f6866029e82d949849ffa32640fb 100644 (file)
--- a/include/block/thread-pool.h
+++ b/include/block/thread-pool.h
@@ -19,7 +19,7 @@
 #define QEMU_THREAD_POOL_H
 
 #include "qemu/aiocb.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 
 #define THREAD_POOL_MAX_THREADS_DEFAULT         64
 

diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
index 75b4d781a5cf319599a4a1cc92a55d6313cc8ae4..d26f1127bb59c6ae820d13fe6466b33566f83778 100644 (file)
--- a/include/hw/scsi/scsi.h
+++ b/include/hw/scsi/scsi.h
@@ -2,7 +2,7 @@
 #define QEMU_HW_SCSI_H
 
 #include "qemu/aiocb.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "hw/block/block.h"
 #include "hw/core/qdev.h"
 #include "scsi/utils.h"

diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 91ff2fa21a54ef713deb9f03541a4081bb25df28..27cd98d2fe11f70b43fbbfb84170c11a1f4f1845 100644 (file)
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -23,7 +23,7 @@
 #include "standard-headers/linux/virtio_config.h"
 #include "standard-headers/linux/virtio_ring.h"
 #include "qom/object.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 
 /*
  * A guest should never accept this. It implies negotiation is broken

diff --git a/include/io/channel.h b/include/io/channel.h
index f42be760f9fe2c79f59c445fe5b8eb63d3c98e2d..1b02350437d5b0582ae2c4e79f8bd1d63b964b4a 100644 (file)
--- a/include/io/channel.h
+++ b/include/io/channel.h
@@ -23,7 +23,7 @@
 
 #include "qom/object.h"
 #include "qemu/coroutine-core.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 
 #define TYPE_QIO_CHANNEL "qio-channel"
 OBJECT_DECLARE_TYPE(QIOChannel, QIOChannelClass,

diff --git a/include/block/aio.h b/include/qemu/aio.h
similarity index 100%
rename from include/block/aio.h
rename to include/qemu/aio.h

diff --git a/include/qemu/job.h b/include/qemu/job.h
index 2b163602c56ccb503da8855218b21ccddc3d32d2..0e40e8b4570a51d5796c83fb0279f78c835ac222 100644 (file)
--- a/include/qemu/job.h
+++ b/include/qemu/job.h
@@ -31,7 +31,7 @@
 #include "qemu/queue.h"
 #include "qemu/progress_meter.h"
 #include "qemu/coroutine.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "block/graph-lock.h"
 
 typedef struct JobDriver JobDriver;

diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h
index 241dc87be503ae248361277f5ce3131c6e00aabd..8c1241a2c11c289bc3c69fff66ab67d06e9f257c 100644 (file)
--- a/include/qemu/main-loop.h
+++ b/include/qemu/main-loop.h
@@ -25,7 +25,7 @@
 #ifndef QEMU_MAIN_LOOP_H
 #define QEMU_MAIN_LOOP_H
 
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "qom/object.h"
 #include "system/event-loop-base.h"
 

diff --git a/include/qemu/throttle.h b/include/qemu/throttle.h
index 8fa2b29452a2b1cf8cafd55c0cb08f051e8e72ee..06b6589c946295ec7e6243e3ca7fd83189688293 100644 (file)
--- a/include/qemu/throttle.h
+++ b/include/qemu/throttle.h
@@ -25,7 +25,7 @@
 #ifndef THROTTLE_H
 #define THROTTLE_H
 
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "qapi/qapi-types-block-core.h"
 #include "qemu/timer.h"
 

diff --git a/include/scsi/pr-manager.h b/include/scsi/pr-manager.h
index 45de28d3542c713e23fa34bb627c87e2e54d3195..5045d115c44cd00e56cc8924d88f8b8a464aee03 100644 (file)
--- a/include/scsi/pr-manager.h
+++ b/include/scsi/pr-manager.h
@@ -4,7 +4,7 @@
 #include "qom/object.h"
 #include "qapi/visitor.h"
 #include "qom/object_interfaces.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 
 #define TYPE_PR_MANAGER "pr-manager"
 

diff --git a/include/system/event-loop-base.h b/include/system/event-loop-base.h
index a6c24f13513d888cd526c8d5d0848ae85a456d4b..130629e7f316fbe40e6e80023676487c32a20608 100644 (file)
--- a/include/system/event-loop-base.h
+++ b/include/system/event-loop-base.h
@@ -13,7 +13,7 @@
 #define QEMU_EVENT_LOOP_BASE_H
 
 #include "qom/object.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 
 #define TYPE_EVENT_LOOP_BASE         "event-loop-base"
 OBJECT_DECLARE_TYPE(EventLoopBase, EventLoopBaseClass,

diff --git a/include/system/iothread.h b/include/system/iothread.h
index d95c17a64567fb21625221fdc1ccb701d74f4adf..e26d13c6c71cc178b211e3367a4cb93d13990e60 100644 (file)
--- a/include/system/iothread.h
+++ b/include/system/iothread.h
@@ -14,7 +14,7 @@
 #ifndef IOTHREAD_H
 #define IOTHREAD_H
 
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "qemu/thread.h"
 #include "qom/object.h"
 #include "system/event-loop-base.h"

diff --git a/include/system/replay.h b/include/system/replay.h
index 68f91bdfbf2fba649d94af0968ebbe83d5423e5d..f8715ca9feb87feab095326b98bd4cf96f3e6d65 100644 (file)
--- a/include/system/replay.h
+++ b/include/system/replay.h
@@ -15,7 +15,7 @@
 #include "qapi/qapi-types-misc.h"
 #include "qapi/qapi-types-run-state.h"
 #include "qapi/qapi-types-ui.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "qemu/audio.h"
 
 /* replay clock kinds */

diff --git a/iothread.c b/iothread.c
index 8810376dcea13cef3f704677fb8c3d06641c9885..caf68e07645827b5a9041ebe1fc9e19d6ca9d23e 100644 (file)
--- a/iothread.c
+++ b/iothread.c
@@ -15,7 +15,7 @@
 #include "qom/object.h"
 #include "qom/object_interfaces.h"
 #include "qemu/module.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "block/block.h"
 #include "system/event-loop-base.h"
 #include "system/iothread.h"

diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index e569224eaea5c56b4707c2790f625ade8b75e18b..9bb1e6a9f4aff5f2bcc95511aadb7887741c78e6 100644 (file)
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -13,7 +13,7 @@
 
 #include "qemu/osdep.h"
 
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "qapi/compat-policy.h"
 #include "qapi/error.h"
 #include "qapi/qmp-registry.h"

diff --git a/replay/replay-events.c b/replay/replay-events.c
index a96e47e77403621df0e3385afbb4c7a79f79a61c..9e5af5e849549f9d8df660d493d8d6d7b8c44b60 100644 (file)
--- a/replay/replay-events.c
+++ b/replay/replay-events.c
@@ -13,7 +13,7 @@
 #include "qemu/error-report.h"
 #include "system/replay.h"
 #include "replay-internal.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "ui/input.h"
 #include "hw/core/cpu.h"
 

diff --git a/scripts/analyze-inclusions b/scripts/analyze-inclusions
index 50a7d95d9e7da25151713414e91ac3155ded3a61..c30e44f02ec5b14985e47da5c02321bc2edd99ed 100644 (file)
--- a/scripts/analyze-inclusions
+++ b/scripts/analyze-inclusions
@@ -52,7 +52,7 @@ echo $(grep_include -F 'qapi-types.h') files include qapi-types.h
 echo $(grep_include -F 'trace/generated-tracers.h') files include generated-tracers.h
 echo $(grep_include -F 'qapi/error.h') files include qapi/error.h
 echo $(grep_include -F 'qom/object.h') files include qom/object.h
-echo $(grep_include -F 'block/aio.h') files include block/aio.h
+echo $(grep_include -F 'qemu/aio.h') files include block/aio.h
 echo $(grep_include -F 'system/memory.h') files include system/memory.h
 echo $(grep_include -F 'fpu/softfloat.h') files include fpu/softfloat.h
 echo $(grep_include -F 'qemu/bswap.h') files include qemu/bswap.h

diff --git a/scsi/pr-manager.c b/scsi/pr-manager.c
index 40e1210eb21826950cf029afcfd5d9f388325624..fec0d68c4cce5b5137529e00d0362973b1d9c88d 100644 (file)
--- a/scsi/pr-manager.c
+++ b/scsi/pr-manager.c
@@ -13,7 +13,7 @@
 #include <scsi/sg.h>
 
 #include "qapi/error.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "block/thread-pool.h"
 #include "scsi/pr-manager.h"
 #include "trace.h"

diff --git a/stubs/linux-aio.c b/stubs/linux-aio.c
index 84d1f784aed9dad907ace0c61491bcbbecd4f7a4..b1a27e926e33a054e230cfd88bca5217ae851d9a 100644 (file)
--- a/stubs/linux-aio.c
+++ b/stubs/linux-aio.c
@@ -8,7 +8,7 @@
  * See the COPYING file in the top-level directory.
  */
 #include "qemu/osdep.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "block/raw-aio.h"
 
 void laio_detach_aio_context(LinuxAioState *s, AioContext *old_context)

diff --git a/stubs/replay-tools.c b/stubs/replay-tools.c
index c537485f401845fa01a326db1cf2b17069942697..17dc3babd9b126df5333e177e3dae4a9b8962266 100644 (file)
--- a/stubs/replay-tools.c
+++ b/stubs/replay-tools.c
@@ -1,6 +1,6 @@
 #include "qemu/osdep.h"
 #include "system/replay.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 
 bool replay_events_enabled(void)
 {

diff --git a/tests/unit/iothread.c b/tests/unit/iothread.c
index f9b0791084e7c78f656dd2b0d82009aa41f73022..a363bf8f7092ac0cb31e25ae3685840575e50ebc 100644 (file)
--- a/tests/unit/iothread.c
+++ b/tests/unit/iothread.c
@@ -14,7 +14,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "qemu/main-loop.h"
 #include "qemu/rcu.h"
 #include "iothread.h"

diff --git a/tests/unit/iothread.h b/tests/unit/iothread.h
index 4877cea6a31e83a90318b4e617cd28e1aef687f0..eb4d0c77f86d4eeb33ef66f1abd6dc12637fdd15 100644 (file)
--- a/tests/unit/iothread.h
+++ b/tests/unit/iothread.h
@@ -13,7 +13,7 @@
 #ifndef TEST_IOTHREAD_H
 #define TEST_IOTHREAD_H
 
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "qemu/thread.h"
 
 typedef struct IOThread IOThread;

diff --git a/tests/unit/test-aio-multithread.c b/tests/unit/test-aio-multithread.c
index c24200a7121c761254f3558bdc1598da771b8fa3..9179cdc6a3218a1beb638c7e6c4278445f0e2e6f 100644 (file)
--- a/tests/unit/test-aio-multithread.c
+++ b/tests/unit/test-aio-multithread.c
@@ -11,7 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "qemu/coroutine.h"
 #include "qemu/thread.h"
 #include "qemu/error-report.h"

diff --git a/tests/unit/test-aio.c b/tests/unit/test-aio.c
index 010d65b79a564474a47a278da37e38345648b81f..b3ca4d8a596ea045d11cf7cc9c241e7ef04f61e1 100644 (file)
--- a/tests/unit/test-aio.c
+++ b/tests/unit/test-aio.c
@@ -11,7 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
 #include "qemu/sockets.h"

diff --git a/tests/unit/test-nested-aio-poll.c b/tests/unit/test-nested-aio-poll.c
index d13ecccd8c05e91bf1ac403bdb6d33bbc11bd072..9ab1ad08a794e004fedcb4c165dc8b0b544979d5 100644 (file)
--- a/tests/unit/test-nested-aio-poll.c
+++ b/tests/unit/test-nested-aio-poll.c
@@ -13,7 +13,7 @@
  * aio_poll() calls. This test case checks that this is indeed what happens.
  */
 #include "qemu/osdep.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "qapi/error.h"
 #include "util/aio-posix.h"
 

diff --git a/tests/unit/test-thread-pool.c b/tests/unit/test-thread-pool.c
index ea5234f9f48b157d3d08a5ff3bf1fce8ca113b85..1e2f05f841661c9752d6a7cedd33fff886eadab4 100644 (file)
--- a/tests/unit/test-thread-pool.c
+++ b/tests/unit/test-thread-pool.c
@@ -1,5 +1,5 @@
 #include "qemu/osdep.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "block/thread-pool.h"
 #include "block/block.h"
 #include "qapi/error.h"

diff --git a/tests/unit/test-throttle.c b/tests/unit/test-throttle.c
index dfa61c75ea4c17433d4796c0b18e0ae7e3ba907a..52eb8966b3f511fe505445a6b19ddbabd979520b 100644 (file)
--- a/tests/unit/test-throttle.c
+++ b/tests/unit/test-throttle.c
@@ -14,7 +14,7 @@
 
 #include "qemu/osdep.h"
 #include <math.h>
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "qapi/error.h"
 #include "qemu/throttle.h"
 #include "qemu/error-report.h"

diff --git a/util/aio-posix.h b/util/aio-posix.h
index babbfa831415d15b0d928b14aa7350d082baee0d..0cedb8d1891d3a3e761077a307c18c441361e7dc 100644 (file)
--- a/util/aio-posix.h
+++ b/util/aio-posix.h
@@ -17,7 +17,7 @@
 #ifndef AIO_POSIX_H
 #define AIO_POSIX_H
 
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "qapi/error.h"
 
 struct AioHandler {

diff --git a/util/async.c b/util/async.c
index 39f391fb71a00bcb9317412f4c0f2748901c6ab7..80d6b01a8aaf9de7a2c936daff38e7509030862a 100644 (file)
--- a/util/async.c
+++ b/util/async.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "block/thread-pool.h"
 #include "block/graph-lock.h"
 #include "qemu/main-loop.h"

diff --git a/util/main-loop.c b/util/main-loop.c
index b462598f76e001ae5f28a27835d20692a5f02559..ad8645c30a44fa8e8afb0bd1f6f541e16a5cf791 100644 (file)
--- a/util/main-loop.c
+++ b/util/main-loop.c
@@ -30,7 +30,7 @@
 #include "exec/icount.h"
 #include "system/replay.h"
 #include "qemu/main-loop.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "block/thread-pool.h"
 #include "qemu/error-report.h"
 #include "qemu/queue.h"

diff --git a/util/qemu-co-timeout.c b/util/qemu-co-timeout.c
index 00cd335649f04f4acf688efd7ae7c8f09e934e15..6774440b287aa045208ef3fb478e4478ec7f5049 100644 (file)
--- a/util/qemu-co-timeout.c
+++ b/util/qemu-co-timeout.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/coroutine.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 
 typedef struct QemuCoTimeoutState {
     CoroutineEntry *entry;

diff --git a/util/qemu-coroutine-lock.c b/util/qemu-coroutine-lock.c
index 2534435388f3dce83de34d5f8a7f0594294975d3..fac91582b5f64936c0cdc9b7844994fdc91b118b 100644 (file)
--- a/util/qemu-coroutine-lock.c
+++ b/util/qemu-coroutine-lock.c
@@ -30,7 +30,7 @@
 #include "qemu/coroutine_int.h"
 #include "qemu/processor.h"
 #include "qemu/queue.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 #include "trace.h"
 
 void qemu_co_queue_init(CoQueue *queue)

diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
index af59f9af9847af2ca1b14217d55aad5d0d15b78e..edef117284437dcc82f5be394dfe8ccdc6e16fc0 100644 (file)
--- a/util/qemu-coroutine-sleep.c
+++ b/util/qemu-coroutine-sleep.c
@@ -14,7 +14,7 @@
 #include "qemu/osdep.h"
 #include "qemu/coroutine_int.h"
 #include "qemu/timer.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 
 static const char *qemu_co_sleep_ns__scheduled = "qemu_co_sleep_ns";
 

diff --git a/util/qemu-coroutine.c b/util/qemu-coroutine.c
index 64d6264fc745d22e74bd329c1bef15bcd100ba15..d17135f585aef5fd0adf7a6e0f889eeebfade754 100644 (file)
--- a/util/qemu-coroutine.c
+++ b/util/qemu-coroutine.c
@@ -19,7 +19,7 @@
 #include "qemu/coroutine_int.h"
 #include "qemu/coroutine-tls.h"
 #include "qemu/cutils.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 
 enum {
     COROUTINE_POOL_BATCH_MAX_SIZE = 128,

diff --git a/util/throttle.c b/util/throttle.c
index 9582899da3e61532daf5fcd8e8e6a03446707412..8044f04ffc967f645f139171c9afa3b613e771a5 100644 (file)
--- a/util/throttle.c
+++ b/util/throttle.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "qemu/throttle.h"
 #include "qemu/timer.h"
-#include "block/aio.h"
+#include "qemu/aio.h"
 
 /* This function make a bucket leak
  *