summaryrefslogtreecommitdiff
path: root/block.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2016-04-05 11:10:50 +0200
committerKevin Wolf <kwolf@redhat.com>2016-05-19 16:45:31 +0200
commitb26ded9a7d9709aacdff36e39630acbb87201057 (patch)
treeaf933a967166bb61e6113fd8b34fa2e1a3417064 /block.c
parent08e83aabe497b97107e19bd46ac09ebbe6982f7e (diff)
downloadqemu-b26ded9a7d9709aacdff36e39630acbb87201057.tar.gz
Revert "block: Forbid I/O throttling on nodes with multiple parents for 2.6"
This reverts commit 76b223200ef4fb09dd87f0e213159795eb68e7a5. Now that I/O throttling is fully done on the BlockBackend level, there is no reason any more to block I/O throttling for nodes with multiple parents as the parents don't influence each other any more. Conflicts: block.c Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block.c')
-rw-r--r--block.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/block.c b/block.c
index 39f14c7397..cedbd7061b 100644
--- a/block.c
+++ b/block.c
@@ -1522,12 +1522,6 @@ static int bdrv_open_inherit(BlockDriverState **pbs, const char *filename,
return -ENODEV;
}
- if (bs->blk && blk_get_public(bs->blk)->throttle_state) {
- error_setg(errp, "Cannot reference an existing block device for "
- "which I/O throttling is enabled");
- return -EINVAL;
- }
-
bdrv_ref(bs);
*pbs = bs;
return 0;