diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-03-15 14:34:37 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-03-30 12:16:01 +0200 |
| commit | 72e775c7d9de3eaa35a6edaf9d87cedee149d0f5 (patch) | |
| tree | 6146ef9c8ce3f93f11df617a2e6d4dfeba72b82e /block/vmdk.c | |
| parent | e4b24b497e4171a89da541fe83c3dc84c51d42da (diff) | |
| download | qemu-72e775c7d9de3eaa35a6edaf9d87cedee149d0f5.zip qemu-72e775c7d9de3eaa35a6edaf9d87cedee149d0f5.tar.gz qemu-72e775c7d9de3eaa35a6edaf9d87cedee149d0f5.tar.bz2 | |
block: Always set writeback mode in blk_new_open()
All callers of blk_new_open() either don't rely on the WCE bit set after
blk_new_open() because they explicitly set it anyway, or they pass
BDRV_O_CACHE_WB unconditionally.
This patch changes blk_new_open() so that it always enables writeback
mode and asserts that BDRV_O_CACHE_WB is clear. For those callers that
used to pass BDRV_O_CACHE_WB unconditionally, the flag is removed now.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block/vmdk.c')
| -rw-r--r-- | block/vmdk.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/block/vmdk.c b/block/vmdk.c index a1a9371..45f9d3c 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1663,8 +1663,7 @@ static int vmdk_create_extent(const char *filename, int64_t filesize, } blk = blk_new_open(filename, NULL, NULL, - BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL, - &local_err); + BDRV_O_RDWR | BDRV_O_PROTOCOL, &local_err); if (blk == NULL) { error_propagate(errp, local_err); ret = -EIO; @@ -1948,7 +1947,7 @@ static int vmdk_create(const char *filename, QemuOpts *opts, Error **errp) } blk = blk_new_open(full_backing, NULL, NULL, - BDRV_O_NO_BACKING | BDRV_O_CACHE_WB, errp); + BDRV_O_NO_BACKING, errp); g_free(full_backing); if (blk == NULL) { ret = -EIO; @@ -2020,8 +2019,7 @@ static int vmdk_create(const char *filename, QemuOpts *opts, Error **errp) } new_blk = blk_new_open(filename, NULL, NULL, - BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_PROTOCOL, - &local_err); + BDRV_O_RDWR | BDRV_O_PROTOCOL, &local_err); if (new_blk == NULL) { error_propagate(errp, local_err); ret = -EIO; |