From nobody Sat Sep 6 17:17:08 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=1756904007; cv=none; d=zohomail.com; s=zohoarc; b=FrJnxAPrhxNB013O5dvMtZgGoF4Z8PPJmoqZfgV7acZ5jbAYNE27WQRol7k8b5C26L8F/+hQivJopPuQI0EstZ039UAF4ok0e4Q8AZm9Uv2z9gTn7pJHe5EE1vBK3T1GssI+j3dcmWxiZRhrRUQo44EHRL6sPSTgbeVMB0LN2xI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756904007; 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=FZvAZvYWMrzkrgCQAZGPX1Zwn7CYwj80wz3CxZgDdzM=; b=Z8cpleHIdUQY6U2mZg7HLSQDIIdGGqiRCqmejKyJG2GoDrIXVQYWHuPCMjLH8nNizUEArNTxHS1XKsC6dBlW33wmIyY4fUo0jeDspjscw2YsVQim3avDKucgkSV2GZ1/9jXHDREEzDOzvOAUgzwEpcS7P/7lefT80rFhRhckTts= 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 1756904007088165.0195038927294; Wed, 3 Sep 2025 05:53:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utmw3-00061Q-LJ; Wed, 03 Sep 2025 08:49:59 -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 1utmvt-0005us-Df for qemu-devel@nongnu.org; Wed, 03 Sep 2025 08:49:50 -0400 Received: from forwardcorp1a.mail.yandex.net ([2a02:6b8:c0e:500:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1utmvq-0000lp-H9 for qemu-devel@nongnu.org; Wed, 03 Sep 2025 08:49:49 -0400 Received: from mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net [IPv6:2a02:6b8:c2d:7394:0:640:5a8a:0]) by forwardcorp1a.mail.yandex.net (Yandex) with ESMTPS id CE202C018E; Wed, 03 Sep 2025 15:49:41 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:b8f::1:11]) by mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id anf8gZ3GnW20-IQx8gFWS; Wed, 03 Sep 2025 15:49:41 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1756903781; bh=FZvAZvYWMrzkrgCQAZGPX1Zwn7CYwj80wz3CxZgDdzM=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=KCUsfGpilWKtqL2L3Kt10RVh+iSGZR7d0puiX+zAGUicvOIkjEaKRbPozsvTJ/DPO 3llvBy0rusS/OPMXEbDw30/DmM1QXAtd9pAPYhq7mh9XFW3l25M1Mn5NnfkeINEwKg vmUly+cYLP/5rWr999Y7SfWfLBzJ1II3XuQ3g2jQ= Authentication-Results: mail-nwsmtp-smtp-corp-main-83.vla.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, yc-core@yandex-team.ru Subject: [PATCH v3 08/19] net/tap: use glib strings vector and g_strsplit for fds case Date: Wed, 3 Sep 2025 15:49:22 +0300 Message-ID: <20250903124934.1169899-9-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250903124934.1169899-1-vsementsov@yandex-team.ru> References: <20250903124934.1169899-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=2a02:6b8:c0e:500:1:45:d181:df01; 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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: 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: 1756904009072124100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy Tested-by: Lei Yang --- net/tap.c | 72 +++++++++++-------------------------------------------- 1 file changed, 14 insertions(+), 58 deletions(-) diff --git a/net/tap.c b/net/tap.c index a1a315a9f0..cfa4ccc651 100644 --- a/net/tap.c +++ b/net/tap.c @@ -761,32 +761,6 @@ failed: return -1; } =20 -static int get_fds(char *str, char *fds[], int max) -{ - char *ptr =3D str, *this; - size_t len =3D strlen(str); - int i =3D 0; - - while (i < max && ptr < str + len) { - this =3D strchr(ptr, ':'); - - if (this =3D=3D NULL) { - fds[i] =3D g_strdup(ptr); - } else { - fds[i] =3D g_strndup(ptr, this - ptr); - } - - i++; - if (this =3D=3D NULL) { - break; - } else { - ptr =3D this + 1; - } - } - - return i; -} - int net_init_tap(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp) { @@ -846,74 +820,56 @@ int net_init_tap(const Netdev *netdev, const char *na= me, return -1; } } else if (tap->fds) { - char **fds; - char **vhost_fds; - int nfds =3D 0, nvhosts =3D 0; + g_auto(GStrv) fds =3D NULL; + g_auto(GStrv) vhost_fds =3D NULL; + int nfds; =20 if (tap->helper || tap->vhostfd) { error_setg(errp, "helper=3D and vhostfd=3D are invalid with fd= s=3D"); return -1; } =20 - fds =3D g_new0(char *, MAX_TAP_QUEUES); - vhost_fds =3D g_new0(char *, MAX_TAP_QUEUES); + fds =3D g_strsplit(tap->fds, ":", MAX_TAP_QUEUES); + nfds =3D g_strv_length(fds); =20 - nfds =3D get_fds(tap->fds, fds, MAX_TAP_QUEUES); if (tap->vhostfds) { - nvhosts =3D get_fds(tap->vhostfds, vhost_fds, MAX_TAP_QUEUES); - if (nfds !=3D nvhosts) { + vhost_fds =3D g_strsplit(tap->vhostfds, ":", MAX_TAP_QUEUES); + if (nfds !=3D g_strv_length(vhost_fds)) { error_setg(errp, "The number of fds passed does not match " "the number of vhostfds passed"); - ret =3D -1; - goto free_fail; + return -1; } } =20 for (i =3D 0; i < nfds; i++) { fd =3D monitor_fd_param(monitor_cur(), fds[i], errp); if (fd =3D=3D -1) { - ret =3D -1; - goto free_fail; + return -1; } =20 if (!qemu_set_blocking(fd, false, errp)) { - ret =3D -1; - goto free_fail; + return -1; } =20 if (i =3D=3D 0) { vnet_hdr =3D tap_probe_vnet_hdr(fd, errp); if (vnet_hdr < 0) { - ret =3D -1; - goto free_fail; + return -1; } } else if (vnet_hdr !=3D tap_probe_vnet_hdr(fd, NULL)) { error_setg(errp, "vnet_hdr not consistent across given tap fds"); - ret =3D -1; - goto free_fail; + return -1; } =20 ret =3D net_init_tap_one(tap, peer, "tap", name, NULL, NULL, NULL, - tap->vhostfds ? vhost_fds[i] : NULL, + vhost_fds ? vhost_fds[i] : NULL, vnet_hdr, fd, errp); if (ret < 0) { - ret =3D -1; - goto free_fail; + return -1; } } - -free_fail: - for (i =3D 0; i < nvhosts; i++) { - g_free(vhost_fds[i]); - } - for (i =3D 0; i < nfds; i++) { - g_free(fds[i]); - } - g_free(fds); - g_free(vhost_fds); - return ret; } else if (tap->helper) { if (tap->vhostfds) { error_setg(errp, "vhostfds=3D is invalid with helper=3D"); --=20 2.48.1