[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/25] block: Fix image re-open in bdrv_commit
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 03/25] block: Fix image re-open in bdrv_commit |
Date: |
Wed, 8 Sep 2010 15:29:20 +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>
---
block.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index da70f29..a5514e3 100644
--- a/block.c
+++ b/block.c
@@ -745,6 +745,7 @@ int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res)
int bdrv_commit(BlockDriverState *bs)
{
BlockDriver *drv = bs->drv;
+ BlockDriver *backing_drv;
int64_t sector, total_sectors;
int n, ro, open_flags;
int ret = 0, rw_ret = 0;
@@ -762,7 +763,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;
@@ -772,12 +774,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 */
@@ -828,7 +832,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] [PATCH 14/25] scsi-disk: fix the block descriptor returned by the MODE SENSE command, (continued)
- [Qemu-devel] [PATCH 14/25] scsi-disk: fix the block descriptor returned by the MODE SENSE command, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 18/25] qemu-io: Make alloc output useful when nb_sectors=1, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 02/25] virtio-blk: Fix migration of queued requests, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 05/25] qemu-img rebase: Open new backing file read-only, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 24/25] block: Fix BDRV_O_CACHE_MASK, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 20/25] Improve ATA IDENTIFY word 64 contents., Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 23/25] qemu-img convert: Use cache=unsafe for output image, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 21/25] scsi-disk: add some optional scsi commands, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 07/25] nbd: Introduce NBD named exports., Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 19/25] raw-posix: Don't use file name for host_cdrom detection on Linux, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 03/25] block: Fix image re-open in bdrv_commit,
Kevin Wolf <=
- [Qemu-devel] [PATCH 11/25] scsi-disk: fix the mode data length field returned by the MODE SENSE command, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 12/25] scsi-disk: fix the mode data header returned by the MODE SENSE(10) command, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 09/25] monitor: make 'info snapshots' show only fully available snapshots, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 16/25] scsi-disk: fix the check of the DBD bit in the MODE SENSE command, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 08/25] posix-aio-compat: Fix async_conmtext for ioctl, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 13/25] scsi-disk: respect the page control (PC) field in the MODE SENSE command, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 01/25] virtio: Factor virtqueue_map_sg out, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 04/25] sheepdog: remove unnecessary includes, Kevin Wolf, 2010/09/08
- [Qemu-devel] [PATCH 10/25] savevm: Generate a name when run without one, Kevin Wolf, 2010/09/08
- Re: [Qemu-devel] [PULL v2 00/25] Block patches, Anthony Liguori, 2010/09/08