[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 2/9] console: allow con==NULL in dpy_{get, set}_ui_info and dp
From: |
Gerd Hoffmann |
Subject: |
[PATCH v2 2/9] console: allow con==NULL in dpy_{get, set}_ui_info and dpy_ui_info_supported |
Date: |
Tue, 8 Dec 2020 12:57:30 +0100 |
Use active_console in that case like we do in many other places.
Signed-off-by: Gerd Hoffmann <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
- [PATCH v2 0/9] vnc: support some new extensions., Gerd Hoffmann, 2020/12/08
- [PATCH v2 2/9] console: allow con==NULL in dpy_{get, set}_ui_info and dpy_ui_info_supported,
Gerd Hoffmann <=
- [PATCH v2 1/9] console: drop qemu_console_get_ui_info, Gerd Hoffmann, 2020/12/08
- [PATCH v2 4/9] vnc: drop unused copyrect feature, Gerd Hoffmann, 2020/12/08
- [PATCH v2 9/9] vnc: move check into vnc_cursor_define, Gerd Hoffmann, 2020/12/08
- [PATCH v2 7/9] vnc: force initial resize message, Gerd Hoffmann, 2020/12/08