diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-08-01 17:27:36 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-08-01 17:27:36 +0100 |
| commit | 3b64f272d36b310587e606217db92b0bcb6673a1 (patch) | |
| tree | 360caadb686ada63ef2d8456c77d6db8463f9d74 /block | |
| parent | 7d48cf8102a10e4a54333811bafb5eb566509268 (diff) | |
| parent | 8e8eb0a9035e5b6c6447c82138570e388282cfa2 (diff) | |
| download | qemu-3b64f272d36b310587e606217db92b0bcb6673a1.tar.gz | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.10.0-rc1
# gpg: Signature made Tue 01 Aug 2017 17:10:52 BST
# gpg: using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
block/qapi: Remove redundant NULL check to silence Coverity
qemu-iotests/059: Fix leaked image files
qemu-iotests/063: Fix leaked image
qemu-iotests/162: Fix leaked temporary files
qemu-iotests/153: Fix leaked scratch images
qemu-iotests/141: Fix image cleanup
qemu-iotests: Remove blkdebug.conf after tests
qemu-iotests/041: Fix leaked scratch images
block: fix leaks in bdrv_open_driver()
block: fix dangling bs->explicit_options in block.c
iotests: Add test of recent fix to 'qemu-img measure'
iotests: Check dirty bitmap statistics in 124
iotests: Redirect stderr to stdout in 186
iotests: Fix test 156
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qapi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/qapi.c b/block/qapi.c index d2b18ee9df..5f1a71f5d2 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -145,8 +145,9 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk, /* Skip automatically inserted nodes that the user isn't aware of for * query-block (blk != NULL), but not for query-named-block-nodes */ - while (blk && bs0 && bs0->drv && bs0->implicit) { + while (blk && bs0->drv && bs0->implicit) { bs0 = backing_bs(bs0); + assert(bs0); } } |