diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2015-02-25 13:14:37 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-02-25 13:14:37 +0000 |
commit | 68b459eaa660be17d3547aa581502fe2c572c84f (patch) | |
tree | e5b3edf44f205dea663ab6d082bfee78fc322d14 /hw/usb/bus.c | |
parent | 3d30395f7fb3315e4ecf0de4e48790e1326bbd47 (diff) | |
parent | 1ce6be24df0a2f634b61b9b882ac6d10af485ad6 (diff) |
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-02-18' into staging
hmp: Normalize HMP command handler names
# gpg: Signature made Wed Feb 18 10:59:44 2015 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
* remotes/armbru/tags/pull-monitor-2015-02-18:
hmp: Name HMP info handler functions hmp_info_SUBCOMMAND()
hmp: Name HMP command handler functions hmp_COMMAND()
hmp: Clean up declarations for long-gone info handlers
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/bus.c')
-rw-r--r-- | hw/usb/bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/usb/bus.c b/hw/usb/bus.c index d83a93887f..91fc3e20d9 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -637,7 +637,7 @@ static char *usb_get_fw_dev_path(DeviceState *qdev) return fw_path; } -void usb_info(Monitor *mon, const QDict *qdict) +void hmp_info_usb(Monitor *mon, const QDict *qdict) { USBBus *bus; USBDevice *dev; |