[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/11] monitor: Improve host_net_add
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v2 04/11] monitor: Improve host_net_add |
Date: |
Sun, 19 Apr 2009 12:04:25 +0200 |
User-agent: |
StGIT/0.14.2 |
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 <address@hidden>
---
monitor.c | 4 ++--
net.c | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index 652d1f0..ca2a56d 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|[[<domain>:]<bus>:]<slot> 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=[[<domain>:]<bus>:]<slot>", "hot remove PCI device" },
- { "host_net_add", "ss", net_host_device_add,
- "[tap,user,socket,vde] options", "add host VLAN client" },
+ { "host_net_add", "ss?", net_host_device_add,
+ "tap|user|socket|vde [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 ca4d87f..22faa40 100644
--- a/net.c
+++ b/net.c
@@ -1860,7 +1860,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)
- [Qemu-devel] [PATCH v2 00/11] Various small networking improvements, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 03/11] net: Prevent multiple slirp instances, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 02/11] net: Check device passed to host_net_remove, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 01/11] net: Fix -net socket,listen, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 07/11] net: Add parameter checks for VLAN clients, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 10/11] slirp: Handle DHCP requests for specific IP, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 06/11] Allow empty params for check_params, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 09/11] net: Add support for capturing VLANs, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 04/11] monitor: Improve host_net_add,
Jan Kiszka <=
- [Qemu-devel] [PATCH v2 05/11] monitor: Allow host_net_add/remove for all targets, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 11/11] slirp: Enhance host-guest redirection setup, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 08/11] net: Untangle nested qemu_send_packet, Jan Kiszka, 2009/04/19
- Re: [Qemu-devel] [PATCH v2 00/11] Various small networking improvements, Anthony Liguori, 2009/04/21