diff options
| author | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2011-10-27 10:54:28 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-10-28 19:25:50 +0200 |
| commit | 03f541bd6eacdc6c2893f72b975257c89cab2b74 (patch) | |
| tree | 06b42b48d6ed6b2758985049b51f9d7e25157fb0 | |
| parent | e7c637967e6aad195b5f30cfd995913c9e0b4666 (diff) | |
| download | focaccia-qemu-03f541bd6eacdc6c2893f72b975257c89cab2b74.tar.gz focaccia-qemu-03f541bd6eacdc6c2893f72b975257c89cab2b74.zip | |
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>
| -rw-r--r-- | block.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/block.c b/block.c index cb37086c8f..96f3c3fe4d 100644 --- a/block.c +++ b/block.c @@ -472,10 +472,13 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename, bs->total_sectors = 0; bs->encrypted = 0; bs->valid_key = 0; + bs->sg = 0; bs->open_flags = flags; + bs->growable = 0; bs->buffer_alignment = 512; pstrcpy(bs->filename, sizeof(bs->filename), filename); + bs->backing_file[0] = '\0'; if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv)) { return -ENOTSUP; @@ -484,8 +487,7 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename, bs->drv = drv; bs->opaque = g_malloc0(drv->instance_size); - if (flags & BDRV_O_CACHE_WB) - bs->enable_write_cache = 1; + bs->enable_write_cache = !!(flags & BDRV_O_CACHE_WB); /* * Clear flags that are internal to the block layer before opening the |