diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-04-05 11:10:50 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-05-19 16:45:31 +0200 |
| commit | b26ded9a7d9709aacdff36e39630acbb87201057 (patch) | |
| tree | af933a967166bb61e6113fd8b34fa2e1a3417064 /blockdev.c | |
| parent | 08e83aabe497b97107e19bd46ac09ebbe6982f7e (diff) | |
| download | qemu-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 'blockdev.c')
| -rw-r--r-- | blockdev.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/blockdev.c b/blockdev.c index 93ddc27307..03ddd3ac6e 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2652,13 +2652,6 @@ void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd, goto out; } - /* The BlockBackend must be the only parent */ - assert(QLIST_FIRST(&bs->parents)); - if (QLIST_NEXT(QLIST_FIRST(&bs->parents), next_parent)) { - error_setg(errp, "Cannot throttle device with multiple parents"); - goto out; - } - throttle_config_init(&cfg); cfg.buckets[THROTTLE_BPS_TOTAL].avg = bps; cfg.buckets[THROTTLE_BPS_READ].avg = bps_rd; |