f27a9bb3e9
Trying to attach a QMP monitor to a chardev that is already in use results in a crash because monitor_init_qmp() passes &error_abort to qemu_chr_fe_init(): $ ./x86_64-softmmu/qemu-system-x86_64 --chardev stdio,id=foo --mon foo,mode=control --mon foo,mode=control Unexpected error in qemu_chr_fe_init() at chardev/char-fe.c:220: qemu-system-x86_64: --mon foo,mode=control: Device 'foo' is in use Abgebrochen (Speicherabzug geschrieben) Fix this by allowing monitor_init_qmp() to return an error and passing any error in qemu_chr_fe_init() to its caller instead of aborting. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20200224143008.13362-18-kwolf@redhat.com> Acked-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
52 lines
1.7 KiB
C
52 lines
1.7 KiB
C
#ifndef MONITOR_H
|
|
#define MONITOR_H
|
|
|
|
#include "block/block.h"
|
|
#include "qapi/qapi-types-misc.h"
|
|
#include "qemu/readline.h"
|
|
|
|
extern __thread Monitor *cur_mon;
|
|
typedef struct MonitorHMP MonitorHMP;
|
|
typedef struct MonitorOptions MonitorOptions;
|
|
|
|
#define QMP_REQ_QUEUE_LEN_MAX 8
|
|
|
|
extern QemuOptsList qemu_mon_opts;
|
|
|
|
bool monitor_cur_is_qmp(void);
|
|
|
|
void monitor_init_globals(void);
|
|
void monitor_init_globals_core(void);
|
|
void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp);
|
|
void monitor_init_hmp(Chardev *chr, bool use_readline);
|
|
int monitor_init(MonitorOptions *opts, Error **errp);
|
|
int monitor_init_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_vprintf(Monitor *mon, const char *fmt, va_list ap)
|
|
GCC_FMT_ATTR(2, 0);
|
|
int monitor_printf(Monitor *mon, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
|
|
void monitor_flush(Monitor *mon);
|
|
int monitor_set_cpu(int cpu_index);
|
|
int monitor_get_cpu_index(void);
|
|
|
|
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,
|
|
bool has_opaque, const char *opaque,
|
|
Error **errp);
|
|
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);
|
|
int64_t monitor_fdset_dup_fd_find(int dup_fd);
|
|
|
|
#endif /* MONITOR_H */
|