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

Deprecate -M command line options 

Superseded by -machine. Therefore, this patch removes -M from the help
list and pushes -machine at the same place in the output.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jan Kiszka 2011-07-23 12:39:46 +02:00 committed by Anthony Liguori
parent 9052ea6bf4
commit 80f52a6694
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
qemu-options.hx
View File

@ -27,14 +27,29 @@ STEXI
Display version information and exit Display version information and exit
ETEXI ETEXI
DEF("M", HAS_ARG, QEMU_OPTION_M, DEF("machine", HAS_ARG, QEMU_OPTION_machine, \
"-M machine select emulated machine (-M ? for list)\n", QEMU_ARCH_ALL) "-machine [type=]name[,prop[=value][,...]]\n"
" selects emulated machine (-machine ? for list)\n"
" property accel=accel1[:accel2[:...]] selects accelerator\n"
" supported accelerators are kvm, xen, tcg (default: tcg)\n",
QEMU_ARCH_ALL)
STEXI STEXI
@item -M @var{machine} @item -machine [type=]@var{name}[,prop=@var{value}[,...]]
@findex -M @findex -machine
Select the emulated @var{machine} (@code{-M ?} for list) Select the emulated machine by @var{name}. Use @code{-machine ?} to list
available machines. Supported machine properties are:
@table @option
@item accel=@var{accels1}[:@var{accels2}[:...]]
This is used to enable an accelerator. Depending on the target architecture,
kvm, xen, or tcg can be available. By default, tcg is used. If there is more
than one accelerator specified, the next one is used if the previous one fails
to initialize.
@end table
ETEXI ETEXI
HXCOMM Deprecated by -machine
DEF("M", HAS_ARG, QEMU_OPTION_M, "", QEMU_ARCH_ALL)
DEF("cpu", HAS_ARG, QEMU_OPTION_cpu, DEF("cpu", HAS_ARG, QEMU_OPTION_cpu,
"-cpu cpu select CPU (-cpu ? for list)\n", QEMU_ARCH_ALL) "-cpu cpu select CPU (-cpu ? for list)\n", QEMU_ARCH_ALL)
STEXI STEXI
@ -2074,26 +2089,6 @@ Enable KVM full virtualization support. This option is only available
if KVM support is enabled when compiling. if KVM support is enabled when compiling.
ETEXI ETEXI
DEF("machine", HAS_ARG, QEMU_OPTION_machine, \
"-machine [type=]name[,prop[=value][,...]]\n"
" selects emulated machine (-machine ? for list)\n"
" property accel=accel1[:accel2[:...]] selects accelerator\n"
" supported accelerators are kvm, xen, tcg (default: tcg)\n",
QEMU_ARCH_ALL)
STEXI
@item -machine [type=]@var{name}[,prop=@var{value}[,...]]
@findex -machine
Select the emulated machine by @var{name}. Use @code{-machine ?} to list
available machines. Supported machine properties are:
@table @option
@item accel=@var{accels1}[:@var{accels2}[:...]]
This is used to enable an accelerator. Depending on the target architecture,
kvm, xen, or tcg can be available. By default, tcg is used. If there is more
than one accelerator specified, the next one is used if the previous one fails
to initialize.
@end table
ETEXI
DEF("xen-domid", HAS_ARG, QEMU_OPTION_xen_domid, DEF("xen-domid", HAS_ARG, QEMU_OPTION_xen_domid,
"-xen-domid id specify xen guest domain id\n", QEMU_ARCH_ALL) "-xen-domid id specify xen guest domain id\n", QEMU_ARCH_ALL)
DEF("xen-create", 0, QEMU_OPTION_xen_create, DEF("xen-create", 0, QEMU_OPTION_xen_create,