diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-01-23 18:44:39 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-01-23 18:44:39 +0000 |
| commit | c0248b36d8d190933a43919b9f71013a255e866c (patch) | |
| tree | 18028f04470a505130913a135edf063a7e4849e6 /ui/console.c | |
| parent | 6918ab2570bcf942651e69f7ad975e137679738b (diff) | |
| parent | a1e8853ed2acbda29a52533abc91b035b723952e (diff) | |
| download | focaccia-qemu-c0248b36d8d190933a43919b9f71013a255e866c.tar.gz focaccia-qemu-c0248b36d8d190933a43919b9f71013a255e866c.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20200123-pull-request' into staging
vnc: fix zlib compression artifacts. ui: add "none" to -display help. # gpg: Signature made Thu 23 Jan 2020 14:20:53 GMT # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full] # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full] # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full] # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/ui-20200123-pull-request: ui/console: Display the 'none' backend in '-display help' vnc: prioritize ZRLE compression over ZLIB Revert "vnc: allow fall back to RAW encoding" Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/console.c')
| -rw-r--r-- | ui/console.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/console.c b/ui/console.c index 69339b028b..179901c35e 100644 --- a/ui/console.c +++ b/ui/console.c @@ -2338,6 +2338,7 @@ void qemu_display_help(void) int idx; printf("Available display backend types:\n"); + printf("none\n"); for (idx = DISPLAY_TYPE_NONE; idx < DISPLAY_TYPE__MAX; idx++) { if (!dpys[idx]) { ui_module_load_one(DisplayType_str(idx)); |