From 12bd312818de05f9afebc19dd0a69e541dbf6aae Mon Sep 17 00:00:00 2001 From: aliguori Date: Tue, 21 Apr 2009 19:56:32 +0000 Subject: [PATCH] monitor: Improve host_net_add (Jan Kiszka) Fix the documentation of the host_net_add monitor command and allow the user to pass no options at all. Moreover, inform the user on the monitor terminal if a request failed. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7201 c046a42c-6fe2-441c-8c8c-71466251a162 --- monitor.c | 4 ++-- net.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index b323af9..5e78f9d 100644 --- a/monitor.c +++ b/monitor.c @@ -1730,8 +1730,8 @@ static const mon_cmd_t mon_cmds[] = { "add drive to PCI storage controller" }, { "pci_add", "sss", pci_device_hot_add, "pci_addr=auto|[[:]:] nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...", "hot-add PCI device" }, { "pci_del", "s", pci_device_hot_remove, "pci_addr=[[:]:]", "hot remove PCI device" }, - { "host_net_add", "ss", net_host_device_add, - "[tap,user,socket,vde,dump] options", "add host VLAN client" }, + { "host_net_add", "ss?", net_host_device_add, + "tap|user|socket|vde|dump [options]", "add host VLAN client" }, { "host_net_remove", "is", net_host_device_remove, "vlan_id name", "remove host VLAN client" }, #endif diff --git a/net.c b/net.c index 7139f4f..ac89f87 100644 --- a/net.c +++ b/net.c @@ -2042,7 +2042,9 @@ void net_host_device_add(Monitor *mon, const char *device, const char *opts) monitor_printf(mon, "invalid host network device %s\n", device); return; } - net_client_init(device, opts); + if (net_client_init(device, opts ? : "") < 0) { + monitor_printf(mon, "adding host network device %s failed\n", device); + } } void net_host_device_remove(Monitor *mon, int vlan_id, const char *device) -- 2.7.4