diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-30 13:43:04 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-30 13:43:05 +0100 |
| commit | b9c27e7ae6fb1387eafe858d8378ff14cd1c5b89 (patch) | |
| tree | 5a66308f776272b19396a47005f5e6438047c8bc /block/vdi.c | |
| parent | 8850dcbfd7664fab86ab49d9c27b6fa700d71618 (diff) | |
| parent | f4e732a0a773c4e44c2c183a5d63cd850ffb57d1 (diff) | |
| download | qemu-b9c27e7ae6fb1387eafe858d8378ff14cd1c5b89.zip qemu-b9c27e7ae6fb1387eafe858d8378ff14cd1c5b89.tar.gz qemu-b9c27e7ae6fb1387eafe858d8378ff14cd1c5b89.tar.bz2 | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches
# gpg: Signature made Wed 30 Mar 2016 11:57:54 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream: (48 commits)
iotests: Test qemu-img convert -S 0 behavior
block/null-{co,aio}: Implement get_block_status()
block/null-{co,aio}: Allow reading zeroes
qemu-img: Fix preallocation with -S 0 for convert
block: Remove bdrv_(set_)enable_write_cache()
block: Remove BDRV_O_CACHE_WB
block: Remove bdrv_parse_cache_flags()
qemu-io: Use bdrv_parse_cache_mode() in reopen_f()
block: Use bdrv_parse_cache_mode() in drive_init()
raw: Support BDRV_REQ_FUA
nbd: Support BDRV_REQ_FUA
iscsi: Support BDRV_REQ_FUA
block: Introduce bdrv_co_writev_flags()
block/qapi: Use blk_enable_write_cache()
block: Move enable_write_cache to BB level
block: Handle flush error in bdrv_pwrite_sync()
block: Always set writeback mode in blk_new_open()
block: blockdev_init(): Call blk_set_enable_write_cache() explicitly
xen_disk: Call blk_set_enable_write_cache() explicitly
qemu-img: Call blk_set_enable_write_cache() explicitly
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/vdi.c')
| -rw-r--r-- | block/vdi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/vdi.c b/block/vdi.c index 71f417c..75d4819 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -770,8 +770,7 @@ static int vdi_create(const char *filename, QemuOpts *opts, Error **errp) } 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; |