From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaGyt-00061g-Ly for qemu-devel@nongnu.org; Fri, 11 Sep 2015 01:34:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaGys-00028Y-Ij for qemu-devel@nongnu.org; Fri, 11 Sep 2015 01:34:39 -0400 Received: from mail-pa0-x233.google.com ([2607:f8b0:400e:c03::233]:35925) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaGys-00027N-AP for qemu-devel@nongnu.org; Fri, 11 Sep 2015 01:34:38 -0400 Received: by padhk3 with SMTP id hk3so64516427pad.3 for ; Thu, 10 Sep 2015 22:34:37 -0700 (PDT) From: Peter Crosthwaite Date: Thu, 10 Sep 2015 22:33:34 -0700 Message-Id: <2c0b4a9aadaefdf671aeb9ed071af1a94f2834b8.1441667360.git.crosthwaite.peter@gmail.com> In-Reply-To: References: Subject: [Qemu-devel] [RFC PATCH v1 24/25] migration: savevm: Update error API usages List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, armbru@redhat.com Use error_prefix() and convert monitor_printf to error_printf_fn. Cc: Juan Quintela Signed-off-by: Peter Crosthwaite --- migration/savevm.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 6071215..683201d 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1266,12 +1266,10 @@ static int del_existing_snapshots(Monitor *mon, const char *name) bdrv_snapshot_find(bs, snapshot, name) >= 0) { bdrv_snapshot_delete_by_id_or_name(bs, name, &err); if (err) { - monitor_printf(mon, - "Error while deleting snapshot on device '%s':" - " %s\n", - bdrv_get_device_name(bs), - error_get_pretty(err)); - error_free(err); + error_prefix(err, + "Error while deleting snapshot on device '%s':", + bdrv_get_device_name(bs)); + error_printf_fn(err, monitor_printf, mon); return -1; } } @@ -1360,7 +1358,7 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) vm_state_size = qemu_ftell(f); qemu_fclose(f); if (ret < 0) { - monitor_printf(mon, "%s\n", error_get_pretty(local_err)); + error_printf_fn(local_err, monitor_printf, mon); error_free(local_err); goto the_end; } @@ -1512,12 +1510,10 @@ void hmp_delvm(Monitor *mon, const QDict *qdict) err = NULL; bdrv_snapshot_delete_by_id_or_name(bs, name, &err); if (err) { - monitor_printf(mon, - "Error while deleting snapshot on device '%s':" - " %s\n", - bdrv_get_device_name(bs), - error_get_pretty(err)); - error_free(err); + error_prefix(err, + "Error while deleting snapshot on device '%s':", + bdrv_get_device_name(bs)); + error_printf_fn(err, monitor_printf, mon); } } } -- 1.9.1