diff options
| author | Peter Maydell | 2017-06-30 14:26:41 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-06-30 14:26:41 +0200 |
| commit | 0912d0f2c719e029c5101eacaacbaf2c755be099 (patch) | |
| tree | b3650273b353d450c5f8b3589bef0ff8f51e748d /include | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.10-20170630' int... (diff) | |
| parent | virtio-pci: use ioeventfd even when KVM is disabled (diff) | |
| download | qemu-0912d0f2c719e029c5101eacaacbaf2c755be099.tar.gz qemu-0912d0f2c719e029c5101eacaacbaf2c755be099.tar.xz qemu-0912d0f2c719e029c5101eacaacbaf2c755be099.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Fri 30 Jun 2017 12:46:17 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-pci: use ioeventfd even when KVM is disabled
tests: fix virtio-net-test ISR dependence
tests: fix virtio-blk-test ISR dependence
tests: fix virtio-scsi-test ISR dependence
libqos: add virtio used ring support
libqos: fix typo in virtio.h QVirtQueue->used comment
virtio-blk: trace vdev so devices can be distinguished
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions