diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-02-06 14:35:52 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-02-06 14:35:52 +0000 |
| commit | cebbae86b4f7ee3d3dd9df906b97d269e70d9cc7 (patch) | |
| tree | 1e85e8bb960a04a33376f23db72a34e2cc26837b /monitor.c | |
| parent | b93acb92cad1f38737e481fc85cb5c41a559d855 (diff) | |
| parent | 2c4681f512822b4aa35371683e164d4818f21dce (diff) | |
| download | focaccia-qemu-cebbae86b4f7ee3d3dd9df906b97d269e70d9cc7.tar.gz focaccia-qemu-cebbae86b4f7ee3d3dd9df906b97d269e70d9cc7.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
# gpg: Signature made Fri 06 Feb 2015 14:10:40 GMT using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" * remotes/stefanha/tags/net-pull-request: monitor: more accurate completion for host_net_remove() net: del hub port when peer is deleted net: remove the wrong comment in net_init_hubport() monitor: print hub port name during info network rtl8139: simplify timer logic MAINTAINERS: add Jason Wang as net subsystem maintainer Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/monitor.c b/monitor.c index 2e2b0e5b37..5a24311844 100644 --- a/monitor.c +++ b/monitor.c @@ -4598,8 +4598,13 @@ void host_net_remove_completion(ReadLineState *rs, int nb_args, const char *str) count = qemu_find_net_clients_except(NULL, ncs, NET_CLIENT_OPTIONS_KIND_NIC, 255); for (i = 0; i < count; i++) { + int id; const char *name; + if (ncs[i]->info->type == NET_CLIENT_OPTIONS_KIND_HUBPORT || + net_hub_id_for_client(ncs[i], &id)) { + continue; + } name = ncs[i]->name; if (!strncmp(str, name, len)) { readline_add_completion(rs, name); |