diff options
| author | Peter Maydell | 2019-06-18 11:47:00 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-06-18 11:47:00 +0200 |
| commit | cdfaa2720f4a09e5254868bd1f6e33f3e9eae76f (patch) | |
| tree | c2fc47de84278d1aacad857a22b754b90cabf9e8 /include | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-docs-20190617' into ... (diff) | |
| parent | vl: Deprecate -mon pretty=... for HMP monitors (diff) | |
| download | qemu-cdfaa2720f4a09e5254868bd1f6e33f3e9eae76f.tar.gz qemu-cdfaa2720f4a09e5254868bd1f6e33f3e9eae76f.tar.xz qemu-cdfaa2720f4a09e5254868bd1f6e33f3e9eae76f.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2019-06-17-v2' into staging
Monitor patches for 2019-06-17
# gpg: Signature made Tue 18 Jun 2019 07:20:25 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-monitor-2019-06-17-v2:
vl: Deprecate -mon pretty=... for HMP monitors
monitor: Replace monitor_init() with monitor_init_{hmp, qmp}()
monitor: Split Monitor.flags into separate bools
monitor: Split out monitor/monitor.c
monitor: Split out monitor/hmp.c
monitor: Split out monitor/qmp.c
monitor: Create monitor-internal.h with common definitions
monitor: Move {hmp, qmp}.c to monitor/{hmp, qmp}-cmds.c
Move monitor.c to monitor/misc.c
monitor: Rename HMP command type and tables
monitor: Remove Monitor.cmd_table indirection
monitor: Create MonitorHMP with readline state
monitor: Make MonitorQMP a child class of Monitor
monitor: Split monitor_init in HMP and QMP function
monitor: Remove unused password prompting fields
monitor: Fix return type of monitor_fdset_dup_fd_find
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/monitor/monitor.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 06cfcd8f36..a81eeff5f8 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -6,19 +6,16 @@ #include "qemu/readline.h" extern __thread Monitor *cur_mon; - -/* flags for monitor_init */ -/* 0x01 unused */ -#define MONITOR_USE_READLINE 0x02 -#define MONITOR_USE_CONTROL 0x04 -#define MONITOR_USE_PRETTY 0x08 +typedef struct MonitorHMP MonitorHMP; #define QMP_REQ_QUEUE_LEN_MAX 8 bool monitor_cur_is_qmp(void); void monitor_init_globals(void); -void monitor_init(Chardev *chr, int flags); +void monitor_init_globals_core(void); +void monitor_init_qmp(Chardev *chr, bool pretty); +void monitor_init_hmp(Chardev *chr, bool use_readline); void monitor_cleanup(void); int monitor_suspend(Monitor *mon); @@ -34,8 +31,8 @@ void monitor_flush(Monitor *mon); int monitor_set_cpu(int cpu_index); int monitor_get_cpu_index(void); -void monitor_read_command(Monitor *mon, int show_prompt); -int monitor_read_password(Monitor *mon, ReadLineFunc *readline_func, +void monitor_read_command(MonitorHMP *mon, int show_prompt); +int monitor_read_password(MonitorHMP *mon, ReadLineFunc *readline_func, void *opaque); AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id, @@ -44,6 +41,6 @@ AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id, int monitor_fdset_get_fd(int64_t fdset_id, int flags); int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd); void monitor_fdset_dup_fd_remove(int dup_fd); -int monitor_fdset_dup_fd_find(int dup_fd); +int64_t monitor_fdset_dup_fd_find(int dup_fd); #endif /* MONITOR_H */ |