8258292e18
Out-of-band command execution was introduced in commitcf869d5317. Unfortunately, we ran into a regression, and had to turn it into an experimental option for 2.12 (commitbe933ffc23). http://lists.gnu.org/archive/html/qemu-devel/2018-03/msg06231.html The regression has since been fixed (commit951702f39c"monitor: bind dispatch bh to iohandler context"). A thorough re-review of OOB commands led to a few more issues, which have also been addressed. This patch partly revertsbe933ffc23(monitor: new parameter "x-oob"), and makes QMP monitors again offer capability "oob" whenever they can provide it, i.e. when the monitor's character device is capable of running in an I/O thread. Some trivial touch-up in the test code is required to make sure qmp-test won't break. Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> Message-Id: <20181009062718.1914-4-peterx@redhat.com> [Conflict with "monitor: check if chardev can switch gcontext for OOB" resolved, commit message updated] Signed-off-by: Markus Armbruster <armbru@redhat.com>
55 lines
1.7 KiB
C
55 lines
1.7 KiB
C
#ifndef MONITOR_H
|
|
#define MONITOR_H
|
|
|
|
#include "qemu-common.h"
|
|
#include "block/block.h"
|
|
#include "qapi/qapi-types-misc.h"
|
|
#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
|
|
|
|
#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_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);
|
|
|
|
void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
|
|
GCC_FMT_ATTR(2, 0);
|
|
void monitor_printf(Monitor *mon, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
|
|
int monitor_fprintf(FILE *stream, 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(Monitor *mon, int show_prompt);
|
|
int monitor_read_password(Monitor *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);
|
|
int monitor_fdset_dup_fd_find(int dup_fd);
|
|
|
|
void monitor_vfprintf(FILE *stream,
|
|
const char *fmt, va_list ap) GCC_FMT_ATTR(2, 0);
|
|
|
|
#endif /* MONITOR_H */
|