From patchwork Wed May 28 12:32:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 353404 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 430231400D8 for ; Wed, 28 May 2014 22:43:33 +1000 (EST) Received: from localhost ([::1]:41734 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpdCc-0007Fm-Q0 for incoming@patchwork.ozlabs.org; Wed, 28 May 2014 08:43:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wpd3y-0003qZ-4a for qemu-devel@nongnu.org; Wed, 28 May 2014 08:34:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wpd3s-0005l1-5l for qemu-devel@nongnu.org; Wed, 28 May 2014 08:34:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6866) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wpd3r-0005jy-Tk for qemu-devel@nongnu.org; Wed, 28 May 2014 08:34:28 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4SCYEMk004806 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 28 May 2014 08:34:14 -0400 Received: from localhost (ovpn-112-46.ams2.redhat.com [10.36.112.46]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s4SCYCpA031244; Wed, 28 May 2014 08:34:13 -0400 From: Stefan Hajnoczi To: Date: Wed, 28 May 2014 14:32:43 +0200 Message-Id: <1401280363-17417-34-git-send-email-stefanha@redhat.com> In-Reply-To: <1401280363-17417-1-git-send-email-stefanha@redhat.com> References: <1401280363-17417-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , Stefan Hajnoczi , Markus Armbruster , MORITA Kazutaka Subject: [Qemu-devel] [PULL v2 33/33] block/sheepdog: Don't use qerror_report() 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 From: Markus Armbruster qerror_report() is a transitional interface to help with converting existing HMP commands to QMP. It should not be used elsewhere. Replace by error_report(). Cc: MORITA Kazutaka Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Signed-off-by: Stefan Hajnoczi --- block/sheepdog.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 7bf1275..39f7461 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -723,7 +723,7 @@ static coroutine_fn void reconnect_to_sdog(void *opaque) s->fd = get_sheep_fd(s, &local_err); if (s->fd < 0) { DPRINTF("Wait for connection to be established\n"); - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err)); error_free(local_err); co_aio_sleep_ns(bdrv_get_aio_context(s->bs), QEMU_CLOCK_REALTIME, 1000000000ULL); @@ -1270,7 +1270,7 @@ static int reload_inode(BDRVSheepdogState *s, uint32_t snapid, const char *tag) fd = connect_to_sdog(s, &local_err); if (fd < 0) { - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err));; error_free(local_err); return -EIO; } @@ -1279,7 +1279,7 @@ static int reload_inode(BDRVSheepdogState *s, uint32_t snapid, const char *tag) ret = find_vdi_name(s, s->name, snapid, tag, &vid, false, &local_err); if (ret) { - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err));; error_free(local_err); goto out; } @@ -1753,7 +1753,7 @@ static void sd_close(BlockDriverState *bs) fd = connect_to_sdog(s, &local_err); if (fd < 0) { - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err));; error_free(local_err); return; } @@ -1804,7 +1804,7 @@ static int sd_truncate(BlockDriverState *bs, int64_t offset) fd = connect_to_sdog(s, &local_err); if (fd < 0) { - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err));; error_free(local_err); return fd; } @@ -1877,7 +1877,7 @@ static bool sd_delete(BDRVSheepdogState *s) fd = connect_to_sdog(s, &local_err); if (fd < 0) { - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err));; error_free(local_err); return false; } @@ -1924,7 +1924,7 @@ static int sd_create_branch(BDRVSheepdogState *s) deleted = sd_delete(s); ret = do_sd_create(s, &vid, !deleted, &local_err); if (ret) { - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err));; error_free(local_err); goto out; } @@ -1933,7 +1933,7 @@ static int sd_create_branch(BDRVSheepdogState *s) fd = connect_to_sdog(s, &local_err); if (fd < 0) { - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err));; error_free(local_err); ret = fd; goto out; @@ -2180,7 +2180,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) /* refresh inode. */ fd = connect_to_sdog(s, &local_err); if (fd < 0) { - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err));; error_free(local_err); ret = fd; goto cleanup; @@ -2195,7 +2195,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) ret = do_sd_create(s, &new_vid, 1, &local_err); if (ret < 0) { - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err));; error_free(local_err); error_report("failed to create inode for snapshot. %s", strerror(errno)); @@ -2297,7 +2297,7 @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab) fd = connect_to_sdog(s, &local_err); if (fd < 0) { - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err));; error_free(local_err); ret = fd; goto out; @@ -2326,7 +2326,7 @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab) fd = connect_to_sdog(s, &local_err); if (fd < 0) { - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err));; error_free(local_err); ret = fd; goto out; @@ -2388,7 +2388,7 @@ static int do_load_save_vmstate(BDRVSheepdogState *s, uint8_t *data, fd = connect_to_sdog(s, &local_err); if (fd < 0) { - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err));; error_free(local_err); return fd; }