Commit def50953 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 87ecd4f3 bd7adc84
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -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.