[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/19] block: make bdrv_swap rebuild the bs graph nod
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 07/19] block: make bdrv_swap rebuild the bs graph node list field. |
Date: |
Fri, 7 Mar 2014 14:32:55 +0100 |
From: BenoƮt Canet <address@hidden>
Moving only the node_name one field could lead to some inconsitencies where a
node_name was defined on a bs which was not registered in the graph node list.
bdrv_swap between a named node bs and a non named node bs would lead to this.
bdrv_make_anon would then crash because it would try to remove the bs from the
graph node list while it is not in it.
This patch remove named node bses from the graph node list before doing the swap
then insert them back.
Signed-off-by: Benoit Canet <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/block.c b/block.c
index f01b91c..7330a87 100644
--- a/block.c
+++ b/block.c
@@ -1847,11 +1847,6 @@ static void bdrv_move_feature_fields(BlockDriverState
*bs_dest,
pstrcpy(bs_dest->device_name, sizeof(bs_dest->device_name),
bs_src->device_name);
bs_dest->device_list = bs_src->device_list;
-
- /* keep the same entry in graph_bdrv_states
- * We do want to swap name but don't want to swap linked list entries
- */
- bs_dest->node_list = bs_src->node_list;
}
/*
@@ -1870,6 +1865,17 @@ void bdrv_swap(BlockDriverState *bs_new,
BlockDriverState *bs_old)
{
BlockDriverState tmp;
+ /* The code needs to swap the node_name but simply swapping node_list won't
+ * work so first remove the nodes from the graph list, do the swap then
+ * insert them back if needed.
+ */
+ if (bs_new->node_name[0] != '\0') {
+ QTAILQ_REMOVE(&graph_bdrv_states, bs_new, node_list);
+ }
+ if (bs_old->node_name[0] != '\0') {
+ QTAILQ_REMOVE(&graph_bdrv_states, bs_old, node_list);
+ }
+
/* bs_new must be anonymous and shouldn't have anything fancy enabled */
assert(bs_new->device_name[0] == '\0');
assert(QLIST_EMPTY(&bs_new->dirty_bitmaps));
@@ -1898,6 +1904,14 @@ void bdrv_swap(BlockDriverState *bs_new,
BlockDriverState *bs_old)
assert(bs_new->io_limits_enabled == false);
assert(!throttle_have_timer(&bs_new->throttle_state));
+ /* insert the nodes back into the graph node list if needed */
+ if (bs_new->node_name[0] != '\0') {
+ QTAILQ_INSERT_TAIL(&graph_bdrv_states, bs_new, node_list);
+ }
+ if (bs_old->node_name[0] != '\0') {
+ QTAILQ_INSERT_TAIL(&graph_bdrv_states, bs_old, node_list);
+ }
+
bdrv_rebind(bs_new);
bdrv_rebind(bs_old);
}
--
1.8.1.4
- [Qemu-devel] [PULL 00/19] Block patches, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 01/19] gluster: Change licence to GPLv2+, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 03/19] qemu-img convert: Fix progress output, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 04/19] qemu-iotests: Test progress output for conversion, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 02/19] gluster: Remove unused defines and header include, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 05/19] iscsi: Use bs->sg for everything else than disks, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 06/19] block: Fix bs->request_alignment assertion for bs->sg=1, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 07/19] block: make bdrv_swap rebuild the bs graph node list field.,
Kevin Wolf <=
- [Qemu-devel] [PULL 08/19] block: mirror - remove code cruft that has no function, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 09/19] block: Keep "filename" option after parsing, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 10/19] block/raw-posix: Implement bdrv_parse_filename(), Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 12/19] block/raw-win32: Implement bdrv_parse_filename(), Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 11/19] block/raw-posix: Strip "file:" prefix on creation, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 13/19] block/raw-win32: Strip "file:" prefix on creation, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 15/19] blockdev: Fix NULL pointer dereference in blockdev-add, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 16/19] qemu-iotests: Test a few blockdev-add error cases, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 14/19] blockdev: Fail blockdev-add with encrypted images, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 17/19] block: Fix error path segfault in bdrv_open(), Kevin Wolf, 2014/03/07