mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-23 19:49:43 +00:00
8631b6084a
Commits 376253ec..731b0364 introduced global variable cur_mon, which points to the "default monitor" (if any), except during execution of monitor_read() or monitor_control_read() it points to the monitor from which we're reading instead (the "current monitor"). Monitor command handlers run within monitor_read() or monitor_control_read(). Default monitor and current monitor are really separate things, and squashing them together is confusing and error-prone. For instance, usb_host_scan() can run both in "info usbhost" and periodically via usb_host_auto_check(). It prints to cur_mon, which is what we want in the former case: the monitor executing "info usbhost". But since that's the default monitor in the latter case, it periodically spams the default monitor there. A few places use cur_mon to log stuff to the default monitor. If we ever log something while cur_mon points to current monitor instead of default monitor, the log temporarily "jumps" to another monitor. Whether that can or cannot happen isn't always obvious. Maybe logging to the default monitor (which may not even exist) is a bad idea, and we should log to stderr or a logfile instead. But that's outside the scope of this commit. Change cur_mon to point to the current monitor. Create new default_mon to point to the default monitor. Update users of cur_mon accordingly. This fixes the periodical spamming of the default monitor by usb_host_scan(). It also stops "log jumping", should that problem exist.
53 lines
1.4 KiB
C
53 lines
1.4 KiB
C
#ifndef MONITOR_H
|
|
#define MONITOR_H
|
|
|
|
#include "qemu-common.h"
|
|
#include "qemu-char.h"
|
|
#include "qdict.h"
|
|
#include "block.h"
|
|
|
|
extern Monitor *cur_mon;
|
|
extern Monitor *default_mon;
|
|
|
|
/* flags for monitor_init */
|
|
#define MONITOR_IS_DEFAULT 0x01
|
|
#define MONITOR_USE_READLINE 0x02
|
|
#define MONITOR_USE_CONTROL 0x04
|
|
|
|
/* QMP events */
|
|
typedef enum MonitorEvent {
|
|
QEVENT_SHUTDOWN,
|
|
QEVENT_RESET,
|
|
QEVENT_POWERDOWN,
|
|
QEVENT_STOP,
|
|
QEVENT_VNC_CONNECTED,
|
|
QEVENT_VNC_INITIALIZED,
|
|
QEVENT_VNC_DISCONNECTED,
|
|
QEVENT_BLOCK_IO_ERROR,
|
|
QEVENT_RTC_CHANGE,
|
|
QEVENT_WATCHDOG,
|
|
QEVENT_MAX,
|
|
} MonitorEvent;
|
|
|
|
void monitor_protocol_event(MonitorEvent event, QObject *data);
|
|
void monitor_init(CharDriverState *chr, int flags);
|
|
|
|
int monitor_suspend(Monitor *mon);
|
|
void monitor_resume(Monitor *mon);
|
|
|
|
int monitor_read_bdrv_key_start(Monitor *mon, BlockDriverState *bs,
|
|
BlockDriverCompletionFunc *completion_cb,
|
|
void *opaque);
|
|
|
|
int monitor_get_fd(Monitor *mon, const char *fdname);
|
|
|
|
void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap);
|
|
void monitor_printf(Monitor *mon, const char *fmt, ...)
|
|
__attribute__ ((__format__ (__printf__, 2, 3)));
|
|
void monitor_print_filename(Monitor *mon, const char *filename);
|
|
void monitor_flush(Monitor *mon);
|
|
|
|
typedef void (MonitorCompletion)(void *opaque, QObject *ret_data);
|
|
|
|
#endif /* !MONITOR_H */
|