Peter Maydell 523a2a42c3 Pull request ... -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE+ber27ys35W+dsvQfe+BBqr8OQ4FAlyIFSwACgkQfe+BBqr8 OQ7wghAAm16eCEr57oTO7QXR3y8uVFsKqXBn9cNH6nbrFp2PUQSglwMDKBls1Z5m olF23X/JaqSlSmkL9BBuzDZ6Up+kkHKuxPq4/5RKXfiDI0pr3R0eqts0COAlaN9q Bew3ipj99m8gzMi2093AW4+Ob0N3658fuDTGLe1M1Uoy7CEg1QJ7rVOBBEui7vIl RbZ8l/Zmb4ldNpB3lnE4Nh9ue8fy0RAj3Nai161nCnNeXNF/VzD3Ye8bojSBbnux PIMX6/RWmykX4feIf9QP8apDpxX4HkyuPq5EdwT9PD8PwdyXPAXZtsYUNCuNtQuk n5VKFVgFYgqUclBeVHmrMYPU4K4iCFQp4/Fua7wzPEC0iG05NiiDv91oVkEJCp3L ManHeuGfNLCcXaIntKZhuJl1cK8yMM3yDww6/pPTehrPjcyvKa0NOqhQBExektcD R6q7maJRzFaxSxdcs+Zzuog9zESvH1mlJxQCKzeYhAP0kkxInyTELE/Vbx37xuqR RFfZYyVQ6x87Q/sxHx4EMiV97WUM8elZOQdSEC/okt5WUUNpgIu0WF9nSQ1VKZ8C CZmv5xh9ogfwvB/kOm6IVwNkLvVagJQcLwddORI5LLXLbSIUcuwVSuyMp/7iDtQ/ hnHkGs2mIJ2JUYbSSNsSJNs6oTurn8eTFCeGoYKJgd9l4QxaThU= =ekU+ -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging Pull request # gpg: Signature made Tue 12 Mar 2019 20:23:08 GMT # gpg: using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E # gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full] # Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB # Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E * remotes/jnsnow/tags/bitmaps-pull-request: (22 commits) tests/qemu-iotests: add bitmap resize test 246 block/qcow2-bitmap: Allow resizes with persistent bitmaps block/qcow2-bitmap: Don't check size for IN_USE bitmap docs/interop/qcow2: Improve bitmap flag in_use specification bitmaps: Fix typo in function name block/dirty-bitmaps: implement inconsistent bit block/dirty-bitmaps: disallow busy bitmaps as merge source block/dirty-bitmaps: prohibit removing readonly bitmaps block/dirty-bitmaps: prohibit readonly bitmaps for backups block/dirty-bitmaps: add block_dirty_bitmap_check function block/dirty-bitmap: add inconsistent status block/dirty-bitmaps: add inconsistent bit iotests: add busy/recording bit test to 124 blockdev: remove unused paio parameter documentation block/dirty-bitmaps: move comment block block/dirty-bitmaps: unify qmp_locked and user_locked calls block/dirty-bitmap: explicitly lock bitmaps with successors nbd: change error checking order for bitmaps block/dirty-bitmap: change semantics of enabled predicate block/dirty-bitmap: remove set/reset assertions against enabled bit ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org> # Conflicts: # tests/qemu-iotests/group		2019-03-13 17:30:34 +00:00
..
accounting.h	block/accounting: introduce latency histogram	2018-03-19 14:58:37 -05:00
aio-wait.h	block: Use a single global AioWait	2018-09-25 15:50:15 +02:00
aio.h	qemu-timer: introduce timer attributes	2018-10-19 13:44:03 +02:00
block_backup.h	block/backup: drop unused synchronization interface	2018-12-14 11:52:40 +01:00
block_int.h	block: Add a 'mutable_opts' field to BlockDriver	2019-03-12 20:30:14 +01:00
block.h	block: Remove the AioContext parameter from bdrv_reopen_multiple()	2019-03-12 20:30:14 +01:00
blockjob_int.h	block: Really pause block jobs on drain	2018-06-18 15:03:25 +02:00
blockjob.h	block: Use a single global AioWait	2018-09-25 15:50:15 +02:00
dirty-bitmap.h	bitmaps: Fix typo in function name	2019-03-12 12:05:49 -04:00
nbd.h	nbd: allow authorization with nbd-server-start QMP command	2019-03-06 11:05:27 -06:00
nvme.h	block: Move NVMe constants to a separate header	2018-02-08 09:22:03 +08:00
qapi.h	Drop superfluous includes of qapi-types.h and test-qapi-types.h	2018-02-09 05:05:11 +01:00
qdict.h	block: Factor out qobject_input_visitor_new_flat_confused()	2018-06-15 14:49:44 +02:00
raw-aio.h	file-posix: Make .bdrv_co_truncate asynchronous	2018-06-29 14:20:56 +02:00
snapshot.h	block/snapshot: remove bdrv_snapshot_delete_by_id_or_name	2019-02-25 15:03:18 +01:00
thread-pool.h	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
throttle-groups.h	throttle-groups: fix restart coroutine iothread race	2019-01-24 10:02:28 +00:00
write-threshold.h	Use scripts/clean-includes to drop redundant qemu/typedefs.h	2016-03-22 22:20:16 +01:00