net: apply -netdev option for bridged network

legacy network option(-net) is not used on new argument setting.

Change-Id: I3b3023cb0bda41f381436e9de94447f44afbc879
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

diff --git a/src/org/tizen/emulator/manager/vms/option/NetworkOption.java b/src/org/tizen/emulator/manager/vms/option/NetworkOption.java
index 47bd1f4..f5a3ad1 100644 (file)
--- a/src/org/tizen/emulator/manager/vms/option/NetworkOption.java
+++ b/src/org/tizen/emulator/manager/vms/option/NetworkOption.java
@@ -51,14 +51,23 @@ public class NetworkOption extends Option {
                boolean isBridge = property.getPropertyValue()
                                .getAdvancedOptionValue(ItemName.NET_CONNECT_TYPE)
                                .equals("Bridge");
-
-               config.addQemuOption("-netdev", "user,id=net0");
-
-               // Qemu MAC argument
-               String netArgument = "virtio-net-pci,netdev=net0";
+               String netArgument;
                if (isBridge) {
+                       if (EmulatorManager.isWin()) {
+                               String tapName = property.getPropertyValue()
+                                               .getAdvancedOptionValue(ItemName.NET_TAP_DEVICE);
+                               config.addQemuOption("-netdev", "tap,id=net0,ifname=" + tapName
+                                               + ",script=no,downscript=no");
+                       } else {
+                               config.addQemuOption("-netdev", "tap,id=net0,script=/etc/emulator-ifup.sh,downscript=no");
+                       }
+                       netArgument = "virtio-net-pci,netdev=net0";
                        config.addVariable(VAR_MAC, getMacAddr(isBridge, property));
                        netArgument += ",mac=" + varForm(VAR_MAC);
+
+               } else {
+                       config.addQemuOption("-netdev", "user,id=net0");
+                       netArgument = "virtio-net-pci,netdev=net0";
                }
 
                config.addQemuOption("-device", netArgument);
@@ -69,18 +78,6 @@ public class NetworkOption extends Option {
                // Kernel host ip argument
                config.addKernelOption("host_ip", getHostIP(isBridge, property));
 
-               // Qemu net argument
-               if (isBridge) {
-                       if (EmulatorManager.isWin()) {
-                               String tapName = property.getPropertyValue()
-                                               .getAdvancedOptionValue(ItemName.NET_TAP_DEVICE);
-                               config.addQemuOption("-net", "tap,ifname=" + tapName
-                                               + ",script=no,downscript=no");
-                       } else {
-                               config.addQemuOption("-net",
-                                               "tap,script=/etc/emulator-ifup.sh,downscript=no");
-                       }
-               }
        }
 
        private String getMacAddr(boolean isBridge, VMProperty property) {