From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVuIN-0007Tn-F5 for qemu-devel@nongnu.org; Mon, 14 Oct 2013 22:23:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VVuIH-0006a1-FQ for qemu-devel@nongnu.org; Mon, 14 Oct 2013 22:23:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30674) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVuIH-0006Zw-6v for qemu-devel@nongnu.org; Mon, 14 Oct 2013 22:23:33 -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 r9F2NWF6003052 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 14 Oct 2013 22:23:32 -0400 From: Fam Zheng Date: Tue, 15 Oct 2013 10:23:24 +0800 Message-Id: <1381803804-4551-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v2] mirror: drop local_err in mirror_complete 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. Also drop the backing_filename which is set but unused since 34b5d2c. Signed-off-by: Fam Zheng -- v2: fix typo in subject line. drop backing_filename. (Thanks Eric) Signed-off-by: Fam Zheng --- block/mirror.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index 7b95acf..7a73022 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -505,15 +505,10 @@ 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