aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-08-14 13:35:33 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-08-14 13:35:33 +0100
commitdef50953bee2cff31cdb78d3e4e7ec443353ab8a (patch)
tree007a78aaec98e707b8bacffac28dd5a37d6c4371
parent87ecd4f3408265fc6403dfbe34fb885057f804ec (diff)
parentbd7adc84492e8e31a48917f515b8a5f598d84544 (diff)
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Mon 14 Aug 2017 13:32:10 BST # gpg: using RSA key 0xEF04965B398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211 * remotes/jasowang/tags/net-pull-request: qemu-doc: Mention host_net_add/-remove in the deprecation chapter Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--qemu-doc.texi8
1 files changed, 8 insertions, 0 deletions
diff --git a/qemu-doc.texi b/qemu-doc.texi
index 4fc6b6f077..9811476ac1 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -3283,6 +3283,14 @@ by the ``convert -l snapshot_param'' argument instead.
@section System emulator human monitor commands
+@subsection host_net_add (since 2.10.0)
+
+The ``host_net_add'' command is replaced by the ``netdev_add'' command.
+
+@subsection host_net_remove (since 2.10.0)
+
+The ``host_net_remove'' command is replaced by the ``netdev_del'' command.
+
@subsection usb_add (since 2.10.0)
The ``usb_add'' command is replaced by the ``device_add'' command.