From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPrmm-0003B2-U4 for qemu-devel@nongnu.org; Wed, 10 Apr 2013 05:57:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPrml-00082G-6d for qemu-devel@nongnu.org; Wed, 10 Apr 2013 05:57:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28057) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPrmk-00081y-Tx for qemu-devel@nongnu.org; Wed, 10 Apr 2013 05:57:47 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3A9vkxd001232 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 10 Apr 2013 05:57:46 -0400 Message-ID: <51653798.9020806@redhat.com> Date: Wed, 10 Apr 2013 11:57:44 +0200 From: Pavel Hrdina MIME-Version: 1.0 References: <451dff8502328bfb24afa139cbdfeeebc60d3e67.1364565637.git.phrdina@redhat.com> <87mwt7debf.fsf@blackfin.pond.sub.org> In-Reply-To: <87mwt7debf.fsf@blackfin.pond.sub.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 02/11] block: add error parameter to del_existing_snapshots() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: qemu-devel@nongnu.org, lcapitulino@redhat.com On 9.4.2013 15:27, Markus Armbruster wrote: > Pavel Hrdina writes: > >> Signed-off-by: Pavel Hrdina >> Reviewed-by: Eric Blake >> --- >> savevm.c | 12 +++++++----- >> 1 file changed, 7 insertions(+), 5 deletions(-) >> >> diff --git a/savevm.c b/savevm.c >> index 77c5291..dc1f4a4 100644 >> --- a/savevm.c >> +++ b/savevm.c >> @@ -2224,7 +2224,7 @@ static int bdrv_snapshot_find(BlockDriverState *bs, QEMUSnapshotInfo *sn_info, >> /* >> * Deletes snapshots of a given name in all opened images. >> */ >> -static int del_existing_snapshots(Monitor *mon, const char *name) >> +static int del_existing_snapshots(const char *name, Error **errp) >> { >> BlockDriverState *bs; >> QEMUSnapshotInfo sn1, *snapshot = &sn1; >> @@ -2237,9 +2237,8 @@ static int del_existing_snapshots(Monitor *mon, const char *name) >> { >> ret = bdrv_snapshot_delete(bs, name); >> if (ret < 0) { >> - monitor_printf(mon, >> - "Error while deleting snapshot on '%s'\n", >> - bdrv_get_device_name(bs)); >> + error_setg(errp, "error while deleting snapshot on '%s'", >> + bdrv_get_device_name(bs)); >> return -1; >> } >> } > > Any particular reason for de-capitalizing "Error"? Yes, Eric told me that we should start the error message with lover case and also we shouldn't print '.' at the end of the error message. > >> @@ -2259,6 +2258,7 @@ void do_savevm(Monitor *mon, const QDict *qdict) >> qemu_timeval tv; >> struct tm tm; >> const char *name = qdict_get_try_str(qdict, "name"); >> + Error *local_err = NULL; >> >> /* Verify if there is a device that doesn't support snapshots and is writable */ >> bs = NULL; >> @@ -2307,7 +2307,9 @@ void do_savevm(Monitor *mon, const QDict *qdict) >> } >> >> /* Delete old snapshots of the same name */ >> - if (name && del_existing_snapshots(mon, name) < 0) { >> + if (name && del_existing_snapshots(name, &local_err) < 0) { >> + monitor_printf(mon, "%s\n", error_get_pretty(local_err)); >> + error_free(local_err); >> goto the_end; >> } > > Could use hmp_handle_error(), except it's static in hmp.c. On the other > hand, even hmp.c doesn't always use it... Luiz, what do you think? >