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
..
bus.c	bus: do not unref hotplug handler	2017-03-01 11:51:28 +04:00
empty_slot.c	hw/core: Clean up includes	2016-01-29 15:07:25 +00:00
fw-path-provider.c	hw/core: Clean up includes	2016-01-29 15:07:25 +00:00
generic-loader.c	hw/core/generic-loader: Fix crash when running without CPU	2017-05-10 10:19:23 +03:00
hotplug.c	qdev: hotplug: drop HotplugHandler.post_plug callback	2016-11-15 17:20:37 +02:00
irq.c	tcg: drop global lock during TCG code execution	2017-02-24 10:32:45 +00:00
loader-fit.c	loader: Support Flattened Image Trees (FIT images)	2017-02-21 23:47:40 +00:00
loader.c	fw_cfg: add write callback	2017-10-15 05:54:40 +03:00
machine.c	misc: remove duplicated includes	2017-12-18 17:07:02 +03:00
Makefile.objs	hw/core: nmi.c can be compiled as common-obj nowadays	2017-06-05 17:23:36 +03:00
nmi.c	nmi: remove x86 specific nmi handling	2016-05-23 16:53:46 +02:00
null-machine.c	hw/core/null-machine: Print error message when using the -kernel parameter	2017-04-20 15:22:41 -03:00
or-irq.c	qdev: Replace cannot_instantiate_with_device_add_yet with !user_creatable	2017-05-17 10:37:00 -03:00
platform-bus.c	platform-bus: use get_uint() for "addr" property	2017-06-20 14:31:32 +02:00
ptimer.c	qemu-timer: do not include sysemu/cpus.h from util/qemu-timer.h	2017-03-14 13:28:18 +01:00
qdev-properties-system.c	Pull request	2017-12-20 11:30:55 +00:00
qdev-properties.c	qapi: Change data type of the FOO_lookup generated for enum FOO	2017-09-04 13:09:13 +02:00
qdev.c	qdev: defer DEVICE_DEL event until instance_finalize()	2017-10-18 10:34:50 +02:00
register.c	register: display register prefix (name) since it is available	2017-06-04 18:42:55 +03:00
reset.c	hw: move reset handlers from vl.c to hw/core	2017-01-16 17:52:35 +01:00
stream.c	hw/core: Clean up includes	2016-01-29 15:07:25 +00:00
sysbus.c	sysbus: Set user_creatable=false by default on TYPE_SYS_BUS_DEVICE	2017-05-17 10:37:01 -03:00
uboot_image.h	Clean up ill-advised or unusual header guards	2016-07-12 16:20:46 +02:00