diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-12-22 14:21:42 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-12-22 14:21:42 +0000 |
| commit | 5dc42c186d63b7b338594fc071cf290805dcc5a5 (patch) | |
| tree | c98e0d705360b381f0a26dea66b5c8d362e31813 /include | |
| parent | c595b21888705dc28f36808e2e87f4c09d1b6a7f (diff) | |
| parent | 723697551a7e926abe7d3c7f2966012b8075143d (diff) | |
| download | qemu-5dc42c186d63b7b338594fc071cf290805dcc5a5.zip qemu-5dc42c186d63b7b338594fc071cf290805dcc5a5.tar.gz qemu-5dc42c186d63b7b338594fc071cf290805dcc5a5.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Tue 22 Dec 2015 08:52:55 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/block-pull-request:
sdhci: add optional quirk property to disable card insertion/removal interrupts
sdhci: don't raise a command index error for an unexpected response
sd: sdhci: Delete over-zealous power check
scripts/gdb: Fix a python exception in mtree.py
parallels: add format spec
block/mirror: replace IOV_MAX with blk_get_max_iov()
block: replace IOV_MAX with BlockLimits.max_iov
block-backend: add blk_get_max_iov()
block: add BlockLimits.max_iov field
virtio-blk: trivial code optimization
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block_int.h | 3 | ||||
| -rw-r--r-- | include/hw/sd/sdhci.h | 1 | ||||
| -rw-r--r-- | include/sysemu/block-backend.h | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/include/block/block_int.h b/include/block/block_int.h index 9a1c466..256609d 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -330,6 +330,9 @@ typedef struct BlockLimits { /* memory alignment for bounce buffer */ size_t opt_mem_alignment; + + /* maximum number of iovec elements */ + int max_iov; } BlockLimits; typedef struct BdrvOpBlocker BdrvOpBlocker; diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index e78d938..ffd1f80 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -77,6 +77,7 @@ typedef struct SDHCIState { uint32_t buf_maxsz; uint16_t data_count; /* current element in FIFO buffer */ uint8_t stopped_state;/* Current SDHC state */ + bool noeject_quirk;/* Quirk to disable card insert/remove interrupts */ /* Buffer Data Port Register - virtual access point to R and W buffers */ /* Software Reset Register - always reads as 0 */ /* Force Event Auto CMD12 Error Interrupt Reg - write only */ diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index fb068ea4..dc24476 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -146,6 +146,7 @@ void blk_lock_medium(BlockBackend *blk, bool locked); void blk_eject(BlockBackend *blk, bool eject_flag); int blk_get_flags(BlockBackend *blk); int blk_get_max_transfer_length(BlockBackend *blk); +int blk_get_max_iov(BlockBackend *blk); void blk_set_guest_block_size(BlockBackend *blk, int align); void *blk_blockalign(BlockBackend *blk, size_t size); bool blk_op_is_blocked(BlockBackend *blk, BlockOpType op, Error **errp); |