diff options
| author | Markus Armbruster <armbru@redhat.com> | 2022-11-04 17:06:52 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2022-12-14 20:03:25 +0100 |
| commit | 54fde4ff0621c22b15cbaaa3c74301cc0dbd1c9e (patch) | |
| tree | 373c23134aab19ba0edf43249e7722eea1d01d14 /block/export | |
| parent | 8461b4d60153ba923c47b6e2f9e270c0e8d6d49c (diff) | |
| download | qemu-54fde4ff0621c22b15cbaaa3c74301cc0dbd1c9e.zip qemu-54fde4ff0621c22b15cbaaa3c74301cc0dbd1c9e.tar.gz qemu-54fde4ff0621c22b15cbaaa3c74301cc0dbd1c9e.tar.bz2 | |
qapi block: Elide redundant has_FOO in generated C
The has_FOO for pointer-valued FOO are redundant, except for arrays.
They are also a nuisance to work with. Recent commit "qapi: Start to
elide redundant has_FOO in generated C" provided the means to elide
them step by step. This is the step for qapi/block*.json.
Said commit explains the transformation in more detail.
There is one instance of the invariant violation mentioned there:
qcow2_signal_corruption() passes false, "" when node_name is an empty
string. Take care to pass NULL then.
The previous two commits cleaned up two more.
Additionally, helper bdrv_latency_histogram_stats() loses its output
parameters and returns a value instead.
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Hanna Reitz <hreitz@redhat.com>
Cc: qemu-block@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20221104160712.3005652-11-armbru@redhat.com>
[Fixes for #ifndef LIBRBD_SUPPORTS_ENCRYPTION and MacOS squashed in]
Diffstat (limited to 'block/export')
| -rw-r--r-- | block/export/export.c | 2 | ||||
| -rw-r--r-- | block/export/vduse-blk.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/block/export/export.c b/block/export/export.c index 7cc0c25..28a91c9 100644 --- a/block/export/export.c +++ b/block/export/export.c @@ -114,7 +114,7 @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp) ctx = bdrv_get_aio_context(bs); aio_context_acquire(ctx); - if (export->has_iothread) { + if (export->iothread) { IOThread *iothread; AioContext *new_ctx; Error **set_context_errp; diff --git a/block/export/vduse-blk.c b/block/export/vduse-blk.c index f101c24..350d6fd 100644 --- a/block/export/vduse-blk.c +++ b/block/export/vduse-blk.c @@ -265,8 +265,7 @@ static int vduse_blk_exp_create(BlockExport *exp, BlockExportOptions *opts, } vblk_exp->num_queues = num_queues; vblk_exp->handler.blk = exp->blk; - vblk_exp->handler.serial = g_strdup(vblk_opts->has_serial ? - vblk_opts->serial : ""); + vblk_exp->handler.serial = g_strdup(vblk_opts->serial ?: ""); vblk_exp->handler.logical_block_size = logical_block_size; vblk_exp->handler.writable = opts->writable; |