Simplify the interface by merging iothread_ref_and_get_aio_context()
into iothread_get_aio_context(). The updated function now requires a
'holder' parameter, ensuring that every retrieval of an AioContext for
long-term use is automatically registered in the IOThread's holder list.
Update all callers across block, virtio, scsi, net, and monitor
subsystems to match the new signature. This cleanup reduces code
redundancy and improves the reliability of IOThread introspection.
Signed-off-by: Zhang Chen <zhangckid@gmail.com>
---
block/export/export.c | 6 +++---
blockdev.c | 2 +-
hw/block/dataplane/xen-block.c | 3 +--
hw/block/virtio-blk.c | 3 +--
hw/scsi/virtio-scsi-dataplane.c | 3 +--
hw/vfio-user/proxy.c | 2 +-
hw/virtio/iothread-vq-mapping.c | 2 +-
hw/virtio/virtio-balloon.c | 2 +-
include/system/iothread.h | 5 ++---
iothread.c | 9 ++-------
monitor/monitor.c | 2 +-
net/colo-compare.c | 2 +-
12 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/block/export/export.c b/block/export/export.c
index 636633c324..37bcb4f4d6 100644
--- a/block/export/export.c
+++ b/block/export/export.c
@@ -141,7 +141,7 @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp)
}
holder_name = bdrv_get_node_name(bs);
- new_ctx = iothread_ref_and_get_aio_context(iothread, holder_name);
+ new_ctx = iothread_get_aio_context(iothread, holder_name);
multithread_count = 1;
local_iothreads = g_new0(IOThread *, 1);
local_iothreads[0] = iothread;
@@ -180,8 +180,8 @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp)
goto fail;
}
local_iothreads[i] = iothread;
- multithread_ctxs[i++] = iothread_ref_and_get_aio_context(iothread,
- holder_name);
+ multithread_ctxs[i++] = iothread_get_aio_context(iothread,
+ holder_name);
}
assert(i == multithread_count);
}
diff --git a/blockdev.c b/blockdev.c
index 6e20579187..7eb206a02a 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3683,7 +3683,7 @@ void qmp_x_blockdev_set_iothread(const char *node_name, StrOrNull *iothread,
goto out;
}
- new_context = iothread_ref_and_get_aio_context(obj, node_name);
+ new_context = iothread_get_aio_context(obj, node_name);
bs->iothread = obj;
} else {
if (bs->iothread) {
diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c
index 552bd8b039..f5984c86e9 100644
--- a/hw/block/dataplane/xen-block.c
+++ b/hw/block/dataplane/xen-block.c
@@ -624,8 +624,7 @@ XenBlockDataPlane *xen_block_dataplane_create(XenDevice *xendev,
g_autofree char *path = object_get_canonical_path(OBJECT(xendev));
dataplane->iothread = iothread;
- dataplane->ctx = iothread_ref_and_get_aio_context(dataplane->iothread,
- path);
+ dataplane->ctx = iothread_get_aio_context(dataplane->iothread, path);
} else {
dataplane->ctx = qemu_get_aio_context();
}
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 70fc85bdde..8c6a3eaa1e 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -1464,8 +1464,7 @@ static bool virtio_blk_vq_aio_context_init(VirtIOBlock *s, Error **errp)
return false;
}
} else if (conf->iothread) {
- AioContext *ctx = iothread_ref_and_get_aio_context(conf->iothread,
- path);
+ AioContext *ctx = iothread_get_aio_context(conf->iothread, path);
for (unsigned i = 0; i < conf->num_queues; i++) {
s->vq_aio_context[i] = ctx;
}
diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c
index cc318162f5..7b37e3d223 100644
--- a/hw/scsi/virtio-scsi-dataplane.c
+++ b/hw/scsi/virtio-scsi-dataplane.c
@@ -74,8 +74,7 @@ void virtio_scsi_dataplane_setup(VirtIOSCSI *s, Error **errp)
return;
}
} else if (vs->conf.iothread) {
- AioContext *ctx = iothread_ref_and_get_aio_context(vs->conf.iothread,
- path);
+ AioContext *ctx = iothread_get_aio_context(vs->conf.iothread, path);
for (uint16_t i = 0; i < vs->conf.num_queues; i++) {
s->vq_aio_context[VIRTIO_SCSI_VQ_NUM_FIXED + i] = ctx;
}
diff --git a/hw/vfio-user/proxy.c b/hw/vfio-user/proxy.c
index eebe202c4a..9a9059290f 100644
--- a/hw/vfio-user/proxy.c
+++ b/hw/vfio-user/proxy.c
@@ -938,7 +938,7 @@ VFIOUserProxy *vfio_user_connect_dev(SocketAddress *addr, Error **errp)
vfio_user_iothread = iothread_create("VFIO user", errp);
}
- proxy->ctx = iothread_ref_and_get_aio_context(vfio_user_iothread, path);
+ proxy->ctx = iothread_get_aio_context(vfio_user_iothread, path);
proxy->req_bh = qemu_bh_new(vfio_user_request, proxy);
QTAILQ_INIT(&proxy->outgoing);
diff --git a/hw/virtio/iothread-vq-mapping.c b/hw/virtio/iothread-vq-mapping.c
index c993281d7f..7dadc43c44 100644
--- a/hw/virtio/iothread-vq-mapping.c
+++ b/hw/virtio/iothread-vq-mapping.c
@@ -94,7 +94,7 @@ bool iothread_vq_mapping_apply(
for (node = list; node; node = node->next) {
IOThread *iothread = iothread_by_id(node->value->iothread);
- AioContext *ctx = iothread_ref_and_get_aio_context(iothread, holder);
+ AioContext *ctx = iothread_get_aio_context(iothread, holder);
if (node->value->vqs) {
uint16List *vq;
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 8a4494905a..bd47ba8256 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -899,7 +899,7 @@ static void virtio_balloon_device_realize(DeviceState *dev, Error **errp)
precopy_add_notifier(&s->free_page_hint_notify);
s->free_page_bh = aio_bh_new_guarded(
- iothread_ref_and_get_aio_context(s->iothread, path),
+ iothread_get_aio_context(s->iothread, path),
virtio_ballloon_get_free_page_hints, s,
&dev->mem_reentrancy_guard);
}
diff --git a/include/system/iothread.h b/include/system/iothread.h
index dbada8249c..fde80f4149 100644
--- a/include/system/iothread.h
+++ b/include/system/iothread.h
@@ -47,9 +47,8 @@ DECLARE_INSTANCE_CHECKER(IOThread, IOTHREAD,
char *iothread_get_id(IOThread *iothread);
IOThread *iothread_by_id(const char *id);
-AioContext *iothread_get_aio_context(IOThread *iothread);
-AioContext *iothread_ref_and_get_aio_context(IOThread *iothread,
- const char *holder);
+AioContext *iothread_get_aio_context(IOThread *iothread,
+ const char *holder);
void iothread_put_aio_context(IOThread *iothread, const char *holder);
GMainContext *iothread_get_g_main_context(IOThread *iothread);
diff --git a/iothread.c b/iothread.c
index 70bc5fb62a..470f267901 100644
--- a/iothread.c
+++ b/iothread.c
@@ -415,13 +415,8 @@ char *iothread_get_id(IOThread *iothread)
return g_strdup(object_get_canonical_path_component(OBJECT(iothread)));
}
-AioContext *iothread_get_aio_context(IOThread *iothread)
-{
- return iothread->ctx;
-}
-
-AioContext *iothread_ref_and_get_aio_context(IOThread *iothread,
- const char *holder)
+AioContext *iothread_get_aio_context(IOThread *iothread,
+ const char *holder)
{
/*
* In some cases, iothread user need the ctx to clearup other resource.
diff --git a/monitor/monitor.c b/monitor/monitor.c
index b6efe776d6..0f9642f11a 100644
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -623,7 +623,7 @@ void monitor_data_init(Monitor *mon, bool is_qmp, bool skip_flush,
*/
g_autofree char *path = g_strdup(is_qmp ? "/monitor/qmp_mon0" :
"/monitor/hmp_mon0");
- mon->ctx = iothread_ref_and_get_aio_context(mon_iothread, path);
+ mon->ctx = iothread_get_aio_context(mon_iothread, path);
}
qemu_mutex_init(&mon->mon_lock);
mon->is_qmp = is_qmp;
diff --git a/net/colo-compare.c b/net/colo-compare.c
index f3231257d2..ff58ea9e0a 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -968,7 +968,7 @@ static void colo_compare_handle_event(void *opaque)
static void colo_compare_iothread(CompareState *s)
{
g_autofree char *path = object_get_canonical_path(OBJECT(s));
- AioContext *ctx = iothread_ref_and_get_aio_context(s->iothread, path);
+ AioContext *ctx = iothread_get_aio_context(s->iothread, path);
s->iothread_ctx = ctx;
s->worker_context = iothread_get_g_main_context(s->iothread);
--
2.49.0