diff options
| author | Vladimir Sementsov-Ogievskiy | 2022-03-14 22:32:24 +0100 |
|---|---|---|
| committer | Eric Blake | 2022-04-26 20:13:50 +0200 |
| commit | 1466ef6cbe26a55e9bd5d4c3d9f58c793e1eb2c4 (patch) | |
| tree | daac17e25ccf613bbd7d947545c87a2ba9a0390c /qemu-img.c | |
| parent | Merge tag 'trivial-branch-for-7.1-pull-request' of https://gitlab.com/laurent... (diff) | |
| download | qemu-1466ef6cbe26a55e9bd5d4c3d9f58c793e1eb2c4.tar.gz qemu-1466ef6cbe26a55e9bd5d4c3d9f58c793e1eb2c4.tar.xz qemu-1466ef6cbe26a55e9bd5d4c3d9f58c793e1eb2c4.zip | |
qapi: rename BlockDirtyBitmapMergeSource to BlockDirtyBitmapOrStr
Rename the type to be reused. Old name is "what is it for". To be
natively reused for other needs, let's name it exactly "what is it".
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@openvz.org>
Message-Id: <20220314213226.362217-2-v.sementsov-og@mail.ru>
[eblake: Adjust S-o-b to Vladimir's new email, with permission]
Reviewed-by: Eric Blake <eblake@redhat.com>
Acked-by: John Snow <jsnow@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'qemu-img.c')
| -rw-r--r-- | qemu-img.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qemu-img.c b/qemu-img.c index 4c84134a1e..4cf4d2423d 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1623,16 +1623,16 @@ static void do_dirty_bitmap_merge(const char *dst_node, const char *dst_name, const char *src_node, const char *src_name, Error **errp) { - BlockDirtyBitmapMergeSource *merge_src; - BlockDirtyBitmapMergeSourceList *list = NULL; + BlockDirtyBitmapOrStr *merge_src; + BlockDirtyBitmapOrStrList *list = NULL; - merge_src = g_new0(BlockDirtyBitmapMergeSource, 1); + merge_src = g_new0(BlockDirtyBitmapOrStr, 1); merge_src->type = QTYPE_QDICT; merge_src->u.external.node = g_strdup(src_node); merge_src->u.external.name = g_strdup(src_name); QAPI_LIST_PREPEND(list, merge_src); qmp_block_dirty_bitmap_merge(dst_node, dst_name, list, errp); - qapi_free_BlockDirtyBitmapMergeSourceList(list); + qapi_free_BlockDirtyBitmapOrStrList(list); } enum ImgConvertBlockStatus { |