[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/8] console: allow con==NULL in dpy_{get, set}_ui_info and dpy_ui
From: |
Gerd Hoffmann |
Subject: |
[PULL 2/8] console: allow con==NULL in dpy_{get, set}_ui_info and dpy_ui_info_supported |
Date: |
Fri, 11 Dec 2020 10:12:44 +0100 |
Use active_console in that case like we do in many other places.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20201208115737.18581-3-kraxel@redhat.com
---
ui/console.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/ui/console.c b/ui/console.c
index f995639e45f6..30e70be555db 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1544,19 +1544,27 @@ static void dpy_set_ui_info_timer(void *opaque)
bool dpy_ui_info_supported(QemuConsole *con)
{
+ if (con == NULL) {
+ con = active_console;
+ }
+
return con->hw_ops->ui_info != NULL;
}
const QemuUIInfo *dpy_get_ui_info(const QemuConsole *con)
{
- assert(con != NULL);
+ if (con == NULL) {
+ con = active_console;
+ }
return &con->ui_info;
}
int dpy_set_ui_info(QemuConsole *con, QemuUIInfo *info)
{
- assert(con != NULL);
+ if (con == NULL) {
+ con = active_console;
+ }
if (!dpy_ui_info_supported(con)) {
return -1;
--
2.27.0
- [PULL 0/8] Ui 20201211 patches, Gerd Hoffmann, 2020/12/11
- [PULL 3/8] vnc: use enum for features, Gerd Hoffmann, 2020/12/11
- [PULL 8/8] sdl2: Add extra mouse buttons, Gerd Hoffmann, 2020/12/11
- [PULL 2/8] console: allow con==NULL in dpy_{get, set}_ui_info and dpy_ui_info_supported,
Gerd Hoffmann <=
- [PULL 7/8] ui/vnc: Add missing lock for send_color_map, Gerd Hoffmann, 2020/12/11
- [PULL 6/8] vnc: add alpha cursor support, Gerd Hoffmann, 2020/12/11
- [PULL 1/8] console: drop qemu_console_get_ui_info, Gerd Hoffmann, 2020/12/11
- [PULL 4/8] vnc: drop unused copyrect feature, Gerd Hoffmann, 2020/12/11
- [PULL 5/8] vnc: add pseudo encodings, Gerd Hoffmann, 2020/12/11
- Re: [PULL 0/8] Ui 20201211 patches, Peter Maydell, 2020/12/11