[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6432] Synch code, help and docs
|
From: |
Blue Swirl |
|
Subject: |
[Qemu-devel] [6432] Synch code, help and docs |
|
Date: |
Sat, 24 Jan 2009 18:19:25 +0000 |
Revision: 6432
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6432
Author: blueswir1
Date: 2009-01-24 18:19:25 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
Synch code, help and docs
Rearrange code, help printout and docs so that they are in the same
(hopefully more logical) order for easier maintenance.
Add help and docs for undocumented options.
Reformat slightly for more consistent help output.
Add comments to encourage better synchronization in the future.
Modified Paths:
--------------
trunk/monitor.c
trunk/qemu-doc.texi
trunk/qemu-img.c
trunk/qemu-img.texi
trunk/vl.c
Modified: trunk/monitor.c
===================================================================
--- trunk/monitor.c 2009-01-24 18:18:20 UTC (rev 6431)
+++ trunk/monitor.c 2009-01-24 18:19:25 UTC (rev 6432)
@@ -1429,6 +1429,7 @@
term_printf("balloon: actual=%d\n", (int)(actual >> 20));
}
+/* Please update qemu-doc.texi when adding or changing commands */
static const term_cmd_t term_cmds[] = {
{ "help|?", "s?", do_help,
"[cmd]", "show the help" },
@@ -1496,8 +1497,8 @@
"path [frequency bits channels]",
"capture audio to a wave file (default frequency=44100 bits=16
channels=2)" },
#endif
- { "stopcapture", "i", do_stop_capture,
- "capture index", "stop capture" },
+ { "stopcapture", "i", do_stop_capture,
+ "capture index", "stop capture" },
{ "memsave", "lis", do_memory_save,
"addr size file", "save to disk virtual memory dump starting at 'addr'
of size 'size'", },
{ "pmemsave", "lis", do_physical_memory_save,
@@ -1520,9 +1521,10 @@
{ NULL, NULL, },
};
+/* Please update qemu-doc.texi when adding or changing commands */
static const term_cmd_t info_cmds[] = {
{ "version", "", do_info_version,
- "", "show the version of qemu" },
+ "", "show the version of QEMU" },
{ "network", "", do_info_network,
"", "show the network state" },
{ "chardev", "", qemu_chr_info,
@@ -1554,9 +1556,9 @@
{ "jit", "", do_info_jit,
"", "show dynamic compiler info", },
{ "kqemu", "", do_info_kqemu,
- "", "show kqemu information", },
+ "", "show KQEMU information", },
{ "kvm", "", do_info_kvm,
- "", "show kvm information", },
+ "", "show KVM information", },
{ "usb", "", usb_info,
"", "show guest USB devices", },
{ "usbhost", "", usb_host_info,
Modified: trunk/qemu-doc.texi
===================================================================
--- trunk/qemu-doc.texi 2009-01-24 18:18:20 UTC (rev 6431)
+++ trunk/qemu-doc.texi 2009-01-24 18:19:25 UTC (rev 6432)
@@ -221,13 +221,25 @@
@end example
@c man begin OPTIONS
address@hidden is a raw hard disk image for IDE hard disk 0.
address@hidden is a raw hard disk image for IDE hard disk 0. Some
+targets do not need a disk image.
General options:
@table @option
address@hidden -h
+Display help and exit
+
@item -M @var{machine}
Select the emulated @var{machine} (@code{-M ?} for list)
address@hidden -cpu @var{model}
+Select CPU model (-cpu ? for list and additional feature selection)
+
address@hidden -smp @var{n}
+Simulate an SMP system with @var{n} CPUs. On the PC target, up to 255
+CPUs are supported. On Sparc32 target, Linux limits the number of usable CPUs
+to 4.
+
@item -fda @var{file}
@item -fdb @var{file}
Use @var{file} as floppy disk 0/1 image (@pxref{disk_images}). You can
@@ -344,6 +356,15 @@
qemu -hda a -hdb b
@end example
address@hidden -mtdblock file
+Use 'file' as on-board Flash memory image.
+
address@hidden -sd file
+Use 'file' as SecureDigital card image.
+
address@hidden -pflash file
+Use 'file' as a parallel flash image.
+
@item -boot [a|c|d|n]
Boot on floppy (a), hard disk (c), CD-ROM (d), or Etherboot (n). Hard disk boot
is the default.
@@ -353,23 +374,28 @@
the raw disk image you use is not written back. You can however force
the write back by pressing @key{C-a s} (@pxref{disk_images}).
address@hidden -no-fd-bootchk
-Disable boot signature checking for floppy disks in Bochs BIOS. It may
-be needed to boot from old floppy disks.
-
@item -m @var{megs}
Set virtual RAM size to @var{megs} megabytes. Default is 128 MiB. Optionally,
a suffix of ``M'' or ``G'' can be used to signify a value in megabytes or
gigabytes respectively.
address@hidden -cpu @var{model}
-Select CPU model (-cpu ? for list and additional feature selection)
address@hidden -k @var{language}
address@hidden -smp @var{n}
-Simulate an SMP system with @var{n} CPUs. On the PC target, up to 255
-CPUs are supported. On Sparc32 target, Linux limits the number of usable CPUs
-to 4.
+Use keyboard layout @var{language} (for example @code{fr} for
+French). This option is only needed where it is not easy to get raw PC
+keycodes (e.g. on Macs, with some X11 servers or with a VNC
+display). You don't normally need to use it on PC/Linux or PC/Windows
+hosts.
+The available layouts are:
address@hidden
+ar de-ch es fo fr-ca hu ja mk no pt-br sv
+da en-gb et fr fr-ch is lt nl pl ru th
+de en-us fi fr-be hr it lv nl-be pt sl tr
address@hidden example
+
+The default is @code{en-us}.
+
@item -audio-help
Will show the audio subsystem help: list of drivers, tunable
@@ -395,45 +421,59 @@
modprobe i810_audio clocking=48000
@end example
address@hidden -localtime
-Set the real time clock to local time (the default is to UTC
-time). This option is needed to have correct date in MS-DOS or
-Windows.
address@hidden table
address@hidden -startdate @var{date}
-Set the initial date of the real time clock. Valid formats for
address@hidden are: @code{now} or @code{2006-06-17T16:01:21} or
address@hidden The default value is @code{now}.
+USB options:
address@hidden @option
address@hidden -pidfile @var{file}
-Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
-from a script.
address@hidden -usb
+Enable the USB driver (will be the default soon)
address@hidden -daemonize
-Daemonize the QEMU process after initialization. QEMU will not detach from
-standard IO until it is ready to receive connections on any of its devices.
-This option is a useful way for external programs to launch QEMU without having
-to cope with initialization race conditions.
address@hidden -usbdevice @var{devname}
+Add the USB device @var{devname}. @xref{usb_devices}.
address@hidden -win2k-hack
-Use it when installing Windows 2000 to avoid a disk full bug. After
-Windows 2000 is installed, you no longer need this option (this option
-slows down the IDE transfers).
address@hidden @code
address@hidden -rtc-td-hack
-Use it if you experience time drift problem in Windows with ACPI HAL.
-This option will try to figure out how many timer interrupts were not
-processed by the Windows guest and will re-inject them.
address@hidden mouse
+Virtual Mouse. This will override the PS/2 mouse emulation when activated.
address@hidden -option-rom @var{file}
-Load the contents of @var{file} as an option ROM.
-This option is useful to load things like EtherBoot.
address@hidden tablet
+Pointer device that uses absolute coordinates (like a touchscreen). This
+means qemu is able to report the mouse position without having to grab the
+mouse. Also overrides the PS/2 mouse emulation when activated.
address@hidden disk:address@hidden:file
+Mass storage device based on file. The optional @var{format} argument
+will be used rather than detecting the format. Can be used to specifiy
+format=raw to avoid interpreting an untrusted format header.
+
address@hidden host:bus.addr
+Pass through the host device identified by bus.addr (Linux only).
+
address@hidden host:vendor_id:product_id
+Pass through the host device identified by vendor_id:product_id (Linux only).
+
address@hidden serial:address@hidden,address@hidden:@var{dev}
+Serial converter to host character device @var{dev}, see @code{-serial} for the
+available devices.
+
address@hidden braille
+Braille device. This will use BrlAPI to display the braille output on a real
+or fake device.
+
address@hidden net:options
+Network adapter that supports CDC ethernet and RNDIS protocols.
+
address@hidden table
+
@item -name @var{name}
Sets the @var{name} of the guest.
This name will be displayed in the SDL window caption.
The @var{name} will also be used for the VNC server.
address@hidden -uuid @var{uuid}
+Set system UUID.
+
@end table
Display options:
@@ -459,10 +499,43 @@
available screen space. This makes the using QEMU in a dedicated desktop
workspace more convenient.
address@hidden -alt-grab
+
+Use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt).
+
@item -no-quit
Disable SDL window close capability.
address@hidden -sdl
+
+Enable SDL.
+
address@hidden -portrait
+
+Rotate graphical output 90 deg left (only PXA LCD).
+
address@hidden -vga @var{type}
+Select type of VGA card to emulate. Valid values for @var{type} are
address@hidden @code
address@hidden cirrus
+Cirrus Logic GD5446 Video card. All Windows versions starting from
+Windows 95 should recognize and use this graphic card. For optimal
+performances, use 16 bit color depth in the guest and the host OS.
+(This one is the default)
address@hidden std
+Standard VGA card with Bochs VBE extensions. If your guest OS
+supports the VESA 2.0 VBE extensions (e.g. Windows XP) and if you want
+to use high resolution modes (>= 1280x1024x16) then you should use
+this option.
address@hidden vmware
+VMWare SVGA-II compatible adapter. Use it if you have sufficiently
+recent XFree86/XOrg server or Windows guest with a driver for this
+card.
address@hidden none
+Disable VGA card.
address@hidden table
+
@item -full-screen
Start in full screen.
@@ -545,70 +618,8 @@
@end table
address@hidden -k @var{language}
-
-Use keyboard layout @var{language} (for example @code{fr} for
-French). This option is only needed where it is not easy to get raw PC
-keycodes (e.g. on Macs, with some X11 servers or with a VNC
-display). You don't normally need to use it on PC/Linux or PC/Windows
-hosts.
-
-The available layouts are:
address@hidden
-ar de-ch es fo fr-ca hu ja mk no pt-br sv
-da en-gb et fr fr-ch is lt nl pl ru th
-de en-us fi fr-be hr it lv nl-be pt sl tr
address@hidden example
-
-The default is @code{en-us}.
-
@end table
-USB options:
address@hidden @option
-
address@hidden -usb
-Enable the USB driver (will be the default soon)
-
address@hidden -usbdevice @var{devname}
-Add the USB device @var{devname}. @xref{usb_devices}.
-
address@hidden @code
-
address@hidden mouse
-Virtual Mouse. This will override the PS/2 mouse emulation when activated.
-
address@hidden tablet
-Pointer device that uses absolute coordinates (like a touchscreen). This
-means qemu is able to report the mouse position without having to grab the
-mouse. Also overrides the PS/2 mouse emulation when activated.
-
address@hidden disk:address@hidden:file
-Mass storage device based on file. The optional @var{format} argument
-will be used rather than detecting the format. Can be used to specifiy
-format=raw to avoid interpreting an untrusted format header.
-
address@hidden host:bus.addr
-Pass through the host device identified by bus.addr (Linux only).
-
address@hidden host:vendor_id:product_id
-Pass through the host device identified by vendor_id:product_id (Linux only).
-
address@hidden serial:address@hidden,address@hidden:@var{dev}
-Serial converter to host character device @var{dev}, see @code{-serial} for the
-available devices.
-
address@hidden braille
-Braille device. This will use BrlAPI to display the braille output on a real
-or fake device.
-
address@hidden net:options
-Network adapter that supports CDC ethernet and RNDIS protocols.
-
address@hidden table
-
address@hidden table
-
Network options:
@table @option
@@ -856,6 +867,34 @@
@end table
+i386 target only:
+
address@hidden @option
+
address@hidden -win2k-hack
+Use it when installing Windows 2000 to avoid a disk full bug. After
+Windows 2000 is installed, you no longer need this option (this option
+slows down the IDE transfers).
+
address@hidden -rtc-td-hack
+Use it if you experience time drift problem in Windows with ACPI HAL.
+This option will try to figure out how many timer interrupts were not
+processed by the Windows guest and will re-inject them.
+
address@hidden -no-fd-bootchk
+Disable boot signature checking for floppy disks in Bochs BIOS. It may
+be needed to boot from old floppy disks.
+
address@hidden -no-acpi
+Disable ACPI (Advanced Configuration and Power Interface) support. Use
+it if your guest OS complains about ACPI problems (PC target machine
+only).
+
address@hidden -no-hpet
+Disable HPET support.
+
address@hidden table
+
Linux boot specific: When using these options, you can use a given
Linux kernel without installing it in the disk image. It can be useful
for easier testing of various kernels.
@@ -881,7 +920,7 @@
@var{dev}. The default device is @code{vc} in graphical mode and
@code{stdio} in non graphical mode.
-This option can be used several times to simulate up to 4 serials
+This option can be used several times to simulate up to 4 serial
ports.
Use @code{-serial none} to disable all serial ports.
@@ -1015,26 +1054,20 @@
The default device is @code{vc} in graphical mode and @code{stdio} in
non graphical mode.
address@hidden -echr numeric_ascii_value
-Change the escape character used for switching to the monitor when using
-monitor and serial sharing. The default is @code{0x01} when using the
address@hidden option. @code{0x01} is equal to pressing
address@hidden You can select a different character from the ascii
-control keys where 1 through 26 map to Control-a through Control-z. For
-instance you could use the either of the following to change the escape
-character to Control-t.
address@hidden @code
address@hidden -echr 0x14
address@hidden -echr 20
address@hidden table
address@hidden -pidfile @var{file}
+Store the QEMU process PID in @var{file}. It is useful if you launch QEMU
+from a script.
address@hidden -S
+Do not start CPU at startup (you must type 'c' in the monitor).
+
@item -s
Wait gdb connection to port 1234 (@pxref{gdb_usage}).
+
@item -p @var{port}
Change gdb connection port. @var{port} can be either a decimal number
to specify a TCP port, or a host device (same devices as the serial port).
address@hidden -S
-Do not start CPU at startup (you must type 'c' in the monitor).
+
@item -d
Output log in /tmp/qemu.log
@item -hdachs @var{c},@var{h},@var{s},[,@var{t}]
@@ -1044,33 +1077,23 @@
all those parameters. This option is useful for old MS-DOS disk
images.
address@hidden -L path
address@hidden -L @var{path}
Set the directory for the BIOS, VGA BIOS and keymaps.
address@hidden -vga @var{type}
-Select type of VGA card to emulate. Valid values for @var{type} are
address@hidden @code
address@hidden cirrus
-Cirrus Logic GD5446 Video card. All Windows versions starting from
-Windows 95 should recognize and use this graphic card. For optimal
-performances, use 16 bit color depth in the guest and the host OS.
-(This one is the default)
address@hidden std
-Standard VGA card with Bochs VBE extensions. If your guest OS
-supports the VESA 2.0 VBE extensions (e.g. Windows XP) and if you want
-to use high resolution modes (>= 1280x1024x16) then you should use
-this option.
address@hidden vmware
-VMWare SVGA-II compatible adapter. Use it if you have sufficiently
-recent XFree86/XOrg server or Windows guest with a driver for this
-card.
address@hidden table
address@hidden -bios @var{file}
+Set the filename for the BIOS.
address@hidden -no-acpi
-Disable ACPI (Advanced Configuration and Power Interface) support. Use
-it if your guest OS complains about ACPI problems (PC target machine
-only).
address@hidden -kernel-kqemu
+Enable KQEMU full virtualization (default is user mode only).
address@hidden -no-kqemu
+Disable KQEMU kernel module usage. KQEMU options are only available if
+KQEMU support is enabled when compiling.
+
address@hidden -enable-kvm
+Enable KVM full virtualization support. This option is only available
+if KVM support is enabled when compiling.
+
@item -no-reboot
Exit instead of rebooting.
@@ -1079,18 +1102,33 @@
This allows for instance switching to monitor to commit changes to the
disk image.
address@hidden -loadvm file
address@hidden -loadvm @var{file}
Start right away with a saved state (@code{loadvm} in monitor)
address@hidden -semihosting
-Enable semihosting syscall emulation (ARM and M68K target machines only).
address@hidden -daemonize
+Daemonize the QEMU process after initialization. QEMU will not detach from
+standard IO until it is ready to receive connections on any of its devices.
+This option is a useful way for external programs to launch QEMU without having
+to cope with initialization race conditions.
-On ARM this implements the "Angel" interface.
-On M68K this implements the "ColdFire GDB" interface used by libgloss.
address@hidden -option-rom @var{file}
+Load the contents of @var{file} as an option ROM.
+This option is useful to load things like EtherBoot.
-Note that this allows guest direct access to the host filesystem,
-so should only be used with trusted guest OS.
address@hidden -clock @var{method}
+Force the use of the given methods for timer alarm. To see what timers
+are available use -clock ?.
address@hidden -localtime
+Set the real time clock to local time (the default is to UTC
+time). This option is needed to have correct date in MS-DOS or
+Windows.
+
address@hidden -startdate @var{date}
+Set the initial date of the real time clock. Valid formats for
address@hidden are: @code{now} or @code{2006-06-17T16:01:21} or
address@hidden The default value is @code{now}.
+
@item -icount [N|auto]
Enable virtual instruction counter. The virtual cpu will execute one
instruction every 2^N ns of virtual time. If @code{auto} is specified
@@ -1101,8 +1139,22 @@
provide cycle accurate emulation. Modern CPUs contain superscalar out of
order cores with complex cache hierarchies. The number of instructions
executed often has little or no correlation with actual performance.
+
address@hidden -echr numeric_ascii_value
+Change the escape character used for switching to the monitor when using
+monitor and serial sharing. The default is @code{0x01} when using the
address@hidden option. @code{0x01} is equal to pressing
address@hidden You can select a different character from the ascii
+control keys where 1 through 26 map to Control-a through Control-z. For
+instance you could use the either of the following to change the escape
+character to Control-t.
address@hidden @code
address@hidden -echr 0x14
address@hidden -echr 20
@end table
address@hidden table
+
@c man end
@node pcsys_keys
@@ -1138,13 +1190,14 @@
@table @key
@item Ctrl-a h
address@hidden Ctrl-a ?
Print this help
@item Ctrl-a x
Exit emulator
@item Ctrl-a s
Save disk data back to file (if -snapshot)
@item Ctrl-a t
-toggle console timestamps
+Toggle console timestamps
@item Ctrl-a b
Send break (magic sysrq in Linux)
@item Ctrl-a c
@@ -1203,26 +1256,68 @@
Show various information about the system state.
@table @option
address@hidden info version
+show the version of QEMU
@item info network
show the various VLANs and the associated devices
address@hidden info chardev
+show the character devices
@item info block
show the block devices
address@hidden info block
+show block device statistics
@item info registers
show the cpu registers
address@hidden info cpus
+show infos for each CPU
@item info history
show the command line history
address@hidden info irq
+show the interrupts statistics (if available)
address@hidden info pic
+show i8259 (PIC) state
@item info pci
-show emulated PCI device
+show emulated PCI device info
address@hidden info tlb
+show virtual to physical memory mappings (i386 only)
address@hidden info mem
+show the active virtual memory mappings (i386 only)
address@hidden info hpet
+show state of HPET (i386 only)
address@hidden info kqemu
+show KQEMU information
address@hidden info kvm
+show KVM information
@item info usb
show USB devices plugged on the virtual USB hub
@item info usbhost
show all USB host devices
address@hidden info profile
+show profiling information
@item info capture
show information about active capturing
@item info snapshots
show list of VM snapshots
address@hidden info status
+show the current VM status (running|paused)
address@hidden info pcmcia
+show guest PCMCIA status
@item info mice
show which guest mouse is receiving events
address@hidden info vnc
+show the vnc server status
address@hidden info name
+show the current VM name
address@hidden info uuid
+show the current VM UUID
address@hidden info cpustats
+show CPU statistics
address@hidden info slirp
+show SLIRP statistics (if available)
address@hidden info migrate
+show migration status
address@hidden info balloon
+show balloon information
@end table
@item q or quit
@@ -1236,13 +1331,15 @@
Change the configuration of a device.
@table @option
address@hidden change @var{diskdevice} @var{filename}
address@hidden change @var{diskdevice} @var{filename} address@hidden
Change the medium for a removable disk device to point to @var{filename}. eg
@example
(qemu) change ide1-cd0 /path/to/some.iso
@end example
address@hidden is optional.
+
@item change vnc @var{display},@var{options}
Change the configuration of the VNC server. The valid syntax for @var{display}
and @var{options} are described at @ref{sec_invocation}. eg
@@ -1267,37 +1364,9 @@
@item screendump @var{filename}
Save screen into PPM image @var{filename}.
address@hidden mouse_move @var{dx} @var{dy} address@hidden
-Move the active mouse to the specified coordinates @var{dx} @var{dy}
-with optional scroll axis @var{dz}.
address@hidden logfile @var{filename}
+Output logs to @var{filename}.
address@hidden mouse_button @var{val}
-Change the active mouse button state @var{val} (1=L, 2=M, 4=R).
-
address@hidden mouse_set @var{index}
-Set which mouse device receives events at given @var{index}, index
-can be obtained with
address@hidden
-info mice
address@hidden example
-
address@hidden wavcapture @var{filename} address@hidden address@hidden
address@hidden
-Capture audio into @var{filename}. Using sample rate @var{frequency}
-bits per sample @var{bits} and number of channels @var{channels}.
-
-Defaults:
address@hidden @minus
address@hidden Sample rate = 44100 Hz - CD quality
address@hidden Bits = 16
address@hidden Number of channels = 2 - Stereo
address@hidden itemize
-
address@hidden stopcapture @var{index}
-Stop capture with a given @var{index}, index can be obtained with
address@hidden
-info capture
address@hidden example
-
@item log @var{item1}[,...]
Activate logging of the specified items to @file{/tmp/qemu.log}.
@@ -1403,14 +1472,14 @@
Reset the system.
address@hidden boot_set @var{bootdevicelist}
address@hidden system_powerdown
-Define new values for the boot device list. Those values will override
-the values specified on the command line through the @code{-boot} option.
+Power down the system (if supported).
-The values that can be specified here depend on the machine type, but are
-the same that can be specified in the @code{-boot} command line option.
address@hidden sum @var{addr} @var{size}
+Compute the checksum of a memory region.
+
@item usb_add @var{devname}
Add the USB device @var{devname}. For details of available devices see
@@ -1422,6 +1491,69 @@
hub. @var{devname} has the syntax @code{bus.addr}. Use the monitor
command @code{info usb} to see the devices you can remove.
address@hidden mouse_move @var{dx} @var{dy} address@hidden
+Move the active mouse to the specified coordinates @var{dx} @var{dy}
+with optional scroll axis @var{dz}.
+
address@hidden mouse_button @var{val}
+Change the active mouse button state @var{val} (1=L, 2=M, 4=R).
+
address@hidden mouse_set @var{index}
+Set which mouse device receives events at given @var{index}, index
+can be obtained with
address@hidden
+info mice
address@hidden example
+
address@hidden wavcapture @var{filename} address@hidden address@hidden
address@hidden
+Capture audio into @var{filename}. Using sample rate @var{frequency}
+bits per sample @var{bits} and number of channels @var{channels}.
+
+Defaults:
address@hidden @minus
address@hidden Sample rate = 44100 Hz - CD quality
address@hidden Bits = 16
address@hidden Number of channels = 2 - Stereo
address@hidden itemize
+
address@hidden stopcapture @var{index}
+Stop capture with a given @var{index}, index can be obtained with
address@hidden
+info capture
address@hidden example
+
address@hidden memsave @var{addr} @var{size} @var{file}
+save to disk virtual memory dump starting at @var{addr} of size @var{size}.
+
address@hidden pmemsave @var{addr} @var{size} @var{file}
+save to disk physical memory dump starting at @var{addr} of size @var{size}.
+
address@hidden boot_set @var{bootdevicelist}
+
+Define new values for the boot device list. Those values will override
+the values specified on the command line through the @code{-boot} option.
+
+The values that can be specified here depend on the machine type, but are
+the same that can be specified in the @code{-boot} command line option.
+
address@hidden nmi @var{cpu}
+Inject an NMI on the given CPU.
+
address@hidden migrate [-d] @var{uri}
+Migrate to @var{uri} (using -d to not wait for completion).
+
address@hidden migrate_cancel
+Cancel the current VM migration.
+
address@hidden migrate_set_speed @var{value}
+Set maximum speed to @var{value} (in bytes) for migrations.
+
address@hidden balloon @var{value}
+Request VM to change its memory allocation to @var{value} (in MB).
+
address@hidden set_link @var{name} [up|down]
+Set link @var{name} up or down.
+
@end table
@subsection Integer expressions
@@ -2850,6 +2982,22 @@
A Linux 2.6 test image is available on the QEMU web site. More
information is available in the QEMU mailing-list archive.
address@hidden man begin OPTIONS
+
+The following options are specific to the ARM emulation:
+
address@hidden @option
+
address@hidden -semihosting
+Enable semihosting syscall emulation.
+
+On ARM this implements the "Angel" interface.
+
+Note that this allows guest direct access to the host filesystem,
+so should only be used with trusted guest OS.
+
address@hidden table
+
@node ColdFire System emulator
@section ColdFire System emulator
@@ -2876,6 +3024,22 @@
Two on-chip UARTs.
@end itemize
address@hidden man begin OPTIONS
+
+The following options are specific to the ARM emulation:
+
address@hidden @option
+
address@hidden -semihosting
+Enable semihosting syscall emulation.
+
+On M68K this implements the "ColdFire GDB" interface used by libgloss.
+
+Note that this allows guest direct access to the host filesystem,
+so should only be used with trusted guest OS.
+
address@hidden table
+
@node QEMU User space emulator
@chapter QEMU User space emulator
Modified: trunk/qemu-img.c
===================================================================
--- trunk/qemu-img.c 2009-01-24 18:18:20 UTC (rev 6431)
+++ trunk/qemu-img.c 2009-01-24 18:19:25 UTC (rev 6432)
@@ -50,6 +50,7 @@
printf(" %s", name);
}
+/* Please keep in synch with qemu-img.texi */
static void help(void)
{
printf("qemu-img version " QEMU_VERSION ", Copyright (c) 2004-2008 Fabrice
Bellard\n"
@@ -61,7 +62,7 @@
" commit [-f fmt] filename\n"
" convert [-c] [-e] [-6] [-f fmt] [-O output_fmt] [-B
output_base_image] filename [filename2 [...]] output_filename\n"
" info [-f fmt] filename\n"
- " snapshot [-l|-a snapshot|-c snapshot|-d snapshot] filename\n"
+ " snapshot [-l | -a snapshot | -c snapshot | -d snapshot]
filename\n"
"\n"
"Command parameters:\n"
" 'filename' is a disk image filename\n"
@@ -72,22 +73,24 @@
" content as the input's base image, however the path, image
format, etc may\n"
" differ\n"
" 'fmt' is the disk image format. It is guessed automatically in
most cases\n"
- " 'size' is the disk image size in kilobytes. Optional suffixes
'M' (megabyte)\n"
- " and 'G' (gigabyte) are supported\n"
+ " 'size' is the disk image size in kilobytes. Optional suffixes\n"
+ " 'M' (megabyte, 1024 * 1024) and 'G' (gigabyte, 1024 * 1024 *
1024) are"
+ " supported any @code{k} or @code{K} is ignored\n"
" 'output_filename' is the destination disk image filename\n"
" 'output_fmt' is the destination format\n"
" '-c' indicates that target image must be compressed (qcow format
only)\n"
" '-e' indicates that the target image must be encrypted (qcow
format only)\n"
" '-6' indicates that the target image must use compatibility
level 6 (vmdk format only)\n"
+ " '-h' with or without a command shows this help and lists the
supported formats\n"
"\n"
- " Parameters to snapshot subcommand:\n"
- " 'snapshot' is the name of the snapshot to create, apply or
delete\n"
- " '-a' applies a snapshot (revert disk to saved state)\n"
- " '-c' creates a snapshot\n"
- " '-d' deletes a snapshot\n"
- " '-l' lists all snapshots in the given image\n"
+ "Parameters to snapshot subcommand:\n"
+ " 'snapshot' is the name of the snapshot to create, apply or
delete\n"
+ " '-a' applies a snapshot (revert disk to saved state)\n"
+ " '-c' creates a snapshot\n"
+ " '-d' deletes a snapshot\n"
+ " '-l' lists all snapshots in the given image\n"
);
- printf("\nSupported format:");
+ printf("\nSupported formats:");
bdrv_iterate_format(format_print, NULL);
printf("\n");
exit(1);
Modified: trunk/qemu-img.texi
===================================================================
--- trunk/qemu-img.texi 2009-01-24 18:18:20 UTC (rev 6431)
+++ trunk/qemu-img.texi 2009-01-24 18:19:25 UTC (rev 6432)
@@ -12,6 +12,7 @@
@item commit [-f @var{fmt}] @var{filename}
@item convert [-c] [-e] [-6] [-f @var{fmt}] [-O @var{output_fmt}] [-B
@var{output_base_image}] @var{filename} address@hidden [...]]
@var{output_filename}
@item info [-f @var{fmt}] @var{filename}
address@hidden snapshot [-l | -a @var{snapshot} | -c @var{snapshot} | -d
@var{snapshot}] @var{filename}
@end table
Command parameters:
@@ -59,7 +60,8 @@
@item size
is the disk image size in kilobytes. Optional suffixes @code{M}
-(megabyte) and @code{G} (gigabyte) are supported
+(megabyte, 1024 * 1024) and @code{G} (gigabyte, 1024 * 1024 * 1024)
+are supported and any @code{k} or @code{K} is ignored.
@item output_filename
is the destination disk image filename
@@ -73,8 +75,26 @@
indicates that the target image must be encrypted (qcow format only)
@item -6
indicates that the target image must use compatibility level 6 (vmdk format
only)
address@hidden -h
+with or without a command shows help and lists the supported formats
@end table
+Parameters to snapshot subcommand:
+
address@hidden @option
+
address@hidden snapshot
+is the name of the snapshot to create, apply or delete
address@hidden -a
+applies a snapshot (revert disk to saved state)
address@hidden -c
+creates a snapshot
address@hidden -d
+deletes a snapshot
address@hidden -l
+lists all snapshots in the given image
address@hidden table
+
Command description:
@table @option
@@ -115,6 +135,10 @@
particular to know the size reserved on disk which can be different
from the displayed size. If VM snapshots are stored in the disk image,
they are displayed too.
+
address@hidden snapshot [-l | -a @var{snapshot} | -c @var{snapshot} | -d
@var{snapshot} ] @var{filename}
+
+List, apply, create or delete snapshots in image @var{filename}.
@end table
@c man end
Modified: trunk/vl.c
===================================================================
--- trunk/vl.c 2009-01-24 18:18:20 UTC (rev 6431)
+++ trunk/vl.c 2009-01-24 18:19:25 UTC (rev 6432)
@@ -3851,14 +3851,18 @@
static void help(int exitcode)
{
+ /* Please keep in synch with QEMU_OPTION_ enums, qemu_options[]
+ and qemu-doc.texi */
printf("QEMU PC emulator version " QEMU_VERSION ", Copyright (c) 2003-2008
Fabrice Bellard\n"
"usage: %s [options] [disk_image]\n"
"\n"
"'disk_image' is a raw hard image image for IDE hard disk 0\n"
"\n"
"Standard options:\n"
+ "-h or -help display this help and exit\n"
"-M machine select emulated machine (-M ? for list)\n"
"-cpu cpu select CPU (-cpu ? for list)\n"
+ "-smp n set the number of CPUs to 'n' [default=1]\n"
"-fda/-fdb file use 'file' as floppy disk 0/1 image\n"
"-hda/-hdb file use 'file' as IDE hard disk 0/1 image\n"
"-hdc/-hdd file use 'file' as IDE hard disk 2/3 image\n"
@@ -3872,19 +3876,7 @@
"-pflash file use 'file' as a parallel flash image\n"
"-boot [a|c|d|n] boot on floppy (a), hard disk (c), CD-ROM (d), or
network (n)\n"
"-snapshot write to temporary files instead of disk image
files\n"
-#ifdef CONFIG_SDL
- "-no-frame open SDL window without a frame and window
decorations\n"
- "-alt-grab use Ctrl-Alt-Shift to grab mouse (instead of
Ctrl-Alt)\n"
- "-no-quit disable SDL window close capability\n"
- "-sdl enable SDL\n"
-#endif
-#ifdef TARGET_I386
- "-no-fd-bootchk disable boot signature checking for floppy disks\n"
-#endif
"-m megs set virtual RAM size to megs MB [default=%d]\n"
- "-smp n set the number of CPUs to 'n' [default=1]\n"
- "-nographic disable graphical output and redirect serial I/Os
to console\n"
- "-portrait rotate graphical output 90 deg left (only PXA
LCD)\n"
#ifndef _WIN32
"-k language use keyboard layout (for example \"fr\" for
French)\n"
#endif
@@ -3895,21 +3887,31 @@
" use -soundhw ? to get the list of supported
cards\n"
" use -soundhw all to enable all of them\n"
#endif
+ "-usb enable the USB driver (will be the default soon)\n"
+ "-usbdevice name add the host or guest USB device 'name'\n"
+ "-name string set the name of the guest\n"
+ "-uuid %%08x-%%04x-%%04x-%%04x-%%012x\n"
+ " specify machine UUID\n"
+ "\n"
+ "Display options:\n"
+ "-nographic disable graphical output and redirect serial I/Os
to console\n"
+#ifdef CONFIG_CURSES
+ "-curses use a curses/ncurses interface instead of SDL\n"
+#endif
+#ifdef CONFIG_SDL
+ "-no-frame open SDL window without a frame and window
decorations\n"
+ "-alt-grab use Ctrl-Alt-Shift to grab mouse (instead of
Ctrl-Alt)\n"
+ "-no-quit disable SDL window close capability\n"
+ "-sdl enable SDL\n"
+#endif
+ "-portrait rotate graphical output 90 deg left (only PXA
LCD)\n"
"-vga [std|cirrus|vmware|none]\n"
" select video card type\n"
- "-localtime set the real time clock to local time
[default=utc]\n"
"-full-screen start in full screen\n"
-#ifdef TARGET_I386
- "-win2k-hack use it when installing Windows 2000 to avoid a
disk full bug\n"
- "-rtc-td-hack use it to fix time drift in Windows ACPI HAL\n"
-#endif
- "-usb enable the USB driver (will be the default soon)\n"
- "-usbdevice name add the host or guest USB device 'name'\n"
#if defined(TARGET_PPC) || defined(TARGET_SPARC)
"-g WxH[xDEPTH] Set the initial graphical resolution and depth\n"
#endif
- "-name string set the name of the guest\n"
- "-uuid %%08x-%%04x-%%04x-%%04x-%%012x specify machine UUID\n"
+ "-vnc display start a VNC server on display\n"
"\n"
"Network options:\n"
"-net nic[,vlan=n][,macaddr=addr][,model=type][,name=str]\n"
@@ -3943,17 +3945,6 @@
#endif
"-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"
- "\n"
- "-bt hci,null Dumb bluetooth HCI - doesn't respond to commands\n"
- "-bt hci,host[:id]\n"
- " Use host's HCI with the given name\n"
- "-bt hci[,vlan=n]\n"
- " Emulate a standard HCI in virtual scatternet 'n'\n"
- "-bt vhci[,vlan=n]\n"
- " Add host computer to virtual scatternet 'n' using
VHCI\n"
- "-bt device:dev[,vlan=n]\n"
- " Emulate a bluetooth device 'dev' in scatternet
'n'\n"
- "\n"
#ifdef CONFIG_SLIRP
"-tftp dir allow tftp access to files in dir [-net user]\n"
"-bootp file advertise file in BOOTP replies\n"
@@ -3964,23 +3955,44 @@
" redirect TCP or UDP connections from host to guest
[-net user]\n"
#endif
"\n"
+ "-bt hci,null dumb bluetooth HCI - doesn't respond to commands\n"
+ "-bt hci,host[:id]\n"
+ " use host's HCI with the given name\n"
+ "-bt hci[,vlan=n]\n"
+ " emulate a standard HCI in virtual scatternet 'n'\n"
+ "-bt vhci[,vlan=n]\n"
+ " add host computer to virtual scatternet 'n' using
VHCI\n"
+ "-bt device:dev[,vlan=n]\n"
+ " emulate a bluetooth device 'dev' in scatternet
'n'\n"
+ "\n"
+#ifdef TARGET_I386
+ "\n"
+ "i386 target only:\n"
+ "-win2k-hack use it when installing Windows 2000 to avoid a
disk full bug\n"
+ "-rtc-td-hack use it to fix time drift in Windows ACPI HAL\n"
+ "-no-fd-bootchk disable boot signature checking for floppy disks\n"
+ "-no-acpi disable ACPI\n"
+ "-no-hpet disable HPET\n"
+#endif
"Linux boot specific:\n"
"-kernel bzImage use 'bzImage' as kernel image\n"
"-append cmdline use 'cmdline' as kernel command line\n"
"-initrd file use 'file' as initial ram disk\n"
"\n"
"Debug/Expert options:\n"
- "-monitor dev redirect the monitor to char device 'dev'\n"
"-serial dev redirect the serial port to char device 'dev'\n"
"-parallel dev redirect the parallel port to char device 'dev'\n"
- "-pidfile file Write PID to 'file'\n"
+ "-monitor dev redirect the monitor to char device 'dev'\n"
+ "-pidfile file write PID to 'file'\n"
"-S freeze CPU at startup (use 'c' to start
execution)\n"
"-s wait gdb connection to port\n"
"-p port set gdb connection port [default=%s]\n"
"-d item1,... output log to %s (use -d ? for a list of log
items)\n"
- "-hdachs c,h,s[,t] force hard disk 0 physical geometry and the
optional BIOS\n"
+ "-hdachs c,h,s[,t]\n"
+ " force hard disk 0 physical geometry and the
optional BIOS\n"
" translation (t=none or lba) (usually qemu can
guess them)\n"
"-L path set the directory for the BIOS, VGA BIOS and
keymaps\n"
+ "-bios file set the filename for the BIOS\n"
#ifdef USE_KQEMU
"-kernel-kqemu enable KQEMU full virtualization (default is user
mode only)\n"
"-no-kqemu disable KQEMU kernel module usage\n"
@@ -3988,29 +4000,36 @@
#ifdef CONFIG_KVM
"-enable-kvm enable KVM full virtualization support\n"
#endif
-#ifdef TARGET_I386
- "-no-acpi disable ACPI\n"
- "-no-hpet disable HPET\n"
-#endif
-#ifdef CONFIG_CURSES
- "-curses use a curses/ncurses interface instead of SDL\n"
-#endif
"-no-reboot exit instead of rebooting\n"
"-no-shutdown stop before shutdown\n"
- "-loadvm [tag|id] start right away with a saved state (loadvm in
monitor)\n"
- "-vnc display start a VNC server on display\n"
+ "-loadvm [tag|id]\n"
+ " start right away with a saved state (loadvm in
monitor)\n"
#ifndef _WIN32
"-daemonize daemonize QEMU after initializing\n"
#endif
"-option-rom rom load a file, rom, into the option ROM space\n"
-#ifdef TARGET_SPARC
- "-prom-env variable=value set OpenBIOS nvram variables\n"
+#if defined(TARGET_SPARC) || defined(TARGET_PPC)
+ "-prom-env variable=value\n"
+ " set OpenBIOS nvram variables\n"
#endif
"-clock force the use of the given methods for timer
alarm.\n"
" To see what timers are available use -clock ?\n"
+ "-localtime set the real time clock to local time
[default=utc]\n"
"-startdate select initial date of the clock\n"
"-icount [N|auto]\n"
- " Enable virtual instruction counter with 2^N clock
ticks per instruction\n"
+ " enable virtual instruction counter with 2^N clock
ticks per instruction\n"
+ "-echr chr set terminal escape character instead of ctrl-a\n"
+ "-virtioconsole c\n"
+ " set virtio console\n"
+ "-show-cursor show cursor\n"
+#if defined(TARGET_ARM) || defined(TARGET_M68K)
+ "-semihosting semihosting mode\n"
+#endif
+#if defined(TARGET_ARM)
+ "-old-param old param mode\n"
+#endif
+ "-tb-size n set TB size\n"
+ "-incoming p prepare for incoming migration, listen on port p\n"
"\n"
"During emulation, the following keys are useful:\n"
"ctrl-alt-f toggle full screen\n"
@@ -4033,34 +4052,49 @@
#define HAS_ARG 0x0001
enum {
+ /* Please keep in synch with help, qemu_options[] and
+ qemu-doc.texi */
+ /* Standard options: */
QEMU_OPTION_h,
-
QEMU_OPTION_M,
QEMU_OPTION_cpu,
+ QEMU_OPTION_smp,
QEMU_OPTION_fda,
QEMU_OPTION_fdb,
QEMU_OPTION_hda,
QEMU_OPTION_hdb,
QEMU_OPTION_hdc,
QEMU_OPTION_hdd,
+ QEMU_OPTION_cdrom,
QEMU_OPTION_drive,
- QEMU_OPTION_cdrom,
QEMU_OPTION_mtdblock,
QEMU_OPTION_sd,
QEMU_OPTION_pflash,
QEMU_OPTION_boot,
QEMU_OPTION_snapshot,
-#ifdef TARGET_I386
- QEMU_OPTION_no_fd_bootchk,
-#endif
QEMU_OPTION_m,
- QEMU_OPTION_nographic,
- QEMU_OPTION_portrait,
-#ifdef HAS_AUDIO
+ QEMU_OPTION_k,
QEMU_OPTION_audio_help,
QEMU_OPTION_soundhw,
-#endif
+ QEMU_OPTION_usb,
+ QEMU_OPTION_usbdevice,
+ QEMU_OPTION_name,
+ QEMU_OPTION_uuid,
+ /* Display options: */
+ QEMU_OPTION_nographic,
+ QEMU_OPTION_curses,
+ QEMU_OPTION_no_frame,
+ QEMU_OPTION_alt_grab,
+ QEMU_OPTION_no_quit,
+ QEMU_OPTION_sdl,
+ QEMU_OPTION_portrait,
+ QEMU_OPTION_vga,
+ QEMU_OPTION_full_screen,
+ QEMU_OPTION_g,
+ QEMU_OPTION_vnc,
+
+ /* Network options: */
QEMU_OPTION_net,
QEMU_OPTION_tftp,
QEMU_OPTION_bootp,
@@ -4068,10 +4102,23 @@
QEMU_OPTION_redir,
QEMU_OPTION_bt,
+ /* i386 target only: */
+ QEMU_OPTION_win2k_hack,
+ QEMU_OPTION_rtc_td_hack,
+ QEMU_OPTION_no_fd_bootchk,
+ QEMU_OPTION_no_acpi,
+ QEMU_OPTION_no_hpet,
+
+ /* Linux boot specific: */
QEMU_OPTION_kernel,
QEMU_OPTION_append,
QEMU_OPTION_initrd,
+ /* Debug/Expert options: */
+ QEMU_OPTION_serial,
+ QEMU_OPTION_parallel,
+ QEMU_OPTION_monitor,
+ QEMU_OPTION_pidfile,
QEMU_OPTION_S,
QEMU_OPTION_s,
QEMU_OPTION_p,
@@ -4079,48 +4126,25 @@
QEMU_OPTION_hdachs,
QEMU_OPTION_L,
QEMU_OPTION_bios,
- QEMU_OPTION_k,
- QEMU_OPTION_localtime,
- QEMU_OPTION_g,
- QEMU_OPTION_vga,
- QEMU_OPTION_echr,
- QEMU_OPTION_monitor,
- QEMU_OPTION_serial,
- QEMU_OPTION_virtiocon,
- QEMU_OPTION_parallel,
- QEMU_OPTION_loadvm,
- QEMU_OPTION_full_screen,
- QEMU_OPTION_no_frame,
- QEMU_OPTION_alt_grab,
- QEMU_OPTION_no_quit,
- QEMU_OPTION_sdl,
- QEMU_OPTION_pidfile,
+ QEMU_OPTION_kernel_kqemu,
QEMU_OPTION_no_kqemu,
- QEMU_OPTION_kernel_kqemu,
QEMU_OPTION_enable_kvm,
- QEMU_OPTION_win2k_hack,
- QEMU_OPTION_rtc_td_hack,
- QEMU_OPTION_usb,
- QEMU_OPTION_usbdevice,
- QEMU_OPTION_smp,
- QEMU_OPTION_vnc,
- QEMU_OPTION_no_acpi,
- QEMU_OPTION_no_hpet,
- QEMU_OPTION_curses,
QEMU_OPTION_no_reboot,
QEMU_OPTION_no_shutdown,
- QEMU_OPTION_show_cursor,
+ QEMU_OPTION_loadvm,
QEMU_OPTION_daemonize,
QEMU_OPTION_option_rom,
- QEMU_OPTION_semihosting,
- QEMU_OPTION_name,
QEMU_OPTION_prom_env,
- QEMU_OPTION_old_param,
QEMU_OPTION_clock,
+ QEMU_OPTION_localtime,
QEMU_OPTION_startdate,
+ QEMU_OPTION_icount,
+ QEMU_OPTION_echr,
+ QEMU_OPTION_virtiocon,
+ QEMU_OPTION_show_cursor,
+ QEMU_OPTION_semihosting,
+ QEMU_OPTION_old_param,
QEMU_OPTION_tb_size,
- QEMU_OPTION_icount,
- QEMU_OPTION_uuid,
QEMU_OPTION_incoming,
};
@@ -4131,36 +4155,60 @@
} QEMUOption;
static const QEMUOption qemu_options[] = {
+ /* Please keep in synch with help, QEMU_OPTION_ enums, and
+ qemu-doc.texi */
+ /* Standard options: */
{ "h", 0, QEMU_OPTION_h },
{ "help", 0, QEMU_OPTION_h },
-
{ "M", HAS_ARG, QEMU_OPTION_M },
{ "cpu", HAS_ARG, QEMU_OPTION_cpu },
+ { "smp", HAS_ARG, QEMU_OPTION_smp },
{ "fda", HAS_ARG, QEMU_OPTION_fda },
{ "fdb", HAS_ARG, QEMU_OPTION_fdb },
{ "hda", HAS_ARG, QEMU_OPTION_hda },
{ "hdb", HAS_ARG, QEMU_OPTION_hdb },
{ "hdc", HAS_ARG, QEMU_OPTION_hdc },
{ "hdd", HAS_ARG, QEMU_OPTION_hdd },
+ { "cdrom", HAS_ARG, QEMU_OPTION_cdrom },
{ "drive", HAS_ARG, QEMU_OPTION_drive },
- { "cdrom", HAS_ARG, QEMU_OPTION_cdrom },
{ "mtdblock", HAS_ARG, QEMU_OPTION_mtdblock },
{ "sd", HAS_ARG, QEMU_OPTION_sd },
{ "pflash", HAS_ARG, QEMU_OPTION_pflash },
{ "boot", HAS_ARG, QEMU_OPTION_boot },
{ "snapshot", 0, QEMU_OPTION_snapshot },
-#ifdef TARGET_I386
- { "no-fd-bootchk", 0, QEMU_OPTION_no_fd_bootchk },
-#endif
{ "m", HAS_ARG, QEMU_OPTION_m },
- { "nographic", 0, QEMU_OPTION_nographic },
- { "portrait", 0, QEMU_OPTION_portrait },
+#ifndef _WIN32
{ "k", HAS_ARG, QEMU_OPTION_k },
+#endif
#ifdef HAS_AUDIO
{ "audio-help", 0, QEMU_OPTION_audio_help },
{ "soundhw", HAS_ARG, QEMU_OPTION_soundhw },
#endif
+ { "usb", 0, QEMU_OPTION_usb },
+ { "usbdevice", HAS_ARG, QEMU_OPTION_usbdevice },
+ { "name", HAS_ARG, QEMU_OPTION_name },
+ { "uuid", HAS_ARG, QEMU_OPTION_uuid },
+ /* Display options: */
+ { "nographic", 0, QEMU_OPTION_nographic },
+#ifdef CONFIG_CURSES
+ { "curses", 0, QEMU_OPTION_curses },
+#endif
+#ifdef CONFIG_SDL
+ { "no-frame", 0, QEMU_OPTION_no_frame },
+ { "alt-grab", 0, QEMU_OPTION_alt_grab },
+ { "no-quit", 0, QEMU_OPTION_no_quit },
+ { "sdl", 0, QEMU_OPTION_sdl },
+#endif
+ { "portrait", 0, QEMU_OPTION_portrait },
+ { "vga", HAS_ARG, QEMU_OPTION_vga },
+ { "full-screen", 0, QEMU_OPTION_full_screen },
+#if defined(TARGET_PPC) || defined(TARGET_SPARC)
+ { "g", 1, QEMU_OPTION_g },
+#endif
+ { "vnc", HAS_ARG, QEMU_OPTION_vnc },
+
+ /* Network options: */
{ "net", HAS_ARG, QEMU_OPTION_net},
#ifdef CONFIG_SLIRP
{ "tftp", HAS_ARG, QEMU_OPTION_tftp },
@@ -4171,11 +4219,25 @@
{ "redir", HAS_ARG, QEMU_OPTION_redir },
#endif
{ "bt", HAS_ARG, QEMU_OPTION_bt },
+#ifdef TARGET_I386
+ /* i386 target only: */
+ { "win2k-hack", 0, QEMU_OPTION_win2k_hack },
+ { "rtc-td-hack", 0, QEMU_OPTION_rtc_td_hack },
+ { "no-fd-bootchk", 0, QEMU_OPTION_no_fd_bootchk },
+ { "no-acpi", 0, QEMU_OPTION_no_acpi },
+ { "no-hpet", 0, QEMU_OPTION_no_hpet },
+#endif
+ /* Linux boot specific: */
{ "kernel", HAS_ARG, QEMU_OPTION_kernel },
{ "append", HAS_ARG, QEMU_OPTION_append },
{ "initrd", HAS_ARG, QEMU_OPTION_initrd },
+ /* Debug/Expert options: */
+ { "serial", HAS_ARG, QEMU_OPTION_serial },
+ { "parallel", HAS_ARG, QEMU_OPTION_parallel },
+ { "monitor", HAS_ARG, QEMU_OPTION_monitor },
+ { "pidfile", HAS_ARG, QEMU_OPTION_pidfile },
{ "S", 0, QEMU_OPTION_S },
{ "s", 0, QEMU_OPTION_s },
{ "p", HAS_ARG, QEMU_OPTION_p },
@@ -4184,64 +4246,34 @@
{ "L", HAS_ARG, QEMU_OPTION_L },
{ "bios", HAS_ARG, QEMU_OPTION_bios },
#ifdef USE_KQEMU
+ { "kernel-kqemu", 0, QEMU_OPTION_kernel_kqemu },
{ "no-kqemu", 0, QEMU_OPTION_no_kqemu },
- { "kernel-kqemu", 0, QEMU_OPTION_kernel_kqemu },
#endif
#ifdef CONFIG_KVM
{ "enable-kvm", 0, QEMU_OPTION_enable_kvm },
#endif
-#if defined(TARGET_PPC) || defined(TARGET_SPARC)
- { "g", 1, QEMU_OPTION_g },
+ { "no-reboot", 0, QEMU_OPTION_no_reboot },
+ { "no-shutdown", 0, QEMU_OPTION_no_shutdown },
+ { "loadvm", HAS_ARG, QEMU_OPTION_loadvm },
+ { "daemonize", 0, QEMU_OPTION_daemonize },
+ { "option-rom", HAS_ARG, QEMU_OPTION_option_rom },
+#if defined(TARGET_SPARC) || defined(TARGET_PPC)
+ { "prom-env", HAS_ARG, QEMU_OPTION_prom_env },
#endif
+ { "clock", HAS_ARG, QEMU_OPTION_clock },
{ "localtime", 0, QEMU_OPTION_localtime },
- { "vga", HAS_ARG, QEMU_OPTION_vga },
+ { "startdate", HAS_ARG, QEMU_OPTION_startdate },
+ { "icount", HAS_ARG, QEMU_OPTION_icount },
{ "echr", HAS_ARG, QEMU_OPTION_echr },
- { "monitor", HAS_ARG, QEMU_OPTION_monitor },
- { "serial", HAS_ARG, QEMU_OPTION_serial },
{ "virtioconsole", HAS_ARG, QEMU_OPTION_virtiocon },
- { "parallel", HAS_ARG, QEMU_OPTION_parallel },
- { "loadvm", HAS_ARG, QEMU_OPTION_loadvm },
- { "full-screen", 0, QEMU_OPTION_full_screen },
-#ifdef CONFIG_SDL
- { "no-frame", 0, QEMU_OPTION_no_frame },
- { "alt-grab", 0, QEMU_OPTION_alt_grab },
- { "no-quit", 0, QEMU_OPTION_no_quit },
- { "sdl", 0, QEMU_OPTION_sdl },
-#endif
- { "pidfile", HAS_ARG, QEMU_OPTION_pidfile },
- { "win2k-hack", 0, QEMU_OPTION_win2k_hack },
- { "rtc-td-hack", 0, QEMU_OPTION_rtc_td_hack },
- { "usbdevice", HAS_ARG, QEMU_OPTION_usbdevice },
- { "smp", HAS_ARG, QEMU_OPTION_smp },
- { "vnc", HAS_ARG, QEMU_OPTION_vnc },
-#ifdef CONFIG_CURSES
- { "curses", 0, QEMU_OPTION_curses },
-#endif
- { "uuid", HAS_ARG, QEMU_OPTION_uuid },
-
- /* temporary options */
- { "usb", 0, QEMU_OPTION_usb },
- { "no-acpi", 0, QEMU_OPTION_no_acpi },
- { "no-hpet", 0, QEMU_OPTION_no_hpet },
- { "no-reboot", 0, QEMU_OPTION_no_reboot },
- { "no-shutdown", 0, QEMU_OPTION_no_shutdown },
{ "show-cursor", 0, QEMU_OPTION_show_cursor },
- { "daemonize", 0, QEMU_OPTION_daemonize },
- { "option-rom", HAS_ARG, QEMU_OPTION_option_rom },
#if defined(TARGET_ARM) || defined(TARGET_M68K)
{ "semihosting", 0, QEMU_OPTION_semihosting },
#endif
- { "name", HAS_ARG, QEMU_OPTION_name },
-#if defined(TARGET_SPARC) || defined(TARGET_PPC)
- { "prom-env", HAS_ARG, QEMU_OPTION_prom_env },
-#endif
#if defined(TARGET_ARM)
{ "old-param", 0, QEMU_OPTION_old_param },
#endif
- { "clock", HAS_ARG, QEMU_OPTION_clock },
- { "startdate", HAS_ARG, QEMU_OPTION_startdate },
{ "tb-size", HAS_ARG, QEMU_OPTION_tb_size },
- { "icount", HAS_ARG, QEMU_OPTION_icount },
{ "incoming", HAS_ARG, QEMU_OPTION_incoming },
{ NULL },
};
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6432] Synch code, help and docs,
Blue Swirl <=