[Qemu-devel] [7201] monitor: Improve host_net_add (Jan Kiszka)

[Anthony Liguori]

Revision: 7201
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7201
Author:   aliguori
Date:     2009-04-21 19:56:32 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
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 <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/monitor.c
    trunk/net.c

Modified: trunk/monitor.c
===================================================================
--- trunk/monitor.c     2009-04-21 19:56:28 UTC (rev 7200)
+++ trunk/monitor.c     2009-04-21 19:56:32 UTC (rev 7201)
@@ -1730,8 +1730,8 @@
                                         "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,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

Modified: trunk/net.c
===================================================================
--- trunk/net.c 2009-04-21 19:56:28 UTC (rev 7200)
+++ trunk/net.c 2009-04-21 19:56:32 UTC (rev 7201)
@@ -2042,7 +2042,9 @@
         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)