* [Qemu-devel] [PATCH v2 0/2] Clean up the remainders of bdrv_swap
@ 2015-12-18 1:04 Fam Zheng
2015-12-18 1:04 ` [Qemu-devel] [PATCH v2 1/2] block: Remove prototype of bdrv_swap from header Fam Zheng
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Fam Zheng @ 2015-12-18 1:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Kevin Wolf, qemu-block
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(-)
--
2.4.3
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH v2 1/2] block: Remove prototype of bdrv_swap from header
2015-12-18 1:04 [Qemu-devel] [PATCH v2 0/2] Clean up the remainders of bdrv_swap Fam Zheng
@ 2015-12-18 1:04 ` Fam Zheng
2015-12-18 1:04 ` [Qemu-devel] [PATCH v2 2/2] iotests: Update comments for bdrv_swap() in 094 Fam Zheng
2015-12-18 12:01 ` [Qemu-devel] [PATCH v2 0/2] Clean up the remainders of bdrv_swap Kevin Wolf
2 siblings, 0 replies; 4+ messages in thread
From: Fam Zheng @ 2015-12-18 1:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Kevin Wolf, qemu-block
The function has gone.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
include/block/block.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/block/block.h b/include/block/block.h
index d048bbf..a36975a 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -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);
--
2.4.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH v2 2/2] iotests: Update comments for bdrv_swap() in 094
2015-12-18 1:04 [Qemu-devel] [PATCH v2 0/2] Clean up the remainders of bdrv_swap Fam Zheng
2015-12-18 1:04 ` [Qemu-devel] [PATCH v2 1/2] block: Remove prototype of bdrv_swap from header Fam Zheng
@ 2015-12-18 1:04 ` Fam Zheng
2015-12-18 12:01 ` [Qemu-devel] [PATCH v2 0/2] Clean up the remainders of bdrv_swap Kevin Wolf
2 siblings, 0 replies; 4+ messages in thread
From: Fam Zheng @ 2015-12-18 1:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Kevin Wolf, qemu-block
Signed-off-by: Fam Zheng <famz@redhat.com>
---
tests/qemu-iotests/094 | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
index 27a2be2..57a68f8 100755
--- a/tests/qemu-iotests/094
+++ b/tests/qemu-iotests/094
@@ -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',
--
2.4.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/2] Clean up the remainders of bdrv_swap
2015-12-18 1:04 [Qemu-devel] [PATCH v2 0/2] Clean up the remainders of bdrv_swap Fam Zheng
2015-12-18 1:04 ` [Qemu-devel] [PATCH v2 1/2] block: Remove prototype of bdrv_swap from header Fam Zheng
2015-12-18 1:04 ` [Qemu-devel] [PATCH v2 2/2] iotests: Update comments for bdrv_swap() in 094 Fam Zheng
@ 2015-12-18 12:01 ` Kevin Wolf
2 siblings, 0 replies; 4+ messages in thread
From: Kevin Wolf @ 2015-12-18 12:01 UTC (permalink / raw)
To: Fam Zheng; +Cc: qemu-devel, qemu-block
Am 18.12.2015 um 02:04 hat Fam Zheng geschrieben:
> 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(-)
Thanks, applied to the block branch.
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-12-18 12:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-18 1:04 [Qemu-devel] [PATCH v2 0/2] Clean up the remainders of bdrv_swap Fam Zheng
2015-12-18 1:04 ` [Qemu-devel] [PATCH v2 1/2] block: Remove prototype of bdrv_swap from header Fam Zheng
2015-12-18 1:04 ` [Qemu-devel] [PATCH v2 2/2] iotests: Update comments for bdrv_swap() in 094 Fam Zheng
2015-12-18 12:01 ` [Qemu-devel] [PATCH v2 0/2] Clean up the remainders of bdrv_swap Kevin Wolf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.