OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qemu-doc: update deprecation section to use -nic and -netdev hubport 

The deprecated SLIRP options -tftp, -bootp, -redir, -smb provide
sample replacements that use "-net nic".  Suggest "-nic" instead,
since we finally have a path towards getting rid of "-net".

For "-net vlan" the replacement involves hubport network devices,
so mention that too.

Cc: Jason Wang <jasowang@redhat.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2018-02-21 12:25:14 +01:00
parent d082d16a5c
commit fb8152181d
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
qemu-doc.texi
View File

@ -2643,42 +2643,46 @@ combined with ``-vnc tls-creds=tls0'
@subsection -tftp (since 2.6.0) @subsection -tftp (since 2.6.0)
The ``-tftp /some/dir'' argument is replaced by The ``-tftp /some/dir'' argument is replaced by either
``-netdev user,id=x,tftp=/some/dir'', either accompanied with ``-netdev user,id=x,tftp=/some/dir '' (for pluggable NICs, accompanied
``-device ...,netdev=x'' (for pluggable NICs) or ``-net nic,netdev=x'' with ``-device ...,netdev=x''), or ``-nic user,tftp=/some/dir''
(for embedded NICs). The new syntax allows different settings to be (for embedded NICs). The new syntax allows different settings to be
provided per NIC. provided per NIC.
@subsection -bootp (since 2.6.0) @subsection -bootp (since 2.6.0)
The ``-bootp /some/file'' argument is replaced by The ``-bootp /some/file'' argument is replaced by either
``-netdev user,id=x,bootp=/some/file'', either accompanied with ``-netdev user,id=x,bootp=/some/file '' (for pluggable NICs, accompanied
``-device ...,netdev=x'' (for pluggable NICs) or ``-net nic,netdev=x'' with ``-device ...,netdev=x''), or ``-nic user,bootp=/some/file''
(for embedded NICs). The new syntax allows different settings to be (for embedded NICs). The new syntax allows different settings to be
provided per NIC. provided per NIC.
@subsection -redir (since 2.6.0) @subsection -redir (since 2.6.0)
The ``-redir [tcp|udp]:hostport:[guestaddr]:guestport'' argument is The ``-redir [tcp|udp]:hostport:[guestaddr]:guestport'' argument is
replaced by ``-netdev replaced by either
user,id=x,hostfwd=[tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport'', ``-netdev user,id=x,hostfwd=[tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport''
either accompanied with ``-device ...,netdev=x'' (for pluggable NICs) or (for pluggable NICs, accompanied with ``-device ...,netdev=x'') or
``-net nic,netdev=x'' (for embedded NICs). The new syntax allows different ``-nic user,hostfwd=[tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport''
settings to be provided per NIC. (for embedded NICs). The new syntax allows different settings to be
provided per NIC.
@subsection -smb (since 2.6.0) @subsection -smb (since 2.6.0)
The ``-smb /some/dir'' argument is replaced by The ``-smb /some/dir'' argument is replaced by either
``-netdev user,id=x,smb=/some/dir'', either accompanied with ``-netdev user,id=x,smb=/some/dir '' (for pluggable NICs, accompanied
``-device ...,netdev=x'' (for pluggable NICs) or ``-net nic,netdev=x'' with ``-device ...,netdev=x''), or ``-nic user,smb=/some/dir''
(for embedded NICs). The new syntax allows different settings to be (for embedded NICs). The new syntax allows different settings to be
provided per NIC. provided per NIC.
@subsection -net vlan (since 2.9.0) @subsection -net vlan (since 2.9.0)
The ``-net vlan=NN'' argument is partially replaced with the The ``-net vlan=NN'' argument was mostly used to attach separate
new ``-netdev'' argument. The remaining use cases will no network backends to different virtual NICs. This is the default
longer be directly supported in QEMU. 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=NN,...''
and ``-nic hubport,hubid=NN''.
@subsection -drive cyls=...,heads=...,secs=...,trans=... (since 2.10.0) @subsection -drive cyls=...,heads=...,secs=...,trans=... (since 2.10.0)