diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2010-05-06 16:34:56 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2010-05-17 10:20:05 +0200 |
| commit | c33491978c5c4c746cc0272d5f2df50aa14d1f02 (patch) | |
| tree | 6fde1e1cbd85836334b3b7722bbcf87d835dc58a /block.c | |
| parent | 209930818bc0bb1400fbfa7d6448066c1b9e7b4c (diff) | |
| download | qemu-c33491978c5c4c746cc0272d5f2df50aa14d1f02.tar.gz | |
block: Fix bdrv_commit
When reopening the image, don't guess the driver, but use the same driver as
was used before. This is important if the format=... option was used for that
image.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block.c')
| -rw-r--r-- | block.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -701,12 +701,12 @@ int bdrv_commit(BlockDriverState *bs) bdrv_delete(bs->backing_hd); bs->backing_hd = NULL; bs_rw = bdrv_new(""); - rw_ret = bdrv_open(bs_rw, filename, open_flags | BDRV_O_RDWR, NULL); + rw_ret = bdrv_open(bs_rw, filename, open_flags | BDRV_O_RDWR, drv); if (rw_ret < 0) { bdrv_delete(bs_rw); /* try to re-open read-only */ bs_ro = bdrv_new(""); - ret = bdrv_open(bs_ro, filename, open_flags & ~BDRV_O_RDWR, NULL); + ret = bdrv_open(bs_ro, filename, open_flags & ~BDRV_O_RDWR, drv); if (ret < 0) { bdrv_delete(bs_ro); /* drive not functional anymore */ @@ -758,7 +758,7 @@ ro_cleanup: bdrv_delete(bs->backing_hd); bs->backing_hd = NULL; bs_ro = bdrv_new(""); - ret = bdrv_open(bs_ro, filename, open_flags & ~BDRV_O_RDWR, NULL); + ret = bdrv_open(bs_ro, filename, open_flags & ~BDRV_O_RDWR, drv); if (ret < 0) { bdrv_delete(bs_ro); /* drive not functional anymore */ |