Received: from [140.186.70.92] (port=44736 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQeNJ-0006Jd-JQ for qemu-devel@nongnu.org; Thu, 09 Dec 2010 06:09:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PQeNI-0000Jt-85 for qemu-devel@nongnu.org; Thu, 09 Dec 2010 06:09:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:25355) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PQeNI-0000Jn-06 for qemu-devel@nongnu.org; Thu, 09 Dec 2010 06:09:24 -0500 From: Kevin Wolf Date: Thu, 9 Dec 2010 12:10:10 +0100 Message-Id: <1291893010-29223-15-git-send-email-kwolf@redhat.com> In-Reply-To: <1291893010-29223-1-git-send-email-kwolf@redhat.com> References: <1291893010-29223-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 14/14] qemu-img: Fail creation if backing format is invalid List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Stefan Hajnoczi The qemu-img create command should check the backing format to ensure only image files with valid backing formats are created. By checking in qemu-img.c we can print a useful error message. Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- qemu-img.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index c5a173c..52282e3 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -288,6 +288,7 @@ static int img_create(int argc, char **argv) const char *base_filename = NULL; BlockDriver *drv, *proto_drv; QEMUOptionParameter *param = NULL, *create_options = NULL; + QEMUOptionParameter *backing_fmt = NULL; char *options = NULL; for(;;) { @@ -379,14 +380,22 @@ static int img_create(int argc, char **argv) goto out; } + backing_fmt = get_option_parameter(param, BLOCK_OPT_BACKING_FMT); + if (backing_fmt && backing_fmt->value.s) { + if (!bdrv_find_format(backing_fmt->value.s)) { + error("Unknown backing file format '%s'", + backing_fmt->value.s); + ret = -1; + goto out; + } + } + // The size for the image must always be specified, with one exception: // If we are using a backing file, we can obtain the size from there if (get_option_parameter(param, BLOCK_OPT_SIZE)->value.n == -1) { QEMUOptionParameter *backing_file = get_option_parameter(param, BLOCK_OPT_BACKING_FILE); - QEMUOptionParameter *backing_fmt = - get_option_parameter(param, BLOCK_OPT_BACKING_FMT); if (backing_file && backing_file->value.s) { BlockDriverState *bs; @@ -395,14 +404,7 @@ static int img_create(int argc, char **argv) char buf[32]; if (backing_fmt && backing_fmt->value.s) { - if (bdrv_find_format(backing_fmt->value.s)) { - fmt = backing_fmt->value.s; - } else { - error("Unknown backing file format '%s'", - backing_fmt->value.s); - ret = -1; - goto out; - } + fmt = backing_fmt->value.s; } bs = bdrv_new_open(backing_file->value.s, fmt, BDRV_O_FLAGS); -- 1.7.2.3