From: Jan Kiszka <jan.kiszka@web.de>
Date: Tue, 28 Apr 2009 19:25:58 +0000 (+0200)
Subject: net: Avoid gcc'ism in net_host_device_add
X-Git-Tag: 0.10.0-0sb10~1379
X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;ds=sidebyside;h=206ab6e090eeddce71372041454d50d93a63017d;p=qemu

net: Avoid gcc'ism in net_host_device_add

>> +    if (net_client_init(device, opts ? : "") < 0) {
>
> Is this a gcc extension?  Do we want to introduce this construct to the
> code base.

Valid remark, fix below.

Thanks,
Jan

-------->

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/net.c b/net.c
index 7ae1e6d..f1752d6 100644
--- a/net.c
+++ b/net.c
@@ -2085,7 +2085,7 @@ void net_host_device_add(Monitor *mon, const char *device, const char *opts)
         monitor_printf(mon, "invalid host network device %s\n", device);
         return;
     }
-    if (net_client_init(device, opts ? : "") < 0) {
+    if (net_client_init(device, opts ? opts : "") < 0) {
         monitor_printf(mon, "adding host network device %s failed\n", device);
     }
 }