summary refs log tree commit diff stats
path: root/include/qemu-common.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-06-25 11:19:46 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-06-25 11:19:46 +0100
commit58e8b33518fd2bb6dce0ba7b6347c3df85aea3c6 (patch)
treee8f83cad0fde87e681eb7eb645e1854e28f4fdcd /include/qemu-common.h
parent355df30554445c043a12168e9c5f912742050548 (diff)
parent12048545019cd1d64c8147ea9277648e685fa489 (diff)
downloadfocaccia-qemu-58e8b33518fd2bb6dce0ba7b6347c3df85aea3c6.tar.gz
focaccia-qemu-58e8b33518fd2bb6dce0ba7b6347c3df85aea3c6.zip
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Wed Jun 24 16:27:53 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:
  virito-blk: drop duplicate check
  qemu-iotests: fix 051.out after qdev error message change
  iov: don't touch iov in iov_send_recv()
  raw-posix: Introduce hdev_is_sg()
  raw-posix: Use DPRINTF for DEBUG_FLOPPY
  raw-posix: DPRINTF instead of DEBUG_BLOCK_PRINT
  Fix migration in case of scsi-generic
  block: Use bdrv_is_sg() everywhere
  nvme: Fix memleak in nvme_dma_read_prp
  vvfat: add a label option
  util/hbitmap: Add an API to reset all set bits in hbitmap
  virtio-blk: Use blk_drain() to drain IO requests
  block-backend: Introduce blk_drain()
  throttle: Check current timers before updating any_timer_armed[]
  block: Let bdrv_drain_all() to call aio_poll() for each AioContext

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