aboutsummaryrefslogtreecommitdiff
path: root/qemu-options.hx
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-06-16 10:35:43 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-06-16 10:35:43 +0100
commit93f6d1c16036aaf34055d16f54ea770fb8d6d280 (patch)
tree393cd2f4938259be149b6e41813cba6b3e726e71 /qemu-options.hx
parent4316536bf424d2e7f9cfa7d0dd561adb0986cc81 (diff)
parent7a4dfd1e4a741991df1acf31672b391648e0aa0c (diff)
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150615-1' into staging
virtio-gpu: pci support bits and virtio-vga. # gpg: Signature made Mon Jun 15 13:55:19 2015 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" * remotes/kraxel/tags/pull-vga-20150615-1: virtio-vga: add vgabios configuration virtio-vga: add '-vga virtio' support virtio-vga: add virtio gpu device with vga compatibility virtio-gpu-pci: add virtio pci support virtio-gpu: fix error message Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-options.hx')
-rw-r--r--qemu-options.hx4
1 files changed, 3 insertions, 1 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index bf1683e5b4..5438f9862c 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1104,7 +1104,7 @@ Rotate graphical output some deg left (only PXA LCD).
ETEXI
DEF("vga", HAS_ARG, QEMU_OPTION_vga,
- "-vga [std|cirrus|vmware|qxl|xenfb|tcx|cg3|none]\n"
+ "-vga [std|cirrus|vmware|qxl|xenfb|tcx|cg3|virtio|none]\n"
" select video card type\n", QEMU_ARCH_ALL)
STEXI
@item -vga @var{type}
@@ -1137,6 +1137,8 @@ fixed resolution of 1024x768.
(sun4m only) Sun cgthree framebuffer. This is a simple 8-bit framebuffer
for sun4m machines available in both 1024x768 (OpenBIOS) and 1152x900 (OBP)
resolutions aimed at people wishing to run older Solaris versions.
+@item virtio
+Virtio VGA card.
@item none
Disable VGA card.
@end table