diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-28 14:27:21 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-28 14:27:21 +0100 |
| commit | 12c8720d8ff3ad1a04a1202ed15958cab03b6c1e (patch) | |
| tree | 33fcc207eb07f8d5136f0103cf40e98b80e65a2f /hw/sh4 | |
| parent | 40428feaeb9708f1bc5b2582d9f071a3db907c07 (diff) | |
| parent | 2f2705908fc4b7be868d45b7b02159fb243a8457 (diff) | |
| download | qemu-12c8720d8ff3ad1a04a1202ed15958cab03b6c1e.zip qemu-12c8720d8ff3ad1a04a1202ed15958cab03b6c1e.tar.gz qemu-12c8720d8ff3ad1a04a1202ed15958cab03b6c1e.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Tue 28 Jun 2016 14:23:24 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
virtio-blk: add num-queues device property
virtio-blk: dataplane multiqueue support
virtio-blk: live migrate s->rq with multiqueue
virtio-blk: associate request with a virtqueue
virtio-blk: tell dataplane which vq to notify
virtio-blk: multiqueue batch notify
virtio-blk: add VirtIOBlockConf->num_queues
dma-helpers: dma_blk_io() cancel support
Revert "virtio: sync the dataplane vring state to the virtqueue before virtio_save"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/sh4')
0 files changed, 0 insertions, 0 deletions