f1faf2d59c
v2:
* Fixed incorrect virtio_blk_data_plane_create() local_err refactoring in
"hw/block: Use errp directly rather than local_err" that broke virtio-blk
over virtio-mmio [Peter]
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJaOSteAAoJEJykq7OBq3PIllkH/RkxTY6JIe9K8PRVsaAX2fRN
edO/3E09KTQe9eHEixoMKOIyeKi3RPdipcktXIbdLIDEY4z4vELmQslTrxK/q+8J
pccdwu+7tEXr14ciYSnq0m6ksvU5JHlJGyAJEvbCmLHE3dPJszABwT1XLLCb1C8s
hSOr3nR/O2U3LHlq/FuvEUK8fohgKlECtE94V/DUWyC774iMw+9OdvTA0VQWYnN6
B0gpYSn4AXmdt5HmpgCa+5rZrT2DjdwhtR9X+iOItPoXJPP81toUxvshLbTgdL54
fSodd12Tbn2Pxr/osD1kwzM9z6oYX8Ay8YZTabODiFo20fhZKZ2wLpL4rrsNnBk=
=Qcx2
-----END PGP SIGNATURE-----
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request
v2:
* Fixed incorrect virtio_blk_data_plane_create() local_err refactoring in
"hw/block: Use errp directly rather than local_err" that broke virtio-blk
over virtio-mmio [Peter]
# gpg: Signature made Tue 19 Dec 2017 15:08:14 GMT
# 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: (23 commits)
qemu-iotests: add 203 savevm with IOThreads test
iothread: fix iothread_stop() race condition
iotests: add VM.add_object()
blockdev: add x-blockdev-set-iothread force boolean
docs: mark nested AioContext locking as a legacy API
block: avoid recursive AioContext acquire in bdrv_inactivate_all()
virtio-blk: reject configs with logical block size > physical block size
virtio-blk: make queue size configurable
qemu-iotests: add 202 external snapshots IOThread test
blockdev: add x-blockdev-set-iothread testing command
iothread: add iothread_by_id() API
block: drop unused BlockDirtyBitmapState->aio_context field
block: don't keep AioContext acquired after internal_snapshot_prepare()
block: don't keep AioContext acquired after blockdev_backup_prepare()
block: don't keep AioContext acquired after drive_backup_prepare()
block: don't keep AioContext acquired after external_snapshot_prepare()
blockdev: hold AioContext for bdrv_unref() in external_snapshot_clean()
qdev: drop unused #include "sysemu/iothread.h"
dev-storage: Fix the unusual function name
hw/block: Use errp directly rather than local_err
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
# hw/core/qdev-properties-system.c
|
||
|---|---|---|
| .. | ||
| acl.h | ||
| atomic.h | ||
| base64.h | ||
| bcd.h | ||
| bitmap.h | ||
| bitops.h | ||
| bswap.h | ||
| buffer.h | ||
| compiler.h | ||
| config-file.h | ||
| coroutine.h | ||
| coroutine_int.h | ||
| cpuid.h | ||
| crc32c.h | ||
| cutils.h | ||
| envlist.h | ||
| error-report.h | ||
| event_notifier.h | ||
| fifo8.h | ||
| fifo32.h | ||
| fprintf-fn.h | ||
| futex.h | ||
| hbitmap.h | ||
| help_option.h | ||
| host-utils.h | ||
| id.h | ||
| int128.h | ||
| iov.h | ||
| jhash.h | ||
| log.h | ||
| main-loop.h | ||
| memfd.h | ||
| mmap-alloc.h | ||
| module.h | ||
| notify.h | ||
| option.h | ||
| option_int.h | ||
| osdep.h | ||
| path.h | ||
| processor.h | ||
| qdist.h | ||
| qht.h | ||
| queue.h | ||
| range.h | ||
| ratelimit.h | ||
| rcu.h | ||
| rcu_queue.h | ||
| readline.h | ||
| seqlock.h | ||
| sockets.h | ||
| stats64.h | ||
| systemd.h | ||
| thread-posix.h | ||
| thread-win32.h | ||
| thread.h | ||
| throttle-options.h | ||
| throttle.h | ||
| timed-average.h | ||
| timer.h | ||
| typedefs.h | ||
| unicode.h | ||
| uri.h | ||
| uuid.h | ||
| xattr.h | ||