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

..

accounting.c

block: make accounting thread-safe

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

backup.c

backup: use copy_bitmap in incremental backup

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

blkdebug.c

block: Align block status requests

2017-10-26 14:45:57 +02:00

blkreplay.c

block: change variable names in BlockDriverState

2017-06-26 14:54:46 +02:00

blkverify.c

blkverify: Catch bs->exact_filename overflow

2017-06-26 14:54:46 +02:00

block-backend.c

block: Don't request I/O permission with BDRV_O_NO_IO

2017-11-21 14:48:22 +01:00

bochs.c

block: Deprecate bdrv_set_read_only() and users

2017-11-17 13:35:59 +01:00

cloop.c

block: Deprecate bdrv_set_read_only() and users

2017-11-17 13:35:59 +01:00

commit.c

blockjob: remove clock argument from block_job_sleep_ns

2017-11-29 15:11:02 +01:00

crypto.c

block: support passthrough of BDRV_REQ_FUA in crypto driver

2017-10-06 16:30:47 +02:00

crypto.h

qcow: convert QCow to use QCryptoBlock for encryption

2017-07-11 17:44:56 +02:00

curl.c

block/curl: fix minor memory leaks

2017-12-18 15:44:39 -05:00

dirty-bitmap.c

hbitmap: add next_zero function

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

dmg-bz2.c

dmg: Move libbz2 code to dmg-bz2.so

2016-10-07 14:14:06 +02:00

dmg.c

block: Deprecate bdrv_set_read_only() and users

2017-11-17 13:35:59 +01:00

dmg.h

block: remove "qemu/osdep.h" from header file

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

file-posix.c

file-posix: Clear out first sector in hdev_create

2017-09-26 14:46:23 +02:00

file-win32.c

qapi: Change data type of the FOO_lookup generated for enum FOO

2017-09-04 13:09:13 +02:00

gluster.c

qapi: Change data type of the FOO_lookup generated for enum FOO

2017-09-04 13:09:13 +02:00

io.c

block: Expect graph changes in bdrv_parent_drained_begin/end

2017-11-29 14:22:03 +01:00

iscsi-opts.c

block/iscsi: statically link qemu_iscsi_opts

2017-01-27 18:07:58 +01:00

iscsi.c

scsi: move block/scsi.h to include/scsi/constants.h

2017-09-19 14:09:31 +02:00

linux-aio.c

block: explicitly acquire aiocontext in aio callbacks that need it

2017-02-21 11:39:39 +00:00

Makefile.objs

block: add throttle block filter driver

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

mirror.c

blockjob: remove clock argument from block_job_sleep_ns

2017-11-29 15:11:02 +01:00

nbd-client.c

nbd: Don't crash when server reports NBD_CMD_READ failure

2017-11-17 08:02:45 -06:00

nbd-client.h

nbd: Minimal structured read for client

2017-10-30 21:48:41 +01:00

nbd.c

nbd: Implement NBD_INFO_BLOCK_SIZE on client

2017-07-14 12:04:42 +02:00

nfs.c

block/nfs: fix nfs_client_open for filesize greater than 1TB

2017-11-29 15:28:15 +01:00

null.c

coroutine: simplify co_aio_sleep_ns() prototype

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

parallels.c

block/parallels: add migration blocker

2017-11-14 18:06:26 +01:00

qapi.c

block: Guard against NULL bs->drv

2017-11-17 18:21:31 +01:00

qcow2-bitmap.c

qcow2: Switch store_bitmap_data() to byte-based iteration

2017-10-06 16:28:58 +02:00

qcow2-cache.c

qcow2: Fix overly broad madvise()

2017-11-17 18:21:31 +01:00

qcow2-cluster.c

qcow2: Unaligned zero cluster in handle_alloc()

2017-11-17 18:21:30 +01:00

qcow2-refcount.c

qcow2: Add bounds check to get_refblock_offset()

2017-11-17 18:21:31 +01:00

qcow2-snapshot.c

qcow2: Discard/zero clusters by byte count

2017-05-11 14:28:07 +02:00

qcow2.c

qcow2: check_errors are fatal

2017-11-17 18:21:30 +01:00

qcow2.h

qcow2: Add bounds check to get_refblock_offset()

2017-11-17 18:21:31 +01:00

qcow.c

block: convert qcrypto_block_encrypt|decrypt to take bytes offset

2017-10-06 16:30:47 +02:00

qed-check.c

qed: Use DIV_ROUND_UP

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

qed-cluster.c

qed: protect table cache with CoMutex

2017-07-17 11:34:11 +08:00

qed-l2-cache.c

qed: protect table cache with CoMutex

2017-07-17 11:34:11 +08:00

qed-table.c

qed: protect table cache with CoMutex

2017-07-17 11:34:11 +08:00

qed.c

block: rename bdrv_co_drain to bdrv_co_drain_begin

2017-10-13 12:38:41 +01:00

qed.h

qed: protect table cache with CoMutex

2017-07-17 11:34:11 +08:00

quorum.c

qapi: Change data type of the FOO_lookup generated for enum FOO

2017-09-04 13:09:13 +02:00

raw-format.c

block: remove unused bdrv_media_changed

2017-09-04 18:31:13 +02:00

rbd.c

block: Deprecate bdrv_set_read_only() and users

2017-11-17 13:35:59 +01:00

replication.c

block: Guard against NULL bs->drv

2017-11-17 18:21:31 +01:00

sheepdog.c

Pull request

2017-12-20 11:30:55 +00:00

snapshot.c

block: Error out on load_vm with active dirty bitmaps

2017-11-21 14:48:23 +01:00

ssh.c

util: remove the obsolete non-blocking connect

2017-09-05 13:21:58 +01:00

stream.c

blockjob: remove clock argument from block_job_sleep_ns

2017-11-29 15:11:02 +01:00

throttle-groups.c

throttle-groups: forget timer and schedule next TGM on detach

2017-11-16 14:12:57 +00:00

throttle.c

block/throttle.c: add bdrv_co_drain_begin/end callbacks

2017-10-13 12:38:41 +01:00

trace-events

block: Make bdrv_round_to_clusters() signature more useful

2017-10-26 14:45:57 +02:00

vdi.c

vdi: make it thread-safe

2017-07-17 11:28:15 +08:00

vhdx-endian.c

vhdx: Use QEMU UUID API

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

vhdx-log.c

vhdx: use QEMU_ALIGN_DOWN

2017-08-31 12:29:07 +02:00

vhdx.c

block/vhdx.c: Don't blindly update the header

2017-11-14 18:06:25 +01:00

vhdx.h

block: vhdx - update PAYLOAD_BLOCK_UNMAPPED value to match 1.00 spec

2014-12-12 15:42:22 +00:00

vmdk.c

vmdk: Fix error handling/reporting of vmdk_check

2017-08-08 15:19:16 +02:00

vpc.c

vpc: use DIV_ROUND_UP

2017-08-31 12:29:07 +02:00

vvfat.c

block: Guard against NULL bs->drv

2017-11-17 18:21:31 +01:00

vxhs.c

qobject: Use simpler QDict/QList scalar insertion macros

2017-05-09 09:13:51 +02:00

win32-aio.c

block: explicitly acquire aiocontext in aio callbacks that need it

2017-02-21 11:39:39 +00:00

write-threshold.c

block: use bdrv_add_before_write_notifier

2016-10-07 13:34:07 +02:00