{"id":808136,"url":"http://patchwork.ozlabs.org/api/patches/808136/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170831082210.8362-11-stefanha@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170831082210.8362-11-stefanha@redhat.com>","list_archive_url":null,"date":"2017-08-31T08:22:05","name":"[PULL,for-2.10,10/15] misc: Remove unused Error variables","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a70ef752dd73a15617fa392831765a748a217111","submitter":{"id":17227,"url":"http://patchwork.ozlabs.org/api/people/17227/?format=json","name":"Stefan Hajnoczi","email":"stefanha@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170831082210.8362-11-stefanha@redhat.com/mbox/","series":[{"id":766,"url":"http://patchwork.ozlabs.org/api/series/766/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=766","date":"2017-08-31T08:21:55","name":"[PULL,for-2.10,01/15] nvme: Fix get/set number of queues feature, again","version":1,"mbox":"http://patchwork.ozlabs.org/series/766/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808136/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808136/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=stefanha@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjbFz4BVNz9s7c\n\tfor ;\n\tThu, 31 Aug 2017 18:32:07 +1000 (AEST)","from localhost ([::1]:54507 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnKtR-0004oj-JV\n\tfor incoming@patchwork.ozlabs.org; Thu, 31 Aug 2017 04:32:05 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:42572)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnKkX-0005Yf-2Q\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 04:22:54 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnKkT-0005vq-3t\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 04:22:53 -0400","from mx1.redhat.com ([209.132.183.28]:41570)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dnKkS-0005ve-Rz\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 04:22:49 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 0BC68C05A1BE;\n\tThu, 31 Aug 2017 08:22:48 +0000 (UTC)","from localhost (ovpn-117-89.ams2.redhat.com [10.36.117.89])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 853B118BBE;\n\tThu, 31 Aug 2017 08:22:45 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0BC68C05A1BE","From":"Stefan Hajnoczi ","To":"","Date":"Thu, 31 Aug 2017 09:22:05 +0100","Message-Id":"<20170831082210.8362-11-stefanha@redhat.com>","In-Reply-To":"<20170831082210.8362-1-stefanha@redhat.com>","References":"<20170831082210.8362-1-stefanha@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tThu, 31 Aug 2017 08:22:48 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL for-2.10 10/15] misc: Remove unused Error\n\tvariables","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Peter Maydell ,\n\tAlberto Garcia , Stefan Hajnoczi ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Alberto Garcia \n\nThere's a few cases which we're passing an Error pointer to a function\nonly to discard it immediately afterwards without checking it. In\nthese cases we can simply remove the variable and pass NULL instead.\n\nSigned-off-by: Alberto Garcia \nReviewed-by: Philippe Mathieu-Daudé \nReviewed-by: Eric Blake \nMessage-id: 20170829120836.16091-1-berto@igalia.com\nSigned-off-by: Stefan Hajnoczi \n---\n block/qcow.c | 12 +++---------\n block/qcow2.c | 8 ++------\n dump.c | 4 +---\n 3 files changed, 6 insertions(+), 18 deletions(-)","diff":"diff --git a/block/qcow.c b/block/qcow.c\nindex c08cdc4a7b..63904a26ee 100644\n--- a/block/qcow.c\n+++ b/block/qcow.c\n@@ -454,13 +454,11 @@ static uint64_t get_cluster_offset(BlockDriverState *bs,\n start_sect = (offset & ~(s->cluster_size - 1)) >> 9;\n for(i = 0; i < s->cluster_sectors; i++) {\n if (i < n_start || i >= n_end) {\n- Error *err = NULL;\n memset(s->cluster_data, 0x00, 512);\n if (qcrypto_block_encrypt(s->crypto, start_sect + i,\n s->cluster_data,\n BDRV_SECTOR_SIZE,\n- &err) < 0) {\n- error_free(err);\n+ NULL) < 0) {\n errno = EIO;\n return -1;\n }\n@@ -572,7 +570,6 @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,\n QEMUIOVector hd_qiov;\n uint8_t *buf;\n void *orig_buf;\n- Error *err = NULL;\n \n if (qiov->niov > 1) {\n buf = orig_buf = qemu_try_blockalign(bs, qiov->size);\n@@ -637,7 +634,7 @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,\n if (bs->encrypted) {\n assert(s->crypto);\n if (qcrypto_block_decrypt(s->crypto, sector_num, buf,\n- n * BDRV_SECTOR_SIZE, &err) < 0) {\n+ n * BDRV_SECTOR_SIZE, NULL) < 0) {\n goto fail;\n }\n }\n@@ -660,7 +657,6 @@ done:\n return ret;\n \n fail:\n- error_free(err);\n ret = -EIO;\n goto done;\n }\n@@ -709,11 +705,9 @@ static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,\n break;\n }\n if (bs->encrypted) {\n- Error *err = NULL;\n assert(s->crypto);\n if (qcrypto_block_encrypt(s->crypto, sector_num, buf,\n- n * BDRV_SECTOR_SIZE, &err) < 0) {\n- error_free(err);\n+ n * BDRV_SECTOR_SIZE, NULL) < 0) {\n ret = -EIO;\n break;\n }\ndiff --git a/block/qcow2.c b/block/qcow2.c\nindex 40ba26c111..fbfffadc76 100644\n--- a/block/qcow2.c\n+++ b/block/qcow2.c\n@@ -1820,15 +1820,13 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset,\n assert(s->crypto);\n assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);\n assert((cur_bytes & (BDRV_SECTOR_SIZE - 1)) == 0);\n- Error *err = NULL;\n if (qcrypto_block_decrypt(s->crypto,\n (s->crypt_physical_offset ?\n cluster_offset + offset_in_cluster :\n offset) >> BDRV_SECTOR_BITS,\n cluster_data,\n cur_bytes,\n- &err) < 0) {\n- error_free(err);\n+ NULL) < 0) {\n ret = -EIO;\n goto fail;\n }\n@@ -1942,7 +1940,6 @@ static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t offset,\n qemu_iovec_concat(&hd_qiov, qiov, bytes_done, cur_bytes);\n \n if (bs->encrypted) {\n- Error *err = NULL;\n assert(s->crypto);\n if (!cluster_data) {\n cluster_data = qemu_try_blockalign(bs->file->bs,\n@@ -1963,8 +1960,7 @@ static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t offset,\n cluster_offset + offset_in_cluster :\n offset) >> BDRV_SECTOR_BITS,\n cluster_data,\n- cur_bytes, &err) < 0) {\n- error_free(err);\n+ cur_bytes, NULL) < 0) {\n ret = -EIO;\n goto fail;\n }\ndiff --git a/dump.c b/dump.c\nindex d9090a24cc..a79773d0f7 100644\n--- a/dump.c\n+++ b/dump.c\n@@ -1695,10 +1695,8 @@ static void dump_process(DumpState *s, Error **errp)\n \n static void *dump_thread(void *data)\n {\n- Error *err = NULL;\n DumpState *s = (DumpState *)data;\n- dump_process(s, &err);\n- error_free(err);\n+ dump_process(s, NULL);\n return NULL;\n }\n \n","prefixes":["PULL","for-2.10","10/15"]}