[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/11] block/export: Conditionally ignore set-context error
From: |
Kevin Wolf |
Subject: |
[PULL 10/11] block/export: Conditionally ignore set-context error |
Date: |
Tue, 20 Jul 2021 17:10:52 +0200 |
From: Max Reitz <mreitz@redhat.com>
When invoking block-export-add with some iothread and
fixed-iothread=false, and changing the node's iothread fails, the error
is supposed to be ignored.
However, it is still stored in *errp, which is wrong. If a second error
occurs, the "*errp must be NULL" assertion in error_setv() fails:
qemu-system-x86_64: ../util/error.c:59: error_setv: Assertion
`*errp == NULL' failed.
So if fixed-iothread=false, we should ignore the error by passing NULL
to bdrv_try_set_aio_context().
Fixes: f51d23c80af73c95e0ce703ad06a300f1b3d63ef
("block/export: add iothread and fixed-iothread options")
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210624083825.29224-2-mreitz@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/export/export.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/block/export/export.c b/block/export/export.c
index fec7d9f738..6d3b9964c8 100644
--- a/block/export/export.c
+++ b/block/export/export.c
@@ -111,6 +111,7 @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error
**errp)
if (export->has_iothread) {
IOThread *iothread;
AioContext *new_ctx;
+ Error **set_context_errp;
iothread = iothread_by_id(export->iothread);
if (!iothread) {
@@ -120,7 +121,9 @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error
**errp)
new_ctx = iothread_get_aio_context(iothread);
- ret = bdrv_try_set_aio_context(bs, new_ctx, errp);
+ /* Ignore errors with fixed-iothread=false */
+ set_context_errp = fixed_iothread ? errp : NULL;
+ ret = bdrv_try_set_aio_context(bs, new_ctx, set_context_errp);
if (ret == 0) {
aio_context_release(ctx);
aio_context_acquire(new_ctx);
--
2.31.1
- [PULL 01/11] block/mirror: set .co for active-write MirrorOp objects, (continued)
- [PULL 01/11] block/mirror: set .co for active-write MirrorOp objects, Kevin Wolf, 2021/07/20
- [PULL 02/11] iotest 151: add test-case that shows active mirror dead-lock, Kevin Wolf, 2021/07/20
- [PULL 03/11] block/mirror: fix active mirror dead-lock in mirror_wait_on_conflicts, Kevin Wolf, 2021/07/20
- [PULL 04/11] block: Add option to use driver whitelist even in tools, Kevin Wolf, 2021/07/20
- [PULL 05/11] replication: Remove s->active_disk, Kevin Wolf, 2021/07/20
- [PULL 11/11] iotests/307: Test iothread conflict for exports, Kevin Wolf, 2021/07/20
- [PULL 09/11] block/vvfat: fix: drop backing, Kevin Wolf, 2021/07/20
- [PULL 07/11] replication: Properly attach children, Kevin Wolf, 2021/07/20
- [PULL 06/11] replication: Reduce usage of s->hidden_disk and s->secondary_disk, Kevin Wolf, 2021/07/20
- [PULL 08/11] replication: Remove workaround, Kevin Wolf, 2021/07/20
- [PULL 10/11] block/export: Conditionally ignore set-context error,
Kevin Wolf <=
- Re: [PULL 00/11] Block layer patches, Peter Maydell, 2021/07/20