yannick.naumann/RT-Task-Generator-QEMU
1
0
Fork 0
forked from alwin.berger/FRET-qemu
Code Pull Requests Activity

block: Remove unnecessary variable in bdrv_block_device_info

Browse Source 
The commit 5d8813593f ("block/qapi: Let bdrv_query_image_info()
recurse") removed the loop where we set the 'bs0' variable, so now it
is just the same as 'bs'.

Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230901184605.32260-3-farosas@suse.de>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Fabiano Rosas 2023-09-01 15:46:05 -03:00 committed by Kevin Wolf
parent be2e51c503
commit c3b29ae6b4
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block/qapi.c
View File

@ -48,7 +48,7 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
{ {
ImageInfo **p_image_info; ImageInfo **p_image_info;
ImageInfo *backing_info; ImageInfo *backing_info;
BlockDriverState *bs0, *backing; BlockDriverState *backing;
BlockDeviceInfo *info; BlockDeviceInfo *info;
ERRP_GUARD(); ERRP_GUARD();
@ -145,7 +145,6 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
info->write_threshold = bdrv_write_threshold_get(bs); info->write_threshold = bdrv_write_threshold_get(bs);
bs0 = bs;
p_image_info = &info->image; p_image_info = &info->image;
info->backing_file_depth = 0; info->backing_file_depth = 0;
@ -153,7 +152,7 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
* Skip automatically inserted nodes that the user isn't aware of for * Skip automatically inserted nodes that the user isn't aware of for
* query-block (blk != NULL), but not for query-named-block-nodes * query-block (blk != NULL), but not for query-named-block-nodes
*/ */
bdrv_query_image_info(bs0, p_image_info, flat, blk != NULL, errp); bdrv_query_image_info(bs, p_image_info, flat, blk != NULL, errp);
if (*errp) { if (*errp) {
qapi_free_BlockDeviceInfo(info); qapi_free_BlockDeviceInfo(info);
return NULL; return NULL;