f96eac8a4f
This introduces abstract QOM type "monitor", with concrete subtypes "monitor-hmp" and "monitor-qmp". This is the bare minimum conversion of just the type declarations and replacing g_new/g_free with object_new/object_unref. Command line option "-monitor" now creates a "monitor-hmp" object "/objects/compat_monitorNNN" in addition to the character device "/chardevs/compat_monitorNNN". NNN counts up from zero. Exception: "-monitor chardev:ID" creates a "monitor-hmp" object "/objects/ID", and does not create a character device. "-qmp" and "-qmp-pretty" work the same, except they create a "monitor-qmp" object. "-mon" now creates either a "monitor-hmp" or "monitor-qmp" object "/objects/ID" if the option argument provides an ID, else "/objects/compat_monitorNNN". "-gdbstub" and "-serial mon:..." now create a "monitor-hmp" object "/objects/compat_monitorNNN". Note that the object's name in "/objects/" matches the QemuOpts ID when it exists. The only cases where it doesn't exist are "-mon" without ID, "-gdbstub" and "-serial mon:". A future patch will make "monitor-hmp" and "monitor-qmp" work with "-object" and "object-add". Note: there is a slight change in the NNN values assigned. The old code would increment the counter for every monitor added (except for -mon, -serial mon:..., -gdbstub), regardless of whether it needed a "compat_monitorNNN" ID assignment. Now it is only incremented when an automatic ID assigned is needed (but even for -mon, -serial mon:..., -gdbstub). Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Message-ID: <20260706135824.2623960-6-berrange@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> [Commit message made slightly more precise] Signed-off-by: Markus Armbruster <armbru@redhat.com>
74 lines
2.5 KiB
C
74 lines
2.5 KiB
C
#ifndef MONITOR_H
|
|
#define MONITOR_H
|
|
|
|
#include "block/block.h"
|
|
#include "qapi/qapi-types-misc.h"
|
|
#include "qemu/readline.h"
|
|
#include "exec/hwaddr.h"
|
|
#include "qom/object.h"
|
|
|
|
#define TYPE_MONITOR "monitor"
|
|
OBJECT_DECLARE_TYPE(Monitor, MonitorClass, MONITOR);
|
|
|
|
#define TYPE_MONITOR_HMP "monitor-hmp"
|
|
OBJECT_DECLARE_TYPE(MonitorHMP, MonitorHMPClass, MONITOR_HMP);
|
|
|
|
#define TYPE_MONITOR_QMP "monitor-qmp"
|
|
OBJECT_DECLARE_TYPE(MonitorQMP, MonitorQMPClass, MONITOR_QMP);
|
|
|
|
typedef struct MonitorOptions MonitorOptions;
|
|
|
|
#define QMP_REQ_QUEUE_LEN_MAX 8
|
|
|
|
extern QemuOptsList qemu_mon_opts;
|
|
|
|
Monitor *monitor_cur(void);
|
|
Monitor *monitor_set_cur(Coroutine *co, Monitor *mon);
|
|
bool monitor_cur_is_qmp(void);
|
|
|
|
void monitor_init_globals(void);
|
|
void monitor_init_globals_core(void);
|
|
char *monitor_compat_id(void);
|
|
void monitor_new_qmp(const char *id, Chardev *chr,
|
|
bool pretty, Error **errp);
|
|
void monitor_new_hmp(const char *id, Chardev *chr,
|
|
bool use_readline, Error **errp);
|
|
int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp);
|
|
int monitor_new_opts(QemuOpts *opts, Error **errp);
|
|
void monitor_cleanup(void);
|
|
|
|
int monitor_suspend(Monitor *mon);
|
|
void monitor_resume(Monitor *mon);
|
|
|
|
int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp);
|
|
int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp);
|
|
|
|
int monitor_puts(Monitor *mon, const char *str);
|
|
int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
|
|
G_GNUC_PRINTF(2, 0);
|
|
int monitor_printf(Monitor *mon, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
|
|
void monitor_printc(Monitor *mon, int ch);
|
|
void monitor_flush(Monitor *mon);
|
|
int monitor_get_cpu_index(Monitor *mon);
|
|
|
|
int monitor_puts_locked(Monitor *mon, const char *str);
|
|
void monitor_flush_locked(Monitor *mon);
|
|
|
|
void *gpa2hva(MemoryRegion **p_mr, hwaddr addr, uint64_t size, Error **errp);
|
|
|
|
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,
|
|
const char *opaque, Error **errp);
|
|
int monitor_fdset_dup_fd_add(int64_t fdset_id, int flags, Error **errp);
|
|
void monitor_fdset_dup_fd_remove(int dup_fd);
|
|
|
|
void monitor_register_hmp(const char *name, bool info,
|
|
void (*cmd)(Monitor *mon, const QDict *qdict));
|
|
void monitor_register_hmp_info_hrt(const char *name,
|
|
HumanReadableText *(*handler)(Error **errp));
|
|
|
|
#endif /* MONITOR_H */
|