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

block: move field reset from bdrv_open_common to bdrv_close 

bdrv_close should leave fields in the same state as bdrv_new.  It is
not up to bdrv_open_common to fix the mess.

Also, backing_format was not being re-initialized.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-05-08 16:51:49 +02:00 committed by Kevin Wolf
parent 947995c09e
commit 6405875cdd
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
block.c
View File

@ -610,16 +610,11 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename,
int ret, open_flags; int ret, open_flags;
assert(drv != NULL); assert(drv != NULL);
assert(bs->file == NULL);
trace_bdrv_open_common(bs, filename, flags, drv->format_name); trace_bdrv_open_common(bs, filename, flags, drv->format_name);
bs->file = NULL;
bs->total_sectors = 0;
bs->encrypted = 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;
assert(bs->copy_on_read == 0); /* bdrv_new() and bdrv_close() make it so */ assert(bs->copy_on_read == 0); /* bdrv_new() and bdrv_close() make it so */
@ -628,7 +623,6 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename,
} }
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;
@ -878,6 +872,11 @@ void bdrv_close(BlockDriverState *bs)
bs->copy_on_read = 0; bs->copy_on_read = 0;
bs->backing_file[0] = '\0'; bs->backing_file[0] = '\0';
bs->backing_format[0] = '\0'; bs->backing_format[0] = '\0';
bs->total_sectors = 0;
bs->encrypted = 0;
bs->valid_key = 0;
bs->sg = 0;
bs->growable = 0;
if (bs->file != NULL) { if (bs->file != NULL) {
bdrv_delete(bs->file); bdrv_delete(bs->file);