ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: reinitialize across bdrv_close()/bdrv_open() 

Several BlockDriverState fields are not being reinitialized across
bdrv_close()/bdrv_open().  Make sure they are reset to their default
values.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2011-10-27 10:54:28 +01:00 committed by Kevin Wolf
parent e7c637967e
commit 03f541bd6e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block.c
View File

@ -472,10 +472,13 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename,
bs->total_sectors = 0; bs->total_sectors = 0;
bs->encrypted = 0; bs->encrypted = 0;
bs->valid_key = 0; bs->valid_key = 0;
bs->sg = 0;
bs->open_flags = flags; bs->open_flags = flags;
bs->growable = 0;
bs->buffer_alignment = 512; bs->buffer_alignment = 512;
pstrcpy(bs->filename, sizeof(bs->filename), filename); pstrcpy(bs->filename, sizeof(bs->filename), filename);
bs->backing_file[0] = '\0';
if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv)) { if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv)) {
return -ENOTSUP; return -ENOTSUP;
@ -484,8 +487,7 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename,
bs->drv = drv; bs->drv = drv;
bs->opaque = g_malloc0(drv->instance_size); bs->opaque = g_malloc0(drv->instance_size);
if (flags & BDRV_O_CACHE_WB) bs->enable_write_cache = !!(flags & BDRV_O_CACHE_WB);
bs->enable_write_cache = 1;
/* /*
* Clear flags that are internal to the block layer before opening the * Clear flags that are internal to the block layer before opening the