From: SeokYeon Hwang Date: Thu, 11 Sep 2014 05:39:14 +0000 (+0900) Subject: Merge "emulator: add get_emul_serial_port func for logging" into tizen_2.3 X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~255 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=20997257c36cef8d4581e5bfcc9e932866802313;p=sdk%2Femulator%2Fqemu.git Merge "emulator: add get_emul_serial_port func for logging" into tizen_2.3 --- 20997257c36cef8d4581e5bfcc9e932866802313 diff --cc tizen/src/emul_state.h index 737f3397ef,b6c325d4d3..597b3ee4d2 --- a/tizen/src/emul_state.h +++ b/tizen/src/emul_state.h @@@ -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 {