From nobody Tue Feb 10 19:47:58 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.zohomail.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 1499952766611592.3962330502609; Thu, 13 Jul 2017 06:32:46 -0700 (PDT) Received: from localhost ([::1]:60090 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVeEU-0003uJ-DT for importer@patchew.org; Thu, 13 Jul 2017 09:32:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVeA0-0008V8-Hj for qemu-devel@nongnu.org; Thu, 13 Jul 2017 09:28:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVe9x-0001Kr-0p for qemu-devel@nongnu.org; Thu, 13 Jul 2017 09:28:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60488) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dVe9w-0001K5-PK for qemu-devel@nongnu.org; Thu, 13 Jul 2017 09:28:00 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 51F88A78ED for ; Thu, 13 Jul 2017 13:27:58 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-60.ams2.redhat.com [10.36.116.60]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E859F7046C; Thu, 13 Jul 2017 13:27:57 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 55365113864A; Thu, 13 Jul 2017 15:27:56 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 51F88A78ED Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=armbru@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 51F88A78ED From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 13 Jul 2017 15:27:50 +0200 Message-Id: <1499952476-3454-4-git-send-email-armbru@redhat.com> In-Reply-To: <1499952476-3454-1-git-send-email-armbru@redhat.com> References: <1499952476-3454-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 13 Jul 2017 13:27:58 +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] [PULL 3/9] 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: Eduardo Habkost 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" From: Eduardo Habkost 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 Message-Id: <20170608133906.12737-4-ehabkost@redhat.com> Reviewed-by: Manos Pitsidianakis Reviewed-by: Eric Blake Reviewed-by: Markus Armbruster Signed-off-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 8fabade..5a3badb 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.7.5