The previous commit improved compile time by including less of the generated QAPI headers. This is impossible for stuff defined directly in qapi-schema.json, because that ends up in headers that that pull in everything. Move everything but include directives from qapi-schema.json to new sub-module qapi/misc.json, then include just the "misc" shard where possible. It's possible everywhere, except: * monitor.c needs qmp-command.h to get qmp_init_marshal() * monitor.c, ui/vnc.c and the generated qapi-event-FOO.c need qapi-event.h to get enum QAPIEvent Perhaps we'll get rid of those some other day. Adding a type to qapi/migration.json now recompiles some 120 instead of 2300 out of 5100 objects. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20180211093607.27351-25-armbru@redhat.com> [eblake: rebase to master] Signed-off-by: Eric Blake <eblake@redhat.com>
		
			
				
	
	
		
			50 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			50 lines
		
	
	
		
			1.6 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 Monitor *cur_mon;
 | 
						|
 | 
						|
/* flags for monitor_init */
 | 
						|
/* 0x01 unused */
 | 
						|
#define MONITOR_USE_READLINE  0x02
 | 
						|
#define MONITOR_USE_CONTROL   0x04
 | 
						|
#define MONITOR_USE_PRETTY    0x08
 | 
						|
 | 
						|
bool monitor_cur_is_qmp(void);
 | 
						|
 | 
						|
void monitor_init_qmp_commands(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);
 | 
						|
 | 
						|
#endif /* MONITOR_H */
 |