From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51901) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USnT3-00085L-Bx for qemu-devel@nongnu.org; Thu, 18 Apr 2013 07:57:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1USnT2-0001Dp-7v for qemu-devel@nongnu.org; Thu, 18 Apr 2013 07:57:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59399) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USnNk-00081W-1n for qemu-devel@nongnu.org; Thu, 18 Apr 2013 07:52:04 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3IBq2Cu018119 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 18 Apr 2013 07:52:02 -0400 Message-ID: <516FDE60.10306@redhat.com> Date: Thu, 18 Apr 2013 13:52:00 +0200 From: Pavel Hrdina MIME-Version: 1.0 References: <918a1a8bde813010ce5576613614ad1d58f10942.1366127809.git.phrdina@redhat.com> <20130418114415.GC2723@dhcp-200-207.str.redhat.com> In-Reply-To: <20130418114415.GC2723@dhcp-200-207.str.redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 01/11] qemu-img: introduce qemu_img_handle_error() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: lcapitulino@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com On 18.4.2013 13:44, Kevin Wolf wrote: > Am 16.04.2013 um 18:05 hat Pavel Hrdina geschrieben: >> Later in the patch series we will use this function few times. >> This will avoid of duplicating the code. >> >> Signed-off-by: Pavel Hrdina >> --- >> qemu-img.c | 17 +++++++++++------ >> 1 file changed, 11 insertions(+), 6 deletions(-) >> >> diff --git a/qemu-img.c b/qemu-img.c >> index 31627b0..dbacdb7 100644 >> --- a/qemu-img.c >> +++ b/qemu-img.c >> @@ -322,6 +322,16 @@ static int add_old_style_options(const char *fmt, QEMUOptionParameter *list, >> return 0; >> } >> >> +static int qemu_img_handle_error(const char *msg, Error *err) >> +{ >> + if (error_is_set(&err)) { >> + error_report("%s: %s", msg, error_get_pretty(err)); >> + error_free(err); >> + return 1; >> + } >> + return 0; >> +} >> + >> static int img_create(int argc, char **argv) >> { >> int c; >> @@ -400,13 +410,8 @@ static int img_create(int argc, char **argv) >> >> bdrv_img_create(filename, fmt, base_filename, base_fmt, >> options, img_size, BDRV_O_FLAGS, &local_err, quiet); >> - if (error_is_set(&local_err)) { >> - error_report("%s", error_get_pretty(local_err)); >> - error_free(local_err); >> - return 1; >> - } >> >> - return 0; >> + return qemu_img_handle_error("qemu-img create failed", local_err); >> } > > This makes a change to the error message that isn't mentioned in the > commit message. It should definitely be mentioned there, but I'm not > even sure if it's a good change. Today you get something like: > > $ qemu-img create -f foo test.img > qemu-img: Unknown file format 'foo' > > With the patch applied it becomes: > > $ qemu-img create -f foo test.img > qemu-img: qemu-img create failed: Unknown file format 'foo' > > Does this add any useful information or does it just make the error > message longer? I feel it's the latter. > > Kevin > Thanks for pointing this out, it should be qemu_img_handle_error("create failed", local_err); and later in patch series also qemu_img_handle_error("snapshot create failed", local_err); Is that OK after this change? Pavel