Branch: refs/heads/master Home: https://github.com/qemu/qemu Commit: 05b4cd5d3c20c9d7a75f0533b57b9c1c3d06e6e7 https://github.com/qemu/qemu/commit/05b4cd5d3c20c9d7a75f0533b57b9c1c3d06e6e7 Author: Kevin Wolf <kw...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017)
Changed paths: M tests/qemu-iotests/172 M tests/qemu-iotests/186 Log Message: ----------- qemu-iotests: Add missing -machine accel=qtest A basic set of qemu options is initialised in ./common: export QEMU_OPTIONS="-nodefaults -machine accel=qtest" However, two test cases (172 and 186) overwrite QEMU_OPTIONS and neglect to manually set '-machine accel=qtest'. Add the missing option for 172. 186 probably only copied the code from 172, it doesn't actually need to overwrite QEMU_OPTIONS, so remove that in 186. Signed-off-by: Kevin Wolf <kw...@redhat.com> Tested-by: Cornelia Huck <coh...@redhat.com> Reviewed-by: Cornelia Huck <coh...@redhat.com> Commit: a16efd53406bc8d89f87253ab10290f8d1b145a7 https://github.com/qemu/qemu/commit/a16efd53406bc8d89f87253ab10290f8d1b145a7 Author: Fam Zheng <f...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M qemu-img.texi Log Message: ----------- qemu-img: Clarify about relative backing file options It's not too surprising when a user specifies the backing file relative to the current working directory instead of the top layer image. This causes error when they differ. Though the error message has enough information to infer the fact about the misunderstanding, it is better if we document this explicitly, so that users don't have to learn from mistakes. Signed-off-by: Fam Zheng <f...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Reviewed-by: Jeff Cody <jc...@redhat.com> Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com> Signed-off-by: Kevin Wolf <kw...@redhat.com> Commit: 97ec9117c346239fc5b0f6d1973111e8ca370087 https://github.com/qemu/qemu/commit/97ec9117c346239fc5b0f6d1973111e8ca370087 Author: Fam Zheng <f...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M block/file-posix.c Log Message: ----------- file-posix: Clear out first sector in hdev_create People get surprised when, after "qemu-img create -f raw /dev/sdX", they still see qcow2 with "qemu-img info", if previously the bdev had a qcow2 header. While this is natural because raw doesn't need to write any magic bytes during creation, hdev_create is free to clear out the first sector to make sure the stale qcow2 header doesn't cause such confusion. Signed-off-by: Fam Zheng <f...@redhat.com> Signed-off-by: Kevin Wolf <kw...@redhat.com> Commit: 78aa8aa019b999ec07b62b322c1280a8250e44ac https://github.com/qemu/qemu/commit/78aa8aa019b999ec07b62b322c1280a8250e44ac Author: Stefan Hajnoczi <stefa...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M Makefile A docs/qemu-block-drivers.texi M qemu-doc.texi Log Message: ----------- docs: add qemu-block-drivers(7) man page Block driver documentation is available in qemu-doc.html. It would be convenient to have documentation for formats, protocols, and filter drivers in a man page. Extract the relevant part of qemu-doc.html into a new file called docs/qemu-block-drivers.texi. This file can also be built as a stand-alone document (man, html, etc). Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com> Signed-off-by: Kevin Wolf <kw...@redhat.com> Commit: f1d5516ab583130157852fe475f96fd7cce227c3 https://github.com/qemu/qemu/commit/f1d5516ab583130157852fe475f96fd7cce227c3 Author: Cornelia Huck <coh...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M tests/qemu-iotests/040 M tests/qemu-iotests/139 M tests/qemu-iotests/182 Log Message: ----------- iotests: use -ccw on s390x for 040, 139, and 182 The default cpu model on s390x does not provide zPCI, which is not yet wired up on tcg. Moreover, virtio-ccw is the standard on s390x, so use the -ccw instead of the -pci versions of virtio devices on s390x. Reviewed-by: Kevin Wolf <kw...@redhat.com> Signed-off-by: Cornelia Huck <coh...@redhat.com> Reviewed-by: QingFeng Hao <ha...@linux.vnet.ibm.com> Signed-off-by: Kevin Wolf <kw...@redhat.com> Commit: 75f02ed53a0dd7fff641de5c73566ee9abe4cf94 https://github.com/qemu/qemu/commit/75f02ed53a0dd7fff641de5c73566ee9abe4cf94 Author: Cornelia Huck <coh...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M tests/qemu-iotests/051 M tests/qemu-iotests/051.out M tests/qemu-iotests/051.pc.out Log Message: ----------- iotests: use -ccw on s390x for 051 The default cpu model on s390x does not provide zPCI, which is not yet wired up on tcg. Moreover, virtio-ccw is the standard on s390x, so use the -ccw instead of the -pci versions of virtio devices on s390x. Signed-off-by: Cornelia Huck <coh...@redhat.com> Reviewed-by: QingFeng Hao <ha...@linux.vnet.ibm.com> Reviewed-by: David Hildenbrand <da...@redhat.com> Reviewed-by: Thomas Huth <th...@redhat.com> Signed-off-by: Kevin Wolf <kw...@redhat.com> Commit: b1149c1a2ad8eaecca08e78f677513672ff3d627 https://github.com/qemu/qemu/commit/b1149c1a2ad8eaecca08e78f677513672ff3d627 Author: Cornelia Huck <coh...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M tests/qemu-iotests/067 M tests/qemu-iotests/067.out Log Message: ----------- iotests: use virtio aliases for 067 The default cpu model on s390x does not provide zPCI, which is not yet wired up on tcg. Moreover, virtio-ccw is the standard on s390x. Using virtio-scsi will implicitly pick the right device, so just switch to that for simplicity. Signed-off-by: Cornelia Huck <coh...@redhat.com> Reviewed-by: QingFeng Hao <ha...@linux.vnet.ibm.com> Reviewed-by: David Hildenbrand <da...@redhat.com> Reviewed-by: Thomas Huth <th...@redhat.com> Signed-off-by: Kevin Wolf <kw...@redhat.com> Commit: 93e53fb6952c85ef54b209c92358963fb66d0fa2 https://github.com/qemu/qemu/commit/93e53fb6952c85ef54b209c92358963fb66d0fa2 Author: Fam Zheng <f...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M tests/qemu-iotests/check Log Message: ----------- iotests: Print full path of bad output if mismatch So it is easier to copy paste the path. Signed-off-by: Fam Zheng <f...@redhat.com> Signed-off-by: Kevin Wolf <kw...@redhat.com> Commit: b5806108d20fc32b4692e721d8bd6376f4ca4a69 https://github.com/qemu/qemu/commit/b5806108d20fc32b4692e721d8bd6376f4ca4a69 Author: Alberto Garcia <be...@igalia.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M util/throttle.c Log Message: ----------- throttle: Assert that bkt->max is valid in throttle_compute_wait() If bkt->max == 0 and bkt->burst_length > 1 then we could have a division by 0 in throttle_do_compute_wait(). That configuration is however not permitted and is already detected by throttle_is_valid(), but let's assert it in throttle_compute_wait() to make it explicit. Found by Coverity (CID: 1381016). Signed-off-by: Alberto Garcia <be...@igalia.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Signed-off-by: Kevin Wolf <kw...@redhat.com> Commit: 43a5dc02fd6070827d5c4ff652b885219fa8cbe1 https://github.com/qemu/qemu/commit/43a5dc02fd6070827d5c4ff652b885219fa8cbe1 Author: Manos Pitsidianakis <el13...@mail.ntua.gr> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M block/throttle-groups.c Log Message: ----------- block/throttle-groups.c: allocate RestartData on the heap RestartData is the opaque data of the throttle_group_restart_queue_entry coroutine. By being stack allocated, it isn't available anymore if aio_co_enter schedules the coroutine with a bottom half and runs after throttle_group_restart_queue returns. Cc: qemu-sta...@nongnu.org Signed-off-by: Manos Pitsidianakis <el13...@mail.ntua.gr> Reviewed-by: Eric Blake <ebl...@redhat.com> Reviewed-by: Alberto Garcia <be...@igalia.com> Signed-off-by: Kevin Wolf <kw...@redhat.com> Commit: 7a6ab45e19b615b9285b9cfa2bbc1fee012bc8d7 https://github.com/qemu/qemu/commit/7a6ab45e19b615b9285b9cfa2bbc1fee012bc8d7 Author: Thomas Huth <th...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M block/vvfat.c Log Message: ----------- block: Clean up some bad code in the vvfat driver Remove the unnecessary home-grown redefinition of the assert() macro here, and remove the unusable debug code at the end of the checkpoint() function. The code there uses assert() with side-effects (assignment to the "mapping" variable), which should be avoided. Looking more closely, it seems as it is apparently also only usable for one certain directory layout (with a file named USB.H in it) and thus is of no use for the rest of the world. Signed-off-by: Thomas Huth <th...@redhat.com> Reviewed-by: John Snow <js...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Signed-off-by: Kevin Wolf <kw...@redhat.com> Commit: f3adefb2cea1c63b7b198acaef5e40eb4b2d2d39 https://github.com/qemu/qemu/commit/f3adefb2cea1c63b7b198acaef5e40eb4b2d2d39 Author: Kevin Wolf <kw...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M qemu-io-cmds.c M tests/qemu-iotests/187.out Log Message: ----------- qemu-io: Drop write permissions before read-only reopen qemu-io provides a 'reopen' command that allows switching from writable to read-only access. We need to make sure that we don't try to keep write permissions to a BlockBackend that becomes read-only, otherwise things are going to fail. This requires a bdrv_drain() call because otherwise in-flight AIO write requests could issue new internal requests while the permission has already gone away, which would cause assertion failures. Draining the queue doesn't break AIO requests in any new way, bdrv_reopen() would drain it anyway only a few lines later. Signed-off-by: Kevin Wolf <kw...@redhat.com> Reviewed-by: Fam Zheng <f...@redhat.com> Commit: e0995dc3da0894d0a8260bddaa200a4cd7809ba4 https://github.com/qemu/qemu/commit/e0995dc3da0894d0a8260bddaa200a4cd7809ba4 Author: Kevin Wolf <kw...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M block.c M block/commit.c M block/mirror.c M block/replication.c M block/vvfat.c M include/block/block_int.h Log Message: ----------- block: Add reopen_queue to bdrv_child_perm() In the context of bdrv_reopen(), we'll have to look at the state of the graph as it will be after the reopen. This interface addition is in preparation for the change. Signed-off-by: Kevin Wolf <kw...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Commit: 3121fb45b004ea85fb3589368ea699f32e6ef832 https://github.com/qemu/qemu/commit/3121fb45b004ea85fb3589368ea699f32e6ef832 Author: Kevin Wolf <kw...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M block.c Log Message: ----------- block: Add reopen queue to bdrv_check_perm() In the context of bdrv_reopen(), we'll have to look at the state of the graph as it will be after the reopen. This interface addition is in preparation for the change. Signed-off-by: Kevin Wolf <kw...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Commit: 148eb13c84cccd0eedd6e59f90e0151bd7bac9fa https://github.com/qemu/qemu/commit/148eb13c84cccd0eedd6e59f90e0151bd7bac9fa Author: Kevin Wolf <kw...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M block.c M include/block/block.h Log Message: ----------- block: Base permissions on rw state after reopen When new permissions are calculated during bdrv_reopen(), they need to be based on the state of the graph as it will be after the reopen has completed, not on the current state of the involved nodes. This patch makes bdrv_is_writable() optionally accept a BlockReopenQueue from which the new flags are taken. This is then used for determining the new bs->file permissions of format drivers as soon as we add the code to actually pass a non-NULL reopen queue to the .bdrv_child_perm callbacks. While moving bdrv_is_writable(), make it static. It isn't used outside block.c. Signed-off-by: Kevin Wolf <kw...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Commit: 1857c97b76af02537b954c86dab066503950a4fd https://github.com/qemu/qemu/commit/1857c97b76af02537b954c86dab066503950a4fd Author: Kevin Wolf <kw...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M block.c Log Message: ----------- block: reopen: Queue children after their parents We will calculate the required new permissions in the prepare stage of a reopen. Required permissions of children can be influenced by the changes made to their parents, but parents are independent from their children. This means that permissions need to be calculated top-down. In order to achieve this, queue parents before their children rather than queuing the children first. Signed-off-by: Kevin Wolf <kw...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Commit: 3045025991ebeec77ce89c8ec56e83858950bbb3 https://github.com/qemu/qemu/commit/3045025991ebeec77ce89c8ec56e83858950bbb3 Author: Kevin Wolf <kw...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M block.c M include/block/block.h Log Message: ----------- block: Fix permissions after bdrv_reopen() If we switch between read-only and read-write, the permissions that image format drivers need on bs->file change, too. Make sure to update the permissions during bdrv_reopen(). Signed-off-by: Kevin Wolf <kw...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Commit: 3fb23e07516aae13d1ba566740c1c81ae12184b7 https://github.com/qemu/qemu/commit/3fb23e07516aae13d1ba566740c1c81ae12184b7 Author: Kevin Wolf <kw...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: A tests/qemu-iotests/195 A tests/qemu-iotests/195.out M tests/qemu-iotests/group Log Message: ----------- qemu-iotests: Test change-backing-file command This involves a temporary read-write reopen if the backing file link in the middle of a backing file chain should be changed and is therefore a good test for the latest bdrv_reopen() vs. op blockers fixes. Signed-off-by: Kevin Wolf <kw...@redhat.com> Commit: 69ff158b677df0862b2f2639740c8fda5eb91599 https://github.com/qemu/qemu/commit/69ff158b677df0862b2f2639740c8fda5eb91599 Author: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M tests/qemu-iotests/181 M tests/qemu-iotests/181.out Log Message: ----------- iotests: fix 181: enable postcopy-ram capability on target Migration capabilities should be enabled on both source and destination qemu processes. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> Signed-off-by: Kevin Wolf <kw...@redhat.com> Commit: 4ffca8904a350460cdaa6304ea8c9b9c693d2d91 https://github.com/qemu/qemu/commit/4ffca8904a350460cdaa6304ea8c9b9c693d2d91 Author: Pavel Butsykin <pbutsy...@virtuozzo.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M qemu-img-cmds.hx M qemu-img.c M qemu-img.texi M tests/qemu-iotests/102 M tests/qemu-iotests/106 Log Message: ----------- qemu-img: add --shrink flag for resize The flag is additional precaution against data loss. Perhaps in the future the operation shrink without this flag will be blocked for all formats, but for now we need to maintain compatibility with raw. Signed-off-by: Pavel Butsykin <pbutsy...@virtuozzo.com> Reviewed-by: Max Reitz <mre...@redhat.com> Reviewed-by: John Snow <js...@redhat.com> Message-id: 20170918124230.8152-2-pbutsy...@virtuozzo.com [mreitz: Added a missing space to a warning] Signed-off-by: Max Reitz <mre...@redhat.com> Commit: f71c08ea8e60f035485a512fd2af8908567592f0 https://github.com/qemu/qemu/commit/f71c08ea8e60f035485a512fd2af8908567592f0 Author: Pavel Butsykin <pbutsy...@virtuozzo.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M block/qcow2-cache.c M block/qcow2-refcount.c M block/qcow2.h Log Message: ----------- qcow2: add qcow2_cache_discard Whenever l2/refcount table clusters are discarded from the file we can automatically drop unnecessary content of the cache tables. This reduces the chance of eviction useful cache data and eliminates inconsistent data in the cache with the data in the file. Signed-off-by: Pavel Butsykin <pbutsy...@virtuozzo.com> Reviewed-by: Max Reitz <mre...@redhat.com> Reviewed-by: John Snow <js...@redhat.com> Message-id: 20170918124230.8152-3-pbutsy...@virtuozzo.com Signed-off-by: Max Reitz <mre...@redhat.com> Commit: 46b732cdf3737ea8f9654f6ccd67ff52ddeddc20 https://github.com/qemu/qemu/commit/46b732cdf3737ea8f9654f6ccd67ff52ddeddc20 Author: Pavel Butsykin <pbutsy...@virtuozzo.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M block/qcow2-cluster.c M block/qcow2-refcount.c M block/qcow2.c M block/qcow2.h M qapi/block-core.json Log Message: ----------- qcow2: add shrink image support This patch add shrinking of the image file for qcow2. As a result, this allows us to reduce the virtual image size and free up space on the disk without copying the image. Image can be fragmented and shrink is done by punching holes in the image file. Signed-off-by: Pavel Butsykin <pbutsy...@virtuozzo.com> Reviewed-by: Max Reitz <mre...@redhat.com> Reviewed-by: John Snow <js...@redhat.com> Message-id: 20170918124230.8152-4-pbutsy...@virtuozzo.com Signed-off-by: Max Reitz <mre...@redhat.com> Commit: fefac70d2a4c2bfb895fdcf2bdc5baf1253eeb74 https://github.com/qemu/qemu/commit/fefac70d2a4c2bfb895fdcf2bdc5baf1253eeb74 Author: Pavel Butsykin <pbutsy...@virtuozzo.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: A tests/qemu-iotests/163 A tests/qemu-iotests/163.out M tests/qemu-iotests/group Log Message: ----------- qemu-iotests: add shrinking image test Signed-off-by: Pavel Butsykin <pbutsy...@virtuozzo.com> Reviewed-by: Max Reitz <mre...@redhat.com> Reviewed-by: John Snow <js...@redhat.com> Message-id: 20170918124230.8152-5-pbutsy...@virtuozzo.com Signed-off-by: Max Reitz <mre...@redhat.com> Commit: 5330f32b71b1868bdb3b444733063cb5adc4e8e6 https://github.com/qemu/qemu/commit/5330f32b71b1868bdb3b444733063cb5adc4e8e6 Author: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M block/qcow2-bitmap.c Log Message: ----------- block/qcow2-bitmap: fix use of uninitialized pointer Without initialization to zero dirty_bitmap field may be not zero for a bitmap which should not be stored and qcow2_store_persistent_dirty_bitmaps will erroneously call store_bitmap for it which leads to SIGSEGV on bdrv_dirty_bitmap_name. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> Message-id: 20170922144353.4220-1-vsement...@virtuozzo.com Cc: qemu-sta...@nongnu.org Reviewed-by: Eric Blake <ebl...@redhat.com> Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com> Signed-off-by: Max Reitz <mre...@redhat.com> Commit: b156d51b62e6970753e1f9f36f7c4d5fdbf4c619 https://github.com/qemu/qemu/commit/b156d51b62e6970753e1f9f36f7c4d5fdbf4c619 Author: Kevin Wolf <kw...@redhat.com> Date: 2017-09-26 (Tue, 26 Sep 2017) Changed paths: M block/qcow2-bitmap.c M block/qcow2-cache.c M block/qcow2-cluster.c M block/qcow2-refcount.c M block/qcow2.c M block/qcow2.h M qapi/block-core.json M qemu-img-cmds.hx M qemu-img.c M qemu-img.texi M tests/qemu-iotests/102 M tests/qemu-iotests/106 A tests/qemu-iotests/163 A tests/qemu-iotests/163.out M tests/qemu-iotests/group Log Message: ----------- Merge remote-tracking branch 'mreitz/tags/pull-block-2017-09-26' into queue-block Block patches # gpg: Signature made Tue Sep 26 15:01:00 2017 CEST # gpg: using RSA key F407DB0061D5CF40 # gpg: Good signature from "Max Reitz <mre...@redhat.com>" # Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40 * mreitz/tags/pull-block-2017-09-26: block/qcow2-bitmap: fix use of uninitialized pointer qemu-iotests: add shrinking image test qcow2: add shrink image support qcow2: add qcow2_cache_discard qemu-img: add --shrink flag for resize Signed-off-by: Kevin Wolf <kw...@redhat.com> Commit: cfe4cade054c0e0d00d0185cdc433a9e3ce3e2e4 https://github.com/qemu/qemu/commit/cfe4cade054c0e0d00d0185cdc433a9e3ce3e2e4 Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2017-09-27 (Wed, 27 Sep 2017) Changed paths: M Makefile M block.c M block/commit.c M block/file-posix.c M block/mirror.c M block/qcow2-bitmap.c M block/qcow2-cache.c M block/qcow2-cluster.c M block/qcow2-refcount.c M block/qcow2.c M block/qcow2.h M block/replication.c M block/throttle-groups.c M block/vvfat.c A docs/qemu-block-drivers.texi M include/block/block.h M include/block/block_int.h M qapi/block-core.json M qemu-doc.texi M qemu-img-cmds.hx M qemu-img.c M qemu-img.texi M qemu-io-cmds.c M tests/qemu-iotests/040 M tests/qemu-iotests/051 M tests/qemu-iotests/051.out M tests/qemu-iotests/051.pc.out M tests/qemu-iotests/067 M tests/qemu-iotests/067.out M tests/qemu-iotests/102 M tests/qemu-iotests/106 M tests/qemu-iotests/139 A tests/qemu-iotests/163 A tests/qemu-iotests/163.out M tests/qemu-iotests/172 M tests/qemu-iotests/181 M tests/qemu-iotests/181.out M tests/qemu-iotests/182 M tests/qemu-iotests/186 M tests/qemu-iotests/187.out A tests/qemu-iotests/195 A tests/qemu-iotests/195.out M tests/qemu-iotests/check M tests/qemu-iotests/group M util/throttle.c Log Message: ----------- Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging Block layer patches # gpg: Signature made Tue 26 Sep 2017 14:52:32 BST # gpg: using RSA key 0x7F09B272C88F2FD6 # gpg: Good signature from "Kevin Wolf <kw...@redhat.com>" # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6 * remotes/kevin/tags/for-upstream: (24 commits) block/qcow2-bitmap: fix use of uninitialized pointer qemu-iotests: add shrinking image test qcow2: add shrink image support qcow2: add qcow2_cache_discard qemu-img: add --shrink flag for resize iotests: fix 181: enable postcopy-ram capability on target qemu-iotests: Test change-backing-file command block: Fix permissions after bdrv_reopen() block: reopen: Queue children after their parents block: Base permissions on rw state after reopen block: Add reopen queue to bdrv_check_perm() block: Add reopen_queue to bdrv_child_perm() qemu-io: Drop write permissions before read-only reopen block: Clean up some bad code in the vvfat driver block/throttle-groups.c: allocate RestartData on the heap throttle: Assert that bkt->max is valid in throttle_compute_wait() iotests: Print full path of bad output if mismatch iotests: use virtio aliases for 067 iotests: use -ccw on s390x for 051 iotests: use -ccw on s390x for 040, 139, and 182 ... Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Compare: https://github.com/qemu/qemu/compare/d666cacaeab9...cfe4cade054c