mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make help output be a little more self-consistent

Browse Source 
Signed-off-by: Bruce Rogers <brogers@novell.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Bruce Rogers 2010-01-06 12:33:57 -07:00 committed by Anthony Liguori
parent 20a86364c9
commit ca1a8a0658
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
qemu-options.hx
View File

@ -42,7 +42,7 @@ DEF("smp", HAS_ARG, QEMU_OPTION_smp,
"-smp n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets]\n" "-smp n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets]\n"
" set the number of CPUs to 'n' [default=1]\n" " set the number of CPUs to 'n' [default=1]\n"
" maxcpus= maximum number of total cpus, including\n" " maxcpus= maximum number of total cpus, including\n"
" offline CPUs for hotplug etc.\n" " offline CPUs for hotplug, etc\n"
" cores= number of CPU cores on one socket\n" " cores= number of CPU cores on one socket\n"
" threads= number of threads on one CPU core\n" " threads= number of threads on one CPU core\n"
" sockets= number of discrete sockets in the system\n") " sockets= number of discrete sockets in the system\n")
@ -405,8 +405,9 @@ ETEXI
DEF("device", HAS_ARG, QEMU_OPTION_device, DEF("device", HAS_ARG, QEMU_OPTION_device,
"-device driver[,options] add device\n") "-device driver[,options] add device\n")
DEF("name", HAS_ARG, QEMU_OPTION_name, DEF("name", HAS_ARG, QEMU_OPTION_name,
"-name string1[,process=string2] set the name of the guest\n" "-name string1[,process=string2]\n"
" string1 sets the window title and string2 the process name (on Linux)\n") " set the name of the guest\n"
" string1 sets the window title and string2 the process name (on Linux)\n")
STEXI STEXI
@item -name @var{name} @item -name @var{name}
Sets the @var{name} of the guest. Sets the @var{name} of the guest.
@ -483,7 +484,7 @@ ETEXI
#ifdef CONFIG_SDL #ifdef CONFIG_SDL
DEF("ctrl-grab", 0, QEMU_OPTION_ctrl_grab, DEF("ctrl-grab", 0, QEMU_OPTION_ctrl_grab,
"-ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt)\n") "-ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt)\n")
#endif #endif
STEXI STEXI
@item -ctrl-grab @item -ctrl-grab
@ -756,12 +757,12 @@ ETEXI
#ifdef TARGET_I386 #ifdef TARGET_I386
DEF("smbios", HAS_ARG, QEMU_OPTION_smbios, DEF("smbios", HAS_ARG, QEMU_OPTION_smbios,
"-smbios file=binary\n" "-smbios file=binary\n"
" Load SMBIOS entry from binary file\n" " load SMBIOS entry from binary file\n"
"-smbios type=0[,vendor=str][,version=str][,date=str][,release=%%d.%%d]\n" "-smbios type=0[,vendor=str][,version=str][,date=str][,release=%%d.%%d]\n"
" Specify SMBIOS type 0 fields\n" " specify SMBIOS type 0 fields\n"
"-smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str]\n" "-smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str]\n"
" [,uuid=uuid][,sku=str][,family=str]\n" " [,uuid=uuid][,sku=str][,family=str]\n"
" Specify SMBIOS type 1 fields\n") " specify SMBIOS type 1 fields\n")
#endif #endif
STEXI STEXI
@item -smbios file=@var{binary} @item -smbios file=@var{binary}
@ -816,13 +817,13 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
"-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes][,vnet_hdr=on|off]\n" "-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes][,vnet_hdr=on|off]\n"
" connect the host TAP network interface to VLAN 'n' and use the\n" " connect the host TAP network interface to VLAN 'n' and use the\n"
" network scripts 'file' (default=%s)\n" " network scripts 'file' (default=%s)\n"
" and 'dfile' (default=%s);\n" " and 'dfile' (default=%s)\n"
" use '[down]script=no' to disable script execution;\n" " use '[down]script=no' to disable script execution\n"
" use 'fd=h' to connect to an already opened TAP interface\n" " use 'fd=h' to connect to an already opened TAP interface\n"
" use 'sndbuf=nbytes' to limit the size of the send buffer; the\n" " use 'sndbuf=nbytes' to limit the size of the send buffer (the\n"
" default of 'sndbuf=1048576' can be disabled using 'sndbuf=0'\n" " default of 'sndbuf=1048576' can be disabled using 'sndbuf=0')\n"
" use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag; use\n" " use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag\n"
" vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition\n" " use vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition\n"
#endif #endif
"-net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port]\n" "-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" " connect the vlan 'n' to another VLAN using a socket connection\n"
@ -837,7 +838,7 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
#endif #endif
"-net dump[,vlan=n][,file=f][,len=n]\n" "-net dump[,vlan=n][,file=f][,len=n]\n"
" dump traffic on vlan 'n' to file 'f' (max n bytes per packet)\n" " dump traffic on vlan 'n' to file 'f' (max n bytes per packet)\n"
"-net none use it alone to have zero network devices; if no -net option\n" "-net none use it alone to have zero network devices. If no -net option\n"
" is provided, the default is '-net nic -net user'\n") " is provided, the default is '-net nic -net user'\n")
DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
"-netdev [" "-netdev ["
@ -1589,7 +1590,7 @@ The default device is @code{vc} in graphical mode and @code{stdio} in
non graphical mode. non graphical mode.
ETEXI ETEXI
DEF("qmp", HAS_ARG, QEMU_OPTION_qmp, \ DEF("qmp", HAS_ARG, QEMU_OPTION_qmp, \
"-qmp dev like -monitor but opens in 'control' mode.\n") "-qmp dev like -monitor but opens in 'control' mode\n")
DEF("mon", HAS_ARG, QEMU_OPTION_mon, \ DEF("mon", HAS_ARG, QEMU_OPTION_mon, \
"-mon chardev=[name][,mode=readline|control][,default]\n") "-mon chardev=[name][,mode=readline|control][,default]\n")
@ -1618,7 +1619,7 @@ from a script.
ETEXI ETEXI
DEF("singlestep", 0, QEMU_OPTION_singlestep, \ DEF("singlestep", 0, QEMU_OPTION_singlestep, \
"-singlestep always run in singlestep mode\n") "-singlestep always run in singlestep mode\n")
STEXI STEXI
@item -singlestep @item -singlestep
Run the emulation in single step mode. Run the emulation in single step mode.
@ -1902,13 +1903,13 @@ STEXI
ETEXI ETEXI
DEF("nodefaults", 0, QEMU_OPTION_nodefaults, \ DEF("nodefaults", 0, QEMU_OPTION_nodefaults, \
"-nodefaults don't create default devices.\n") "-nodefaults don't create default devices\n")
STEXI STEXI
ETEXI ETEXI
#ifndef _WIN32 #ifndef _WIN32
DEF("chroot", HAS_ARG, QEMU_OPTION_chroot, \ DEF("chroot", HAS_ARG, QEMU_OPTION_chroot, \
"-chroot dir Chroot to dir just before starting the VM.\n") "-chroot dir chroot to dir just before starting the VM\n")
#endif #endif
STEXI STEXI
@item -chroot @var{dir} @item -chroot @var{dir}
@ -1918,7 +1919,7 @@ ETEXI
#ifndef _WIN32 #ifndef _WIN32
DEF("runas", HAS_ARG, QEMU_OPTION_runas, \ DEF("runas", HAS_ARG, QEMU_OPTION_runas, \
"-runas user Change to user id user just before starting the VM.\n") "-runas user change to user id user just before starting the VM\n")
#endif #endif
STEXI STEXI
@item -runas @var{user} @item -runas @var{user}