Create a new header corresponding to functions defined in
util/aiocb.c, and include it whenever AIOCBs are used but
AioContext is not.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
fsdev/qemu-fsdev-throttle.h | 1 -
include/block/aio.h | 21 -----------------
include/block/block-global-state.h | 1 +
include/block/block-io.h | 1 +
include/block/block_int-common.h | 2 +-
include/block/raw-aio.h | 1 +
include/block/thread-pool.h | 1 +
include/hw/ide/ide-dma.h | 2 +-
include/hw/scsi/scsi.h | 1 +
include/qemu/aiocb.h | 38 ++++++++++++++++++++++++++++++
include/qemu/job.h | 1 +
include/qemu/throttle.h | 1 +
block/win32-aio.c | 1 +
hw/core/ptimer.c | 1 -
hw/misc/i2c-echo.c | 1 -
hw/virtio/virtio-pmem.c | 1 -
scsi/qemu-pr-helper.c | 1 -
tests/unit/test-thread-pool.c | 1 +
ui/input-linux.c | 1 -
ui/vnc-jobs.c | 1 -
util/aiocb.c | 2 +-
21 files changed, 50 insertions(+), 31 deletions(-)
create mode 100644 include/qemu/aiocb.h
diff --git a/fsdev/qemu-fsdev-throttle.h b/fsdev/qemu-fsdev-throttle.h
index daa8ca2494d..a1dc0307903 100644
--- a/fsdev/qemu-fsdev-throttle.h
+++ b/fsdev/qemu-fsdev-throttle.h
@@ -15,7 +15,6 @@
#ifndef QEMU_FSDEV_THROTTLE_H
#define QEMU_FSDEV_THROTTLE_H
-#include "block/aio.h"
#include "qemu/coroutine.h"
#include "qemu/throttle.h"
diff --git a/include/block/aio.h b/include/block/aio.h
index cc3d5f25a24..59c56d695ee 100644
--- a/include/block/aio.h
+++ b/include/block/aio.h
@@ -27,27 +27,6 @@
#include "hw/core/qdev.h"
-typedef struct BlockAIOCB BlockAIOCB;
-typedef void BlockCompletionFunc(void *opaque, int ret);
-
-typedef struct AIOCBInfo {
- void (*cancel_async)(BlockAIOCB *acb);
- size_t aiocb_size;
-} AIOCBInfo;
-
-struct BlockAIOCB {
- const AIOCBInfo *aiocb_info;
- BlockDriverState *bs;
- BlockCompletionFunc *cb;
- void *opaque;
- int refcnt;
-};
-
-void *qemu_aio_get(const AIOCBInfo *aiocb_info, BlockDriverState *bs,
- BlockCompletionFunc *cb, void *opaque);
-void qemu_aio_unref(void *p);
-void qemu_aio_ref(void *p);
-
typedef struct AioHandler AioHandler;
typedef QLIST_HEAD(, AioHandler) AioHandlerList;
typedef void QEMUBHFunc(void *opaque);
diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h
index 479ca2858e1..c2127f17249 100644
--- a/include/block/block-global-state.h
+++ b/include/block/block-global-state.h
@@ -24,6 +24,7 @@
#ifndef BLOCK_GLOBAL_STATE_H
#define BLOCK_GLOBAL_STATE_H
+#include "qemu/aiocb.h"
#include "block/block-common.h"
#include "qemu/coroutine.h"
#include "qemu/transactions.h"
diff --git a/include/block/block-io.h b/include/block/block-io.h
index 4cf83fb3674..e5efe0efb2f 100644
--- a/include/block/block-io.h
+++ b/include/block/block-io.h
@@ -24,6 +24,7 @@
#ifndef BLOCK_IO_H
#define BLOCK_IO_H
+#include "qemu/aiocb.h"
#include "block/aio-wait.h"
#include "block/block-common.h"
#include "qemu/coroutine.h"
diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
index cb0143ea77b..6d0898e53d1 100644
--- a/include/block/block_int-common.h
+++ b/include/block/block_int-common.h
@@ -24,10 +24,10 @@
#ifndef BLOCK_INT_COMMON_H
#define BLOCK_INT_COMMON_H
-#include "block/aio.h"
#include "block/block-common.h"
#include "block/block-global-state.h"
#include "block/snapshot.h"
+#include "qemu/aiocb.h"
#include "qemu/iov.h"
#include "qemu/rcu.h"
#include "qemu/stats64.h"
diff --git a/include/block/raw-aio.h b/include/block/raw-aio.h
index 30e5fc9a9fd..d568b887f1c 100644
--- a/include/block/raw-aio.h
+++ b/include/block/raw-aio.h
@@ -16,6 +16,7 @@
#ifndef QEMU_RAW_AIO_H
#define QEMU_RAW_AIO_H
+#include "qemu/aiocb.h"
#include "block/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 dd48cf07e85..65cabfc1388 100644
--- a/include/block/thread-pool.h
+++ b/include/block/thread-pool.h
@@ -18,6 +18,7 @@
#ifndef QEMU_THREAD_POOL_H
#define QEMU_THREAD_POOL_H
+#include "qemu/aiocb.h"
#include "block/aio.h"
#define THREAD_POOL_MAX_THREADS_DEFAULT 64
diff --git a/include/hw/ide/ide-dma.h b/include/hw/ide/ide-dma.h
index d0b19ac9c57..296010a4e0d 100644
--- a/include/hw/ide/ide-dma.h
+++ b/include/hw/ide/ide-dma.h
@@ -1,7 +1,7 @@
#ifndef HW_IDE_DMA_H
#define HW_IDE_DMA_H
-#include "block/aio.h"
+#include "qemu/aiocb.h"
#include "qemu/iov.h"
typedef struct IDEState IDEState;
diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
index 83782339d4b..75b4d781a5c 100644
--- a/include/hw/scsi/scsi.h
+++ b/include/hw/scsi/scsi.h
@@ -1,6 +1,7 @@
#ifndef QEMU_HW_SCSI_H
#define QEMU_HW_SCSI_H
+#include "qemu/aiocb.h"
#include "block/aio.h"
#include "hw/block/block.h"
#include "hw/core/qdev.h"
diff --git a/include/qemu/aiocb.h b/include/qemu/aiocb.h
new file mode 100644
index 00000000000..0622646f31d
--- /dev/null
+++ b/include/qemu/aiocb.h
@@ -0,0 +1,38 @@
+/*
+ * Data structures representing asynchronous I/O operations
+ *
+ * Copyright IBM, Corp. 2008
+ *
+ * Authors:
+ * Anthony Liguori <aliguori@us.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef QEMU_AIOCB_H
+#define QEMU_AIOCB_H
+
+typedef struct BlockAIOCB BlockAIOCB;
+typedef void BlockCompletionFunc(void *opaque, int ret);
+
+typedef struct AIOCBInfo {
+ void (*cancel_async)(BlockAIOCB *acb);
+ size_t aiocb_size;
+} AIOCBInfo;
+
+struct BlockAIOCB {
+ const AIOCBInfo *aiocb_info;
+ BlockDriverState *bs;
+ BlockCompletionFunc *cb;
+ void *opaque;
+ int refcnt;
+};
+
+void *qemu_aio_get(const AIOCBInfo *aiocb_info, BlockDriverState *bs,
+ BlockCompletionFunc *cb, void *opaque);
+void qemu_aio_unref(void *p);
+void qemu_aio_ref(void *p);
+
+#endif
diff --git a/include/qemu/job.h b/include/qemu/job.h
index ead31578d3d..af29b8c6531 100644
--- a/include/qemu/job.h
+++ b/include/qemu/job.h
@@ -27,6 +27,7 @@
#define JOB_H
#include "qapi/qapi-types-job.h"
+#include "qemu/aiocb.h"
#include "qemu/queue.h"
#include "qemu/progress_meter.h"
#include "qemu/coroutine.h"
diff --git a/include/qemu/throttle.h b/include/qemu/throttle.h
index 181245d29bc..8fa2b29452a 100644
--- a/include/qemu/throttle.h
+++ b/include/qemu/throttle.h
@@ -25,6 +25,7 @@
#ifndef THROTTLE_H
#define THROTTLE_H
+#include "block/aio.h"
#include "qapi/qapi-types-block-core.h"
#include "qemu/timer.h"
diff --git a/block/win32-aio.c b/block/win32-aio.c
index f0689f3ee95..539f1c81c65 100644
--- a/block/win32-aio.c
+++ b/block/win32-aio.c
@@ -28,6 +28,7 @@
#include "block/block_int.h"
#include "block/aio.h"
#include "block/raw-aio.h"
+#include "qemu/aiocb.h"
#include "qemu/event_notifier.h"
#include "qemu/iov.h"
#include "qemu/memalign.h"
diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
index e42e06fa4de..0cbe1ed5787 100644
--- a/hw/core/ptimer.c
+++ b/hw/core/ptimer.c
@@ -13,7 +13,6 @@
#include "exec/replay-core.h"
#include "exec/icount.h"
#include "system/qtest.h"
-#include "block/aio.h"
#include "hw/core/clock.h"
#define DELTA_ADJUST 1
diff --git a/hw/misc/i2c-echo.c b/hw/misc/i2c-echo.c
index 2bb99ec0dbf..54d07db6fae 100644
--- a/hw/misc/i2c-echo.c
+++ b/hw/misc/i2c-echo.c
@@ -11,7 +11,6 @@
#include "qemu/osdep.h"
#include "qemu/timer.h"
#include "qemu/main-loop.h"
-#include "block/aio.h"
#include "hw/i2c/i2c.h"
#include "trace.h"
diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c
index 854d08abf6e..5381d592824 100644
--- a/hw/virtio/virtio-pmem.c
+++ b/hw/virtio/virtio-pmem.c
@@ -22,7 +22,6 @@
#include "standard-headers/linux/virtio_ids.h"
#include "standard-headers/linux/virtio_pmem.h"
#include "system/hostmem.h"
-#include "block/aio.h"
#include "block/thread-pool.h"
#include "trace.h"
diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c
index 074b4db4720..9dcd3ec7111 100644
--- a/scsi/qemu-pr-helper.c
+++ b/scsi/qemu-pr-helper.c
@@ -52,7 +52,6 @@
#include "trace/control.h"
#include "qemu-version.h"
-#include "block/aio.h"
#include "block/thread-pool.h"
#include "scsi/constants.h"
diff --git a/tests/unit/test-thread-pool.c b/tests/unit/test-thread-pool.c
index 33407b595d3..ea5234f9f48 100644
--- a/tests/unit/test-thread-pool.c
+++ b/tests/unit/test-thread-pool.c
@@ -3,6 +3,7 @@
#include "block/thread-pool.h"
#include "block/block.h"
#include "qapi/error.h"
+#include "qemu/aiocb.h"
#include "qemu/timer.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
diff --git a/ui/input-linux.c b/ui/input-linux.c
index 44d0c15a9b7..c16726a3b79 100644
--- a/ui/input-linux.c
+++ b/ui/input-linux.c
@@ -13,7 +13,6 @@
#include "ui/input.h"
#include "qom/object_interfaces.h"
#include "system/iothread.h"
-#include "block/aio.h"
#include <sys/ioctl.h>
#include "standard-headers/linux/input.h"
diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
index bed33950a87..b296d19e089 100644
--- a/ui/vnc-jobs.c
+++ b/ui/vnc-jobs.c
@@ -31,7 +31,6 @@
#include "vnc-jobs.h"
#include "qemu/sockets.h"
#include "qemu/main-loop.h"
-#include "block/aio.h"
#include "trace.h"
/*
diff --git a/util/aiocb.c b/util/aiocb.c
index 5aef3a069c8..d1a581080d3 100644
--- a/util/aiocb.c
+++ b/util/aiocb.c
@@ -23,7 +23,7 @@
*/
#include "qemu/osdep.h"
-#include "block/aio.h"
+#include "qemu/aiocb.h"
void *qemu_aio_get(const AIOCBInfo *aiocb_info, BlockDriverState *bs,
BlockCompletionFunc *cb, void *opaque)
--
2.52.0On 3/12/25 19:51, Paolo Bonzini wrote: > Create a new header corresponding to functions defined in > util/aiocb.c, and include it whenever AIOCBs are used but > AioContext is not. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > fsdev/qemu-fsdev-throttle.h | 1 - > include/block/aio.h | 21 ----------------- > include/block/block-global-state.h | 1 + > include/block/block-io.h | 1 + > include/block/block_int-common.h | 2 +- > include/block/raw-aio.h | 1 + > include/block/thread-pool.h | 1 + > include/hw/ide/ide-dma.h | 2 +- > include/hw/scsi/scsi.h | 1 + > include/qemu/aiocb.h | 38 ++++++++++++++++++++++++++++++ > include/qemu/job.h | 1 + > include/qemu/throttle.h | 1 + > block/win32-aio.c | 1 + > hw/core/ptimer.c | 1 - > hw/misc/i2c-echo.c | 1 - > hw/virtio/virtio-pmem.c | 1 - > scsi/qemu-pr-helper.c | 1 - > tests/unit/test-thread-pool.c | 1 + > ui/input-linux.c | 1 - > ui/vnc-jobs.c | 1 - > util/aiocb.c | 2 +- > 21 files changed, 50 insertions(+), 31 deletions(-) > create mode 100644 include/qemu/aiocb.h Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
© 2016 - 2025 Red Hat, Inc.