OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block: make .bdrv_close optional

Browse Source 
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2018-08-14 15:43:19 +03:00 committed by Kevin Wolf
parent 8d65a3ccfd
commit 3c005293c2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block.c
View File

@ -3349,7 +3349,9 @@ static void bdrv_close(BlockDriverState *bs)
bdrv_drain(bs); /* in case flush left pending I/O */ bdrv_drain(bs); /* in case flush left pending I/O */
if (bs->drv) { if (bs->drv) {
bs->drv->bdrv_close(bs); if (bs->drv->bdrv_close) {
bs->drv->bdrv_close(bs);
}
bs->drv = NULL; bs->drv = NULL;
} }

4
block/snapshot.c
View File

@ -218,7 +218,9 @@ int bdrv_snapshot_goto(BlockDriverState *bs,
qobject_unref(file_options); qobject_unref(file_options);
qdict_put_str(options, "file", bdrv_get_node_name(file)); qdict_put_str(options, "file", bdrv_get_node_name(file));
drv->bdrv_close(bs); if (drv->bdrv_close) {
drv->bdrv_close(bs);
}
bdrv_unref_child(bs, bs->file); bdrv_unref_child(bs, bs->file);
bs->file = NULL; bs->file = NULL;