From nobody Sun Feb 8 13:49:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149692951482176.47629039198694; Thu, 8 Jun 2017 06:45:14 -0700 (PDT) Received: from localhost ([::1]:49696 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIxkN-0007i8-8s for importer@patchew.org; Thu, 08 Jun 2017 09:45:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIxef-0001cd-Ex for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:39:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIxee-0005QJ-L1 for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:39:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52154) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dIxea-0005Mi-Ex; Thu, 08 Jun 2017 09:39:12 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6DB46C04B955; Thu, 8 Jun 2017 13:39:11 +0000 (UTC) Received: from localhost (ovpn-116-27.gru2.redhat.com [10.97.116.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4BB98D1A1; Thu, 8 Jun 2017 13:39:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6DB46C04B955 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 6DB46C04B955 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 8 Jun 2017 10:39:02 -0300 Message-Id: <20170608133906.12737-2-ehabkost@redhat.com> In-Reply-To: <20170608133906.12737-1-ehabkost@redhat.com> References: <20170608133906.12737-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 08 Jun 2017 13:39:11 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/5] xilinx: Fix error handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E. Iglesias" , Jason Wang , qemu-arm@nongnu.org, Markus Armbruster , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Assigning directly to *errp is not valid, as errp may be NULL, &error_fatal, or &error_abort. Use error_propagate() instead. error_propagate() handles non-NULL *errp correctly, so the "if (!*errp)" check can be removed. Cc: "Edgar E. Iglesias" Cc: Alistair Francis Cc: Jason Wang Cc: qemu-arm@nongnu.org Signed-off-by: Eduardo Habkost Reviewed-by: Alistair Francis Reviewed-by: Eric Blake Reviewed-by: Markus Armbruster --- hw/dma/xilinx_axidma.c | 4 +--- hw/net/xilinx_axienet.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 6065689ad1..3987b5ff96 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -554,9 +554,7 @@ static void xilinx_axidma_realize(DeviceState *dev, Err= or **errp) return; =20 xilinx_axidma_realize_fail: - if (!*errp) { - *errp =3D local_err; - } + error_propagate(errp, local_err); } =20 static void xilinx_axidma_init(Object *obj) diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index b6701844d3..5ffa739f68 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -981,9 +981,7 @@ static void xilinx_enet_realize(DeviceState *dev, Error= **errp) return; =20 xilinx_enet_realize_fail: - if (!*errp) { - *errp =3D local_err; - } + error_propagate(errp, local_err); } =20 static void xilinx_enet_init(Object *obj) --=20 2.11.0.259.g40922b1 From nobody Sun Feb 8 13:49:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496929360689535.7052232225724; Thu, 8 Jun 2017 06:42:40 -0700 (PDT) Received: from localhost ([::1]:49684 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIxhv-0004pH-DC for importer@patchew.org; Thu, 08 Jun 2017 09:42:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIxek-0001ha-Gd for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:39:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIxei-0005TU-Mf for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:39:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60370) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dIxec-0005OF-9h; Thu, 08 Jun 2017 09:39:14 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4D1321766A9; Thu, 8 Jun 2017 13:39:13 +0000 (UTC) Received: from localhost (ovpn-116-27.gru2.redhat.com [10.97.116.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id C9F2D8E265; Thu, 8 Jun 2017 13:39:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4D1321766A9 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 4D1321766A9 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 8 Jun 2017 10:39:03 -0300 Message-Id: <20170608133906.12737-3-ehabkost@redhat.com> In-Reply-To: <20170608133906.12737-1-ehabkost@redhat.com> References: <20170608133906.12737-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 08 Jun 2017 13:39:13 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/5] block: Don't try to set *errp directly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Markus Armbruster , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Assigning directly to *errp is not valid, as errp may be NULL, &error_fatal, or &error_abort. Use error_propagate() instead. With this, there's no need to check if errp is NULL anymore, as error_propagate() and error_prepend() are able to handle that. Cc: Kevin Wolf Cc: Max Reitz Cc: qemu-block@nongnu.org Signed-off-by: Eduardo Habkost Reviewed-by: Alberto Garcia Reviewed-by: Eric Blake Reviewed-by: Markus Armbruster --- block.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index fa1d06d846..1750a1838e 100644 --- a/block.c +++ b/block.c @@ -4263,11 +4263,9 @@ bool bdrv_op_is_blocked(BlockDriverState *bs, BlockO= pType op, Error **errp) assert((int) op >=3D 0 && op < BLOCK_OP_TYPE_MAX); if (!QLIST_EMPTY(&bs->op_blockers[op])) { blocker =3D QLIST_FIRST(&bs->op_blockers[op]); - if (errp) { - *errp =3D error_copy(blocker->reason); - error_prepend(errp, "Node '%s' is busy: ", - bdrv_get_device_or_node_name(bs)); - } + error_propagate(errp, error_copy(blocker->reason)); + error_prepend(errp, "Node '%s' is busy: ", + bdrv_get_device_or_node_name(bs)); return true; } return false; --=20 2.11.0.259.g40922b1 From nobody Sun Feb 8 13:49:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496929375103696.621550350111; Thu, 8 Jun 2017 06:42:55 -0700 (PDT) Received: from localhost ([::1]:49686 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIxi8-0004yN-FS for importer@patchew.org; Thu, 08 Jun 2017 09:42:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46798) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIxef-0001cc-Ew for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:39:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIxee-0005QR-MI for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:39:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43406) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dIxee-0005Pj-GC for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:39:16 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 78B06B1E40 for ; Thu, 8 Jun 2017 13:39:15 +0000 (UTC) Received: from localhost (ovpn-116-27.gru2.redhat.com [10.97.116.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id B014B7CDE6; Thu, 8 Jun 2017 13:39:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 78B06B1E40 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 78B06B1E40 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 8 Jun 2017 10:39:04 -0300 Message-Id: <20170608133906.12737-4-ehabkost@redhat.com> In-Reply-To: <20170608133906.12737-1-ehabkost@redhat.com> References: <20170608133906.12737-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 08 Jun 2017 13:39:15 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/5] websock: Don't try to set *errp directly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Assigning directly to *errp is not valid, as errp may be NULL, &error_fatal, or &error_abort. Use error_propagate() instead. Cc: "Daniel P. Berrange" Signed-off-by: Eduardo Habkost Reviewed-by: Eric Blake Reviewed-by: Manos Pitsidianakis Reviewed-by: Markus Armbruster --- io/channel-websock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/io/channel-websock.c b/io/channel-websock.c index 8fabadea2f..5a3badbec2 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -856,7 +856,7 @@ static ssize_t qio_channel_websock_readv(QIOChannel *io= c, ssize_t ret; =20 if (wioc->io_err) { - *errp =3D error_copy(wioc->io_err); + error_propagate(errp, error_copy(wioc->io_err)); return -1; } =20 @@ -902,7 +902,7 @@ static ssize_t qio_channel_websock_writev(QIOChannel *i= oc, ssize_t ret; =20 if (wioc->io_err) { - *errp =3D error_copy(wioc->io_err); + error_propagate(errp, error_copy(wioc->io_err)); return -1; } =20 --=20 2.11.0.259.g40922b1 From nobody Sun Feb 8 13:49:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496929372072277.675166898135; Thu, 8 Jun 2017 06:42:52 -0700 (PDT) Received: from localhost ([::1]:49685 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIxi6-0004xD-H4 for importer@patchew.org; Thu, 08 Jun 2017 09:42:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIxeh-0001eL-79 for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:39:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIxeg-0005Qw-ID for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:39:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58530) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dIxeg-0005Qm-By for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:39:18 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 65DF9796FE for ; Thu, 8 Jun 2017 13:39:17 +0000 (UTC) Received: from localhost (ovpn-116-27.gru2.redhat.com [10.97.116.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED2597F1C9; Thu, 8 Jun 2017 13:39:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 65DF9796FE Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 65DF9796FE From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 8 Jun 2017 10:39:05 -0300 Message-Id: <20170608133906.12737-5-ehabkost@redhat.com> In-Reply-To: <20170608133906.12737-1-ehabkost@redhat.com> References: <20170608133906.12737-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 08 Jun 2017 13:39:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/5] migration: Don't try to set *errp directly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , "Dr. David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Assigning directly to *errp is not valid, as errp may be NULL, &error_fatal, or &error_abort. Use error_propagate() instead. Cc: Juan Quintela Cc: "Dr. David Alan Gilbert" Signed-off-by: Eduardo Habkost Reviewed-by: Eric Blake Reviewed-by: Juan Quintela --- migration/migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/migration.c b/migration/migration.c index 48c94c9ca1..5a8bef3ef5 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1188,7 +1188,7 @@ bool migration_is_blocked(Error **errp) } =20 if (migration_blockers) { - *errp =3D error_copy(migration_blockers->data); + error_propagate(errp, error_copy(migration_blockers->data)); return true; } =20 --=20 2.11.0.259.g40922b1 From nobody Sun Feb 8 13:49:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496929513809372.8608838712952; Thu, 8 Jun 2017 06:45:13 -0700 (PDT) Received: from localhost ([::1]:49695 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIxkM-0007hg-0F for importer@patchew.org; Thu, 08 Jun 2017 09:45:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIxem-0001ji-Bq for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:39:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIxel-0005VH-7r for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:39:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43844) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dIxek-0005Uf-Vn for qemu-devel@nongnu.org; Thu, 08 Jun 2017 09:39:23 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C988342BC9 for ; Thu, 8 Jun 2017 13:39:21 +0000 (UTC) Received: from localhost (ovpn-116-27.gru2.redhat.com [10.97.116.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id C987C8E27C; Thu, 8 Jun 2017 13:39:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C988342BC9 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C988342BC9 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 8 Jun 2017 10:39:06 -0300 Message-Id: <20170608133906.12737-6-ehabkost@redhat.com> In-Reply-To: <20170608133906.12737-1-ehabkost@redhat.com> References: <20170608133906.12737-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 08 Jun 2017 13:39:21 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 5/5] vnc: No need for Error** parameter at vnc_client_io_error() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The only callers of vnc_client_io_error() with non-NULL errp don't use *errp after the function gets called, so there's no need to use an Error** argument. Change parameter to Error* and simplify the code. Cc: Gerd Hoffmann Cc: Daniel P. Berrange Signed-off-by: Eduardo Habkost Reviewed-by: Eric Blake --- ui/vnc.h | 2 +- ui/vnc.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ui/vnc.h b/ui/vnc.h index 694cf32ca9..52f65bbd86 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -526,7 +526,7 @@ uint32_t read_u32(uint8_t *data, size_t offset); =20 /* Protocol stage functions */ void vnc_client_error(VncState *vs); -ssize_t vnc_client_io_error(VncState *vs, ssize_t ret, Error **errp); +ssize_t vnc_client_io_error(VncState *vs, ssize_t ret, Error *err); =20 void start_client_init(VncState *vs); void start_auth_vnc(VncState *vs); diff --git a/ui/vnc.c b/ui/vnc.c index 47b49c7318..51f13f0c29 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1180,7 +1180,7 @@ void vnc_disconnect_finish(VncState *vs) g_free(vs); } =20 -ssize_t vnc_client_io_error(VncState *vs, ssize_t ret, Error **errp) +ssize_t vnc_client_io_error(VncState *vs, ssize_t ret, Error *err) { if (ret <=3D 0) { if (ret =3D=3D 0) { @@ -1188,14 +1188,11 @@ ssize_t vnc_client_io_error(VncState *vs, ssize_t r= et, Error **errp) vnc_disconnect_start(vs); } else if (ret !=3D QIO_CHANNEL_ERR_BLOCK) { VNC_DEBUG("Closing down client sock: ret %zd (%s)\n", - ret, errp ? error_get_pretty(*errp) : "Unknown"); + ret, err ? error_get_pretty(err) : "Unknown"); vnc_disconnect_start(vs); } =20 - if (errp) { - error_free(*errp); - *errp =3D NULL; - } + error_free(err); return 0; } return ret; @@ -1231,7 +1228,7 @@ ssize_t vnc_client_write_buf(VncState *vs, const uint= 8_t *data, size_t datalen) ret =3D qio_channel_write( vs->ioc, (const char *)data, datalen, &err); VNC_DEBUG("Wrote wire %p %zd -> %ld\n", data, datalen, ret); - return vnc_client_io_error(vs, ret, &err); + return vnc_client_io_error(vs, ret, err); } =20 =20 @@ -1344,7 +1341,7 @@ ssize_t vnc_client_read_buf(VncState *vs, uint8_t *da= ta, size_t datalen) ret =3D qio_channel_read( vs->ioc, (char *)data, datalen, &err); VNC_DEBUG("Read wire %p %zd -> %ld\n", data, datalen, ret); - return vnc_client_io_error(vs, ret, &err); + return vnc_client_io_error(vs, ret, err); } =20 =20 --=20 2.11.0.259.g40922b1