diff options
| author | Peter Maydell | 2017-07-19 11:48:31 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-07-19 11:48:31 +0200 |
| commit | f1a46e888515c6b49f3d43f938a9c17acac831f5 (patch) | |
| tree | 59634db84fc7e9c7c616b26401a8afb8175c0353 /block/commit.c | |
| parent | Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-07-18-1' in... (diff) | |
| parent | qemu-img: Check for backing image if specified during create (diff) | |
| download | qemu-f1a46e888515c6b49f3d43f938a9c17acac831f5.tar.gz qemu-f1a46e888515c6b49f3d43f938a9c17acac831f5.tar.xz qemu-f1a46e888515c6b49f3d43f938a9c17acac831f5.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches
# gpg: Signature made Tue 18 Jul 2017 14:29:59 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: (21 commits)
qemu-img: Check for backing image if specified during create
blockdev: move BDRV_O_NO_BACKING option forward
block/vvfat: Fix compiler warning with gcc 7
vvfat: initialize memory after allocating it
vvfat: correctly parse non-ASCII short and long file names
vvfat: add a constant for bootsector name
vvfat: add constants for special values of name[0]
qemu-iotests: Test unplug of -device without drive
qemu-iotests: Test 'info block'
scsi-disk: bdrv_attach_dev() for empty CD-ROM
ide: bdrv_attach_dev() for empty CD-ROM
block: List anonymous device BBs in query-block
block/qapi: Use blk_all_next() for query-block
block: Make blk_all_next() public
block/qapi: Add qdev device name to query-block
block: Make blk_get_attached_dev_id() public
block/vpc.c: Handle write failures in get_image_offset()
block/vmdk: Report failures in vmdk_read_cid()
block: remove timer canceling in throttle_config()
block: add clock_type field to ThrottleGroup
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/commit.c')
| -rw-r--r-- | block/commit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/block/commit.c b/block/commit.c index 13143608f8..5cc910f567 100644 --- a/block/commit.c +++ b/block/commit.c @@ -90,7 +90,9 @@ static void commit_complete(BlockJob *job, void *opaque) /* Make sure overlay_bs and top stay around until bdrv_set_backing_hd() */ bdrv_ref(top); - bdrv_ref(overlay_bs); + if (overlay_bs) { + bdrv_ref(overlay_bs); + } /* Remove base node parent that still uses BLK_PERM_WRITE/RESIZE before * the normal backing chain can be restored. */ |