aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-04-05 12:49:10 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-04-05 12:49:10 -0500
commit5098699a51756f7e8934dc035112c8f8aa2a0ec3 (patch)
tree19bebb098d1cbd0b4e811f2d7ef20979ecab987a /include
parent150a470b64c548b7539ea47526f345f15ebac355 (diff)
parentc2b6ff51e4a3ad1f7ec5dbc94970e9778b31d718 (diff)
Merge remote-tracking branch 'kwolf/for-anthony' into staging
# By Stefan Hajnoczi (4) and Kevin Wolf (3) # Via Kevin Wolf * kwolf/for-anthony: qcow2: Fix L1 write error handling in qcow2_update_snapshot_refcount qcow2: Return real error in qcow2_update_snapshot_refcount block: clean up I/O throttling wait_time code block: drop duplicated slice extension code block: keep I/O throttling slice time constant block: fix I/O throttling accounting blind spot usb-storage: Forward serial number to scsi-disk
Diffstat (limited to 'include')
-rw-r--r--include/block/block_int.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 0986a2d6ac..9aa98b5d12 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -252,11 +252,10 @@ struct BlockDriverState {
unsigned int copy_on_read_in_flight;
/* the time for latest disk I/O */
- int64_t slice_time;
int64_t slice_start;
int64_t slice_end;
BlockIOLimit io_limits;
- BlockIOBaseValue io_base;
+ BlockIOBaseValue slice_submitted;
CoQueue throttled_reqs;
QEMUTimer *block_timer;
bool io_limits_enabled;