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 /vl.c | |
| parent | 3d30395f7fb3315e4ecf0de4e48790e1326bbd47 (diff) | |
| parent | 1ce6be24df0a2f634b61b9b882ac6d10af485ad6 (diff) | |
| download | focaccia-qemu-68b459eaa660be17d3547aa581502fe2c572c84f.tar.gz focaccia-qemu-68b459eaa660be17d3547aa581502fe2c572c84f.zip | |
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 'vl.c')
| -rw-r--r-- | vl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vl.c b/vl.c index 8c8f14287e..7e6e93c9f0 100644 --- a/vl.c +++ b/vl.c @@ -1284,7 +1284,7 @@ static int usb_parse(const char *cmdline) return r; } -void do_usb_add(Monitor *mon, const QDict *qdict) +void hmp_usb_add(Monitor *mon, const QDict *qdict) { const char *devname = qdict_get_str(qdict, "devname"); if (usb_device_add(devname) < 0) { @@ -1292,7 +1292,7 @@ void do_usb_add(Monitor *mon, const QDict *qdict) } } -void do_usb_del(Monitor *mon, const QDict *qdict) +void hmp_usb_del(Monitor *mon, const QDict *qdict) { const char *devname = qdict_get_str(qdict, "devname"); if (usb_device_del(devname) < 0) { |