Peter Maydell f1faf2d59c 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] -----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		2017-12-20 11:30:55 +00:00
..
acl.c
aio-posix.c	aio-posix: drop QEMU_AIO_POLL_MAX_NS env var	2017-11-06 11:04:38 +00:00
aio-win32.c	util/aio-win32: Only select on what we are actually waiting for	2017-07-17 15:58:37 +01:00
aiocb.c
async.c	coroutine: abort if we try to schedule or enter a pending coroutine	2017-11-21 11:58:07 -05:00
base64.c
bitmap.c	bitmap: provide to_le/from_le helpers	2017-09-22 14:11:25 +02:00
bitops.c	bitmap: remove BITOP_WORD()	2017-09-22 14:11:23 +02:00
buffer.c
bufferiszero.c	util: Introduce include/qemu/cpuid.h	2017-07-24 12:42:55 +01:00
cacheinfo.c	configure: Drop AIX host support	2017-09-07 19:02:30 +01:00
compatfd.c
coroutine-sigaltstack.c
coroutine-ucontext.c
coroutine-win32.c
crc32c.c
cutils.c	Convert remaining single line fprintf() to warn_report()	2017-09-19 16:20:49 +02:00
envlist.c
error.c
event_notifier-posix.c
event_notifier-win32.c
fifo8.c
getauxval.c
hbitmap.c	hbitmap: add next_zero function	2017-12-18 10:54:13 -05:00
hexdump.c
host-utils.c
id.c
iohandler.c
iov.c
keyval.c	qapi: Generate FOO_str() macro for QAPI enum FOO	2017-09-04 13:09:13 +02:00
lockcnt.c
log.c
main-loop.c	Convert multi-line fprintf() to warn_report()	2017-09-19 14:09:34 +02:00
Makefile.objs	util: move qemu_real_host_page_size/mask to osdep.h	2017-10-10 09:45:00 -07:00
memfd.c
mmap-alloc.c	sparc: Make sure we mmap at SHMLBA alignment	2017-12-15 15:26:24 +00:00
module.c
notify.c
osdep.c	osdep: introduce qemu_mprotect_rwx/none	2017-10-24 13:53:42 -07:00
oslib-posix.c	oslib-posix: Use sysctl(2) call to resolve exec_dir on NetBSD	2017-11-02 16:19:34 +00:00
oslib-win32.c
pagesize.c	util: move qemu_real_host_page_size/mask to osdep.h	2017-10-10 09:45:00 -07:00
path.c
qdist.c
qemu-config.c	config: qemu_config_parse() return number of config groups	2017-10-09 23:21:52 -03:00
qemu-coroutine-io.c
qemu-coroutine-lock.c
qemu-coroutine-sleep.c	coroutine: simplify co_aio_sleep_ns() prototype	2017-12-19 09:25:27 +00:00
qemu-coroutine.c	coroutine: abort if we try to schedule or enter a pending coroutine	2017-11-21 11:58:07 -05:00
qemu-error.c	error: Revert unwanted change of warning messages	2017-07-24 14:16:29 +02:00
qemu-openpty.c
qemu-option.c
qemu-progress.c
qemu-sockets.c	misc: remove duplicated includes	2017-12-18 17:07:02 +03:00
qemu-thread-posix.c	util/qemu-thread-posix.c: Replace OS ifdefs with CONFIG_HAVE_SEM_TIMEDWAIT	2017-09-26 09:06:02 +03:00
qemu-thread-win32.c
qemu-timer-common.c
qemu-timer.c
qht.c
range.c
rcu.c	Revert "rcu: do not create thread in pthread_atfork callback"	2017-08-08 10:40:19 +02:00
readline.c
stats64.c	util/stats64: Fix min/max comparisons	2017-11-15 09:34:51 +01:00
systemd.c
thread-pool.c
throttle.c	throttle: Assert that bkt->max is valid in throttle_compute_wait()	2017-09-26 14:46:23 +02:00
timed-average.c
trace-events	docs: fix broken paths to docs/devel/tracing.txt	2017-07-31 13:12:53 +03:00
unicode.c
uri.c
uuid.c