skin: modified test.hb.ignore to hb.ignore

remote: add conditional sentence for remote excution

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

diff --git a/package/changelog b/package/changelog
index a74c626a296b300b2d4367eb762829a2249c138b..f41ad1b0eba53d45d1cf16baffdd1367786e4b9f 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 1.5.88
+- modified test.hb.ignore to hb.ignore and add conditional sentence for remote excution
+== Sungmin Ha <sungmin82.ha@samsung.com> 2013-09-04
 * 1.5.87
 - modified SDL logic
 == GiWoong Kim <giwoong.kim@samsung.com> 2013-09-03

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index aa6de4465357a3b453635669bb1054b72c21e702..bc2c6cdb8398c6dec6337f4134f9d47094fbaa2f 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version: 1.5.87
+Version: 1.5.88
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 Source: emulator
 

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index e93ec86faab8a26c057951bd4f57734eb99680c4..1cbc611ab38ef9590049dbd553e4a402273b4910 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -94,6 +94,7 @@ char tizen_target_img_path[PATH_MAX];
 
 int enable_gl = 0;
 int enable_yagl = 0;
+int enable_spice = 0;
 int is_webcam_enabled;
 
 static int _skin_argc;

diff --git a/tizen/src/hw/maru_board.c b/tizen/src/hw/maru_board.c
index 7728a703768ffc94b013463f52821477d58385a5..e70390cb039c8dee424fcf2da19b4d17b2f21d29 100644 (file)
--- a/tizen/src/hw/maru_board.c
+++ b/tizen/src/hw/maru_board.c
@@ -79,6 +79,7 @@ extern int enable_yagl;
 extern const char *yagl_backend;
 extern int enable_vigs;
 extern const char *vigs_backend;
+extern int enable_spice;
 
 #define MAX_IDE_BUS 2
 
@@ -130,7 +131,7 @@ static void maru_x86_machine_init(MemoryRegion *system_memory,
     void *fw_cfg = NULL;
 #if defined(__linux__)
     Display *display = XOpenDisplay(0);
-    if (!display) {
+    if (!display && !enable_spice) {
         fprintf(stderr, "Cannot open X display\n");
         exit(1);
     }

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java
index 44aad9152fcb52d7a039878daeee9f6f84806710..6234d5df8d51ae218cdd24ff06c39dd0485084d5 100755 (executable)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java
@@ -257,7 +257,7 @@ public class SocketCommunicator implements ICommunicator {
                }
 
                boolean ignoreHeartbeat =
-                               config.getArgBoolean(ArgsConstants.TEST_HEART_BEAT_IGNORE);
+                               config.getArgBoolean(ArgsConstants.HEART_BEAT_IGNORE);
 
                if (ignoreHeartbeat) {
                        logger.info("Ignore Skin heartbeat.");

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/config/EmulatorConfig.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/config/EmulatorConfig.java
index a6f575dca37d68c2b9d5913ac141946e47357f99..fc72b5f5bab4ab06164e92e27b266bf498116f03 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/config/EmulatorConfig.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/config/EmulatorConfig.java
@@ -75,7 +75,7 @@ public class EmulatorConfig {
                public static final String UID = "uid";
                public static final String RESOLUTION_WIDTH = "width";
                public static final String RESOLUTION_HEIGHT = "height";
-               public static final String TEST_HEART_BEAT_IGNORE = "test.hb.ignore";
+               public static final String HEART_BEAT_IGNORE = "hb.ignore";
                public static final String LOG_LEVEL = "log.level";
                public static final String VM_PATH = "vm.path";
                public static final String VM_SKIN_PORT = "vm.skinport";
@@ -97,7 +97,7 @@ public class EmulatorConfig {
        }
 
        public interface ConfigPropertiesConstants {
-               public static final String TEST_HEART_BEAT_IGNORE = "test.hb.ignore";
+               public static final String HEART_BEAT_IGNORE = "hb.ignore";
                public static final String LOG_LEVEL = "log.level";
        }
 

diff --git a/tizen/src/skin/maruskin_server.c b/tizen/src/skin/maruskin_server.c
index e342752acd5dd4e088a67b7d1082662a501e9fab..96e078783914486b336264f2fa974456d28be48b 100644 (file)
--- a/tizen/src/skin/maruskin_server.c
+++ b/tizen/src/skin/maruskin_server.c
@@ -92,7 +92,7 @@ MULTI_DEBUG_CHANNEL(qemu, skin_server);
 
 #define PORT_RETRY_COUNT 50
 
-#define TEST_HB_IGNORE "test.hb.ignore"
+#define HB_IGNORE "hb.ignore"
 #define TEST_VM_SKINPORT "test.vm.skinport"
 #define SKIN_CONFIG_PROP ".skinconfig.properties"
 
@@ -496,7 +496,7 @@ static void parse_skinconfig_prop(void)
 
     char hb_ignore_prop[32] = { 0, };
     memset(hb_ignore_prop, 0, 32);
-    strcat(hb_ignore_prop, TEST_HB_IGNORE);
+    strcat(hb_ignore_prop, HB_IGNORE);
     strcat(hb_ignore_prop, "=true");
 
     char* line_str = strtok(buf, "\n");
@@ -536,7 +536,7 @@ static void parse_skin_args(void)
             INFO("skin parameter key : %s, value : %s\n",
                 key, value);
 
-            if (0 == strcmp(TEST_HB_IGNORE, key)) {
+            if (0 == strcmp(HB_IGNORE, key)) {
                 if (0 == strcmp(OPT_BOOLEAN_TRUE, value)) {
                     ignore_heartbeat = 1;
                 } else if (0 == strcmp(OPT_BOOLEAN_FALSE, value)) {

diff --git a/vl.c b/vl.c
index 3dae7028302535daddc1c0ac6b3b531b8f16993a..9262c6a2723e2916ac0942306859d5390a30a3ce 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -204,6 +204,7 @@ int skin_disabled = 0;
 //virtio-gl
 extern int enable_gl;
 extern int enable_yagl;
+extern int enable_spice;
 const char *yagl_backend = NULL;
 int enable_vigs = 0;
 char *vigs_backend = NULL;
@@ -3934,6 +3935,9 @@ int main(int argc, char **argv, char **envp)
                     fprintf(stderr, "spice is not supported by this qemu build.\n");
                     exit(1);
                 }
+#ifdef CONFIG_MARU
+                enable_spice = 1;
+#endif
                 opts = qemu_opts_parse(olist, optarg, 0);
                 if (!opts) {
                     exit(1);