[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/21] block: Fix bdrv_commit
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 10/21] block: Fix bdrv_commit |
Date: |
Fri, 14 May 2010 19:10:44 +0200 |
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 <address@hidden>
---
block.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/block.c b/block.c
index 977d01f..c134c2b 100644
--- a/block.c
+++ b/block.c
@@ -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 */
--
1.6.6.1
- [Qemu-devel] [PATCH 11/21] block/vdi: Allow disk images of size 0, (continued)
- [Qemu-devel] [PATCH 11/21] block/vdi: Allow disk images of size 0, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 15/21] dmg: fix reading of uncompressed chunks, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 14/21] block/vpc: Fix conversion from size to disk geometry, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 02/21] qemu-nbd: Improve error reporting, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 16/21] dmg: use pread, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 17/21] dmg: use qemu block API, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 18/21] block/vdi: Fix image opening and creation for odd disk sizes, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 20/21] Fix docs for block stats monitor command, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 21/21] block: Remove special case for vvfat, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 19/21] use qemu_free() instead of free(), Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 10/21] block: Fix bdrv_commit,
Kevin Wolf <=
- [Qemu-devel] Re: [PULL 00/21] Block patches, Anthony Liguori, 2010/05/17