Clean up the remainders of bdrv_swap
cover Clean up the remainders of bdrv_swap
Fam Zheng (2):
block: Remove prototype of bdrv_swap from header
iotests: Don't mention bdrv_swap in comments
include/block/block.h | 1 - tests/qemu-iotests/094 | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-)
Signature · 1 line
2.4.3
PATCH 1/2 block: Remove prototype of bdrv_swap from header
The function has gone.
--- 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 2/2 iotests: Don't mention bdrv_swap in comments
In reply to Fam Zheng--- tests/qemu-iotests/094 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
tests/qemu-iotests/094 +1 -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,6 @@ _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 _send_qemu_cmd $QEMU_HANDLE \ "{'execute': 'drive-mirror', 'arguments': {'device': 'src',
Signature · 1 line
2.4.3
Re: [Qemu-devel] [PATCH 2/2] iotests: Don't mention bdrv_swap in comments
Am 17.12.2015 um 06:09 hat Fam Zheng geschrieben:
Quoted 18 lines
Signed-off-by Fam Zheng <[email protected]>--- tests/qemu-iotests/094 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)tests/qemu-iotests/094 +1
-1@@ -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. #
tests/qemu-iotests/094 _send_qemu_cmd $QEMU_HANDLE \ · line 55
Quoted 8 lines
tests/qemu-iotests/094 +0
-2@@ -50,8 +50,6 @@ _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 _send_qemu_cmd $QEMU_HANDLE \ "{'execute': 'drive-mirror', 'arguments': {'device': 'src',
Just completely removing the comment doesn't seem right to me if we leave the "bad" option around.
The test seems to be a regression test for what was fixed in commit f53a829, i.e. a direct effect of bdrv_swap(). This effect can't exist any more, so we would keep the test just for some additional coverage for NBD. Do we still need 'format': 'nbd' (if so, with a comment why we do that) or should we make it 'raw' now?
Kevin
Re: [Qemu-devel] [PATCH 2/2] iotests: Don't mention bdrv_swap in comments
Quoted 31 lines · Kevin Wolf
Am 17.12.2015 um 06:09 hat Fam Zheng geschrieben:
Quoted 18 lines
Signed-off-by Fam Zheng <[email protected]>--- tests/qemu-iotests/094 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)tests/qemu-iotests/094 +1
-1@@ -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. #tests/qemu-iotests/094 _send_qemu_cmd $QEMU_HANDLE \ · line 55
Quoted 8 lines
tests/qemu-iotests/094 +0
-2@@ -50,8 +50,6 @@ _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 _send_qemu_cmd $QEMU_HANDLE \ "{'execute': 'drive-mirror', 'arguments': {'device': 'src',Just completely removing the comment doesn't seem right to me if we leave the "bad" option around.
Quoted 6 lines
The test seems to be a regression test for what was fixed in commit f53a829, i.e. a direct effect of
bdrv_swap(). This effect can't exist any more, so we would keep the test just for some additional coverage for NBD. Do we still need 'format': 'nbd' (if so, with a comment why we do that) or should we make it 'raw' now?
I prefer keeping it as is, because making it raw would spoil the purpose as a regression test (the fix was on nbd).
Can we re-comment it as below?
# '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.
Fam
Re: [Qemu-devel] [PATCH 2/2] iotests: Don't mention bdrv_swap in comments
Am 17.12.2015 um 13:44 hat Fam Zheng geschrieben:
Quoted 42 lines · Kevin Wolf
Quoted 31 lines
Am 17.12.2015 um 06:09 hat Fam Zheng geschrieben:
Quoted 18 lines
Signed-off-by Fam Zheng <[email protected]>--- tests/qemu-iotests/094 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)tests/qemu-iotests/094 +1
-1@@ -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. #tests/qemu-iotests/094 _send_qemu_cmd $QEMU_HANDLE \ · line 55
Quoted 8 lines
tests/qemu-iotests/094 +0
-2@@ -50,8 +50,6 @@ _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 _send_qemu_cmd $QEMU_HANDLE \ "{'execute': 'drive-mirror', 'arguments': {'device': 'src',Just completely removing the comment doesn't seem right to me if we leave the "bad" option around.
Quoted 6 lines
The test seems to be a regression test for what was fixed in commit f53a829, i.e. a direct effect of
bdrv_swap(). This effect can't exist any more, so we would keep the test just for some additional coverage for NBD. Do we still need 'format': 'nbd' (if so, with a comment why we do that) or should we make it 'raw' now?I prefer keeping it as is, because making it raw would spoil the purpose as a regression test (the fix was on nbd).
Quoted 6 lines
Can we re-comment it as below?
# '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.
That's fine with me.
Kevin
Re: [Qemu-devel] [PATCH 2/2] iotests: Don't mention bdrv_swap in comments
In reply to Kevin WolfQuoted 8 lines · Kevin Wolf
Quoted 5 lines
tests/qemu-iotests/094 _send_qemu_cmd $QEMU_HANDLE \ · line 55
Quoted 5 lines
tests/qemu-iotests/094 +0
-2-# 'format': 'nbd' is not actually "correct", but this is probably the only way -# to test bdrv_swap() on an NBD BDS _send_qemu_cmd $QEMU_HANDLE \ "{'execute': 'drive-mirror', 'arguments': {'device': 'src',Just completely removing the comment doesn't seem right to me if we leave the "bad" option around.
Quoted 5 lines
The test seems to be a regression test for what was fixed in commit f53a829, i.e. a direct effect of
bdrv_swap(). This effect can't exist any more, so we would keep the test just for some additional coverage for NBD. Do we still need 'format': 'nbd' (if so, with a comment why we do that) or should we make it 'raw' now?
Some coverage of no-format BDSes is nice to have, since raw is sometimes measurably slower than no format at all.
Paolo