From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUslR-000396-ID for qemu-devel@nongnu.org; Sat, 12 Oct 2013 02:33:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VUslL-0007H5-KB for qemu-devel@nongnu.org; Sat, 12 Oct 2013 02:33:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31221) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUslL-0007H1-CB for qemu-devel@nongnu.org; Sat, 12 Oct 2013 02:33:19 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9C6XIxX011602 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sat, 12 Oct 2013 02:33:18 -0400 From: Fam Zheng Date: Sat, 12 Oct 2013 14:33:12 +0800 Message-Id: <1381559592-6309-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH] mirror: drop local_err in mirror_compelte List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com There is errp passed in, so no need for local_err and error_propagate. Signed-off-by: Fam Zheng --- block/mirror.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index 7b95acf..f2e9558 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -505,15 +505,13 @@ static void mirror_iostatus_reset(BlockJob *job) static void mirror_complete(BlockJob *job, Error **errp) { MirrorBlockJob *s = container_of(job, MirrorBlockJob, common); - Error *local_err = NULL; int ret; - ret = bdrv_open_backing_file(s->target, NULL, &local_err); + ret = bdrv_open_backing_file(s->target, NULL, errp); if (ret < 0) { char backing_filename[PATH_MAX]; bdrv_get_full_backing_filename(s->target, backing_filename, sizeof(backing_filename)); - error_propagate(errp, local_err); return; } if (!s->synced) { -- 1.8.3.1