From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:33274)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1TjYLA-0000ue-Qx
	for qemu-devel@nongnu.org; Fri, 14 Dec 2012 11:42:26 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1TjYL9-0001ap-Ma
	for qemu-devel@nongnu.org; Fri, 14 Dec 2012 11:42:24 -0500
Received: from mx1.redhat.com ([209.132.183.28]:10306)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1TjYL9-0001ak-F3
	for qemu-devel@nongnu.org; Fri, 14 Dec 2012 11:42:23 -0500
Received: from int-mx11.intmail.prod.int.phx2.redhat.com
	(int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBEGgLGI028956
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Fri, 14 Dec 2012 11:42:22 -0500
Date: Fri, 14 Dec 2012 14:42:22 -0200
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20121214144222.5e5892de@doriath.home>
In-Reply-To: <0e0b8429c8da2bc3b210d52e0e223bbf79cb5dcf.1355404685.git.phrdina@redhat.com>
References: <cover.1355404685.git.phrdina@redhat.com>
	<0e0b8429c8da2bc3b210d52e0e223bbf79cb5dcf.1355404685.git.phrdina@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v2 07/17] block: add error parameter to
 del_existing_snapshots()
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Pavel Hrdina <phrdina@redhat.com>
Cc: qemu-devel@nongnu.org

On Thu, 13 Dec 2012 16:40:41 +0100
Pavel Hrdina <phrdina@redhat.com> wrote:

> Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
> ---
>  savevm.c | 12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/savevm.c b/savevm.c
> index 7ab7c7c..3ee7da5 100644
> --- a/savevm.c
> +++ b/savevm.c
> @@ -2094,22 +2094,18 @@ static int bdrv_snapshot_find(BlockDriverState *bs,
>  /*
>   * 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;
> -    int ret;
>  
>      bs = NULL;
>      while ((bs = bdrv_next(bs))) {
>          if (bdrv_can_snapshot(bs) &&
>              bdrv_snapshot_find(bs, snapshot, name, NULL) >= 0)
>          {
> -            ret = bdrv_snapshot_delete(bs, name, NULL);
> -            if (ret < 0) {
> -                monitor_printf(mon,
> -                               "Error while deleting snapshot on '%s'\n",
> -                               bdrv_get_device_name(bs));
> +            if (bdrv_snapshot_delete(bs, name, errp) < 0) {
>                  return -1;
>              }
>          }
> @@ -2194,7 +2190,7 @@ 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, NULL) < 0) {

Where do you print the error message returned by
del_existing_snapshots()? Actually, you seem to be leaking the
error object...

>          goto the_end;
>      }
>