diff options
| author | Peter Maydell | 2019-03-19 17:27:14 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-03-19 17:27:14 +0100 |
| commit | e0991e2616f70ec382db0f944c61f420e272e539 (patch) | |
| tree | c0588dc2a1d816a43147eb9c7a2dfc4fb4539459 /hw/timer/slavio_timer.c | |
| parent | Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20190319' into st... (diff) | |
| parent | qemu-iotests: Treat custom TEST_DIR in 051 (diff) | |
| download | qemu-e0991e2616f70ec382db0f944c61f420e272e539.tar.gz qemu-e0991e2616f70ec382db0f944c61f420e272e539.tar.xz qemu-e0991e2616f70ec382db0f944c61f420e272e539.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:
- mirror: Fix early return from drain (could cause deadlocks)
- vmdk: Fixed probing for version 3 images
- vl: Fix to create migration object before block backends again (fixes
segfault for block drivers that set migration blockers)
- Several minor fixes, documentation and test case improvements
# gpg: Signature made Tue 19 Mar 2019 14:59:17 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:
qemu-iotests: Treat custom TEST_DIR in 051
blockdev: Check @replaces in blockdev_mirror_common
block: Make bdrv_{copy_on_read,crypto_luks,replication} static
blockjob: fix user pause in block_job_error_action
qemu-iotests: Fix 232 for non-qcow2
vl: Fix to create migration object before block backends again
iotests: 153: Wait for an answer to QMP commands
block: Silence Coverity in bdrv_drop_intermediate()
vmdk: Support version=3 in VMDK descriptor files
qapi: fix block-latency-histogram-set description and examples
qcow2: Fix data file error condition in qcow2_co_create()
mirror: Confirm we're quiesced only if the job is paused or cancelled
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/timer/slavio_timer.c')
0 files changed, 0 insertions, 0 deletions