summary refs log tree commit diff stats
path: root/include/hw/virtio/virtio-net.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-06-30 16:29:51 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-06-30 16:29:51 +0100
commit82d76dc7fc19a5eb9f731d7faed1792bb97214e0 (patch)
tree264c6521046007c6bd8ea2358c06b75a22371e85 /include/hw/virtio/virtio-net.h
parent6db174aed1f70215b681aaf3a6a9e23e2c7ba86d (diff)
parentc61e684e44272f2acb2bef34cf2aa234582a73a9 (diff)
downloadfocaccia-qemu-82d76dc7fc19a5eb9f731d7faed1792bb97214e0.tar.gz
focaccia-qemu-82d76dc7fc19a5eb9f731d7faed1792bb97214e0.zip
Merge remote-tracking branch 'remotes/famz/tags/block-pull-request' into staging
# gpg: Signature made Fri 30 Jun 2017 15:08:45 BST
# gpg:                using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/block-pull-request:
  block: Exploit BDRV_BLOCK_EOF for larger zero blocks
  block: Add BDRV_BLOCK_EOF to bdrv_get_block_status()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/virtio/virtio-net.h')
0 files changed, 0 insertions, 0 deletions