Revision 7a9f6e4a vl.c

b/vl.c
3887 3887 
           "-uuid %%08x-%%04x-%%04x-%%04x-%%012x specify machine UUID\n"
3888 3888 
           "\n"
3889 3889 
           "Network options:\n"
3890 
           "-net nic[,vlan=n][,macaddr=addr][,model=type]\n"
3890 
           "-net nic[,vlan=n][,macaddr=addr][,model=type][,name=str]\n"
3891 3891 
           "                create a new Network Interface Card and connect it to VLAN 'n'\n"
3892 3892 
#ifdef CONFIG_SLIRP
3893 
           "-net user[,vlan=n][,hostname=host]\n"
3893 
           "-net user[,vlan=n][,name=str][,hostname=host]\n"
3894 3894 
           "                connect the user mode network stack to VLAN 'n' and send\n"
3895 3895 
           "                hostname 'host' to DHCP clients\n"
3896 3896 
#endif
3897 3897 
#ifdef _WIN32
3898 
           "-net tap[,vlan=n],ifname=name\n"
3898 
           "-net tap[,vlan=n][,name=str],ifname=name\n"
3899 3899 
           "                connect the host TAP network interface to VLAN 'n'\n"
3900 3900 
#else
3901 
           "-net tap[,vlan=n][,fd=h][,ifname=name][,script=file][,downscript=dfile]\n"
3901 
           "-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile]\n"
3902 3902 
           "                connect the host TAP network interface to VLAN 'n' and use the\n"
3903 3903 
           "                network scripts 'file' (default=%s)\n"
3904 3904 
           "                and 'dfile' (default=%s);\n"
3905 3905 
           "                use '[down]script=no' to disable script execution;\n"
3906 3906 
           "                use 'fd=h' to connect to an already opened TAP interface\n"
3907 3907 
#endif
3908 
           "-net socket[,vlan=n][,fd=h][,listen=[host]:port][,connect=host:port]\n"
3908 
           "-net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port]\n"
3909 3909 
           "                connect the vlan 'n' to another VLAN using a socket connection\n"
3910 
           "-net socket[,vlan=n][,fd=h][,mcast=maddr:port]\n"
3910 
           "-net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port]\n"
3911 3911 
           "                connect the vlan 'n' to multicast maddr and port\n"
3912 3912 
#ifdef CONFIG_VDE
3913 
           "-net vde[,vlan=n][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode]\n"
3913 
           "-net vde[,vlan=n][,name=str][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode]\n"
3914 3914 
           "                connect the vlan 'n' to port 'n' of a vde switch running\n"
3915 3915 
           "                on host and listening for incoming connections on 'socketpath'.\n"
3916 3916 
           "                Use group 'groupname' and mode 'octalmode' to change default\n"

Also available in: Unified diff