The QMP monitor code has two helper methods object_add and qmp_object_del that are called from several places in the code (QMP, HMP and main emulator startup). The HMP and main emulator startup code also share further logic that extracts the qom-type & id values from a qdict. We soon need to use this logic from qemu-img, qemu-io and qemu-nbd too, but don't want those to depend on the monitor, nor do we want to duplicate the code. To avoid this, move some code out of qmp.c and hmp.c adding new methods to qom/object_interfaces.c - user_creatable_add - takes a QDict holding a full object definition & instantiates it - user_creatable_add_type - takes an ID, type name, and QDict holding object properties & instantiates it - user_creatable_add_opts - takes a QemuOpts holding a full object definition & instantiates it - user_creatable_add_opts_foreach - variant on user_creatable_add_opts which can be directly used in conjunction with qemu_opts_foreach. - user_creatable_del - takes an ID and deletes the corresponding object The existing code is updated to use these new methods. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Message-Id: <1455129674-17255-2-git-send-email-berrange@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
55 lines
1.9 KiB
C
55 lines
1.9 KiB
C
#ifndef MONITOR_H
|
|
#define MONITOR_H
|
|
|
|
#include "qemu-common.h"
|
|
#include "qapi/qmp/qdict.h"
|
|
#include "block/block.h"
|
|
#include "qemu/readline.h"
|
|
|
|
extern Monitor *cur_mon;
|
|
|
|
/* flags for monitor_init */
|
|
#define MONITOR_IS_DEFAULT 0x01
|
|
#define MONITOR_USE_READLINE 0x02
|
|
#define MONITOR_USE_CONTROL 0x04
|
|
#define MONITOR_USE_PRETTY 0x08
|
|
|
|
bool monitor_cur_is_qmp(void);
|
|
|
|
void monitor_init(CharDriverState *chr, int flags);
|
|
|
|
int monitor_suspend(Monitor *mon);
|
|
void monitor_resume(Monitor *mon);
|
|
|
|
int monitor_read_bdrv_key_start(Monitor *mon, BlockDriverState *bs,
|
|
BlockCompletionFunc *completion_cb,
|
|
void *opaque);
|
|
int monitor_read_block_device_key(Monitor *mon, const char *device,
|
|
BlockCompletionFunc *completion_cb,
|
|
void *opaque);
|
|
|
|
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 */
|