[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [STABLE 0.13][PATCH 3/6] block: Fix image re-open in bdrv_c
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [STABLE 0.13][PATCH 3/6] block: Fix image re-open in bdrv_commit |
Date: |
Mon, 30 Aug 2010 18:53:50 +0200 |
Arguably we should re-open the backing file with the backing file format and
not with the format of the snapshot image.
Signed-off-by: Kevin Wolf <address@hidden>
(cherry picked from commit ee1811965fd15e0b41f8d508b951a8ab826ae3a7)
Conflicts:
block.c
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index 8014a5c..e6087f3 100644
--- a/block.c
+++ b/block.c
@@ -743,6 +743,7 @@ int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res)
int bdrv_commit(BlockDriverState *bs)
{
BlockDriver *drv = bs->drv;
+ BlockDriver *backing_drv;
int64_t i, total_sectors;
int n, j, ro, open_flags;
int ret = 0, rw_ret = 0;
@@ -760,7 +761,8 @@ int bdrv_commit(BlockDriverState *bs)
if (bs->backing_hd->keep_read_only) {
return -EACCES;
}
-
+
+ backing_drv = bs->backing_hd->drv;
ro = bs->backing_hd->read_only;
strncpy(filename, bs->backing_hd->filename, sizeof(filename));
open_flags = bs->backing_hd->open_flags;
@@ -770,12 +772,14 @@ 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, drv);
+ rw_ret = bdrv_open(bs_rw, filename, open_flags | BDRV_O_RDWR,
+ backing_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, drv);
+ ret = bdrv_open(bs_ro, filename, open_flags & ~BDRV_O_RDWR,
+ backing_drv);
if (ret < 0) {
bdrv_delete(bs_ro);
/* drive not functional anymore */
@@ -827,7 +831,8 @@ 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, drv);
+ ret = bdrv_open(bs_ro, filename, open_flags & ~BDRV_O_RDWR,
+ backing_drv);
if (ret < 0) {
bdrv_delete(bs_ro);
/* drive not functional anymore */
--
1.7.2.2
- [Qemu-devel] [STABLE 0.13][PULL 0/6] Block patches for stable-0.13, Kevin Wolf, 2010/08/30
- [Qemu-devel] [STABLE 0.13][PATCH 1/6] virtio: Factor virtqueue_map_sg out, Kevin Wolf, 2010/08/30
- [Qemu-devel] [STABLE 0.13][PATCH 3/6] block: Fix image re-open in bdrv_commit,
Kevin Wolf <=
- [Qemu-devel] [STABLE 0.13][PATCH 4/6] qemu-img rebase: Open new backing file read-only, Kevin Wolf, 2010/08/30
- [Qemu-devel] [STABLE 0.13][PATCH 6/6] posix-aio-compat: Fix async_conmtext for ioctl, Kevin Wolf, 2010/08/30
- [Qemu-devel] [STABLE 0.13][PATCH 5/6] vvfat: fat_chksum(): fix access above array bounds, Kevin Wolf, 2010/08/30
- [Qemu-devel] [STABLE 0.13][PATCH 2/6] virtio-blk: Fix migration of queued requests, Kevin Wolf, 2010/08/30