From patchwork Mon Nov 5 07:41:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liguang X-Patchwork-Id: 197157 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D9BC92C014C for ; Mon, 5 Nov 2012 18:43:35 +1100 (EST) Received: from localhost ([::1]:47722 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TVHLF-0002Ch-RL for incoming@patchwork.ozlabs.org; Mon, 05 Nov 2012 02:43:29 -0500 Received: from eggs.gnu.org ([208.118.235.92]:43816) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TVHL5-00026a-So for qemu-devel@nongnu.org; Mon, 05 Nov 2012 02:43:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TVHL5-00087E-3d for qemu-devel@nongnu.org; Mon, 05 Nov 2012 02:43:19 -0500 Received: from [222.73.24.84] (port=56028 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TVHL2-00086r-Rs; Mon, 05 Nov 2012 02:43:17 -0500 X-IronPort-AV: E=Sophos;i="4.80,713,1344182400"; d="scan'208";a="6138919" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 05 Nov 2012 15:41:10 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id qA57gd1G015852; Mon, 5 Nov 2012 15:42:46 +0800 Received: from liguang.fnst.cn.fujitsu.com ([10.167.225.128]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012110515414941-958055 ; Mon, 5 Nov 2012 15:41:49 +0800 From: liguang To: qemu-devel@nongnu.org Date: Mon, 5 Nov 2012 15:41:40 +0800 Message-Id: <1352101300-12060-1-git-send-email-lig.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.2.5 X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/11/05 15:41:49, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/11/05 15:41:55, Serialize complete at 2012/11/05 15:41:55 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: qemu-trivial@nongnu.org, liguang Subject: [Qemu-devel] [PATCH v4] correct error message qemu-img reported X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qemu-img will complain when qcow or qcow2 size overflow for 64 bits, report the right message in this condition. Signed-off-by: liguang Reviewed-by: Stefan Hajnoczi Nacked-by: QEMU Patches --- qemu-img.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index b41e670..d9434ad 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -340,7 +340,12 @@ static int img_create(int argc, char **argv) int64_t sval; char *end; sval = strtosz_suffix(argv[optind++], &end, STRTOSZ_DEFSUFFIX_B); - if (sval < 0 || *end) { + if (sval < 0) { + error_report("Image size must be less than 8 exabytes!"); + ret = -1; + goto out; + } + if (*end) { error_report("Invalid image size specified! You may use k, M, G or " "T suffixes for "); error_report("kilobytes, megabytes, gigabytes and terabytes.");