modified spice option for auto port setting

Change-Id: I9114fb03a2c25d09f71da1894bdccb3df621b8fd
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>

diff --git a/common-project/src/org/tizen/emulator/manager/console/ActionList.java b/common-project/src/org/tizen/emulator/manager/console/ActionList.java
index a7a67be..d33d8e0 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/console/ActionList.java
+++ b/common-project/src/org/tizen/emulator/manager/console/ActionList.java
@@ -755,8 +755,8 @@ class Launch extends Action {
                */
 
                commandList.add(new Command("s", Actions.OP_SPICE_PORT,
-                               "With spice port",
-                               "", false, true));
+                               "Enable spice mode",
+                               "", false, false));
        }
 
        @Override
@@ -778,7 +778,6 @@ class Launch extends Action {
                                        isTest = true;
                                        break;
                                case 's' :
-                                       RemoteManager.setRemotePort(c.getCurrentValue());
                                        RemoteManager.setSpiceMode(true);
                                        break;
                                /*
@@ -799,7 +798,7 @@ class RemoteLaunch extends Action {
        public RemoteLaunch() {
                this.action     = Actions.AC_REMOTE_LAUNCH;
                this.description = "Start remote emulator using selected VM.";
-               this.usage = "remote-launch -n test -e ip -u account -s port [options]";
+               this.usage = "remote-launch -n test -e ip -u account [options]";
 
                commandList.add(new Command("n", Actions.OP_NAME,
                                "Name of VM to start.","", true, true));
@@ -813,8 +812,8 @@ class RemoteLaunch extends Action {
                                "", false, false));
 
                commandList.add(new Command("s", Actions.OP_SPICE_PORT,
-                               "With spice port",
-                               "", true, true));
+                               "Enable spice port",
+                               "", false, false));
 
                commandList.add(new Command("u", Actions.OP_USER_ACCOUNT,
                                "User account of remote.", "", true, true));
@@ -851,7 +850,6 @@ class RemoteLaunch extends Action {
                                        }
                                        break;
                                case 's' :
-                                       RemoteManager.setRemotePort(c.getCurrentValue());
                                        RemoteManager.setSpiceMode(true);
                                        break;
                                case 'e' :

diff --git a/common-project/src/org/tizen/emulator/manager/console/RemoteManager.java b/common-project/src/org/tizen/emulator/manager/console/RemoteManager.java
index af9938c..bf4c9b3 100755 (executable)
--- a/common-project/src/org/tizen/emulator/manager/console/RemoteManager.java
+++ b/common-project/src/org/tizen/emulator/manager/console/RemoteManager.java
@@ -220,7 +220,9 @@ public class RemoteManager {
                        cmd.add("-p " + path);
                }
 
-               cmd.add("-s " + RemoteManager.getRemotePort());
+               if (SpiceMode) {
+                       cmd.add("-s");
+               }
 
                runRemoteCmd(cmd);
 

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 eacb86c..a3bc56b 100644 (file)
--- 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
@@ -451,9 +451,9 @@ public class Launcher implements ILauncher {
                /* spice options */
                if (RemoteManager.getSpiceMode()) {
                        cmd.add("-spice");
-                       cmd.add("port=" + RemoteManager.getRemotePort() + ",disable-ticketing");
+                       cmd.add("disable-ticketing");
                        cmd.add("-device");
-                       cmd.add("virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0,addr=0x12");
+                       cmd.add("virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0");
                        cmd.add("-chardev");
                        cmd.add("spicevmc,id=vdagent,name=vdagent");
                        cmd.add("-device");

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 00edaaa..5e70225 100644 (file)
--- 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
@@ -429,9 +429,9 @@ public class Launcher implements ILauncher {
                /* spice options */
                if (RemoteManager.getSpiceMode()) {
                        cmd.add("-spice");
-                       cmd.add("port=" + RemoteManager.getRemotePort() + ",disable-ticketing");
+                       cmd.add("disable-ticketing");
                        cmd.add("-device");
-                       cmd.add("virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0,addr=0x10");
+                       cmd.add("virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0");
                        cmd.add("-chardev");
                        cmd.add("spicevmc,id=vdagent,name=vdagent");
                        cmd.add("-device");