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.h

Clean up ill-advised or unusual header guards

2016-07-12 16:20:46 +02:00

atomic.h

memory: avoid "resurrection" of dead FlatViews

2017-09-21 23:19:37 +02:00

base64.h

Clean up ill-advised or unusual header guards

2016-07-12 16:20:46 +02:00

bcd.h

Clean up decorations and whitespace around header guards

2016-07-12 16:20:46 +02:00

bitmap.h

bitmap: provide to_le/from_le helpers

2017-09-22 14:11:25 +02:00

bitops.h

vnc: replace hweight_long() with ctpopl()

2017-05-12 12:36:02 +02:00

bswap.h

bswap.h: Document cpu_to_* and *_to_cpu conversion functions

2016-07-12 15:08:53 +01:00

buffer.h

Clean up ill-advised or unusual header guards

2016-07-12 16:20:46 +02:00

compiler.h

use _Static_assert in QEMU_BUILD_BUG_ON

2017-05-05 12:09:59 +02:00

config-file.h

arch_init: Remove unnecessary default_config_files table

2017-01-23 21:25:36 -02:00

coroutine_int.h

coroutine: abort if we try to schedule or enter a pending coroutine

2017-11-21 11:58:07 -05:00

coroutine.h

coroutine: simplify co_aio_sleep_ns() prototype

2017-12-19 09:25:27 +00:00

cpuid.h

util: Introduce include/qemu/cpuid.h

2017-07-24 12:42:55 +01:00

crc32c.h

include/qemu/crc32c.h: Rename include guards to match filename

2014-02-26 17:20:07 +00:00

cutils.h

util/cutils: Change qemu_strtosz*() from int64_t to uint64_t

2017-02-23 20:35:36 +01:00

envlist.h

misc: move include files to include/qemu/

2012-12-19 08:32:39 +01:00

error-report.h

error: Functions to report warnings and informational messages

2017-07-13 13:49:54 +02:00

event_notifier.h

event_notifier: cleanups around event_notifier_set_handler

2017-01-16 17:52:35 +01:00

fifo8.h

Clean up header guards that don't match their file name

2016-07-12 16:19:16 +02:00

fifo32.h

hw: Clean up includes

2016-06-07 18:19:23 +03:00

fprintf-fn.h

Clean up decorations and whitespace around header guards

2016-07-12 16:20:46 +02:00

futex.h

futex: add missing header guards

2017-10-16 20:57:13 +03:00

hbitmap.h

hbitmap: add next_zero function

2017-12-18 10:54:13 -05:00

help_option.h

Clean up decorations and whitespace around header guards

2016-07-12 16:20:46 +02:00

host-utils.h

host-utils: Simplify pow2ceil()

2017-09-06 14:38:03 +01:00

id.h

Clean up decorations and whitespace around header guards

2016-07-12 16:20:46 +02:00

int128.h

tcg: Add atomic128 helpers

2016-10-26 08:29:01 -07:00

iov.h

tests: Use real size for iov tests

2017-09-05 22:34:40 +02:00

jhash.h

Jhash: add linux kernel jhashtable in qemu

2016-09-27 17:54:21 +08:00

log.h

log: Add locking to large logging blocks

2016-11-01 10:29:03 -06:00

main-loop.h

main_loop: Make main_loop_wait() return void

2017-07-04 14:39:28 +02:00

memfd.h

include: Clean up includes

2016-02-23 12:43:05 +00:00

mmap-alloc.h

exec, kvm, target-ppc: Move getrampagesize() to common code

2017-03-03 11:30:59 +11:00

module.h

qmp: Dumb down how we run QMP command registration

2017-03-05 09:02:10 +01:00

notify.h

notify: add NotiferWithReturn so notifier list can abort

2013-06-28 09:20:26 +02:00

option_int.h

Clean up header guards that don't match their file name

2016-07-12 16:19:16 +02:00

option.h

keyval: New keyval_parse()

2017-03-07 16:07:46 +01:00

osdep.h

sparc: Make sure we mmap at SHMLBA alignment

2017-12-15 15:26:24 +00:00

path.h

Clean up decorations and whitespace around header guards

2016-07-12 16:20:46 +02:00

processor.h

include/processor.h: define cpu_relax()

2016-06-11 23:10:17 +00:00

qdist.h

clean-includes: run it once more

2016-06-16 18:39:03 +02:00

qht.h

qht: fix kernel-doc markup in qht.h

2017-12-18 17:07:02 +03:00

queue.h

migration: migrate QTAILQ

2017-01-24 17:54:47 +00:00

range.h

range: Replace internal representation of Range

2016-07-04 16:49:33 +03:00

ratelimit.h

blockjob: Track job ratelimits via bytes, not sectors

2017-07-10 13:18:06 +02:00

rcu_queue.h

Clean up decorations and whitespace around header guards

2016-07-12 16:20:46 +02:00

rcu.h

Revert "rcu: do not create thread in pthread_atfork callback"

2017-08-08 10:40:19 +02:00

readline.h

Clean up decorations and whitespace around header guards

2016-07-12 16:20:46 +02:00

seqlock.h

seqlock: use atomic writes for the sequence

2016-10-04 10:00:26 +02:00

sockets.h

net/net: Convert parse_host_port() to Error

2017-09-08 08:17:37 +08:00

stats64.h

util: add stats64 module

2017-06-16 07:55:00 +08:00

systemd.h

qemu-ga: obey LISTEN_PID when using systemd socket activation

2017-03-19 11:12:12 +01:00

thread-posix.h

thread-posix: fix qemu_rec_mutex_trylock macro

2017-11-14 14:31:33 +01:00

thread-win32.h

qemu-thread: Assert locks are initialized before using

2017-07-04 14:39:28 +02:00

thread.h

qemu-thread: optimize QemuLockCnt with futexes on Linux

2017-01-16 13:25:18 +00:00

throttle-options.h

block: add throttle block filter driver

2017-09-06 10:12:02 +02:00

throttle.h

block: convert ThrottleGroup to object with QOM

2017-09-05 18:12:21 +02:00

timed-average.h

include: Clean up includes

2016-02-23 12:43:05 +00:00

timer.h

timer.h: Provide better monotonic time

2017-06-13 14:56:59 +01:00

typedefs.h

console: add support for dmabufs

2017-10-17 10:25:42 +02:00

unicode.h

Clean up decorations and whitespace around header guards

2016-07-12 16:20:46 +02:00

uri.h

Remove unused function declarations

2016-09-15 15:32:22 +03:00

uuid.h

vl: Switch qemu_uuid to QemuUUID

2016-09-23 11:42:52 +08:00

xattr.h

include: Fix typos found by codespell

2017-01-24 23:26:52 +03:00