diff options
author | Kevin Wolf | 2016-03-21 10:49:51 +0100 |
---|---|---|
committer | Kevin Wolf | 2016-05-19 16:45:29 +0200 |
commit | a5614993d79584af93bb845f69f59872b3f76cf8 (patch) | |
tree | e511d519aeb53d92c3f334d7f912c988a19cdfbd /tests | |
parent | Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-05-1... (diff) | |
download | qemu-a5614993d79584af93bb845f69f59872b3f76cf8.tar.gz qemu-a5614993d79584af93bb845f69f59872b3f76cf8.tar.xz qemu-a5614993d79584af93bb845f69f59872b3f76cf8.zip |
block: Make sure throttled BDSes always have a BB
It was already true in principle that a throttled BDS always has a BB
attached, except that the order of operations while attaching or
detaching a BDS to/from a BB wasn't careful enough.
This commit breaks graph manipulations while I/O throttling is enabled.
It would have been possible to keep things working with some temporary
hacks, but quite cumbersome, so it's not worth the hassle. We'll fix
things again in a minute.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test-throttle.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/test-throttle.c b/tests/test-throttle.c index 744a524368..77b95d6380 100644 --- a/tests/test-throttle.c +++ b/tests/test-throttle.c @@ -574,11 +574,16 @@ static void test_accounting(void) static void test_groups(void) { ThrottleConfig cfg1, cfg2; + BlockBackend *blk1, *blk2, *blk3; BlockDriverState *bdrv1, *bdrv2, *bdrv3; - bdrv1 = bdrv_new(); - bdrv2 = bdrv_new(); - bdrv3 = bdrv_new(); + blk1 = blk_new_with_bs(&error_abort); + blk2 = blk_new_with_bs(&error_abort); + blk3 = blk_new_with_bs(&error_abort); + + bdrv1 = blk_bs(blk1); + bdrv2 = blk_bs(blk2); + bdrv3 = blk_bs(blk3); g_assert(bdrv1->throttle_state == NULL); g_assert(bdrv2->throttle_state == NULL); |