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
..
authz	authz: add QAuthZPAM object type for authorizing using PAM	2019-02-26 15:32:19 +00:00
block	Pull request	2019-03-13 17:30:34 +00:00
chardev	char: move SpiceChardev and open_spice_port() to spice.h header	2019-02-21 14:09:17 +01:00
crypto	Don't talk about the LGPL if the file is licensed under the GPL	2019-01-30 10:51:20 +01:00
disas	target/mips: Add disassembler support for nanoMIPS	2018-10-25 22:13:33 +02:00
exec	migration: Add an ability to ignore shared RAM blocks	2019-03-06 10:49:17 +00:00
fpu	softfloat: Implement float128_to_uint32	2019-02-26 14:05:19 +00:00
hw	Machine queue, 2019-03-11	2019-03-12 15:25:46 +00:00
io	io: Make qio_channel_yield() interruptible	2019-02-25 15:03:19 +01:00
libdecnumber
migration	slirp: use libslirp migration code	2019-03-07 12:46:31 +01:00
monitor	monitor: Remove "x-oob", offer capability "oob" unconditionally	2018-12-12 10:28:27 +01:00
net	net: Add a network device specific self-announcement ability	2019-03-05 11:27:41 +08:00
qapi	qapi: remove qmp_unregister_command()	2019-02-18 14:44:05 +01:00
qemu	hostmem-file: reject invalid pmem file sizes	2019-03-11 10:44:19 -03:00
qom	qom: Move compat_props machinery from qdev to QOM	2019-03-11 22:53:44 +01:00
scsi	avoid TABs in files that only contain a few	2019-01-11 15:46:56 +01:00
standard-headers	* cpu-exec fixes (Emilio, Laurent)	2019-02-05 19:39:22 +00:00
sysemu	hw/nvram/fw_cfg: Remove the unnecessary boot_splash_filedata_size	2019-03-11 18:48:20 +01:00
ui	spice: set device address and device display ID in QXL interface	2019-02-21 10:15:26 +01:00
elf.h	pvh: Boot uncompressed kernel using direct boot ABI	2019-02-05 16:50:16 +01:00
glib-compat.h	slirp: Move g_spawn_async_with_fds_qemu compatibility to slirp/	2019-02-07 15:49:08 +02:00
qemu-common.h	qemu-common.h: Update copyright string for 2019	2019-02-06 15:45:23 +01:00
qemu-io.h
trace-tcg.h