diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-12-10 16:14:20 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-12-10 16:14:20 -0800 |
| commit | b9aad5d68d0fa636d1a1edbbeffa0d7a80370711 (patch) | |
| tree | b21dd4d8fecabe85167ce2b889aa1a32d44a47a5 /hmp-commands.hx | |
| parent | 1ead3ed55584a62a12d840a71d3aab71f12ec42e (diff) | |
| parent | 02d38fcb2caa4454cf4ed728d5908c3cc9ba47be (diff) | |
| download | focaccia-qemu-b9aad5d68d0fa636d1a1edbbeffa0d7a80370711.tar.gz focaccia-qemu-b9aad5d68d0fa636d1a1edbbeffa0d7a80370711.zip | |
Merge remote-tracking branch 'stefanha/net-next' into staging
# By Vincenzo Maffione (2) and others # Via Stefan Hajnoczi * stefanha/net-next: net: Update netdev peer on link change virtio-net: don't update mac_table in error state MAINTAINERS: Add netmap maintainers net: Adding netmap network backend Message-id: 1386594692-21278-1-git-send-email-stefanha@redhat.com Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'hmp-commands.hx')
| -rw-r--r-- | hmp-commands.hx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hmp-commands.hx b/hmp-commands.hx index caae5ad9e9..ebe8e78bb9 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1190,7 +1190,7 @@ ETEXI { .name = "host_net_add", .args_type = "device:s,opts:s?", - .params = "tap|user|socket|vde|dump [options]", + .params = "tap|user|socket|vde|netmap|dump [options]", .help = "add host VLAN client", .mhandler.cmd = net_host_device_add, }, @@ -1218,7 +1218,7 @@ ETEXI { .name = "netdev_add", .args_type = "netdev:O", - .params = "[user|tap|socket|hubport],id=str[,prop=value][,...]", + .params = "[user|tap|socket|hubport|netmap],id=str[,prop=value][,...]", .help = "add host network device", .mhandler.cmd = hmp_netdev_add, }, |