diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-01-14 16:00:31 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-01-14 16:00:31 +0000 |
| commit | 3a63b24a1bbf166e6f455fe43a6bbd8dea413d92 (patch) | |
| tree | f6def5fbe955648e9d632a2a266fc80c02b12893 /include | |
| parent | fee0ec1fd11a6fb960517e18201ed8a686a0d7e8 (diff) | |
| parent | c4c00922cc948bb5e879bfae60764eba1f8745f3 (diff) | |
| download | qemu-3a63b24a1bbf166e6f455fe43a6bbd8dea413d92.zip qemu-3a63b24a1bbf166e6f455fe43a6bbd8dea413d92.tar.gz qemu-3a63b24a1bbf166e6f455fe43a6bbd8dea413d92.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20200114-pull-request' into staging
ui: add "-display help", gtk refresh rate.
# gpg: Signature made Tue 14 Jan 2020 10:01:14 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-20200114-pull-request:
display/gtk: get proper refreshrate
ui: Print available display backends with '-display help'
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/console.h | 1 | ||||
| -rw-r--r-- | include/ui/gtk.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index 281f9c1..f35b4fc 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -442,6 +442,7 @@ void qemu_display_register(QemuDisplay *ui); bool qemu_display_find_default(DisplayOptions *opts); void qemu_display_early_init(DisplayOptions *opts); void qemu_display_init(DisplayState *ds, DisplayOptions *opts); +void qemu_display_help(void); /* vnc.c */ void vnc_display_init(const char *id, Error **errp); diff --git a/include/ui/gtk.h b/include/ui/gtk.h index d9eedad..d1b2308 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -28,6 +28,8 @@ #include "ui/egl-context.h" #endif +#define MILLISEC_PER_SEC 1000000 + typedef struct GtkDisplayState GtkDisplayState; typedef struct VirtualGfxConsole { |