spice-server: added auto port setting for tizen

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

diff --git a/tizen/src/emul_state.c b/tizen/src/emul_state.c
index ce5668320c4657d268ccebc3572eb9279d995aeb..3dacc5f588a7d840c719bb2ed8c5b7f0089ab7ad 100644 (file)
--- a/tizen/src/emul_state.c
+++ b/tizen/src/emul_state.c
@@ -149,6 +149,12 @@ void set_emul_vm_base_port(int port)
     _emul_info.device_serial_number = port + 1;
     _emul_info.ecs_port = port + 3;
     _emul_info.serial_port = port + 4;
+    _emul_info.spice_port = port + 5;
+}
+
+int get_emul_spice_port(void)
+{
+    return _emul_info.spice_port;
 }
 
 void set_emul_ecs_port(int port)

diff --git a/tizen/src/emul_state.h b/tizen/src/emul_state.h
index 597b3ee4d2ad59c17b9391ae0a39f01b60018571..1c4fdc3e5d64d236c0140583e67a051e6c3dfe5d 100644 (file)
--- a/tizen/src/emul_state.h
+++ b/tizen/src/emul_state.h
@@ -98,6 +98,7 @@ typedef  struct EmulatorConfigInfo {
     int ecs_port;
     char http_proxy_addr[MAX_ADDR_LEN];
     char http_proxy_port[MAX_PORT_LEN];
+    int spice_port;
     char *vm_name;
     /* add here */
     int serial_port;
@@ -146,6 +147,7 @@ int get_emul_vm_base_port(void);
 int get_device_serial_number(void);
 int get_emul_ecs_port(void);
 int get_emul_serial_port(void);
+int get_emul_spice_port(void);
 
 int get_emulator_condition(void);
 short get_emul_rotation(void);

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 4cce3b38c006d7caef404a3749f42e58848843c2..b7d869b75aad0d6ca3f786deff0b1af1094f155e 100644 (file)
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -39,6 +39,10 @@
 #include "hw/hw.h"
 #include "ui/spice-display.h"
 
+#ifdef CONFIG_MARU
+extern int get_emul_spice_port(void);
+#endif
+
 /* core bits */
 
 static SpiceServer *spice_server;
@@ -648,7 +652,12 @@ void qemu_spice_init(void)
     if (!opts) {
         return;
     }
+
+#ifdef CONFIG_MARU
+    port = get_emul_spice_port();
+#else
     port = qemu_opt_get_number(opts, "port", 0);
+#endif
     tls_port = qemu_opt_get_number(opts, "tls-port", 0);
     if (!port && !tls_port) {
         error_report("neither port nor tls-port specified for spice");