summary refs log tree commit diff stats
path: root/util/qemu-coroutine-sleep.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-11-18 17:06:17 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-11-18 17:06:17 +0000
commita5c2a235103ab366ad5318636ec138e52c6dcfa4 (patch)
tree803b176647a9894516d862e436de458cecb2d35b /util/qemu-coroutine-sleep.c
parent1bd0f1c9c149c2fb738f381099cec7ad0ee224a9 (diff)
parentb1f6a8e180367c945b67c6c9bbcec5c856be3779 (diff)
downloadfocaccia-qemu-a5c2a235103ab366ad5318636ec138e52c6dcfa4.tar.gz
focaccia-qemu-a5c2a235103ab366ad5318636ec138e52c6dcfa4.zip
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:

- Fix HMP savevm with -blockdev
- Minor iotests improvements

# gpg: Signature made Mon 18 Nov 2019 16:51:56 GMT
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  iotests: Test multiple blockdev-snapshot calls
  block: Remove 'backing': null from bs->{explicit_,}options
  iotests: Fix "no qualified output" error path
  qemu-iotests/iotests.py: improve assert_qmp message

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