diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-26 07:44:39 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-26 07:44:39 -0600 |
| commit | 864a556e9a800116a305f10fbb714268ca7e9bc3 (patch) | |
| tree | c9e5fdc33d2a1be16446c7504106b4f128e3d0cd /hw/block-common.h | |
| parent | 9a1d7f00efd4b69f051d4223a70ca91af0ccb19d (diff) | |
| parent | bf3caa3dc17552b323cec6831301a22cfc98ecd5 (diff) | |
| download | hqemu-864a556e9a800116a305f10fbb714268ca7e9bc3.zip hqemu-864a556e9a800116a305f10fbb714268ca7e9bc3.tar.gz | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
# By Paolo Bonzini (7) and others
# Via Kevin Wolf
* kwolf/for-anthony: (22 commits)
pc: add compatibility machine types for 1.4
blockdev: enable discard by default
qemu-nbd: add --discard option
blockdev: add discard suboption to -drive
block: implement BDRV_O_UNMAP
block: complete all IOs before .bdrv_truncate
coroutine: trim down nesting level in perf_nesting test
coroutine: move pooling to common code
qemu-iotests: Test qcow2 image creation options
qemu-iotests: Add qemu-img compare test
qemu-img: Add compare subcommand
qemu-img: Add "Quiet mode" option
block: Add synchronous wrapper for bdrv_co_is_allocated_above
block: refuse negative iops and bps values
block: use Error in do_check_io_limits()
qcow2: support compressed clusters in BlockFragInfo
qemu-img: add compressed clusters to BlockFragInfo
qemu-img: fix missing space in qemu-img check output
qcow2: record fragmentation statistics during check
qcow2: introduce check_refcounts_l1/l2() flags
...
Diffstat (limited to 'hw/block-common.h')
| -rw-r--r-- | hw/block-common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/block-common.h b/hw/block-common.h index bb808f7..dd11532 100644 --- a/hw/block-common.h +++ b/hw/block-common.h @@ -50,7 +50,7 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf) DEFINE_PROP_UINT32("opt_io_size", _state, _conf.opt_io_size, 0), \ DEFINE_PROP_INT32("bootindex", _state, _conf.bootindex, -1), \ DEFINE_PROP_UINT32("discard_granularity", _state, \ - _conf.discard_granularity, 0) + _conf.discard_granularity, -1) #define DEFINE_BLOCK_CHS_PROPERTIES(_state, _conf) \ DEFINE_PROP_UINT32("cyls", _state, _conf.cyls, 0), \ |
