From nobody Sat Nov 15 05:18:18 2025 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1755965191; cv=none; d=zohomail.com; s=zohoarc; b=K6WHk2AwnJMnsxXPEmDe9AWbWswdToW54cm05cQtHaa0PqqpV3HYZAsxzNrfK8IAaxC+5Vr35g6PFnrEynFgduj1b+vFSa2k7e20ByIihONPvZbN4NebpF9UhtjHpg2fTMioSobxYYYVHVRTNTxCKM401eSCucO5yle708LriMU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755965191; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kmfQHM8TLUvJTk/2iH8NlzJJp/mIQx68htlSJAODbrY=; b=aoPGUgNL3sJwThhkv1E7hXkBSnFPfzcLo0j8vWkBbNR/nBSvN2nb/XN2JKO8VO3+OxlSEeq95Uxi5X2BxjxbHNRdQKZb4YCH+sKpNhPgBXrGwRUvE64ghp+L4IXDjt/MR+eZRM+5OKfjl4FcbIFTRP8nrT1MaVljk4KBqZGIqvE= 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+importer=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 1755965191252577.2319415493076; Sat, 23 Aug 2025 09:06:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1upqio-0005Rk-4O; Sat, 23 Aug 2025 12:04:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1upqiP-0005Ky-MN for qemu-devel@nongnu.org; Sat, 23 Aug 2025 12:03:42 -0400 Received: from forwardcorp1b.mail.yandex.net ([178.154.239.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1upqiL-0000Hj-0c for qemu-devel@nongnu.org; Sat, 23 Aug 2025 12:03:37 -0400 Received: from mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net [IPv6:2a02:6b8:c23:36c1:0:640:5f85:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id DEA6B80636; Sat, 23 Aug 2025 19:03:28 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:c91::1:b]) by mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id Q3YUrj0Gl8c0-FG1CDEro; Sat, 23 Aug 2025 19:03:28 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1755965008; bh=kmfQHM8TLUvJTk/2iH8NlzJJp/mIQx68htlSJAODbrY=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=IVX30jzSnOOZ1wg0Z6fwK+O8gcFWe8O5bN7iiDgX9rYtSXcXyWHrb+pPlmMvnDZJ5 3ZHK2gqYfFvsOE+Stc+XbRvH50eveV8Bbb7CzuoYPExVV3eFyjsXTRHPu3iWA54tJ9 hK7AC0oa4jMWjffWinEtddhLqoKhz3vyq9ZTZkfc= Authentication-Results: mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: jasowang@redhat.com Cc: qemu-devel@nongnu.org, vsementsov@yandex-team.ru, leiyang@redhat.com, steven.sistare@oracle.com Subject: [PATCH v2 03/20] net/tap: tap_set_sndbuf(): add return value Date: Sat, 23 Aug 2025 19:03:06 +0300 Message-ID: <20250823160323.20811-4-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250823160323.20811-1-vsementsov@yandex-team.ru> References: <20250823160323.20811-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=178.154.239.136; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1b.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1755965193615124100 Content-Type: text/plain; charset="utf-8" Follow common recommendations to avoid error propagation. Probably, it would also be good to use bool as a return type (switching to true/false as success/failure instead of 0/-1). But seems almost all functions (including a lot of them with errp argument) have 0/-1 semantics in net/, so making exclusions doesn't seem good. If we want such a switch, we should update the whole net/ directory. Signed-off-by: Vladimir Sementsov-Ogievskiy --- net/tap-linux.c | 5 ++++- net/tap.c | 4 +--- net/tap_int.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/net/tap-linux.c b/net/tap-linux.c index 22ec2f45d2..3625379c58 100644 --- a/net/tap-linux.c +++ b/net/tap-linux.c @@ -140,7 +140,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_h= dr, */ #define TAP_DEFAULT_SNDBUF 0 =20 -void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp) +int tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp) { int sndbuf; =20 @@ -154,7 +154,10 @@ void tap_set_sndbuf(int fd, const NetdevTapOptions *ta= p, Error **errp) =20 if (ioctl(fd, TUNSETSNDBUF, &sndbuf) =3D=3D -1 && tap->has_sndbuf) { error_setg_errno(errp, errno, "TUNSETSNDBUF ioctl failed"); + return -1; } + + return 0; } =20 int tap_probe_vnet_hdr(int fd, Error **errp) diff --git a/net/tap.c b/net/tap.c index ba2731ee8a..0258ac8574 100644 --- a/net/tap.c +++ b/net/tap.c @@ -702,9 +702,7 @@ static int net_init_tap_one(const NetdevTapOptions *tap= , NetClientState *peer, TAPState *s =3D net_tap_fd_init(peer, model, name, fd, vnet_hdr); int vhostfd; =20 - tap_set_sndbuf(s->fd, tap, &err); - if (err) { - error_propagate(errp, err); + if (tap_set_sndbuf(s->fd, tap, errp) < 0) { goto failed; } =20 diff --git a/net/tap_int.h b/net/tap_int.h index 8857ff299d..d21acf8486 100644 --- a/net/tap_int.h +++ b/net/tap_int.h @@ -33,7 +33,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, =20 ssize_t tap_read_packet(int tapfd, uint8_t *buf, int maxlen); =20 -void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp); +int tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp); int tap_probe_vnet_hdr(int fd, Error **errp); int tap_probe_has_ufo(int fd); int tap_probe_has_uso(int fd); --=20 2.48.1