qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
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	[thread overview]
Message-ID: <20201208115737.18581-3-kraxel@redhat.com> (raw)
In-Reply-To: <20201208115737.18581-1-kraxel@redhat.com>

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



  parent reply	other threads:[~2020-12-08 11:59 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-08 11:57 [PATCH v2 0/9] vnc: support some new extensions Gerd Hoffmann
2020-12-08 11:57 ` [PATCH v2 1/9] console: drop qemu_console_get_ui_info Gerd Hoffmann
2020-12-08 12:27   ` Marc-André Lureau
2020-12-08 14:40   ` Daniel P. Berrangé
2020-12-08 11:57 ` Gerd Hoffmann [this message]
2020-12-08 12:26   ` [PATCH v2 2/9] console: allow con==NULL in dpy_{get, set}_ui_info and dpy_ui_info_supported Marc-André Lureau
2020-12-08 14:44   ` Daniel P. Berrangé
2020-12-08 11:57 ` [PATCH v2 3/9] vnc: use enum for features Gerd Hoffmann
2020-12-08 11:57 ` [PATCH v2 4/9] vnc: drop unused copyrect feature Gerd Hoffmann
2020-12-08 14:49   ` Daniel P. Berrangé
2020-12-08 11:57 ` [PATCH v2 5/9] vnc: add pseudo encodings Gerd Hoffmann
2020-12-08 14:49   ` Daniel P. Berrangé
2020-12-08 11:57 ` [PATCH v2 6/9] vnc: add alpha cursor support Gerd Hoffmann
2020-12-08 14:39   ` Daniel P. Berrangé
2020-12-08 11:57 ` [PATCH v2 7/9] vnc: force initial resize message Gerd Hoffmann
2020-12-08 14:53   ` Daniel P. Berrangé
2020-12-08 11:57 ` [PATCH v2 8/9] vnc: add support for extended desktop resize Gerd Hoffmann
2020-12-08 18:13   ` Daniel P. Berrangé
2020-12-15 10:15     ` Gerd Hoffmann
2020-12-15 10:20       ` Daniel P. Berrangé
2020-12-16 11:12         ` Daniel P. Berrangé
2020-12-08 11:57 ` [PATCH v2 9/9] vnc: move check into vnc_cursor_define Gerd Hoffmann
2020-12-08 12:40 ` [PATCH v2 0/9] vnc: support some new extensions Daniel P. Berrangé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201208115737.18581-3-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).