Clean up the remainders of bdrv_swap
v2 cover Clean up the remainders of bdrv_swap
v2: Update comment in patch 2. [Kevin]
Fam Zheng (2):
block: Remove prototype of bdrv_swap from header
iotests: Update comments for bdrv_swap() in 094
include/block/block.h | 1 - tests/qemu-iotests/094 | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-)
Signature · 1 line
2.4.3
PATCH v2 1/2 block: Remove prototype of bdrv_swap from header
The function has gone.
Signed-off-by Fam Zheng <[email protected]>
--- include/block/block.h | 1 - 1 file changed, 1 deletion(-)
include/block/block.h +0 -1
@@ -197,7 +197,6 @@ int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp);BlockDriverState *bdrv_new_root (void );BlockDriverState *bdrv_new (void );void bdrv_make_anon (BlockDriverState *bs); -void bdrv_swap (BlockDriverState *bs_new,BlockDriverState *bs_old);void bdrv_append (BlockDriverState *bs_new,BlockDriverState *bs_top);void bdrv_replace_in_backing_chain (BlockDriverState *old,BlockDriverState *new);
Signature · 1 line
2.4.3
PATCH v2 2/2 iotests: Update comments for bdrv_swap() in 094
In reply to Fam ZhengSigned-off-by Fam Zheng <[email protected]>
--- tests/qemu-iotests/094 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
tests/qemu-iotests/094 +5 -3
@@ -1,6 +1,6 @@ #!/bin/bash # -# Test case for drive-mirror to NBD (especially bdrv_swap() on NBD BDS) +# Test case for drive-mirror to NBD # # Copyright (C) 2015 Red Hat, Inc. #
@@ -50,8 +50,10 @@ _send_qemu_cmd $QEMU_HANDLE \ "{'execute': 'qmp_capabilities'}" \ 'return' -# 'format': 'nbd' is not actually "correct", but this is probably the only way -# to test bdrv_swap() on an NBD BDS +# 'format': 'nbd' is not actually "correct", but this was the only way to +# test the bug fixed in commit f53a829. Though the bug's related code +# bdrv_swap() was replaced later, let's make sure we don't fall in the same +# pit again. _send_qemu_cmd $QEMU_HANDLE \ "{'execute': 'drive-mirror', 'arguments': {'device': 'src',
Signature · 1 line
2.4.3
Kevin Wolf
AppliedAm 18.12.2015 um 02:04 hat Fam Zheng geschrieben:
Quoted 11 lines
v2: Update comment in patch 2. [Kevin]
Fam Zheng (2):
block: Remove prototype ofbdrv_swapfrom header
iotests: Update comments forbdrv_swap()in 094include/block/block.h | 1 - tests/qemu-iotests/094 | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-)
Thanks, applied to the block branch.
Kevin