aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2018-09-20 10:22:27 +0200
committerThomas Huth <thuth@redhat.com>2018-09-25 17:26:17 +0200
commit68cb29ea6585c6fb87ee598583c561cde246873b (patch)
tree0b09de3054939723edaf72de9ad92caa84f30753
parent101625a4d4ac7e96227a156bc5f6d21a9cc383cd (diff)
net/slirp: Deprecate the [hub_id name] parameter tuple
The "name" in the [hub_id name] parameter tuple is the same as a "netdev_id" (which should be unique), so specifying the hub_id here is just redundant (it was likely just necessary in the past when the network subsystem was still using "vlans" only and when it did not use unique "id"s yet). Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
-rw-r--r--net/slirp.c2
-rw-r--r--qemu-deprecated.texi7
2 files changed, 9 insertions, 0 deletions
diff --git a/net/slirp.c b/net/slirp.c
index c18060f778..c93b64dd91 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -404,6 +404,8 @@ static SlirpState *slirp_lookup(Monitor *mon, const char *hub_id,
monitor_printf(mon, "unrecognized (hub-id, stackname) pair\n");
return NULL;
}
+ warn_report("Using 'hub-id' is deprecated, specify the netdev id "
+ "directly instead");
} else {
nc = qemu_find_netdev(name);
if (!nc) {
diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
index 4ac5c6a6f0..9b918f02ec 100644
--- a/qemu-deprecated.texi
+++ b/qemu-deprecated.texi
@@ -104,6 +104,13 @@ The ``query-cpus'' command is replaced by the ``query-cpus-fast'' command.
The ``arch'' output member of the ``query-cpus-fast'' command is
replaced by the ``target'' output member.
+@section System emulator human monitor commands
+
+@subsection The hub_id parameter of 'hostfwd_add' / 'hostfwd_remove' (since 3.1)
+
+The @option{[hub_id name]} parameter tuple of the 'hostfwd_add' and
+'hostfwd_remove' HMP commands has been replaced by @option{netdev_id}.
+
@section System emulator devices
@subsection ivshmem (since 2.6.0)