Most callers know which monitor type they want to have. Instead of
calling monitor_init() with flags that can describe both types of
monitors, make monitor_init_{hmp,qmp}() public interfaces that take
specific bools instead of flags and call these functions directly.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20190613153405.24769-15-kwolf@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
		
	
			
		
			
				
	
	
		
			47 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			47 lines
		
	
	
		
			1.5 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;
 | 
						|
 | 
						|
#define QMP_REQ_QUEUE_LEN_MAX 8
 | 
						|
 | 
						|
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);
 | 
						|
void monitor_init_hmp(Chardev *chr, bool use_readline);
 | 
						|
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 */
 |