diff options
| author | Fam Zheng <famz@redhat.com> | 2016-01-26 11:59:00 +0800 |
|---|---|---|
| committer | Timothy Pearson <tpearson@raptorengineering.com> | 2019-11-29 19:30:23 -0600 |
| commit | 07907147f156b1b25ab010b8bf52af88a27f1375 (patch) | |
| tree | 94b20e4992cb49166121b9606482d71c2006d69a | |
| parent | f48a0822d0fb63cfc5badd7272d66aa8b89b54e9 (diff) | |
| download | hqemu-07907147f156b1b25ab010b8bf52af88a27f1375.zip hqemu-07907147f156b1b25ab010b8bf52af88a27f1375.tar.gz | |
block: Use returned *file in bdrv_co_get_block_status
Now that all drivers return the right "file" pointer, we can use it.
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1453780743-16806-14-git-send-email-famz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
| -rw-r--r-- | block/io.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1554,13 +1554,13 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, } } - if (bs->file && + if (*file && *file != bs && (ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO) && (ret & BDRV_BLOCK_OFFSET_VALID)) { BlockDriverState *file2; int file_pnum; - ret2 = bdrv_co_get_block_status(bs->file->bs, ret >> BDRV_SECTOR_BITS, + ret2 = bdrv_co_get_block_status(*file, ret >> BDRV_SECTOR_BITS, *pnum, &file_pnum, &file2); if (ret2 >= 0) { /* Ignore errors. This is just providing extra information, it |
