diff options
| author | Jeff Cody <jcody@redhat.com> | 2012-09-20 15:13:18 -0400 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-09-24 15:15:11 +0200 |
| commit | 55b110f24ec765a09cfb7f4c013fcd90dd807628 (patch) | |
| tree | 34441cd2f0daa6a5b77b98eab17a97c1e61267db | |
| parent | be028adcedd68ca4d78fdc43e7e2fa4f1cdbc653 (diff) | |
| download | focaccia-qemu-55b110f24ec765a09cfb7f4c013fcd90dd807628.tar.gz focaccia-qemu-55b110f24ec765a09cfb7f4c013fcd90dd807628.zip | |
block: make bdrv_set_enable_write_cache() modify open_flags
bdrv_set_enable_write_cache() sets the bs->enable_write_cache flag, but without the flag recorded in bs->open_flags, then next time a reopen() is performed the enable_write_cache setting may be inadvertently lost. This will set the flag in open_flags, so it is preserved across reopens. Signed-off-by: Jeff Cody <jcody@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/block.c b/block.c index 4c0e7f5439..458bcc9b13 100644 --- a/block.c +++ b/block.c @@ -2168,6 +2168,13 @@ int bdrv_enable_write_cache(BlockDriverState *bs) void bdrv_set_enable_write_cache(BlockDriverState *bs, bool wce) { bs->enable_write_cache = wce; + + /* so a reopen() will preserve wce */ + if (wce) { + bs->open_flags |= BDRV_O_CACHE_WB; + } else { + bs->open_flags &= ~BDRV_O_CACHE_WB; + } } int bdrv_is_encrypted(BlockDriverState *bs) |