From nobody Mon Sep 28 02:00:07 2026 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1785249849; cv=none; d=zohomail.com; s=zohoarc; b=YOAsOtK0zzHZdYAo95co5BwD1OmmU4OBelIAxu4SK71nIuyvVACXbIsuUo1rREtAvXN1tUtX39fLrkqcgCjph1kpX206mN7GUPY6H8XYpwFRvs/GdtrVELysiXb8w7j69Oi6bO9Y2pANjNuTqvL4yyQhweoHswV+GbiE5gPSKOs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785249849; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wCtAzg51hhstS+Gbl8wuHsxX6KoJDd8QSjWjrDQlyaQ=; b=EaiCzv6pC4UlG3c45N2n9Rh6Mmc5UwePvY/5TjrCOecse/GgLAa2dOdUnjWwXZm4FEN5XeHl7VaG4fWfMslZX4f7OR/evsLlfi+xyH+/Cw6vtXzU4DAhH6NyjSrAB9PZYAbbq6rb4WU/N4aKBtgujD2iyEoeiLJYsg3XKIQB3O4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178524984974544.005754266645226; Tue, 28 Jul 2026 07:44:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woj21-0004LG-Lm; Tue, 28 Jul 2026 10:43:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woj1u-0004JW-VL for qemu-devel@nongnu.org; Tue, 28 Jul 2026 10:43:41 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1woj1r-0001jK-DD for qemu-devel@nongnu.org; Tue, 28 Jul 2026 10:43:36 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4953e04ef16so42402765e9.2 for ; Tue, 28 Jul 2026 07:43:34 -0700 (PDT) Received: from ip-172-31-13-20.eu-central-1.compute.internal (ec2-18-198-207-175.eu-central-1.compute.amazonaws.com. [18.198.207.175]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-496c444304esm80724215e9.0.2026.07.28.07.43.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2026 07:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785249814; x=1785854614; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=wCtAzg51hhstS+Gbl8wuHsxX6KoJDd8QSjWjrDQlyaQ=; b=dMGz1fvZKEJLLA5+aJhoTxTXB0EMllwovmHRim1CjFUT5HaYSMw69Y9ImMgAIoDoMa diN2P8crRliIFFzj83TDDc2vfbg3DupFesxr3KQYsCyh+oS59QSUbITKEMaUOXi4Mhiz RuzFMmWAI2jxiqPUtyDjw3Xi0w5Cfyqiqc5jLWRX/42mYUgT2Umzjcg0brCbrwHCIs6q Q6zHCknLXFs+CyMfXwXyz0bJxZlKspCz4cXykmWN4ESocUA6pgrlBhNq5cTdbFPAQxln hvCyuNhugyXVzkqT+yReIudeX/efYv3T5aUhWhiyP+p9sPchUc0qVtcOmDTxyO9OsJoF azWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785249814; x=1785854614; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=wCtAzg51hhstS+Gbl8wuHsxX6KoJDd8QSjWjrDQlyaQ=; b=P9PcAb+J8Y8Qw5HqSsVDiS03/09p8SRoFJrshr8PUJFuTrzNcce/FNyJBZkHLDtPoY 9agt/50755A3I089fkmFe2M4Fl3kT2MiVVkcXnOUA3E+Bv5FgcYh/5Ok/kqL+lNvJytt cdtYTBfGOtaj5LaoUyI5TU2b5OzE9f+MD6C+kx3+WfGK0FyXgR8DrslpXdoxgzr+cDCY +gir7HVgTop9VflP4GeTHB8T04Mf/RVxWb6po3moqbh7Sez2f/wTktxLa7IdAeQUTDkw lglQqbOHAGFFhsuWHx6vATwCldyN1yx8alVwJir2+slh+6ybxI4eb0oYMfvcV1xuj2bO gHEQ== X-Forwarded-Encrypted: i=1; AHgh+RoLc3i8UgTCqrftj36602BMFSu12jHSrijNHR1m0xdBJwQCGx0nJtaljjRzA71bCgA2JIY4cSahU+yZ@nongnu.org X-Gm-Message-State: AOJu0Yx+ywdc4pBn+PLGkujqxkieht8gbo0T5Rn89E/CitYMS5opGuaB W6PpB8U4IS5z+cwACIxpVMBgdv6m9DlOJXdqDxsaM6VH9k7AVQlBYy3L X-Gm-Gg: AR+sD11aoAgVOe30E0hzAUGul37RUgzmWAhAX9SdGK0g8wzFVxRU80r3yS4IXKH6bma Em7AS1cVf5yvnI6EECcYPcY0ZLn8rVPKfG2jEPPeaZ+WfWFJRSbS8TnNpq7ZNxZ+Ak/FCqn7TKN rQskPTlAoJnQ+AJrFQ14qUiYcd2CuXyZ7yuv7KLzMt1qKcKxvJ5Elex7WBTJnSfJHfFszEnQakB t1YngBNKDq32Y+GWi8iR0bAdMfwIxu9nay6gzAnYOutDNuP+Wdie1pfLpa3kmbAGHuDAx0qoPAA Gr9TJa69JfmDYVdm24V+3MY4QQfQsR3ur44h2xnzqnENueH+wHX5ORKSsgXvfB8yUPbIZ3BNM1H wniJBw41IWx4wyt9buevu8G6fsvTEnilGPR0TswXsQZ86MbW49MAJ1TuXeU8JIsQhb2hR+GjBAa 8VugDv3l0X0NOrb1Qn3ehQJB5Zsfyve5LZCn0JiqJt6TIp2gQ7hh2QeZ/IbMTV8zTvcH9gVjg9+ AReGrYZwaZxBUS9BOwu38hWtLoB7ho9hts1ETl1VaJx+an83uY= X-Received: by 2002:a05:600c:638f:b0:496:bba5:33a9 with SMTP id 5b1f17b1804b1-496c658ef41mr31120935e9.34.1785249813521; Tue, 28 Jul 2026 07:43:33 -0700 (PDT) From: Rohitashv Kumar To: Jason Wang , qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Eric Blake , Markus Armbruster , Rohitashv Kumar Subject: [PATCH] qapi/net: gate user/vde/netmap netdev backends behind their CONFIG symbols Date: Tue, 28 Jul 2026 14:43:03 +0000 Message-ID: <20260728144303.223207-1-rohit.kuma1313@gmail.com> X-Mailer: git-send-email 2.50.1 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=rohit.kuma1313@gmail.com; helo=mail-wm1-x335.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, 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 Precedence: list List-Id: qemu development 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 @gmail.com) X-ZM-MESSAGEID: 1785249851933158500 Content-Type: text/plain; charset="utf-8" From: Rohitashv Kumar Their NetClientDriver enum members and Netdev union branches were unconditional, so query-qmp-schema advertised them even when built without CONFIG_SLIRP/CONFIG_VDE/CONFIG_NETMAP. Gate them, and guard the matching NET_CLIENT_DRIVER_USER/_VDE case labels in net/hub.c. Signed-off-by: Rohitashv Kumar Reviewed-by: Markus Armbruster --- net/hub.c | 4 ++++ qapi/net.json | 19 +++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/net/hub.c b/net/hub.c index ee5881f6d5..2a7c2bc6d7 100644 --- a/net/hub.c +++ b/net/hub.c @@ -294,12 +294,16 @@ void net_hub_check_clients(void) #ifdef CONFIG_PASST case NET_CLIENT_DRIVER_PASST: #endif +#ifdef CONFIG_SLIRP case NET_CLIENT_DRIVER_USER: +#endif case NET_CLIENT_DRIVER_TAP: case NET_CLIENT_DRIVER_SOCKET: case NET_CLIENT_DRIVER_STREAM: case NET_CLIENT_DRIVER_DGRAM: +#ifdef CONFIG_VDE case NET_CLIENT_DRIVER_VDE: +#endif case NET_CLIENT_DRIVER_VHOST_USER: has_host_dev =3D 1; break; diff --git a/qapi/net.json b/qapi/net.json index 1a6382825c..e9f1300629 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -922,9 +922,13 @@ # Since: 2.7 ## { 'enum': 'NetClientDriver', - 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'stream', - 'dgram', 'vde', 'bridge', 'hubport', 'netmap', 'vhost-user', - 'vhost-vdpa', + 'data': [ 'none', 'nic', + { 'name': 'user', 'if': 'CONFIG_SLIRP' }, + 'tap', 'l2tpv3', 'socket', 'stream', 'dgram', + { 'name': 'vde', 'if': 'CONFIG_VDE' }, + 'bridge', 'hubport', + { 'name': 'netmap', 'if': 'CONFIG_NETMAP' }, + 'vhost-user', 'vhost-vdpa', { 'name': 'passt', 'if': 'CONFIG_PASST' }, { 'name': 'af-xdp', 'if': 'CONFIG_AF_XDP' }, { 'name': 'vmnet-host', 'if': 'CONFIG_VMNET' }, @@ -949,16 +953,19 @@ 'nic': 'NetLegacyNicOptions', 'passt': { 'type': 'NetdevPasstOptions', 'if': 'CONFIG_PASST' }, - 'user': 'NetdevUserOptions', + 'user': { 'type': 'NetdevUserOptions', + 'if': 'CONFIG_SLIRP' }, 'tap': 'NetdevTapOptions', 'l2tpv3': 'NetdevL2TPv3Options', 'socket': 'NetdevSocketOptions', 'stream': 'NetdevStreamOptions', 'dgram': 'NetdevDgramOptions', - 'vde': 'NetdevVdeOptions', + 'vde': { 'type': 'NetdevVdeOptions', + 'if': 'CONFIG_VDE' }, 'bridge': 'NetdevBridgeOptions', 'hubport': 'NetdevHubPortOptions', - 'netmap': 'NetdevNetmapOptions', + 'netmap': { 'type': 'NetdevNetmapOptions', + 'if': 'CONFIG_NETMAP' }, 'af-xdp': { 'type': 'NetdevAFXDPOptions', 'if': 'CONFIG_AF_XDP' }, 'vhost-user': 'NetdevVhostUserOptions', --=20 2.50.1