commit 947e47448dcc4e4d7a8b7c42b43acb3435b3ad35
author Kevin Wolf <kwolf@redhat.com> Mon Oct 05 17:58:44 2020 +0200
committer Markus Armbruster <armbru@redhat.com> Fri Oct 09 07:08:19 2020 +0200
tree 855a18a7da785ee7dff7919ec9a02be34c6ff51c
parent 87e6f4a4d6885006931b371771e2933c40700427

monitor: Use getter/setter functions for cur_mon

cur_mon really needs to be coroutine-local as soon as we move monitor
command handlers to coroutines and let them yield. As a first step, just
remove all direct accesses to cur_mon so that we can implement this in
the getter function later.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201005155855.256490-4-kwolf@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>

util/qemu-print.c

diff --git a/util/qemu-print.c b/util/qemu-print.c
index e79d6b8..69ba612 100644
--- a/util/qemu-print.c
+++ b/util/qemu-print.c
@@ -20,6 +20,7 @@
  */
 int qemu_vprintf(const char *fmt, va_list ap)
 {
+    Monitor *cur_mon = monitor_cur();
     if (cur_mon) {
         return monitor_vprintf(cur_mon, fmt, ap);
     }
@@ -48,7 +49,7 @@
 int qemu_vfprintf(FILE *stream, const char *fmt, va_list ap)
 {
     if (!stream) {
-        return monitor_vprintf(cur_mon, fmt, ap);
+        return monitor_vprintf(monitor_cur(), fmt, ap);
     }
     return vfprintf(stream, fmt, ap);
 }