mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdev-monitor: print help to stdout

Browse Source 
qdev_device_help() is used from command line "-device help", or from
HMP "device_add". If used from command line, print help to stdout
(it is only printed on explicit demand).

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Marc-André Lureau 2018-09-07 11:45:39 +04:00
parent b8e5671a8c
commit a95db58f21
3 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/monitor/monitor.h
View File

@ -47,4 +47,7 @@ int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd);
void monitor_fdset_dup_fd_remove(int dup_fd); void monitor_fdset_dup_fd_remove(int dup_fd);
int monitor_fdset_dup_fd_find(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 */ #endif /* MONITOR_H */

20
monitor.c
View File

@ -4492,6 +4492,20 @@ static void monitor_readline_flush(void *opaque)
monitor_flush(opaque); monitor_flush(opaque);
} }
/*
* Print to current monitor if we have one, else to stream.
* TODO should return int, so callers can calculate width, but that
* requires surgery to monitor_vprintf(). Left for another day.
*/
void monitor_vfprintf(FILE *stream, const char *fmt, va_list ap)
{
if (cur_mon && !monitor_cur_is_qmp()) {
monitor_vprintf(cur_mon, fmt, ap);
} else {
vfprintf(stream, fmt, ap);
}
}
/* /*
* Print to current monitor if we have one, else to stderr. * Print to current monitor if we have one, else to stderr.
* TODO should return int, so callers can calculate width, but that * TODO should return int, so callers can calculate width, but that
@ -4499,11 +4513,7 @@ static void monitor_readline_flush(void *opaque)
*/ */
void error_vprintf(const char *fmt, va_list ap) void error_vprintf(const char *fmt, va_list ap)
{ {
if (cur_mon && !monitor_cur_is_qmp()) { monitor_vfprintf(stderr, fmt, ap);
monitor_vprintf(cur_mon, fmt, ap);
} else {
vfprintf(stderr, fmt, ap);
}
} }
void error_vprintf_unless_qmp(const char *fmt, va_list ap) void error_vprintf_unless_qmp(const char *fmt, va_list ap)

32
qdev-monitor.c
View File

@ -104,22 +104,31 @@ static bool qdev_class_has_alias(DeviceClass *dc)
return (qdev_class_get_alias(dc) != NULL); return (qdev_class_get_alias(dc) != NULL);
} }
static void out_printf(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
monitor_vfprintf(stdout, fmt, ap);
va_end(ap);
}
static void qdev_print_devinfo(DeviceClass *dc) static void qdev_print_devinfo(DeviceClass *dc)
{ {
error_printf("name \"%s\"", object_class_get_name(OBJECT_CLASS(dc))); out_printf("name \"%s\"", object_class_get_name(OBJECT_CLASS(dc)));
if (dc->bus_type) { if (dc->bus_type) {
error_printf(", bus %s", dc->bus_type); out_printf(", bus %s", dc->bus_type);
} }
if (qdev_class_has_alias(dc)) { if (qdev_class_has_alias(dc)) {
error_printf(", alias \"%s\"", qdev_class_get_alias(dc)); out_printf(", alias \"%s\"", qdev_class_get_alias(dc));
} }
if (dc->desc) { if (dc->desc) {
error_printf(", desc \"%s\"", dc->desc); out_printf(", desc \"%s\"", dc->desc);
} }
if (!dc->user_creatable) { if (!dc->user_creatable) {
error_printf(", no-user"); out_printf(", no-user");
} }
error_printf("\n"); out_printf("\n");
} }
static void qdev_print_devinfos(bool show_no_user) static void qdev_print_devinfos(bool show_no_user)
@ -155,8 +164,7 @@ static void qdev_print_devinfos(bool show_no_user)
continue; continue;
} }
if (!cat_printed) { if (!cat_printed) {
error_printf("%s%s devices:\n", i ? "\n" : "", out_printf("%s%s devices:\n", i ? "\n" : "", cat_name[i]);
cat_name[i]);
cat_printed = true; cat_printed = true;
} }
qdev_print_devinfo(dc); qdev_print_devinfo(dc);
@ -278,13 +286,11 @@ int qdev_device_help(QemuOpts *opts)
} }
for (prop = prop_list; prop; prop = prop->next) { for (prop = prop_list; prop; prop = prop->next) {
error_printf("%s.%s=%s", driver, out_printf("%s.%s=%s", driver, prop->value->name, prop->value->type);
prop->value->name,
prop->value->type);
if (prop->value->has_description) { if (prop->value->has_description) {
error_printf(" (%s)\n", prop->value->description); out_printf(" (%s)\n", prop->value->description);
} else { } else {
error_printf("\n"); out_printf("\n");
} }
} }