OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi: introduce x-query-usb QMP command 

This is a counterpart to the HMP "info usb" command. It is being
added with an "x-" prefix because this QMP command is intended as an
adhoc debugging tool and will thus not be modelled in QAPI as fully
structured data, nor will it have long term guaranteed stability.
The existing HMP command is rewritten to call the QMP command.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-09-08 10:35:43 +01:00
parent 1b8ae799d8
commit fc30920731
5 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hmp-commands-info.hx
View File

@ -338,7 +338,7 @@ ERST
.args_type = "",
.params = "",
.help = "show guest USB devices",
.cmd = hmp_info_usb,
.cmd_info_hrt = qmp_x_query_usb,
},
SRST

24
hw/usb/bus.c
View File

@ -2,6 +2,8 @@
#include "hw/qdev-properties.h"
#include "hw/usb.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-machine.h"
#include "qapi/type-helpers.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "sysemu/sysemu.h"
@ -631,15 +633,16 @@ static char *usb_get_fw_dev_path(DeviceState *qdev)
return fw_path;
}
void hmp_info_usb(Monitor *mon, const QDict *qdict)
HumanReadableText *qmp_x_query_usb(Error **errp)
{
g_autoptr(GString) buf = g_string_new("");
USBBus *bus;
USBDevice *dev;
USBPort *port;
if (QTAILQ_EMPTY(&busses)) {
monitor_printf(mon, "USB support not enabled\n");
return;
error_setg(errp, "USB support not enabled");
return NULL;
}
QTAILQ_FOREACH(bus, &busses, next) {
@ -647,14 +650,17 @@ void hmp_info_usb(Monitor *mon, const QDict *qdict)
dev = port->dev;
if (!dev)
continue;
monitor_printf(mon, " Device %d.%d, Port %s, Speed %s Mb/s, "
"Product %s%s%s\n",
bus->busnr, dev->addr, port->path,
usb_speed(dev->speed), dev->product_desc,
dev->qdev.id ? ", ID: " : "",
dev->qdev.id ?: "");
g_string_append_printf(buf,
" Device %d.%d, Port %s, Speed %s Mb/s, "
"Product %s%s%s\n",
bus->busnr, dev->addr, port->path,
usb_speed(dev->speed), dev->product_desc,
dev->qdev.id ? ", ID: " : "",
dev->qdev.id ?: "");
}
}
return human_readable_text_from_str(buf);
}
/* handle legacy -usbdevice cmd line option */

12
qapi/machine.json
View File

@ -1447,3 +1447,15 @@
##
{ 'command': 'x-query-roms',
'returns': 'HumanReadableText' }
##
# @x-query-usb:
#
# Query information on the USB devices
#
# Returns: USB device information
#
# Since: 6.2
##
{ 'command': 'x-query-usb',
'returns': 'HumanReadableText' }

8
stubs/usb-dev-stub.c
View File

@ -8,6 +8,8 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-machine.h"
#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
#include "hw/usb.h"
@ -19,6 +21,12 @@ USBDevice *usbdevice_create(const char *driver)
return NULL;
}
HumanReadableText *qmp_x_query_usb(Error **errp)
{
error_setg(errp, "Support for USB devices not built-in");
return NULL;
}
void hmp_info_usb(Monitor *mon, const QDict *qdict)
{
monitor_printf(mon, "Support for USB devices not built-in\n");

2
tests/qtest/qmp-cmd-test.c
View File

@ -49,6 +49,8 @@ static int query_error_class(const char *cmd)
#ifndef CONFIG_PROFILER
{ "x-query-profile", ERROR_CLASS_GENERIC_ERROR },
#endif
/* Only valid with a USB bus added */
{ "x-query-usb", ERROR_CLASS_GENERIC_ERROR },
{ NULL, -1 }
};
int i;