Merge "emulator: add get_emul_serial_port func for logging" into tizen_2.3
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 11 Sep 2014 05:39:14 +0000 (14:39 +0900)
committerGerrit Code Review <gerrit2@twin.s-core.co.kr>
Thu, 11 Sep 2014 05:39:14 +0000 (14:39 +0900)
1  2 
tizen/src/emul_state.c
tizen/src/emul_state.h

Simple merge
index 737f3397ef95016bd68d9d11ad5b4c5d1786fa3e,b6c325d4d37751d53574fdfec315c2c3fb5d706a..597b3ee4d2ad59c17b9391ae0a39f01b60018571
@@@ -93,10 -94,9 +96,11 @@@ typedef  struct EmulatorConfigInfo 
      int vm_base_port;
      int device_serial_number;
      int ecs_port;
 +    char http_proxy_addr[MAX_ADDR_LEN];
 +    char http_proxy_port[MAX_PORT_LEN];
      char *vm_name;
      /* add here */
+     int serial_port;
  } EmulatorConfigInfo;
  
  typedef struct EmulatorConfigState {