From nobody Sat Nov 15 07:45:52 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=1755526096; cv=none; d=zohomail.com; s=zohoarc; b=kfxrLYSRBZZBTKHCixoth8QXpyMVMpgWUw43wqI2xuH5R1OK79vbhJZdkebgL3tRICI2OFiR1ouLHRlb7wkGVAbTfO0Ez1Q1BSiSbMfBc/SnTop+AlHCOdJvdiJPIgR0q0qbTdwsslb5mjysPprDuEOwC53rk5pN8wIrogWUPuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755526096; 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=qurO9nCLOGwJkhLe8okvAExVdaifk8VQ87gE0if9bt8=; b=CZ4+uJE+ofODaQzyqsvS1zn8zk+pKPgpfsnzMsrI18DZAEfXJA4Bs+aDh4Pjcw8lQegPBMmGJC1AN85igJQzcY95ZhJELvjk3QbRtnY6xFo5dXhKZSvwIVDF2auuZCvN8oBoTAYQf4thJ4Kmh/1Qq8GwOkUyMkj+lURtmvKkXUw= 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 1755526096003155.6443040867282; Mon, 18 Aug 2025 07:08:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uo0W0-0001nI-B4; Mon, 18 Aug 2025 10:07:12 -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 1uo0Vy-0001mZ-7o for qemu-devel@nongnu.org; Mon, 18 Aug 2025 10:07:10 -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 1uo0Vw-0002D2-JM for qemu-devel@nongnu.org; Mon, 18 Aug 2025 10:07:09 -0400 Received: from mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net [IPv6:2a02:6b8:c21:2d8b:0:640:7d49:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id ACDE7807D8; Mon, 18 Aug 2025 17:06:53 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:b25::1:17]) by mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id k6RC4003YeA0-Y3p4N9j0; Mon, 18 Aug 2025 17:06:53 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1755526013; bh=qurO9nCLOGwJkhLe8okvAExVdaifk8VQ87gE0if9bt8=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=eHGnJSwKQk4l5+0QuyRGBvHTyofIejOFRrX4z6QsFUDaHzjz9tJza7Pdm7lar/MEk zSrI/h+LSGmB+t+P6KnNdqq3CNpHYi0YdgMGaHDMIkWBDJNyjBksFKvszkqtZYM5Oc f6F/QkmHM05xE7DYNQBAVTGq61ZF0PYS/vWKobhk= Authentication-Results: mail-nwsmtp-smtp-corp-main-34.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 Subject: [PATCH 18/19] net/tap: split net_tap_setup_vhost() separate function Date: Mon, 18 Aug 2025 17:06:44 +0300 Message-ID: <20250818140645.27904-19-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250818140645.27904-1-vsementsov@yandex-team.ru> References: <20250818140645.27904-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: 1755526097417116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy --- net/tap.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/net/tap.c b/net/tap.c index 93db3c47f8..fd977b748c 100644 --- a/net/tap.c +++ b/net/tap.c @@ -93,6 +93,8 @@ static int net_init_tap_one(const Netdev *netdev, NetClie= ntState *peer, const char *ifname, const char *script, const char *downscript, const char *vhostfdnam= e, int vnet_hdr, int fd, Error **errp); +static int net_tap_setup_vhost(TAPState *s, const NetdevTapOptions *tap, + const char *vhostfdname, Error **errp); =20 static void tap_update_fd_handler(TAPState *s) { @@ -742,7 +744,7 @@ static int net_init_tap_one(const Netdev *netdev, NetCl= ientState *peer, { const NetdevTapOptions *tap; TAPState *s =3D net_tap_fd_init(peer, model, name, fd, vnet_hdr); - int vhostfd; + int ret; =20 if (netdev->type =3D=3D NET_CLIENT_DRIVER_BRIDGE) { const NetdevBridgeOptions *bridge =3D &netdev->u.bridge; @@ -773,9 +775,25 @@ static int net_init_tap_one(const Netdev *netdev, NetC= lientState *peer, } } =20 + ret =3D net_tap_setup_vhost(s, tap, vhostfdname, errp); + if (ret < 0) { + goto failed; + } + + return 0; + +failed: + qemu_del_net_client(&s->nc); + return -1; +} + +static int net_tap_setup_vhost(TAPState *s, const NetdevTapOptions *tap, + const char *vhostfdname, Error **errp) +{ if (tap->has_vhost ? tap->vhost : vhostfdname || (tap->has_vhostforce && tap->vhostforce)) { VhostNetOptions options; + int vhostfd; =20 options.backend_type =3D VHOST_BACKEND_TYPE_KERNEL; options.net_backend =3D &s->nc; @@ -788,20 +806,20 @@ static int net_init_tap_one(const Netdev *netdev, Net= ClientState *peer, if (vhostfdname) { vhostfd =3D monitor_fd_param(monitor_cur(), vhostfdname, errp); if (vhostfd =3D=3D -1) { - goto failed; + return -1; } if (!set_fd_nonblocking(vhostfd, vhostfdname, errp)) { - goto failed; + return -1; } } else { vhostfd =3D open("/dev/vhost-net", O_RDWR); if (vhostfd < 0) { error_setg_errno(errp, errno, "tap: open vhost char device failed"); - goto failed; + return -1; } if (!set_fd_nonblocking(vhostfd, "opened /dev/vhost-net", errp= )) { - goto failed; + return -1; } } options.opaque =3D (void *)(uintptr_t)vhostfd; @@ -816,15 +834,11 @@ static int net_init_tap_one(const Netdev *netdev, Net= ClientState *peer, if (!s->vhost_net) { error_setg(errp, "vhost-net requested but could not be initialized"); - goto failed; + return -1; } } =20 return 0; - -failed: - qemu_del_net_client(&s->nc); - return -1; } =20 static int net_tap_from_monitor_fd(const Netdev *netdev, NetClientState *p= eer, --=20 2.48.1