aboutsummaryrefslogtreecommitdiff
path: root/util/qemu-error.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2020-10-05 17:58:44 +0200
committerMarkus Armbruster <armbru@redhat.com>2020-10-09 07:08:19 +0200
commit947e47448dcc4e4d7a8b7c42b43acb3435b3ad35 (patch)
tree855a18a7da785ee7dff7919ec9a02be34c6ff51c /util/qemu-error.c
parent87e6f4a4d6885006931b371771e2933c40700427 (diff)
downloadqemu-947e47448dcc4e4d7a8b7c42b43acb3435b3ad35.zip
qemu-947e47448dcc4e4d7a8b7c42b43acb3435b3ad35.tar.gz
qemu-947e47448dcc4e4d7a8b7c42b43acb3435b3ad35.tar.bz2
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>
Diffstat (limited to 'util/qemu-error.c')
-rw-r--r--util/qemu-error.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/util/qemu-error.c b/util/qemu-error.c
index 3ee4143..aa30f03 100644
--- a/util/qemu-error.c
+++ b/util/qemu-error.c
@@ -171,7 +171,7 @@ static void print_loc(void)
int i;
const char *const *argp;
- if (!cur_mon && progname) {
+ if (!monitor_cur() && progname) {
fprintf(stderr, "%s:", progname);
sep = " ";
}
@@ -208,7 +208,7 @@ static void vreport(report_type type, const char *fmt, va_list ap)
GTimeVal tv;
gchar *timestr;
- if (error_with_timestamp && !cur_mon) {
+ if (error_with_timestamp && !monitor_cur()) {
g_get_current_time(&tv);
timestr = g_time_val_to_iso8601(&tv);
error_printf("%s ", timestr);
@@ -216,7 +216,7 @@ static void vreport(report_type type, const char *fmt, va_list ap)
}
/* Only prepend guest name if -msg guest-name and -name guest=... are set */
- if (error_with_guestname && error_guest_name && !cur_mon) {
+ if (error_with_guestname && error_guest_name && !monitor_cur()) {
error_printf("%s ", error_guest_name);
}