[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/11] block: Fix bdrv_commit
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 10/11] block: Fix bdrv_commit |
Date: |
Fri, 7 May 2010 17:14:06 +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 01/11] block: Remove semicolon in BDRV_SECTOR_MASK macro, (continued)
- [Qemu-devel] [PATCH 01/11] block: Remove semicolon in BDRV_SECTOR_MASK macro, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 02/11] qemu-nbd: Improve error reporting, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 04/11] cloop: use qemu block API, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 03/11] cloop: use pread, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 06/11] bochs: use pread, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 08/11] block: Avoid unchecked casts for AIOCBs, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 05/11] ide: Fix ide_dma_cancel, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 09/11] block: Fix protocol detection for Windows devices, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 07/11] bochs: use qemu block API, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 11/11] block/vdi: Allow disk images of size 0, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 10/11] block: Fix bdrv_commit,
Kevin Wolf <=