{"id":2197884,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2197884/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<20260218202829.1322088-10-vsementsov@yandex-team.ru>","date":"2026-02-18T20:28:25","name":"[v3,09/12] net/tap: move fds parameters handling to separate functions","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"520dd3c0092b7f8630c56e1a02aedcb62ebe2097","submitter":{"id":84116,"url":"http://patchwork.ozlabs.org/api/1.0/people/84116/?format=json","name":"Vladimir Sementsov-Ogievskiy","email":"vsementsov@yandex-team.ru"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260218202829.1322088-10-vsementsov@yandex-team.ru/mbox/","series":[{"id":492602,"url":"http://patchwork.ozlabs.org/api/1.0/series/492602/?format=json","date":"2026-02-18T20:28:20","name":"net: refactoring and fixes","version":3,"mbox":"http://patchwork.ozlabs.org/series/492602/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2197884/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=yandex-team.ru header.i=@yandex-team.ru\n header.a=rsa-sha256 header.s=default header.b=Q/QWShrU;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)","mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net;\n dkim=pass header.i=@yandex-team.ru"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fGSmL0p8Xz1xwC\n\tfor ; Thu, 19 Feb 2026 07:29:38 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1vsoAT-0007DW-Qs; Wed, 18 Feb 2026 15:29:05 -0500","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1vsoA6-00075c-SY\n for qemu-devel@nongnu.org; Wed, 18 Feb 2026 15:28:44 -0500","from forwardcorp1a.mail.yandex.net ([178.154.239.72])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1vsoA5-0007sy-7j\n for qemu-devel@nongnu.org; Wed, 18 Feb 2026 15:28:42 -0500","from mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net\n (mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net\n [IPv6:2a02:6b8:c2d:3530:0:640:eca4:0])\n by forwardcorp1a.mail.yandex.net (Yandex) with ESMTPS id EF678C0389;\n Wed, 18 Feb 2026 23:28:39 +0300 (MSK)","from vsementsov-lin (unknown [2a02:6bf:8080:53d::1:1b])\n by mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net (smtpcorp/Yandex) with\n ESMTPSA id VShB144A8iE0-8ezo4kjE; Wed, 18 Feb 2026 23:28:39 +0300"],"Precedence":"bulk","X-Yandex-Fwd":"1","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru;\n s=default; t=1771446519;\n bh=o/aFvBrBgV0clNaGOdZOhE5r1XfxDS8kc1noxuRnRqQ=;\n h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From;\n b=Q/QWShrU+OnS2MOmvw6gaSiEZoCsuuYh9TA8QYRaC/Q4a4q74RexKxcOdhF1pyWsO\n j+8g3FzLx2M2YjJW7x0I6UDTqiv/S+USdmWSRnskVCBKQLthJ1KMJU4I6GHTpL6DAk\n tvDaBNIZW2U6BQXIejFMVo2KRx0kKRaoZdYcffx4=","From":"Vladimir Sementsov-Ogievskiy ","To":"jasowang@redhat.com","Cc":"qemu-devel@nongnu.org, bchaney@akamai.com, yc-core@yandex-team.ru,\n d-tatianin@yandex-team.ru, davydov-max@yandex-team.ru,\n vsementsov@yandex-team.ru","Subject":"[PATCH v3 09/12] net/tap: move fds parameters handling to separate\n functions","Date":"Wed, 18 Feb 2026 23:28:25 +0300","Message-ID":"<20260218202829.1322088-10-vsementsov@yandex-team.ru>","X-Mailer":"git-send-email 2.52.0","In-Reply-To":"<20260218202829.1322088-1-vsementsov@yandex-team.ru>","References":"<20260218202829.1322088-1-vsementsov@yandex-team.ru>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=178.154.239.72;\n envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1a.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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n 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","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"This significantly simplify the code in net_init_tap().\n\nSigned-off-by: Vladimir Sementsov-Ogievskiy \n---\n net/tap.c | 99 ++++++++++++++++++++++++++++++++++++-------------------\n 1 file changed, 65 insertions(+), 34 deletions(-)","diff":"diff --git a/net/tap.c b/net/tap.c\nindex 2d4630c350..b794f80e34 100644\n--- a/net/tap.c\n+++ b/net/tap.c\n@@ -781,6 +781,61 @@ failed:\n return false;\n }\n \n+static bool unblock_fds(int *fds, int nfds, Error **errp)\n+{\n+ for (int i = 0; i < nfds; i++) {\n+ if (!qemu_set_blocking(fds[i], false, errp)) {\n+ return false;\n+ }\n+ }\n+\n+ return true;\n+}\n+\n+static int tap_parse_fds_and_queues(const NetdevTapOptions *tap, int **fds,\n+ Error **errp)\n+{\n+ int queues = 1;\n+\n+ if (tap->has_queues + !!tap->helper + !!tap->fds + !!tap->fd > 1) {\n+ error_setg(errp, \"queues=, helper=, fds= and fd= are mutual exclusive\");\n+ return -1;\n+ }\n+\n+ if (tap->has_queues) {\n+ if (tap->queues > INT_MAX) {\n+ error_setg(errp, \"queues exceeds maximum %d\", INT_MAX);\n+ return -1;\n+ }\n+ queues = tap->queues;\n+ *fds = NULL;\n+ } else if (tap->fd || tap->fds) {\n+ queues = net_parse_fds(tap->fd ?: tap->fds, fds,\n+ tap->fd ? 1 : 0, errp);\n+ if (!*fds) {\n+ return -1;\n+ }\n+ } else if (tap->helper) {\n+ int fd = net_bridge_run_helper(tap->helper,\n+ tap->br ?: DEFAULT_BRIDGE_INTERFACE,\n+ errp);\n+ if (fd < 0) {\n+ return -1;\n+ }\n+\n+ queues = 1;\n+ *fds = g_new(int, 1);\n+ **fds = fd;\n+ }\n+\n+ if (*fds && !unblock_fds(*fds, queues, errp)) {\n+ net_free_fds(*fds, queues);\n+ return -1;\n+ }\n+\n+ return queues;\n+}\n+\n int net_init_tap(const Netdev *netdev, const char *name,\n NetClientState *peer, Error **errp)\n {\n@@ -792,7 +847,6 @@ int net_init_tap(const Netdev *netdev, const char *name,\n \n assert(netdev->type == NET_CLIENT_DRIVER_TAP);\n tap = &netdev->u.tap;\n- queues = tap->has_queues ? tap->queues : 1;\n \n /* QEMU hubs do not support multiqueue tap, in this case peer is set.\n * For -netdev, peer is always NULL. */\n@@ -829,10 +883,15 @@ int net_init_tap(const Netdev *netdev, const char *name,\n return -1;\n }\n \n+ queues = tap_parse_fds_and_queues(tap, &fds, errp);\n+ if (queues < 0) {\n+ return -1;\n+ }\n+\n if (tap->vhostfd) {\n vhostfd = monitor_fd_param(monitor_cur(), tap->vhostfd, errp);\n if (vhostfd == -1) {\n- return -1;\n+ goto fail;\n }\n \n if (!qemu_set_blocking(vhostfd, false, errp)) {\n@@ -841,41 +900,23 @@ int net_init_tap(const Netdev *netdev, const char *name,\n }\n \n if (tap->fd) {\n- fd = monitor_fd_param(monitor_cur(), tap->fd, errp);\n- if (fd == -1) {\n- goto fail;\n- }\n-\n- if (!qemu_set_blocking(fd, false, errp)) {\n- goto fail;\n- }\n-\n- vnet_hdr = tap_probe_vnet_hdr(fd, errp);\n+ vnet_hdr = tap_probe_vnet_hdr(fds[0], errp);\n if (vnet_hdr < 0) {\n goto fail;\n }\n \n if (!net_init_tap_one(tap, peer, name, NULL,\n NULL, NULL,\n- vhostfd, vnet_hdr, fd, errp)) {\n+ vhostfd, vnet_hdr, fds[0], errp)) {\n goto fail;\n }\n } else if (tap->fds) {\n- queues = net_parse_fds(tap->fds, &fds, 0, errp);\n- if (queues < 0) {\n- goto fail;\n- }\n-\n if (tap->vhostfds && net_parse_fds(tap->vhostfds, &vhost_fds,\n queues, errp) < 0) {\n goto fail;\n }\n \n for (i = 0; i < queues; i++) {\n- if (!qemu_set_blocking(fds[i], false, errp)) {\n- goto fail;\n- }\n-\n if (vhost_fds && !qemu_set_blocking(vhost_fds[i], false, errp)) {\n goto fail;\n }\n@@ -899,24 +940,14 @@ int net_init_tap(const Netdev *netdev, const char *name,\n }\n }\n } else if (tap->helper) {\n- fd = net_bridge_run_helper(tap->helper,\n- tap->br ?: DEFAULT_BRIDGE_INTERFACE,\n- errp);\n- if (fd == -1) {\n- goto fail;\n- }\n-\n- if (!qemu_set_blocking(fd, false, errp)) {\n- goto fail;\n- }\n- vnet_hdr = tap_probe_vnet_hdr(fd, errp);\n+ vnet_hdr = tap_probe_vnet_hdr(fds[0], errp);\n if (vnet_hdr < 0) {\n goto fail;\n }\n \n if (!net_init_tap_one(tap, peer, name, ifname,\n NULL, NULL, vhostfd,\n- vnet_hdr, fd, errp)) {\n+ vnet_hdr, fds[0], errp)) {\n goto fail;\n }\n } else {\n","prefixes":["v3","09/12"]}