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>
8 months ago · ba773aded3
43 changed files with 43 additions and 43 deletions
--- a/2
+++ b/2
@ -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
--- 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 {
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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"
 /**
--- 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"
--- 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
--- 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"
--- 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
--- 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,
--- a/include/block/aio.h
+++ b/include/block/aio.h
--- 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;
--- 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"
--- 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"
--- 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"
--- 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,
--- 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"
--- 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 */
--- 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"
--- 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"
--- 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"
--- 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
--- 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"
--- 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)
--- 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)
 {
--- 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"
--- 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;
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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 {
--- 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"
--- 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"
--- 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;
--- 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)
--- 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";
--- 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,
--- 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
 *