diff options
| author | Anthony Liguori | 2010-09-08 21:26:57 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2010-09-08 21:26:57 +0200 |
| commit | aab2e8f79ad253c760787ff3ce4d64967fed0003 (patch) | |
| tree | bc837d155b4d558b71ad196c561f9e71c10136d0 /qemu-img.c | |
| parent | Merge remote branch 'mst/for_anthony' into staging (diff) | |
| parent | qcow2: Remove unnecessary flush after L2 write (diff) | |
| download | qemu-aab2e8f79ad253c760787ff3ce4d64967fed0003.tar.gz qemu-aab2e8f79ad253c760787ff3ce4d64967fed0003.tar.xz qemu-aab2e8f79ad253c760787ff3ce4d64967fed0003.zip | |
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'qemu-img.c')
| -rw-r--r-- | qemu-img.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qemu-img.c b/qemu-img.c index e300f911cb..4e035e44cc 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -783,7 +783,8 @@ static int img_convert(int argc, char **argv) goto out; } - out_bs = bdrv_new_open(out_filename, out_fmt, BDRV_O_FLAGS | BDRV_O_RDWR); + out_bs = bdrv_new_open(out_filename, out_fmt, + BDRV_O_FLAGS | BDRV_O_RDWR | BDRV_O_NO_FLUSH); if (!out_bs) { ret = -1; goto out; @@ -1286,7 +1287,7 @@ static int img_rebase(int argc, char **argv) } bs_new_backing = bdrv_new("new_backing"); - ret = bdrv_open(bs_new_backing, out_baseimg, BDRV_O_FLAGS | BDRV_O_RDWR, + ret = bdrv_open(bs_new_backing, out_baseimg, BDRV_O_FLAGS, new_backing_drv); if (ret) { error("Could not open new backing file '%s'", out_baseimg); |