From: minkee.lee <minkee.lee@samsung.com>
Date: Thu, 21 May 2015 06:06:24 +0000 (+0900)
Subject: Option: Modified network option .
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb3cf28fd0682da741a6b01bb54ab51f81783a37;p=sdk%2Femulator%2Femulator-manager.git

Option: Modified network option .

- Remove mac address option when NAT mode.

Change-Id: I6200ca488da33fc4481c4684146a6dc571fa8ea7
Signed-off-by: minkee.lee <minkee.lee@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 dd66658..47bd1f4 100644
--- a/src/org/tizen/emulator/manager/vms/option/NetworkOption.java
+++ b/src/org/tizen/emulator/manager/vms/option/NetworkOption.java
@@ -52,11 +52,16 @@ public class NetworkOption extends Option {
 				.getAdvancedOptionValue(ItemName.NET_CONNECT_TYPE)
 				.equals("Bridge");
 
-		// Qemu MAC argument
-		config.addVariable(VAR_MAC, getMacAddr(isBridge, property));
 		config.addQemuOption("-netdev", "user,id=net0");
-		config.addQemuOption("-device", "virtio-net-pci,netdev=net0,mac="
-				+ varForm(VAR_MAC));
+
+		// Qemu MAC argument
+		String netArgument = "virtio-net-pci,netdev=net0";
+		if (isBridge) {
+			config.addVariable(VAR_MAC, getMacAddr(isBridge, property));
+			netArgument += ",mac=" + varForm(VAR_MAC);
+		}
+
+		config.addQemuOption("-device", netArgument);
 
 		// Kernel IP argument
 		config.addKernelOption(getIP(isBridge, property));
@@ -76,7 +81,6 @@ public class NetworkOption extends Option {
 						"tap,script=/etc/emulator-ifup.sh,downscript=no");
 			}
 		}
-
 	}
 
 	private String getMacAddr(boolean isBridge, VMProperty property) {
@@ -155,19 +159,6 @@ public class NetworkOption extends Option {
 		return hostIp;
 	}
 
-	private String getNetArgument(boolean isBridge, VMProperty property) {
-		String netArgument;
-		if (isBridge) {
-			String tapName = property.getPropertyValue()
-					.getAdvancedOptionValue(ItemName.NET_TAP_DEVICE);
-			netArgument = "tap,ifname=" + tapName + ",script=no,downscript=no";
-
-		} else {
-			netArgument = ("user,dhcpstart=10.0.2.16");
-		}
-		return netArgument;
-	}
-
 	@Override
 	public void checkArgument(VMProperty property) throws VMLauncherException {
 		boolean isBridge = property.getPropertyValue()