From patchwork Thu Feb 4 13:45:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2,4/4] Open backing file read-only also for snapshot mode Date: Thu, 04 Feb 2010 03:45:22 -0000 From: Naphtali Sprei X-Patchwork-Id: 44494 Message-Id: <1265291122-31159-2-git-send-email-nsprei@redhat.com> To: qemu-devel@nongnu.org Cc: Naphtali Sprei Signed-off-by: Naphtali Sprei --- block.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/block.c b/block.c index 527b146..1db9961 100644 --- a/block.c +++ b/block.c @@ -483,19 +483,11 @@ int bdrv_open2(BlockDriverState *bs, const char *filename, int flags, if (bs->backing_format[0] != '\0') back_drv = bdrv_find_format(bs->backing_format); - open_flags &= ~BDRV_O_RDWR; /* clear RW, then restore from orig */ - if (bs->is_temporary) { - open_flags |= (flags & BDRV_O_RDWR); - } + open_flags &= ~BDRV_O_RDWR; ret = bdrv_open2(bs->backing_hd, backing_filename, open_flags, back_drv); if (ret < 0) { - open_flags &= ~BDRV_O_RDWR; /* Fall-back to read-only for the backing file */ - ret = bdrv_open2(bs->backing_hd, backing_filename, open_flags, - back_drv); - } - if (ret < 0) { bdrv_close(bs); return ret; }