From: Gerd Hoffmann <kraxel@redhat.com>
Date: Tue, 8 Dec 2020 11:57:30 +0000 (+0100)
Subject: console: allow con==NULL in dpy_{get, set}_ui_info and dpy_ui_info_supported
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5c4b107f88ad2679817b73445fa706c62db4d8e0;p=qmiga%2Fqemu.git

console: allow con==NULL in dpy_{get, set}_ui_info and dpy_ui_info_supported

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
---

diff --git a/ui/console.c b/ui/console.c
index f995639e45..30e70be555 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;