* [Qemu-devel] [PATCH] block: Fix bdrv_commit
@ 2010-05-06 14:44 Kevin Wolf
2010-05-06 14:58 ` [Qemu-devel] " Naphtali Sprei
2010-05-06 19:56 ` [Qemu-devel] " Christoph Hellwig
0 siblings, 2 replies; 3+ messages in thread
From: Kevin Wolf @ 2010-05-06 14:44 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, nsprei
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 <kwolf@redhat.com>
---
block.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/block.c b/block.c
index adb3e5d..ffe82f8 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Qemu-devel] Re: [PATCH] block: Fix bdrv_commit
2010-05-06 14:44 [Qemu-devel] [PATCH] block: Fix bdrv_commit Kevin Wolf
@ 2010-05-06 14:58 ` Naphtali Sprei
2010-05-06 19:56 ` [Qemu-devel] " Christoph Hellwig
1 sibling, 0 replies; 3+ messages in thread
From: Naphtali Sprei @ 2010-05-06 14:58 UTC (permalink / raw)
To: Kevin Wolf; +Cc: qemu-devel
Kevin Wolf wrote:
> 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 <kwolf@redhat.com>
> ---
> block.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/block.c b/block.c
> index adb3e5d..ffe82f8 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 */
Acked-by: Naphtali Sprei <nsprei@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] block: Fix bdrv_commit
2010-05-06 14:44 [Qemu-devel] [PATCH] block: Fix bdrv_commit Kevin Wolf
2010-05-06 14:58 ` [Qemu-devel] " Naphtali Sprei
@ 2010-05-06 19:56 ` Christoph Hellwig
1 sibling, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2010-05-06 19:56 UTC (permalink / raw)
To: Kevin Wolf; +Cc: nsprei, qemu-devel
On Thu, May 06, 2010 at 04:44:34PM +0200, Kevin Wolf wrote:
> 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 <kwolf@redhat.com>
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-05-06 19:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-06 14:44 [Qemu-devel] [PATCH] block: Fix bdrv_commit Kevin Wolf
2010-05-06 14:58 ` [Qemu-devel] " Naphtali Sprei
2010-05-06 19:56 ` [Qemu-devel] " Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).