From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIMy4-0006Az-DL for qemu-devel@nongnu.org; Mon, 02 Feb 2015 14:47:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIMy0-0000cs-TQ for qemu-devel@nongnu.org; Mon, 02 Feb 2015 14:47:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60944) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIMy0-0000ci-Jx for qemu-devel@nongnu.org; Mon, 02 Feb 2015 14:47:28 -0500 Message-ID: <54CFD44C.8080902@redhat.com> Date: Mon, 02 Feb 2015 14:47:24 -0500 From: Max Reitz MIME-Version: 1.0 References: <1422284444-12529-1-git-send-email-mreitz@redhat.com> <1422284444-12529-7-git-send-email-mreitz@redhat.com> <20150202190004.GD19586@noname.redhat.com> In-Reply-To: <20150202190004.GD19586@noname.redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 06/14] qemu-img: Use blk_new_open() in img_rebase() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: Stefano Stabellini , qemu-devel@nongnu.org, Stefan Hajnoczi , Markus Armbruster On 2015-02-02 at 14:00, Kevin Wolf wrote: > Am 26.01.2015 um 16:00 hat Max Reitz geschrieben: >> Signed-off-by: Max Reitz >> --- >> qemu-img.c | 57 ++++++++++++++++++++++++--------------------------------- >> 1 file changed, 24 insertions(+), 33 deletions(-) >> >> diff --git a/qemu-img.c b/qemu-img.c >> index be1953d..0b23c87 100644 >> --- a/qemu-img.c >> +++ b/qemu-img.c >> @@ -2430,7 +2430,6 @@ static int img_rebase(int argc, char **argv) >> { >> BlockBackend *blk = NULL, *blk_old_backing = NULL, *blk_new_backing = NULL; >> BlockDriverState *bs = NULL, *bs_old_backing = NULL, *bs_new_backing = NULL; >> - BlockDriver *old_backing_drv, *new_backing_drv; >> char *filename; >> const char *fmt, *cache, *src_cache, *out_basefmt, *out_baseimg; >> int c, flags, src_flags, ret; >> @@ -2524,54 +2523,46 @@ static int img_rebase(int argc, char **argv) >> } >> bs = blk_bs(blk); >> >> - /* Find the right drivers for the backing files */ >> - old_backing_drv = NULL; >> - new_backing_drv = NULL; >> - >> - if (!unsafe && bs->backing_format[0] != '\0') { >> - old_backing_drv = bdrv_find_format(bs->backing_format); >> - if (old_backing_drv == NULL) { >> - error_report("Invalid format name: '%s'", bs->backing_format); >> - ret = -1; >> - goto out; >> - } >> - } >> - >> - if (out_basefmt != NULL) { >> - new_backing_drv = bdrv_find_format(out_basefmt); >> - if (new_backing_drv == NULL) { >> - error_report("Invalid format name: '%s'", out_basefmt); >> - ret = -1; >> - goto out; >> - } >> - } > You're removing the validity check of the new backing file format: > > [master] $ ./qemu-img rebase -u -b /tmp/backing.qcow2 -F foobar /tmp/test.qcow2 > qemu-img: Invalid format name: 'foobar' > [master] $ > > [growable-v3] $ ./qemu-img rebase -u -b /tmp/backing.qcow2 -F foobar /tmp/test.qcow2 > [growable-v3] $ Oops, right, I missed that this changes the unsafe path. Thanks for catching it! I'll fix it in v4. Max