summaryrefslogtreecommitdiffstats
path: root/net/slirp.c
diff options
context:
space:
mode:
authorThomas Huth2018-04-30 20:02:24 +0200
committerJason Wang2018-05-14 09:47:14 +0200
commit442da403ead80525761898ab0d8036a9cd3c6829 (patch)
tree110c04b8598adfceb0c237ead32101ef8df7ddcb /net/slirp.c
parentnet: Remove the deprecated "vlan" parameter (diff)
downloadqemu-442da403ead80525761898ab0d8036a9cd3c6829.tar.gz
qemu-442da403ead80525761898ab0d8036a9cd3c6829.tar.xz
qemu-442da403ead80525761898ab0d8036a9cd3c6829.zip
net: Get rid of 'vlan' terminology and use 'hub' instead in the source files
'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 Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'net/slirp.c')
-rw-r--r--net/slirp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/slirp.c b/net/slirp.c
index 8991816bbf..692252445a 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -415,7 +415,7 @@ static SlirpState *slirp_lookup(Monitor *mon, const char *hub_id,
if (hub_id) {
nc = net_hub_find_client_by_name(strtol(hub_id, NULL, 0), name);
if (!nc) {
- monitor_printf(mon, "unrecognized (vlan-id, stackname) pair\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)
QTAILQ_FOREACH(s, &slirp_stacks, entry) {
int id;
- bool got_vlan_id = net_hub_id_for_client(&s->nc, &id) == 0;
- monitor_printf(mon, "VLAN %d (%s):\n",
- got_vlan_id ? id : -1,
+ bool got_hub_id = net_hub_id_for_client(&s->nc, &id) == 0;
+ monitor_printf(mon, "Hub %d (%s):\n",
+ got_hub_id ? id : -1,
s->nc.name);
slirp_connection_info(s->slirp, mon);
}