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 /net/slirp.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 'net/slirp.c')
| -rw-r--r-- | net/slirp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/slirp.c b/net/slirp.c index 0cbca3cc83..9bbed7447a 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -299,7 +299,7 @@ static SlirpState *slirp_lookup(Monitor *mon, const char *vlan, } } -void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict) +void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict) { struct in_addr host_addr = { .s_addr = INADDR_ANY }; int host_port; @@ -420,7 +420,7 @@ static int slirp_hostfwd(SlirpState *s, const char *redir_str, return -1; } -void net_slirp_hostfwd_add(Monitor *mon, const QDict *qdict) +void hmp_hostfwd_add(Monitor *mon, const QDict *qdict) { const char *redir_str; SlirpState *s; @@ -681,7 +681,7 @@ static int slirp_guestfwd(SlirpState *s, const char *config_str, return -1; } -void do_info_usernet(Monitor *mon, const QDict *qdict) +void hmp_info_usernet(Monitor *mon, const QDict *qdict) { SlirpState *s; |