From nobody Fri Nov 14 16:48:27 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589286838; cv=none; d=zohomail.com; s=zohoarc; b=V4bmQJQ6Bam4KPwH/8jkbha2OmJy4y77uZmWwfDVOXieEnTkZSb6zdZGmN855nstMGtf33brNYqNBay95lbWDEW9O0fUP9uOrKvh6qzD1YGUwJV8ugwHwCKtiEtTG6ULtOMDEPjzn4XGsElk7y4+sxyETGBClz1CMBujM0TkzrE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589286838; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=49tYsxIzzACQzUjPEMtptE4ywZ48RR5MimwNRO4Z8aM=; b=cCnexdEivA6aWBruPngPRQwCgUVHtLLHdfz1awaw3iRuampLgrVLJL7geFsNm7hA+oNVt9UgTs8h4SYf07Z79gtVKc8dQYCF4y7oxRzVABqWC3+lXTjl3D3ZKt0OyD/IMmvTMzI9QBsjaZJOrxw9VuBMb69l+g2ZvXcNmF2nfh0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589286838566913.4795103206343; Tue, 12 May 2020 05:33:58 -0700 (PDT) Received: from localhost ([::1]:52326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYU6f-00032F-78 for importer@patchew.org; Tue, 12 May 2020 08:33:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYU4p-0001zT-Qe for qemu-devel@nongnu.org; Tue, 12 May 2020 08:32:03 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:52517 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jYU4o-0007lJ-MU for qemu-devel@nongnu.org; Tue, 12 May 2020 08:32:03 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-421-qekmzr5YNZ65_Llvv1HKjg-1; Tue, 12 May 2020 08:31:57 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E102F8005B7 for ; Tue, 12 May 2020 12:31:56 +0000 (UTC) Received: from thuth.com (ovpn-112-112.ams2.redhat.com [10.36.112.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA3DD100034E; Tue, 12 May 2020 12:31:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589286721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=49tYsxIzzACQzUjPEMtptE4ywZ48RR5MimwNRO4Z8aM=; b=Nt455AIbcKUGCuL//ModASxRXBh/ONlnRRTpdtLD6TADuhhls/S40x4zW0ik0TocEqhfe8 tD0DOAPoiaxOY9vgJa2O9dDyzuODu3omY2kmm+h6VB5BtMMgtsfb446uYCF83GA25E+9xj ce+4eOLptoTRGIePkOsywngcSeO2av4= X-MC-Unique: qekmzr5YNZ65_Llvv1HKjg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Jason Wang Subject: [PATCH v2 1/2] net: Drop the legacy "name" parameter from the -net option Date: Tue, 12 May 2020 14:31:48 +0200 Message-Id: <20200512123149.30207-2-thuth@redhat.com> In-Reply-To: <20200512123149.30207-1-thuth@redhat.com> References: <20200512123149.30207-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=207.211.31.120; envelope-from=thuth@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/12 02:20:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It's been deprecated since QEMU v3.1, so it's time to finally remove it. The "id" parameter can simply be used instead. Reviewed-by: Eric Blake Signed-off-by: Thomas Huth --- docs/system/deprecated.rst | 15 +++++++++------ net/net.c | 10 +--------- qapi/net.json | 3 --- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 3142fac386..1b87c8f0db 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -47,12 +47,6 @@ The 'file' driver for drives is no longer appropriate fo= r character or host devices and will only accept regular files (S_IFREG). The correct driver for these file types is 'host_cdrom' or 'host_device' as appropriate. =20 -``-net ...,name=3D``\ *name* (since 3.1) -'''''''''''''''''''''''''''''''''''''' - -The ``name`` parameter of the ``-net`` option is a synonym -for the ``id`` parameter, which should now be used instead. - ``-smp`` (invalid topologies) (since 3.1) ''''''''''''''''''''''''''''''''''''''''' =20 @@ -470,6 +464,15 @@ What follows is a record of recently removed, formerly= deprecated features that serves as a record for users who have encountered trouble after a recent upgrade. =20 +System emulator command line arguments +-------------------------------------- + +``-net ...,name=3D``\ *name* (removed in 5.1) +''''''''''''''''''''''''''''''''''''''''''' + +The ``name`` parameter of the ``-net`` option was a synonym +for the ``id`` parameter, which should now be used instead. + QEMU Machine Protocol (QMP) commands ------------------------------------ =20 diff --git a/net/net.c b/net/net.c index 38778e831d..a24da66e66 100644 --- a/net/net.c +++ b/net/net.c @@ -969,12 +969,10 @@ static int net_client_init1(const void *object, bool = is_netdev, Error **errp) { Netdev legacy =3D {0}; const Netdev *netdev; - const char *name; NetClientState *peer =3D NULL; =20 if (is_netdev) { netdev =3D object; - name =3D netdev->id; =20 if (netdev->type =3D=3D NET_CLIENT_DRIVER_NIC || !net_client_init_fun[netdev->type]) { @@ -987,12 +985,6 @@ static int net_client_init1(const void *object, bool i= s_netdev, Error **errp) const NetLegacyOptions *opts =3D net->opts; legacy.id =3D net->id; netdev =3D &legacy; - /* missing optional values have been initialized to "all bits zero= " */ - name =3D net->has_id ? net->id : net->name; - - if (net->has_name) { - warn_report("The 'name' parameter is deprecated, use 'id' inst= ead"); - } =20 /* Map the old options to the new flat type */ switch (opts->type) { @@ -1052,7 +1044,7 @@ static int net_client_init1(const void *object, bool = is_netdev, Error **errp) } } =20 - if (net_client_init_fun[netdev->type](netdev, name, peer, errp) < 0) { + if (net_client_init_fun[netdev->type](netdev, netdev->id, peer, errp) = < 0) { /* FIXME drop when all init functions store an Error */ if (errp && !*errp) { error_setg(errp, QERR_DEVICE_INIT_FAILED, diff --git a/qapi/net.json b/qapi/net.json index cebb1b52e3..fc7c95f6d8 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -474,8 +474,6 @@ # # @id: identifier for monitor commands # -# @name: identifier for monitor commands, ignored if @id is present -# # @opts: device type specific properties (legacy) # # Since: 1.2 @@ -483,7 +481,6 @@ { 'struct': 'NetLegacy', 'data': { '*id': 'str', - '*name': 'str', 'opts': 'NetLegacyOptions' } } =20 ## --=20 2.18.1 From nobody Fri Nov 14 16:48:27 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589286928; cv=none; d=zohomail.com; s=zohoarc; b=jbnFyVjH4mFeXfGAaTSStnergenxJ83McXhQ7+OY+1ZtTASQX0ZABDzHLabhozBSasZdXoHMXmz/pPNj6U7YLV0NeG0ZY0XjvNyOoYkATJRYOGhgWcyePoybsolb7W5vWBjVBpdr4IKITaP6aRn6WTzRi/y3oVQF7kF6hp5G8ts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589286928; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=6z1U8sO9SLfuN1XFZYy2zfWRK5y8vCJCBZ1CUTt7ekQ=; b=O0Wgz9GrW8A5NhStgrWKPvqg9RXEP0ixt1vW+Z/onXqrKBis1Qa1BNfMptjxVWqzQyUK+5iHyAk+Y0H/ZL/r6p+yIEUTRqBTBH2sig+mtmwbl3DpX0MGuHDxE2zTWn6wFjrWxXT8n274rap5d1cTJymS4ZQubl3Y7zn4rB3zcr8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589286928440138.83285221862718; Tue, 12 May 2020 05:35:28 -0700 (PDT) Received: from localhost ([::1]:56318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYU86-0005Ej-1Q for importer@patchew.org; Tue, 12 May 2020 08:35:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYU4q-00020I-Mh for qemu-devel@nongnu.org; Tue, 12 May 2020 08:32:04 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:37509 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jYU4p-0007lN-J8 for qemu-devel@nongnu.org; Tue, 12 May 2020 08:32:04 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-459-uCFY12LDMVi2v2xut0vMKg-1; Tue, 12 May 2020 08:32:00 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DCA0C1005510 for ; Tue, 12 May 2020 12:31:59 +0000 (UTC) Received: from thuth.com (ovpn-112-112.ams2.redhat.com [10.36.112.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE735100034E; Tue, 12 May 2020 12:31:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589286722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=6z1U8sO9SLfuN1XFZYy2zfWRK5y8vCJCBZ1CUTt7ekQ=; b=WnU/TBoj7FrxlXRms/OaKvkWDNpHgqVbULQgVeKiBrRSzD9Vlc3n+BgRmN7cE7c++/57Qy bHzDjpF9dze5DNRx6Isxe9A3uQILQiXpmjOYfZvDGRhvEVgTfPekW+Yr8rUVEXOvujkP0e e7lWh/D09H6K9lYv5Pq3PPWOQkq7LTU= X-MC-Unique: uCFY12LDMVi2v2xut0vMKg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Jason Wang Subject: [PATCH v2 2/2] net: Drop the NetLegacy structure, always use Netdev instead Date: Tue, 12 May 2020 14:31:49 +0200 Message-Id: <20200512123149.30207-3-thuth@redhat.com> In-Reply-To: <20200512123149.30207-1-thuth@redhat.com> References: <20200512123149.30207-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=207.211.31.81; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/12 01:41:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Now that the "name" parameter is gone, there is hardly any difference between NetLegacy and Netdev anymore. Drop NetLegacy and always use Netdev to simplify the code quite a bit. Signed-off-by: Thomas Huth --- net/net.c | 74 ++++++++------------------------------------------- qapi/net.json | 48 +-------------------------------- 2 files changed, 12 insertions(+), 110 deletions(-) diff --git a/net/net.c b/net/net.c index a24da66e66..4177224939 100644 --- a/net/net.c +++ b/net/net.c @@ -967,13 +967,14 @@ static int (* const net_client_init_fun[NET_CLIENT_DR= IVER__MAX])( =20 static int net_client_init1(const void *object, bool is_netdev, Error **er= rp) { - Netdev legacy =3D {0}; - const Netdev *netdev; + const Netdev *netdev =3D object; NetClientState *peer =3D NULL; =20 if (is_netdev) { - netdev =3D object; - + if (!netdev->has_id) { + error_setg(errp, QERR_MISSING_PARAMETER, "id"); + return -1; + } if (netdev->type =3D=3D NET_CLIENT_DRIVER_NIC || !net_client_init_fun[netdev->type]) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type", @@ -981,56 +982,11 @@ static int net_client_init1(const void *object, bool = is_netdev, Error **errp) return -1; } } else { - const NetLegacy *net =3D object; - const NetLegacyOptions *opts =3D net->opts; - legacy.id =3D net->id; - netdev =3D &legacy; - - /* Map the old options to the new flat type */ - switch (opts->type) { - case NET_LEGACY_OPTIONS_TYPE_NONE: + if (netdev->type =3D=3D NET_CLIENT_DRIVER_NONE) { return 0; /* nothing to do */ - case NET_LEGACY_OPTIONS_TYPE_NIC: - legacy.type =3D NET_CLIENT_DRIVER_NIC; - legacy.u.nic =3D opts->u.nic; - break; - case NET_LEGACY_OPTIONS_TYPE_USER: - legacy.type =3D NET_CLIENT_DRIVER_USER; - legacy.u.user =3D opts->u.user; - break; - case NET_LEGACY_OPTIONS_TYPE_TAP: - legacy.type =3D NET_CLIENT_DRIVER_TAP; - legacy.u.tap =3D opts->u.tap; - break; - case NET_LEGACY_OPTIONS_TYPE_L2TPV3: - legacy.type =3D NET_CLIENT_DRIVER_L2TPV3; - legacy.u.l2tpv3 =3D opts->u.l2tpv3; - break; - case NET_LEGACY_OPTIONS_TYPE_SOCKET: - legacy.type =3D NET_CLIENT_DRIVER_SOCKET; - legacy.u.socket =3D opts->u.socket; - break; - case NET_LEGACY_OPTIONS_TYPE_VDE: - legacy.type =3D NET_CLIENT_DRIVER_VDE; - legacy.u.vde =3D opts->u.vde; - break; - case NET_LEGACY_OPTIONS_TYPE_BRIDGE: - legacy.type =3D NET_CLIENT_DRIVER_BRIDGE; - legacy.u.bridge =3D opts->u.bridge; - break; - case NET_LEGACY_OPTIONS_TYPE_NETMAP: - legacy.type =3D NET_CLIENT_DRIVER_NETMAP; - legacy.u.netmap =3D opts->u.netmap; - break; - case NET_LEGACY_OPTIONS_TYPE_VHOST_USER: - legacy.type =3D NET_CLIENT_DRIVER_VHOST_USER; - legacy.u.vhost_user =3D opts->u.vhost_user; - break; - default: - abort(); } - - if (!net_client_init_fun[netdev->type]) { + if (netdev->type =3D=3D NET_CLIENT_DRIVER_HUBPORT || + !net_client_init_fun[netdev->type]) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type", "a net backend type (maybe it is not compiled " "into this binary)"); @@ -1039,7 +995,7 @@ static int net_client_init1(const void *object, bool i= s_netdev, Error **errp) =20 /* Do not add to a hub if it's a nic with a netdev=3D parameter. */ if (netdev->type !=3D NET_CLIENT_DRIVER_NIC || - !opts->u.nic.has_netdev) { + !netdev->u.nic.has_netdev) { peer =3D net_hub_add_port(0, NULL, NULL); } } @@ -1143,21 +1099,13 @@ static int net_client_init(QemuOpts *opts, bool is_= netdev, Error **errp) } } =20 - if (is_netdev) { - visit_type_Netdev(v, NULL, (Netdev **)&object, &err); - } else { - visit_type_NetLegacy(v, NULL, (NetLegacy **)&object, &err); - } + visit_type_Netdev(v, NULL, (Netdev **)&object, &err); =20 if (!err) { ret =3D net_client_init1(object, is_netdev, &err); } =20 - if (is_netdev) { - qapi_free_Netdev(object); - } else { - qapi_free_NetLegacy(object); - } + qapi_free_Netdev(object); =20 out: error_propagate(errp, err); diff --git a/qapi/net.json b/qapi/net.json index fc7c95f6d8..e344825c43 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -453,7 +453,7 @@ # 'l2tpv3' - since 2.1 ## { 'union': 'Netdev', - 'base': { 'id': 'str', 'type': 'NetClientDriver' }, + 'base': { '*id': 'str', 'type': 'NetClientDriver' }, 'discriminator': 'type', 'data': { 'nic': 'NetLegacyNicOptions', @@ -467,52 +467,6 @@ 'netmap': 'NetdevNetmapOptions', 'vhost-user': 'NetdevVhostUserOptions' } } =20 -## -# @NetLegacy: -# -# Captures the configuration of a network device; legacy. -# -# @id: identifier for monitor commands -# -# @opts: device type specific properties (legacy) -# -# Since: 1.2 -## -{ 'struct': 'NetLegacy', - 'data': { - '*id': 'str', - 'opts': 'NetLegacyOptions' } } - -## -# @NetLegacyOptionsType: -# -# Since: 1.2 -## -{ 'enum': 'NetLegacyOptionsType', - 'data': ['none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde', - 'bridge', 'netmap', 'vhost-user'] } - -## -# @NetLegacyOptions: -# -# Like Netdev, but for use only by the legacy command line options -# -# Since: 1.2 -## -{ 'union': 'NetLegacyOptions', - 'base': { 'type': 'NetLegacyOptionsType' }, - 'discriminator': 'type', - 'data': { - 'nic': 'NetLegacyNicOptions', - 'user': 'NetdevUserOptions', - 'tap': 'NetdevTapOptions', - 'l2tpv3': 'NetdevL2TPv3Options', - 'socket': 'NetdevSocketOptions', - 'vde': 'NetdevVdeOptions', - 'bridge': 'NetdevBridgeOptions', - 'netmap': 'NetdevNetmapOptions', - 'vhost-user': 'NetdevVhostUserOptions' } } - ## # @NetFilterDirection: # --=20 2.18.1