From 38465a00d306ddae980b5d19fefbc27a9b66536b Mon Sep 17 00:00:00 2001 From: "minkee.lee" Date: Tue, 28 Jul 2015 11:37:03 +0900 Subject: [PATCH] network-option: changed network argument to old style. - use "-net" instead of "-netdev" & "-device. (fixed NAT option.) Change-Id: If6ab3137d1a08e00b4c008110e7fbab9cda7a7d7 Signed-off-by: minkee.lee --- .../emulator/manager/vms/option/NetworkOption.java | 34 ++++++++++++++++------ 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/src/org/tizen/emulator/manager/vms/option/NetworkOption.java b/src/org/tizen/emulator/manager/vms/option/NetworkOption.java index 21fdf93..d96173f 100644 --- a/src/org/tizen/emulator/manager/vms/option/NetworkOption.java +++ b/src/org/tizen/emulator/manager/vms/option/NetworkOption.java @@ -53,25 +53,41 @@ public class NetworkOption extends Option { boolean isBridge = property.getPropertyValue() .getAdvancedOptionValue(ItemName.NET_CONNECT_TYPE) .equals("Bridge"); //$NON-NLS-1$ - String netArgument; +// 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(OPTION_KEY.VAR_MAC, getMacAddr(isBridge, property)); +// netArgument += ",mac=" + varForm(OPTION_KEY.VAR_MAC); +// +// } else { +// config.addQemuOption("-netdev", "user,id=net0"); +// netArgument = "virtio-net-pci,netdev=net0"; +// } +// config.addQemuOption("-device", 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"); + config.addQemuOption("-net", "tap,ifname=" + tapName + ",script=no,downscript=no"); } else { - config.addQemuOption("-netdev", "tap,id=net0,script=/etc/emulator-ifup.sh,downscript=no"); + config.addQemuOption("-net", "tap,script=/etc/emulator-ifup.sh,downscript=no"); } - netArgument = "virtio-net-pci,netdev=net0"; config.addVariable(OPTION_KEY.VAR_MAC, getMacAddr(isBridge, property)); - netArgument += ",mac=" + varForm(OPTION_KEY.VAR_MAC); + config.addQemuOption("-net", "nic,model=virtio,macaddr=" + varForm(OPTION_KEY.VAR_MAC)); } else { - config.addQemuOption("-netdev", "user,id=net0"); - netArgument = "virtio-net-pci,netdev=net0"; + config.addQemuOption("-net", "nic,model=virtio"); + config.addQemuOption("-net", "user"); } - config.addQemuOption("-device", netArgument); // Kernel IP argument config.addKernelOption(getIP(isBridge, property)); -- 2.7.4