Commit c3349197 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Fix bdrv_commit 



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: default avatarKevin Wolf <kwolf@redhat.com>
parent 20993081

block.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */