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 /vl.c | |
| parent | 490dda053e3324c97b28439813fab4c2f362183e (diff) | |
| parent | 569a93cbbe428bb5c583ae4bf31447eb3acc30fe (diff) | |
| download | focaccia-qemu-f18f2e7cfcdc31d7f82af15947aae60c4b16e131.tar.gz focaccia-qemu-f18f2e7cfcdc31d7f82af15947aae60c4b16e131.zip | |
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 'vl.c')
| -rw-r--r-- | vl.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/vl.c b/vl.c index 40ed4d0cb9..ca49e750be 100644 --- a/vl.c +++ b/vl.c @@ -3729,12 +3729,6 @@ int main(int argc, char **argv, char **envp) #endif break; } - case QEMU_OPTION_input_linux: - if (!qemu_opts_parse_noisily(qemu_find_opts("input-linux"), - optarg, true)) { - exit(1); - } - break; case QEMU_OPTION_no_acpi: acpi_enabled = 0; break; @@ -4598,10 +4592,6 @@ int main(int argc, char **argv, char **envp) qemu_spice_display_init(); } #endif -#ifdef CONFIG_LINUX - qemu_opts_foreach(qemu_find_opts("input-linux"), - input_linux_init, NULL, &error_fatal); -#endif if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) { exit(1); |