diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-24 16:00:14 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-24 16:00:14 +0000 |
| commit | f18f2e7cfcdc31d7f82af15947aae60c4b16e131 (patch) | |
| tree | da9999caa961abf68c83a264cae13f71cee6fa2a /qemu-options.hx | |
| parent | 490dda053e3324c97b28439813fab4c2f362183e (diff) | |
| parent | 569a93cbbe428bb5c583ae4bf31447eb3acc30fe (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160324-1' into staging
input-linux + spice fixes
# gpg: Signature made Thu 24 Mar 2016 07:54:45 GMT 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-ui-20160324-1:
spice: Disallow use of gl + TCP port
input-linux: fix Coverity warning
input-linux: switch over to -object
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 732ed8cbc5..b98fa3e1f1 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1226,15 +1226,6 @@ STEXI Set the initial graphical resolution and depth (PPC, SPARC only). ETEXI -DEF("input-linux", 1, QEMU_OPTION_input_linux, - "-input-linux <evdev>\n" - " Use input device.\n", QEMU_ARCH_ALL) -STEXI -@item -input-linux @var{dev} -@findex -input-linux -Use input device. -ETEXI - DEF("vnc", HAS_ARG, QEMU_OPTION_vnc , "-vnc display start a VNC server on display\n", QEMU_ARCH_ALL) STEXI |