Commit 3c656346c91448f2a42b67e169a9fd4f62e4552e
1 parent
29b9a345
update
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2053 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
14 additions
and
6 deletions
VERSION
qemu-doc.texi
| @@ -250,16 +250,19 @@ with a serial console. | @@ -250,16 +250,19 @@ with a serial console. | ||
| 250 | @item -vnc d | 250 | @item -vnc d |
| 251 | 251 | ||
| 252 | Normally, QEMU uses SDL to display the VGA output. With this option, | 252 | Normally, QEMU uses SDL to display the VGA output. With this option, |
| 253 | -you can have QEMU listen on VNC display d and redirect the VGA display | ||
| 254 | -over the VNC session. It is very useful to enable the usb tablet device | ||
| 255 | -when using this option (option @option{-usbdevice tablet}). | 253 | +you can have QEMU listen on VNC display @var{d} and redirect the VGA |
| 254 | +display over the VNC session. It is very useful to enable the usb | ||
| 255 | +tablet device when using this option (option @option{-usbdevice | ||
| 256 | +tablet}). When using the VNC display, you must use the @option{-k} | ||
| 257 | +option to set the keyboard layout. | ||
| 256 | 258 | ||
| 257 | @item -k language | 259 | @item -k language |
| 258 | 260 | ||
| 259 | Use keyboard layout @var{language} (for example @code{fr} for | 261 | Use keyboard layout @var{language} (for example @code{fr} for |
| 260 | French). This option is only needed where it is not easy to get raw PC | 262 | French). This option is only needed where it is not easy to get raw PC |
| 261 | -keycodes (e.g. on Macs or with some X11 servers). You don't need to | ||
| 262 | -use it on PC/Linux or PC/Windows hosts. | 263 | +keycodes (e.g. on Macs, with some X11 servers or with a VNC |
| 264 | +display). You don't normally need to use it on PC/Linux or PC/Windows | ||
| 265 | +hosts. | ||
| 263 | 266 | ||
| 264 | The available layouts are: | 267 | The available layouts are: |
| 265 | @example | 268 | @example |
| @@ -617,6 +620,11 @@ Cirrus Logic GD5446 PCI VGA). If your guest OS supports the VESA 2.0 | @@ -617,6 +620,11 @@ Cirrus Logic GD5446 PCI VGA). If your guest OS supports the VESA 2.0 | ||
| 617 | VBE extensions (e.g. Windows XP) and if you want to use high | 620 | VBE extensions (e.g. Windows XP) and if you want to use high |
| 618 | resolution modes (>= 1280x1024x16) then you should use this option. | 621 | resolution modes (>= 1280x1024x16) then you should use this option. |
| 619 | 622 | ||
| 623 | +@item -no-acpi | ||
| 624 | +Disable ACPI (Advanced Configuration and Power Interface) support. Use | ||
| 625 | +it if your guest OS complains about ACPI problems (PC target machine | ||
| 626 | +only). | ||
| 627 | + | ||
| 620 | @item -loadvm file | 628 | @item -loadvm file |
| 621 | Start right away with a saved state (@code{loadvm} in monitor) | 629 | Start right away with a saved state (@code{loadvm} in monitor) |
| 622 | @end table | 630 | @end table |