openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

block: Fix image re-open in bdrv_commit 

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 <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2010-08-05 13:05:22 +02:00
parent b6a4805b55
commit ee1811965f
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
block.c
View File

@ -745,6 +745,7 @@ int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res)
int bdrv_commit(BlockDriverState *bs) int bdrv_commit(BlockDriverState *bs)
{ {
BlockDriver *drv = bs->drv; BlockDriver *drv = bs->drv;
BlockDriver *backing_drv;
int64_t sector, total_sectors; int64_t sector, total_sectors;
int n, ro, open_flags; int n, ro, open_flags;
int ret = 0, rw_ret = 0; int ret = 0, rw_ret = 0;
@ -763,6 +764,7 @@ int bdrv_commit(BlockDriverState *bs)
return -EACCES; return -EACCES;
} }
backing_drv = bs->backing_hd->drv;
ro = bs->backing_hd->read_only; ro = bs->backing_hd->read_only;
strncpy(filename, bs->backing_hd->filename, sizeof(filename)); strncpy(filename, bs->backing_hd->filename, sizeof(filename));
open_flags = bs->backing_hd->open_flags; open_flags = bs->backing_hd->open_flags;
@ -772,12 +774,14 @@ int bdrv_commit(BlockDriverState *bs)
bdrv_delete(bs->backing_hd); bdrv_delete(bs->backing_hd);
bs->backing_hd = NULL; bs->backing_hd = NULL;
bs_rw = bdrv_new(""); 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) { if (rw_ret < 0) {
bdrv_delete(bs_rw); bdrv_delete(bs_rw);
/* try to re-open read-only */ /* try to re-open read-only */
bs_ro = bdrv_new(""); 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) { if (ret < 0) {
bdrv_delete(bs_ro); bdrv_delete(bs_ro);
/* drive not functional anymore */ /* drive not functional anymore */
@ -828,7 +832,8 @@ ro_cleanup:
bdrv_delete(bs->backing_hd); bdrv_delete(bs->backing_hd);
bs->backing_hd = NULL; bs->backing_hd = NULL;
bs_ro = bdrv_new(""); 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) { if (ret < 0) {
bdrv_delete(bs_ro); bdrv_delete(bs_ro);
/* drive not functional anymore */ /* drive not functional anymore */