From: minkee.lee <minkee.lee@samsung.com>
Date: Thu, 8 Jan 2015 12:11:43 +0000 (+0900)
Subject: SMP: Applied smp option to Mobile,Wearable profile.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b952f9e9b17d6ec944217613a6cf0d8f39fb8ff;p=sdk%2Femulator%2Femulator-manager.git

SMP: Applied smp option to Mobile,Wearable profile.

Change-Id: I1d2083ffa3f045552eb73e009f6bf7a663d7eb99
Signed-off-by: minkee.lee <minkee.lee@samsung.com>
---

diff --git a/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/vms/Launcher.java b/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/vms/Launcher.java
index 562ec5b..6512f76 100644
--- a/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/vms/Launcher.java
+++ b/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/vms/Launcher.java
@@ -54,6 +54,7 @@ import org.tizen.emulator.manager.vms.VMProperty;
 import org.tizen.emulator.manager.vms.helper.CheckingRunningEmulator;
 import org.tizen.emulator.manager.vms.helper.MonitoringEmulator;
 import org.tizen.emulator.manager.vms.helper.VMLauncherException;
+import org.tizen.emulator.manager.vms.xml.CpuType;
 import org.tizen.emulator.manager.vms.xml.OptionType;
 import org.tizen.emulator.manager.vms.xml.TouchType;
 
@@ -233,6 +234,11 @@ public class Launcher implements ILauncher {
 
 			cmd.add("-serial");
 			cmd.add("file:" + FilePathResources.getTizenVmsPath() + File.separator + property.getName() + File.separator + "logs" + File.separator + "emulator.klog");
+			CpuType cpuOption = property.getConfiguration().getDevice().getCPU();
+			if (cpuOption != null) {
+				cmd.add("-smp");
+				cmd.add(String.valueOf(cpuOption.getValue().getValue()));
+			}
 			cmd.add("-m");
 			cmd.add(String.valueOf(property.getConfiguration().getDevice().getRAM().getSize().getValue()));
 			cmd.add("-M");
diff --git a/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/vms/Launcher.java b/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/vms/Launcher.java
index 4349bc0..11a44f9 100644
--- a/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/vms/Launcher.java
+++ b/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/vms/Launcher.java
@@ -53,6 +53,7 @@ import org.tizen.emulator.manager.vms.VMProperty;
 import org.tizen.emulator.manager.vms.helper.CheckingRunningEmulator;
 import org.tizen.emulator.manager.vms.helper.MonitoringEmulator;
 import org.tizen.emulator.manager.vms.helper.VMLauncherException;
+import org.tizen.emulator.manager.vms.xml.CpuType;
 import org.tizen.emulator.manager.vms.xml.OptionType;
 import org.tizen.emulator.manager.vms.xml.TouchType;
 
@@ -227,6 +228,11 @@ public class Launcher implements ILauncher {
 
 			cmd.add("-serial");
 			cmd.add("file:" + FilePathResources.getTizenVmsPath() + File.separator + property.getName() + File.separator + "logs" + File.separator + "emulator.klog");
+			CpuType cpuOption = property.getConfiguration().getDevice().getCPU();
+			if (cpuOption != null) {
+				cmd.add("-smp");
+				cmd.add(String.valueOf(cpuOption.getValue().getValue()));
+			}
 			cmd.add("-m");
 			cmd.add(String.valueOf(property.getConfiguration().getDevice().getRAM().getSize().getValue()));
 			cmd.add("-M");
diff --git a/template/w-x86-standard-template.xml b/template/w-x86-standard-template.xml
index b918252..15c50a1 100644
--- a/template/w-x86-standard-template.xml
+++ b/template/w-x86-standard-template.xml
@@ -29,6 +29,7 @@
 			<item type="spinner" name="dpi" title="Density"/>
 			<item type="combo" name="skin" title="Skin"/>
 		</item>
+		<item type="combo" name="processors" title="Processors" />
 		<item type="combo" name="ramSize" title="RAM Size">
 			<option name="list">512,768,1024</option>
 		</item>
diff --git a/template/x86-standard-template.xml b/template/x86-standard-template.xml
index 53a311d..5cc89a1 100644
--- a/template/x86-standard-template.xml
+++ b/template/x86-standard-template.xml
@@ -27,6 +27,7 @@
 			<item type="spinner" name="dpi" title="Density"/>
 			<item type="combo" name="skin" title="Skin"/>
 		</item>
+		<item type="combo" name="processors" title="Processors" />
 		<item type="combo" name="ramSize" title="RAM Size">
 			<option name="list">512,768,1024</option>
 		</item>