diff options
| author |   Mark McLoughlin <markmc@redhat.com> | 2009-10-28 11:51:32 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2009-10-28 11:52:42 +0000 |
| commit | 4c3bad2f638cebe70864952a054ebeed6327daee (patch) | |
| tree | e3bfa75a5f567befc3a7b7ba96d03bcfe98398c4 /qemu-options.hx | |
| parent | Merge commit '8febfa26846e75d38848255028dfe2d06e5ba941' into upstream-merge (diff) | |
| parent | net: make tap_receive() re-use tap_receive_iov() code (diff) | |
| download | qemu-kvm-4c3bad2f638cebe70864952a054ebeed6327daee.tar.gz qemu-kvm-4c3bad2f638cebe70864952a054ebeed6327daee.tar.bz2 qemu-kvm-4c3bad2f638cebe70864952a054ebeed6327daee.zip | |
Merge commit '38c75be3139a117b02350dbda9d48d47aa57fa3d' into upstream-merge
* commit '38c75be3139a117b02350dbda9d48d47aa57fa3d':
net: make tap_receive() re-use tap_receive_iov() code
net: import linux tap ioctl definitions
net: remove unused includes of if_tun.h and if_tap.h
Revert "qcow2: Bring synchronous read/write back to life"
linux-aio: Honour AsyncContext
posix-aio-compat: Honour AsyncContext
block: Use new AsyncContext for bdrv_read/write emulation
Introduce contexts for asynchronous callbacks
Split out bottom halves
Conflicts:
net.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 17a7ebfb4..b12f53ecf 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -811,21 +811,15 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, "-net tap[,vlan=n][,name=str],ifname=name\n" " connect the host TAP network interface to VLAN 'n'\n" #else - "-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile]" -#ifdef TUNSETSNDBUF - "[,sndbuf=nbytes]" -#endif - "\n" + "-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes]\n" " connect the host TAP network interface to VLAN 'n' and use the\n" " network scripts 'file' (default=%s)\n" " and 'dfile' (default=%s);\n" " use '[down]script=no' to disable script execution;\n" " use 'fd=h' to connect to an already opened TAP interface\n" -#ifdef TUNSETSNDBUF " use 'sndbuf=nbytes' to limit the size of the send buffer; the\n" " default of 'sndbuf=1048576' can be disabled using 'sndbuf=0'\n" #endif -#endif "-net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port]\n" " connect the vlan 'n' to another VLAN using a socket connection\n" "-net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port]\n" |