From nobody Thu Apr 18 21:35:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523861342625562.2324794603388; Sun, 15 Apr 2018 23:49:02 -0700 (PDT) Received: from localhost ([::1]:49899 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7xwe-0001Z7-So for importer@patchew.org; Mon, 16 Apr 2018 02:48:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7xsq-0007HJ-Pl for qemu-devel@nongnu.org; Mon, 16 Apr 2018 02:45:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7xsm-0007aO-01 for qemu-devel@nongnu.org; Mon, 16 Apr 2018 02:45:00 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:50038 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f7xsl-0007Zp-R2 for qemu-devel@nongnu.org; Mon, 16 Apr 2018 02:44:55 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7E1B6E44B5; Mon, 16 Apr 2018 06:44:53 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-76.ams2.redhat.com [10.36.116.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0B9D111DCF6; Mon, 16 Apr 2018 06:44:51 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Jason Wang Date: Mon, 16 Apr 2018 08:44:39 +0200 Message-Id: <1523861081-3600-2-git-send-email-thuth@redhat.com> In-Reply-To: <1523861081-3600-1-git-send-email-thuth@redhat.com> References: <1523861081-3600-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Mon, 16 Apr 2018 06:44:53 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Mon, 16 Apr 2018 06:44:53 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v3 for-2.13 1/3] net: Remove the deprecated "vlan" parameter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Thibault , Stefan Hajnoczi , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It's been marked as deprecated since QEMU v2.9.0, so that should have been enough time for everybody to either just drop unnecessary "vlan=3D0" parameters, to switch to the modern -device + -netdev syntax for connecting guest NICs with host network backends, or to switch to the "hubport" netdev in case hubs are really wanted instead. Buglink: https://bugs.launchpad.net/qemu/+bug/658904 Signed-off-by: Thomas Huth --- docs/qdev-device-use.txt | 3 -- hw/core/qdev-properties-system.c | 80 ------------------------------------= ---- include/hw/qdev-properties.h | 3 -- include/net/net.h | 1 - net/net.c | 12 ++---- qapi/net.json | 15 ++++---- qemu-doc.texi | 9 ----- qemu-options.hx | 29 ++++++--------- 8 files changed, 22 insertions(+), 130 deletions(-) diff --git a/docs/qdev-device-use.txt b/docs/qdev-device-use.txt index 8f188d1..98229b3 100644 --- a/docs/qdev-device-use.txt +++ b/docs/qdev-device-use.txt @@ -277,9 +277,6 @@ devices and ne2k_isa are. =20 Some PCI devices aren't available with -net nic, e.g. i82558a. =20 -To connect to a VLAN instead of an ordinary host part, replace -netdev=3DNET-ID by vlan=3DVLAN. - =3D=3D=3D Graphics Devices =3D=3D=3D =20 Host and guest part of graphics devices have always been separate. diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index 1d3ba72..8b22fb5 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -321,86 +321,6 @@ const PropertyInfo qdev_prop_netdev =3D { .set =3D set_netdev, }; =20 -/* --- vlan --- */ - -static int print_vlan(DeviceState *dev, Property *prop, char *dest, size_t= len) -{ - NetClientState **ptr =3D qdev_get_prop_ptr(dev, prop); - - if (*ptr) { - int id; - if (!net_hub_id_for_client(*ptr, &id)) { - return snprintf(dest, len, "%d", id); - } - } - - return snprintf(dest, len, ""); -} - -static void get_vlan(Object *obj, Visitor *v, const char *name, void *opaq= ue, - Error **errp) -{ - DeviceState *dev =3D DEVICE(obj); - Property *prop =3D opaque; - NetClientState **ptr =3D qdev_get_prop_ptr(dev, prop); - int32_t id =3D -1; - - if (*ptr) { - int hub_id; - if (!net_hub_id_for_client(*ptr, &hub_id)) { - id =3D hub_id; - } - } - - visit_type_int32(v, name, &id, errp); -} - -static void set_vlan(Object *obj, Visitor *v, const char *name, void *opaq= ue, - Error **errp) -{ - DeviceState *dev =3D DEVICE(obj); - Property *prop =3D opaque; - NICPeers *peers_ptr =3D qdev_get_prop_ptr(dev, prop); - NetClientState **ptr =3D &peers_ptr->ncs[0]; - Error *local_err =3D NULL; - int32_t id; - NetClientState *hubport; - - if (dev->realized) { - qdev_prop_set_after_realize(dev, name, errp); - return; - } - - visit_type_int32(v, name, &id, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } - if (id =3D=3D -1) { - *ptr =3D NULL; - return; - } - if (*ptr) { - error_set_from_qdev_prop_error(errp, -EINVAL, dev, prop, name); - return; - } - - hubport =3D net_hub_port_find(id); - if (!hubport) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, - name, prop->info->name); - return; - } - *ptr =3D hubport; -} - -const PropertyInfo qdev_prop_vlan =3D { - .name =3D "int32", - .description =3D "Integer VLAN id to connect to", - .print =3D print_vlan, - .get =3D get_vlan, - .set =3D set_vlan, -}; =20 void qdev_prop_set_drive(DeviceState *dev, const char *name, BlockBackend *value, Error **errp) diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index b2ad8e9..4f60cc8 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -29,7 +29,6 @@ extern const PropertyInfo qdev_prop_bios_chs_trans; extern const PropertyInfo qdev_prop_fdc_drive_type; extern const PropertyInfo qdev_prop_drive; extern const PropertyInfo qdev_prop_netdev; -extern const PropertyInfo qdev_prop_vlan; extern const PropertyInfo qdev_prop_pci_devfn; extern const PropertyInfo qdev_prop_blocksize; extern const PropertyInfo qdev_prop_pci_host_devaddr; @@ -195,8 +194,6 @@ extern const PropertyInfo qdev_prop_off_auto_pcibar; DEFINE_PROP(_n, _s, _f, qdev_prop_string, char*) #define DEFINE_PROP_NETDEV(_n, _s, _f) \ DEFINE_PROP(_n, _s, _f, qdev_prop_netdev, NICPeers) -#define DEFINE_PROP_VLAN(_n, _s, _f) \ - DEFINE_PROP(_n, _s, _f, qdev_prop_vlan, NICPeers) #define DEFINE_PROP_DRIVE(_n, _s, _f) \ DEFINE_PROP(_n, _s, _f, qdev_prop_drive, BlockBackend *) #define DEFINE_PROP_MACADDR(_n, _s, _f) \ diff --git a/include/net/net.h b/include/net/net.h index 1f7341e..1425960 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -37,7 +37,6 @@ typedef struct NICConf { =20 #define DEFINE_NIC_PROPERTIES(_state, _conf) \ DEFINE_PROP_MACADDR("mac", _state, _conf.macaddr), \ - DEFINE_PROP_VLAN("vlan", _state, _conf.peers), \ DEFINE_PROP_NETDEV("netdev", _state, _conf.peers) =20 =20 diff --git a/net/net.c b/net/net.c index 29f8398..72c275e 100644 --- a/net/net.c +++ b/net/net.c @@ -965,7 +965,6 @@ static int net_client_init1(const void *object, bool is= _netdev, Error **errp) const Netdev *netdev; const char *name; NetClientState *peer =3D NULL; - static bool vlan_warned; =20 if (is_netdev) { netdev =3D object; @@ -1036,15 +1035,10 @@ static int net_client_init1(const void *object, boo= l is_netdev, Error **errp) return -1; } =20 - /* Do not add to a vlan if it's a nic with a netdev=3D parameter. = */ + /* 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) { - peer =3D net_hub_add_port(net->has_vlan ? net->vlan : 0, NULL,= NULL); - } - - if (net->has_vlan && !vlan_warned) { - error_report("'vlan' is deprecated. Please use 'netdev' instea= d."); - vlan_warned =3D true; + peer =3D net_hub_add_port(0, NULL, NULL); } } =20 @@ -1365,7 +1359,7 @@ void qmp_set_link(const char *name, bool up, Error **= errp) * If the peer is a HUBPORT or a backend, we do not change the * link status. * - * This behavior is compatible with qemu vlans where there could be + * This behavior is compatible with qemu hubs where there could be * multiple clients that can still communicate with each other in * disconnected mode. For now maintain this compatibility. */ diff --git a/qapi/net.json b/qapi/net.json index 9117c56..b4fe4b6 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -209,7 +209,7 @@ ## # @NetdevTapOptions: # -# Connect the host TAP network interface name to the VLAN. +# Used to configure a host TAP network interface backend. # # @ifname: interface name # @@ -267,8 +267,8 @@ ## # @NetdevSocketOptions: # -# Connect the VLAN to a remote VLAN in another QEMU virtual machine using = a TCP -# socket connection. +# Socket netdevs are used to establish a network connection to another +# QEMU virtual machine via a TCP socket. # # @fd: file descriptor of an already opened socket # @@ -296,7 +296,7 @@ ## # @NetdevL2TPv3Options: # -# Connect the VLAN to Ethernet over L2TPv3 Static tunnel +# Configure an Ethernet over L2TPv3 tunnel. # # @src: source address # @@ -352,7 +352,7 @@ ## # @NetdevVdeOptions: # -# Connect the VLAN to a vde switch running on the host. +# Connect to a vde switch running on the host. # # @sock: socket path # @@ -490,8 +490,6 @@ # # Captures the configuration of a network device; legacy. # -# @vlan: vlan number -# # @id: identifier for monitor commands # # @name: identifier for monitor commands, ignored if @id is present @@ -499,10 +497,11 @@ # @opts: device type specific properties (legacy) # # Since: 1.2 +# +# 'vlan' - removed with 2.12 ## { 'struct': 'NetLegacy', 'data': { - '*vlan': 'int32', '*id': 'str', '*name': 'str', 'opts': 'NetLegacyOptions' } } diff --git a/qemu-doc.texi b/qemu-doc.texi index 5813d27..b901cc2 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2855,15 +2855,6 @@ with ``-device ...,netdev=3Dx''), or ``-nic user,smb= =3D/some/dir'' (for embedded NICs). The new syntax allows different settings to be provided per NIC. =20 -@subsection -net vlan (since 2.9.0) - -The ``-net vlan=3DNN'' argument was mostly used to attach separate -network backends to different virtual NICs. This is the default -behavior for ``-netdev'' and ``-nic''. You can connect multiple -``-netdev'' and ``-nic'' devices to the same network using the -"hubport" network backend, created with ``-netdev hubport,hubid=3DNN,...'' -and ``-nic hubport,hubid=3DNN''. - @subsection -drive cyls=3D...,heads=3D...,secs=3D...,trans=3D... (since 2.= 10.0) =20 The drive geometry arguments are replaced by the the geometry arguments diff --git a/qemu-options.hx b/qemu-options.hx index ca4e412..db4d238 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2003,7 +2003,7 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, " configure a vhost-user network, backed by a chardev '= dev'\n" #endif "-netdev hubport,id=3Dstr,hubid=3Dn[,netdev=3Dnd]\n" - " configure a hub port on QEMU VLAN 'n'\n", QEMU_ARCH_A= LL) + " configure a hub port on the hub with ID 'n'\n", QEMU_= ARCH_ALL) DEF("nic", HAS_ARG, QEMU_OPTION_nic, "--nic [tap|bridge|" #ifdef CONFIG_SLIRP @@ -2028,10 +2028,9 @@ DEF("nic", HAS_ARG, QEMU_OPTION_nic, " provided a 'user' network connection)\n", QEMU_ARCH_ALL) DEF("net", HAS_ARG, QEMU_OPTION_net, - "-net nic[,vlan=3Dn][,netdev=3Dnd][,macaddr=3Dmac][,model=3Dtype][,nam= e=3Dstr][,addr=3Dstr][,vectors=3Dv]\n" + "-net nic[,macaddr=3Dmac][,model=3Dtype][,name=3Dstr][,addr=3Dstr][,ve= ctors=3Dv]\n" " configure or create an on-board (or machine default) = NIC and\n" - " connect it either to VLAN 'n' or the netdev 'nd' (for= pluggable\n" - " NICs please use '-device devtype,netdev=3Dnd' instead= )\n" + " connect it to hub 0 (please use -nic for direct conne= ctions)\n" "-net [" #ifdef CONFIG_SLIRP "user|" @@ -2044,7 +2043,7 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, #ifdef CONFIG_NETMAP "netmap|" #endif - "socket][,vlan=3Dn][,option][,option][,...]\n" + "socket][,option][,option][,...]\n" " old way to initialize a host network interface\n" " (use the -netdev option if possible instead)\n", QEMU= _ARCH_ALL) STEXI @@ -2462,17 +2461,14 @@ qemu -m 512 -object memory-backend-file,id=3Dmem,si= ze=3D512M,mem-path=3D/hugetlbfs,sha Create a hub port on the emulated hub with ID @var{hubid}. =20 The hubport netdev lets you connect a NIC to a QEMU emulated hub instead o= f a -single netdev. @code{-net} and @code{-device} with the parameter @option{v= lan} -(deprecated), or @code{-nic hubport} can also be used to connect a -network device or a NIC to a hub. Alternatively, you can also connect the -hubport to another netdev with ID @var{nd} by using the @option{netdev=3D@= var{nd}} -option. +single netdev. Alternatively, you can also connect the hubport to another +netdev with ID @var{nd} by using the @option{netdev=3D@var{nd}} option. =20 -@item -net nic[,vlan=3D@var{n}][,netdev=3D@var{nd}][,macaddr=3D@var{mac}][= ,model=3D@var{type}] [,name=3D@var{name}][,addr=3D@var{addr}][,vectors=3D@v= ar{v}] +@item -net nic[,netdev=3D@var{nd}][,macaddr=3D@var{mac}][,model=3D@var{typ= e}] [,name=3D@var{name}][,addr=3D@var{addr}][,vectors=3D@var{v}] @findex -net Legacy option to configure or create an on-board (or machine default) Netw= ork -Interface Card(NIC) and connect it either to the emulated hub port ("vlan") -with number @var{n} (@var{n} =3D 0 is the default), or to the netdev @var{= nd}. +Interface Card(NIC) and connect it either to the emulated hub with ID 0 (i= .e. +the default hub), or to the netdev @var{nd}. The NIC is an e1000 by default on the PC target. Optionally, the MAC addre= ss can be changed to @var{mac}, the device address set to @var{addr} (PCI car= ds only), and a @var{name} can be assigned for use in monitor commands. @@ -2482,11 +2478,10 @@ that the card should have; this option currently on= ly affects virtio cards; set NIC is created. QEMU can emulate several different models of network card. Use @code{-net nic,model=3Dhelp} for a list of available devices for your = target. =20 -@item -net user|tap|bridge|socket|l2tpv3|vde[,...][,vlan=3D@var{n}][,name= =3D@var{name}] +@item -net user|tap|bridge|socket|l2tpv3|vde[,...][,name=3D@var{name}] Configure a host network backend (with the options corresponding to the sa= me -@option{-netdev} option) and connect it to the emulated hub ("vlan") with = the -number @var{n} (default is number 0). Use @var{name} to specify the name o= f the -hub port. +@option{-netdev} option) and connect it to the emulated hub 0 (the default +hub). Use @var{name} to specify the name of the hub port. ETEXI =20 STEXI --=20 1.8.3.1 From nobody Thu Apr 18 21:35:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523861226203533.756280470275; Sun, 15 Apr 2018 23:47:06 -0700 (PDT) Received: from localhost ([::1]:49762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7xuh-0008Q2-QS for importer@patchew.org; Mon, 16 Apr 2018 02:46:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7xsq-0007HM-Qd for qemu-devel@nongnu.org; Mon, 16 Apr 2018 02:45:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7xso-0007bw-D4 for qemu-devel@nongnu.org; Mon, 16 Apr 2018 02:45:00 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:50042 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f7xso-0007bf-7J for qemu-devel@nongnu.org; Mon, 16 Apr 2018 02:44:58 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B5E56E44B5; Mon, 16 Apr 2018 06:44:57 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-76.ams2.redhat.com [10.36.116.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id B606B111DCF6; Mon, 16 Apr 2018 06:44:53 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Jason Wang Date: Mon, 16 Apr 2018 08:44:40 +0200 Message-Id: <1523861081-3600-3-git-send-email-thuth@redhat.com> In-Reply-To: <1523861081-3600-1-git-send-email-thuth@redhat.com> References: <1523861081-3600-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Mon, 16 Apr 2018 06:44:57 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Mon, 16 Apr 2018 06:44:57 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v3 for-2.13 2/3] net: Get rid of 'vlan' terminology and use 'hub' instead in the source files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Thibault , Stefan Hajnoczi , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 'vlan' is very confusing since it does not mean something like IEEE 802.1Q, but rather emulated hubs, so let's switch to that terminology instead. Buglink: https://bugs.launchpad.net/qemu/+bug/658904 Signed-off-by: Thomas Huth Reviewed-by: Stefan Hajnoczi --- net/hub.c | 7 +++---- net/slirp.c | 8 ++++---- net/tap.c | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/net/hub.c b/net/hub.c index 5e84a9a..78b671e 100644 --- a/net/hub.c +++ b/net/hub.c @@ -23,8 +23,7 @@ =20 /* * A hub broadcasts incoming packets to all its ports except the source po= rt. - * Hubs can be used to provide independent network segments, also confusin= gly - * named the QEMU 'vlan' feature. + * Hubs can be used to provide independent emulated network segments. */ =20 typedef struct NetHub NetHub; @@ -345,10 +344,10 @@ void net_hub_check_clients(void) } } if (has_host_dev && !has_nic) { - warn_report("vlan %d with no nics", hub->id); + warn_report("hub %d with no nics", hub->id); } if (has_nic && !has_host_dev) { - warn_report("vlan %d is not connected to host network", hub->i= d); + warn_report("hub %d is not connected to host network", hub->id= ); } } } diff --git a/net/slirp.c b/net/slirp.c index 8991816..6922524 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -415,7 +415,7 @@ static SlirpState *slirp_lookup(Monitor *mon, const cha= r *hub_id, if (hub_id) { nc =3D net_hub_find_client_by_name(strtol(hub_id, NULL, 0), na= me); if (!nc) { - monitor_printf(mon, "unrecognized (vlan-id, stackname) pai= r\n"); + monitor_printf(mon, "unrecognized (hub-id, stackname) pair= \n"); return NULL; } } else { @@ -870,9 +870,9 @@ void hmp_info_usernet(Monitor *mon, const QDict *qdict) =20 QTAILQ_FOREACH(s, &slirp_stacks, entry) { int id; - bool got_vlan_id =3D net_hub_id_for_client(&s->nc, &id) =3D=3D 0; - monitor_printf(mon, "VLAN %d (%s):\n", - got_vlan_id ? id : -1, + bool got_hub_id =3D net_hub_id_for_client(&s->nc, &id) =3D=3D 0; + monitor_printf(mon, "Hub %d (%s):\n", + got_hub_id ? id : -1, s->nc.name); slirp_connection_info(s->slirp, mon); } diff --git a/net/tap.c b/net/tap.c index 2b3a36f..de05f20 100644 --- a/net/tap.c +++ b/net/tap.c @@ -766,10 +766,10 @@ int net_init_tap(const Netdev *netdev, const char *na= me, queues =3D tap->has_queues ? tap->queues : 1; vhostfdname =3D tap->has_vhostfd ? tap->vhostfd : NULL; =20 - /* QEMU vlans does not support multiqueue tap, in this case peer is se= t. + /* QEMU hubs do not support multiqueue tap, in this case peer is set. * For -netdev, peer is always NULL. */ if (peer && (tap->has_queues || tap->has_fds || tap->has_vhostfds)) { - error_setg(errp, "Multiqueue tap cannot be used with QEMU vlans"); + error_setg(errp, "Multiqueue tap cannot be used with hubs"); return -1; } =20 --=20 1.8.3.1 From nobody Thu Apr 18 21:35:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152386122822062.10977476986034; Sun, 15 Apr 2018 23:47:08 -0700 (PDT) Received: from localhost ([::1]:49763 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7xup-00005M-H6 for importer@patchew.org; Mon, 16 Apr 2018 02:47:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7xsr-0007Hf-PA for qemu-devel@nongnu.org; Mon, 16 Apr 2018 02:45:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7xsq-0007d5-JK for qemu-devel@nongnu.org; Mon, 16 Apr 2018 02:45:01 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:54552 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f7xsq-0007cl-DN for qemu-devel@nongnu.org; Mon, 16 Apr 2018 02:45:00 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F320C4072446; Mon, 16 Apr 2018 06:44:59 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-76.ams2.redhat.com [10.36.116.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1F8E2111DCF6; Mon, 16 Apr 2018 06:44:57 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Jason Wang Date: Mon, 16 Apr 2018 08:44:41 +0200 Message-Id: <1523861081-3600-4-git-send-email-thuth@redhat.com> In-Reply-To: <1523861081-3600-1-git-send-email-thuth@redhat.com> References: <1523861081-3600-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Mon, 16 Apr 2018 06:45:00 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Mon, 16 Apr 2018 06:45:00 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v3 for-2.13 3/3] net: Get rid of 'vlan' terminology and use 'hub' instead in the doc files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Thibault , Stefan Hajnoczi , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 'vlan' is very confusing since it does not mean something like IEEE 802.1Q, but rather emulated hubs, so let's switch to that terminology instead. While we're at it, move the subsection about hub a little bit downward in the documentation (it's not as important anymore as it was before the invention of the -netdev parameter), and extend it a little bit. Buglink: https://bugs.launchpad.net/qemu/+bug/658904 Signed-off-by: Thomas Huth Reviewed-by: Stefan Hajnoczi --- qemu-doc.texi | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/qemu-doc.texi b/qemu-doc.texi index b901cc2..f058341 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -714,20 +714,12 @@ state is not saved or restored properly (in particula= r USB). @node pcsys_network @section Network emulation =20 -QEMU can simulate several network cards (PCI or ISA cards on the PC -target) and can connect them to an arbitrary number of Virtual Local -Area Networks (VLANs). Host TAP devices can be connected to any QEMU -VLAN. VLAN can be connected between separate instances of QEMU to -simulate large networks. For simpler usage, a non privileged user mode -network stack can replace the TAP device to have a basic network -connection. - -@subsection VLANs - -QEMU simulates several VLANs. A VLAN can be symbolised as a virtual -connection between several network devices. These devices can be for -example QEMU virtual Ethernet cards or virtual Host ethernet devices -(TAP devices). +QEMU can simulate several network cards (e.g. PCI or ISA cards on the PC +target) and can connect them to a network backend on the host or an emulat= ed +hub. The various host network backends can either be used to connect the N= IC of +the guest to a real network (e.g. by using a TAP devices or the non-privil= eged +user mode network stack), or to other guest instances running in another Q= EMU +process (e.g. by using the socket host network backend). =20 @subsection Using TAP network interfaces =20 @@ -763,7 +755,7 @@ network). The virtual network configuration is the foll= owing: =20 @example =20 - QEMU VLAN <------> Firewall/DHCP server <-----> Internet + guest (10.0.2.15) <------> Firewall/DHCP server <-----> Internet | (10.0.2.2) | ----> DNS server (10.0.2.3) @@ -798,11 +790,23 @@ When using the @option{'-netdev user,hostfwd=3D...'} = option, TCP or UDP connections can be redirected from the host to the guest. It allows for example to redirect X11, telnet or SSH connections. =20 -@subsection Connecting VLANs between QEMU instances +@subsection Hubs + +QEMU can simulate several hubs. A hub can be symbolised as a virtual conne= ction +between several network devices. These devices can be for example QEMU vir= tual +ethernet cards or virtual Host ethernet devices (TAP devices). You can con= nect +guest NICs or host network backends to such a hub using the @option{-netdev +hubport} or @option{-nic hubport} options. The legacy @option{-net} option +also connects the given device to the emulated hub with ID 0 (i.e. the def= ault +hub) unless you specify a netdev with @option{-net nic,netdev=3Dxxx} here. + +@subsection Connecting emulated networks between QEMU instances =20 -Using the @option{-net socket} option, it is possible to make VLANs -that span several QEMU instances. See @ref{sec_invocation} to have a -basic example. +Using the @option{-netdev socket} (or @option{-nic socket} or +@option{-net socket}) option, it is possible to create emulated +networks that span several QEMU instances. +See the description of the @option{-netdev socket} option in the +@ref{sec_invocation,,Invocation chapter} to have a basic example. =20 @node pcsys_other_devs @section Other Devices --=20 1.8.3.1