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>
This commit is contained in:
committed by
Markus Armbruster
parent
87e6f4a4d6
commit
947e47448d
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user