From nobody Thu Jan 9 23:33:01 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653491693; cv=none; d=zohomail.com; s=zohoarc; b=DksKP2G9C6n5bsqQQL1Ws33jIjKdGhbDpUOWwprUj63pQVhIKbX8ypHh1WhWk8d7KC94s0Cc8PR29pvFuK6Qn2JKM3jbvV7JW6CXIh6qr8WyQNB41ySyVXrJpcSb5ll5OlDPjFR8TBeZEPY+/rxkZt0KJj5S4KWe3GKiT6+Osag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653491693; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JxY9MA5x6iqOBnouDVh/yzYbs9SpUuAnmlQWplmWNGw=; b=LUBQUgikBi3zwAwgSx2cs1uos65+tvsOrqpXzz84yHLnSXDKGzwuhOyJ6oWDlVy+L+rT/UtrQZSoOP3+Cq8wkBsfL1usX1fW5MpHfqYPpu1H/u/DnVKAdCdvECdKgT2GczQPke/YDo+YtMLRa5uBRnb+ebGSlWjediRbEItaX4g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653491693739399.538263947632; Wed, 25 May 2022 08:14:53 -0700 (PDT) Received: from localhost ([::1]:59582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ntsiq-0005qj-Cu for importer2@patchew.org; Wed, 25 May 2022 11:14:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntsGo-0003Ex-8T for qemu-devel@nongnu.org; Wed, 25 May 2022 10:45:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:57961) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntsCy-00065O-4e for qemu-devel@nongnu.org; Wed, 25 May 2022 10:41:57 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-31-DHNpZfYjMw2iUPbNW3q3LQ-1; Wed, 25 May 2022 10:41:54 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DBE97185A794 for ; Wed, 25 May 2022 14:41:53 +0000 (UTC) Received: from localhost (unknown [10.39.192.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id 934D240C1240; Wed, 25 May 2022 14:41:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653489715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JxY9MA5x6iqOBnouDVh/yzYbs9SpUuAnmlQWplmWNGw=; b=Pv1u1TXBhWULjEJLfsfna9YCNplpOCFJ/COZ+41bwJnQGsueixBCe78rp4uSDAEJzKpzmC PD3iHEE4FAmwjTR7fLS0RBAdZzeQqwKlsJj7/XUHOaLhGyP1ne4pFlK1hOQfsO0ehTgzH8 fjJg/NUxh/rJ4/u45ZmjLsEhq6BPys4= X-MC-Unique: DHNpZfYjMw2iUPbNW3q3LQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Konstantin Kostiuk , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v5 07/15] qga: throw an Error in ga_channel_open() Date: Wed, 25 May 2022 16:41:32 +0200 Message-Id: <20220525144140.591926-8-marcandre.lureau@redhat.com> In-Reply-To: <20220525144140.591926-1-marcandre.lureau@redhat.com> References: <20220525144140.591926-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653491695857100001 From: Marc-Andr=C3=A9 Lureau Allow for a single point of error reporting, and further refactoring. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Markus Armbruster --- qga/channel-posix.c | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/qga/channel-posix.c b/qga/channel-posix.c index a996858e24..25fcc5cb1a 100644 --- a/qga/channel-posix.c +++ b/qga/channel-posix.c @@ -119,7 +119,7 @@ static int ga_channel_client_add(GAChannel *c, int fd) } =20 static gboolean ga_channel_open(GAChannel *c, const gchar *path, - GAChannelMethod method, int fd) + GAChannelMethod method, int fd, Error **er= rp) { int ret; c->method =3D method; @@ -133,21 +133,20 @@ static gboolean ga_channel_open(GAChannel *c, const g= char *path, #endif ); if (fd =3D=3D -1) { - g_critical("error opening channel: %s", strerror(errno)); + error_setg_errno(errp, errno, "error opening channel"); return false; } #ifdef CONFIG_SOLARIS ret =3D ioctl(fd, I_SETSIG, S_OUTPUT | S_INPUT | S_HIPRI); if (ret =3D=3D -1) { - g_critical("error setting event mask for channel: %s", - strerror(errno)); + error_setg_errno(errp, errno, "error setting event mask for ch= annel"); close(fd); return false; } #endif ret =3D ga_channel_client_add(c, fd); if (ret) { - g_critical("error adding channel to main loop"); + error_setg(errp, "error adding channel to main loop"); close(fd); return false; } @@ -159,7 +158,7 @@ static gboolean ga_channel_open(GAChannel *c, const gch= ar *path, assert(fd < 0); fd =3D qemu_open_old(path, O_RDWR | O_NOCTTY | O_NONBLOCK); if (fd =3D=3D -1) { - g_critical("error opening channel: %s", strerror(errno)); + error_setg_errno(errp, errno, "error opening channel"); return false; } tcgetattr(fd, &tio); @@ -180,7 +179,7 @@ static gboolean ga_channel_open(GAChannel *c, const gch= ar *path, tcsetattr(fd, TCSANOW, &tio); ret =3D ga_channel_client_add(c, fd); if (ret) { - g_critical("error adding channel to main loop"); + error_setg(errp, "error adding channel to main loop"); close(fd); return false; } @@ -188,12 +187,8 @@ static gboolean ga_channel_open(GAChannel *c, const gc= har *path, } case GA_CHANNEL_UNIX_LISTEN: { if (fd < 0) { - Error *local_err =3D NULL; - - fd =3D unix_listen(path, &local_err); - if (local_err !=3D NULL) { - g_critical("%s", error_get_pretty(local_err)); - error_free(local_err); + fd =3D unix_listen(path, errp); + if (fd < 0) { return false; } } @@ -202,24 +197,19 @@ static gboolean ga_channel_open(GAChannel *c, const g= char *path, } case GA_CHANNEL_VSOCK_LISTEN: { if (fd < 0) { - Error *local_err =3D NULL; SocketAddress *addr; char *addr_str; =20 addr_str =3D g_strdup_printf("vsock:%s", path); - addr =3D socket_parse(addr_str, &local_err); + addr =3D socket_parse(addr_str, errp); g_free(addr_str); - if (local_err !=3D NULL) { - g_critical("%s", error_get_pretty(local_err)); - error_free(local_err); + if (!addr) { return false; } =20 - fd =3D socket_listen(addr, 1, &local_err); + fd =3D socket_listen(addr, 1, errp); qapi_free_SocketAddress(addr); - if (local_err !=3D NULL) { - g_critical("%s", error_get_pretty(local_err)); - error_free(local_err); + if (fd < 0) { return false; } } @@ -227,7 +217,7 @@ static gboolean ga_channel_open(GAChannel *c, const gch= ar *path, break; } default: - g_critical("error binding/listening to specified socket"); + error_setg(errp, "error binding/listening to specified socket"); return false; } =20 @@ -272,12 +262,14 @@ GIOStatus ga_channel_read(GAChannel *c, gchar *buf, g= size size, gsize *count) GAChannel *ga_channel_new(GAChannelMethod method, const gchar *path, int listen_fd, GAChannelCallback cb, gpointer op= aque) { + Error *err =3D NULL; GAChannel *c =3D g_new0(GAChannel, 1); c->event_cb =3D cb; c->user_data =3D opaque; =20 - if (!ga_channel_open(c, path, method, listen_fd)) { - g_critical("error opening channel"); + if (!ga_channel_open(c, path, method, listen_fd, &err)) { + g_critical("%s", error_get_pretty(err)); + error_free(err); ga_channel_free(c); return NULL; } --=20 2.36.1