diff options
| author | Peter Maydell | 2015-04-09 13:05:00 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-04-09 13:05:00 +0200 |
| commit | a6f2cb037a82fb8679e70e175cfbc879dd829e06 (patch) | |
| tree | 2474354310450cbe8857870456a83a0eb92fedc0 /include | |
| parent | tcg/tcg-op.c: Fix ld/st of 64 bit values on 32-bit bigendian hosts (diff) | |
| parent | block/iscsi: handle zero events from iscsi_which_events (diff) | |
| download | qemu-a6f2cb037a82fb8679e70e175cfbc879dd829e06.tar.gz qemu-a6f2cb037a82fb8679e70e175cfbc879dd829e06.tar.xz qemu-a6f2cb037a82fb8679e70e175cfbc879dd829e06.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Thu Apr 9 10:55:11 2015 BST 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:
block/iscsi: handle zero events from iscsi_which_events
aio: strengthen memory barriers for bottom half scheduling
virtio-blk: correctly dirty guest memory
qcow2: Fix header update with overridden backing file
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/virtio/virtio-blk.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h index b3ffcd96b8..6bf5905c52 100644 --- a/include/hw/virtio/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -67,6 +67,7 @@ typedef struct VirtIOBlockReq { struct virtio_blk_inhdr *in; struct virtio_blk_outhdr out; QEMUIOVector qiov; + size_t in_len; struct VirtIOBlockReq *next; struct VirtIOBlockReq *mr_next; BlockAcctCookie acct; |