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=1755965222; cv=none; d=zohomail.com; s=zohoarc; b=X/eH5KN6y8t6VC0o89oG17Nt0io0P457Hr9qb/iNiUSfyAxozvtpKHopYbBFPxl3JlVIZvsKhk8xpc81MtIWYEIsSBZk8ptmvV2ffdHGKrw/spxlS63ODje6HC5ui94rm4bl/AS8vRUmSiEWnBlEQVBm0UC4vQtieMaVWkB5PxI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755965222; 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=cRcMgIZiYjlHYEaFWbqF61HRn8FG2JLDckGn87d2yNY=; b=ClKge57QdW9QjOTixdFe5gaA0qV0zyqwXxPxfJa+1y4Wst5cR1pioWbdixPnn5qf1xsn4GuStk9ozSSBJYMVYE/5ZbQjmqHWnfWyEx5dyb0y2uFXJiSVuNaK3VgR8VZdBf7P8oSjupuK5cHRyMYcH+J59RXK3TjdsCrTItx3Weg= 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 17559652226744.419045653674857; Sat, 23 Aug 2025 09:07:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1upqig-0005P5-0F; Sat, 23 Aug 2025 12:03:54 -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-0005Kx-AX for qemu-devel@nongnu.org; Sat, 23 Aug 2025 12:03:42 -0400 Received: from forwardcorp1b.mail.yandex.net ([2a02:6b8:c02:900: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 1upqiK-0000Hu-Vu 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 D7A74806D1; Sat, 23 Aug 2025 19:03:29 +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-LbveTovP; Sat, 23 Aug 2025 19:03:29 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1755965009; bh=cRcMgIZiYjlHYEaFWbqF61HRn8FG2JLDckGn87d2yNY=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=aCmD78SzmZL5+cR3V8EG10CrXoHM5HEgNx63Or7PD3b7drwfzMeyvnb3/c38RTae8 zdeadl3Wm75TGvKUolniGFYeW+LLBj4PGqYAHy/VoOcWejojSTWhUJuYlsH0/4TBH9 2JVtCBIPy1ZXO95hkvYzpDSP9177MlFh5I0APG8c= 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 05/20] net/tap: net_init_tap_one(): move parameter checking earlier Date: Sat, 23 Aug 2025 19:03:08 +0300 Message-ID: <20250823160323.20811-6-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=2a02:6b8:c02:900:1:45:d181:df01; 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, 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: 1755965224480116600 Content-Type: text/plain; charset="utf-8" Let's keep all similar argument checking in net_init_tap() function. Signed-off-by: Vladimir Sementsov-Ogievskiy --- net/tap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/tap.c b/net/tap.c index 58c3318b1c..3fe99ef63f 100644 --- a/net/tap.c +++ b/net/tap.c @@ -765,9 +765,6 @@ static int net_init_tap_one(const NetdevTapOptions *tap= , NetClientState *peer, "vhost-net requested but could not be initialized"); goto failed; } - } else if (vhostfdname) { - error_setg(errp, "vhostfd(s)=3D is not valid without vhost"); - goto failed; } =20 return 0; @@ -829,6 +826,11 @@ int net_init_tap(const Netdev *netdev, const char *nam= e, return -1; } =20 + if (tap->has_vhost && !tap->vhost && (tap->vhostfds || tap->vhostfd)) { + error_setg(errp, "vhostfd(s)=3D is not valid without vhost"); + return -1; + } + if (tap->fd) { if (tap->ifname || tap->script || tap->downscript || tap->has_vnet_hdr || tap->helper || tap->has_queues || --=20 2.48.1