OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

misc: minor fix 

Some minor comments refine and fix some typo

Tracked-On: #7215
Signed-off-by: Fei Li <fei1.li@intel.com>
This commit is contained in:
Fei Li 2022-03-30 12:21:54 +08:00 committed by acrnsi-robot
parent 4169bfc21c
commit 187e19da2f
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/services/acrn_manager/acrnd.service
View File

@ -1,5 +1,5 @@
[Unit]
Description=ACRN manager deamon
Description=ACRN manager daemon
After=systemd-resolved.service
After=life_mngr.service
ConditionPathExists=/dev/acrn_hsm

4
misc/services/life_mngr/command_handler.c
View File

@ -246,7 +246,7 @@ int req_reboot_handler(void *arg, int fd)
ret = send_message_by_uart(c_dev->uart_device, ACK_REQ_SYS_REBOOT,
strlen(ACK_REQ_SYS_REBOOT));
if (ret < 0)
LOG_WRITE("Send acked message to user VM fail\n");
LOG_WRITE("Sending a reboot acknowledgement message to user VM failed.\n");
system_reboot_request_flag = true;
usleep(SECOND_TO_US);
LOG_PRINTF("Send acked shutdown request message to user VM (%s)\n", c_dev->name);
@ -282,7 +282,7 @@ int req_shutdown_handler(void *arg, int fd)
ret = send_message_by_uart(c_dev->uart_device, ACK_REQ_SYS_SHUTDOWN,
strlen(ACK_REQ_SYS_SHUTDOWN));
if (ret < 0)
LOG_WRITE("Send acked message to user VM fail\n");
LOG_WRITE("Sending a shutdown acknowledgement message to user VM failed.\n");
usleep(SECOND_TO_US);
LOG_PRINTF("Send acked shutdown request message to user VM (%s)\n", c_dev->name);
start_all_uart_channel_dev_resend(c, POWEROFF_CMD, VM_SHUTDOWN_RETRY_TIMES);

13
misc/services/life_mngr/life_mngr_win.c
View File

@ -31,7 +31,7 @@
#define UVM_SOCKET_PORT (0x2001U)
#define READ_INTERVAL (100U) /* The time unit is microsecond */
#define MIN_RESEND_TIME (3U)
#define MS_TO_SECOND (1000U)
#define SECOND_TO_MS (1000U)
#define RETRY_RECV_TIMES (8U)
HANDLE hCom2;
@ -65,7 +65,12 @@ void handle_socket_request(SOCKET sClient, char *req_message)
char ack_message[BUFF_SIZE];
snprintf(ack_message, sizeof(ack_message), "ack_%s", req_message);
Sleep(6U * MS_TO_SECOND);
/**
* The lifecycle manager in Service VM checks sync message every 5 seconds
* during listening phase, delay 6 seconds to wait Service VM to receive the
* sync message, then start to send message to Service VM.
*/
Sleep(6U * SECOND_TO_MS);
send(sClient, ack_message, sizeof(ack_message), 0);
start_uart_resend(req_message, MIN_RESEND_TIME);
send_message_by_uart(hCom2, req_message, sizeof(req_message));
@ -203,7 +208,7 @@ int main()
* during listening phase, delay 5 seconds to wait Service VM to receive the
* sync message, then start to read ack message from Service VM.
*/
Sleep(5U * MS_TO_SECOND);
Sleep(5U * SECOND_TO_MS);
do {
do {
retry_times = RETRY_RECV_TIMES;
@ -215,7 +220,7 @@ int main()
} while ((recvsize < MSG_SIZE) && (retry_times > 0));
if (recvsize < MSG_SIZE) {
if (resend_time > 1U) {
Sleep(6U * MS_TO_SECOND);
Sleep(6U * SECOND_TO_MS);
printf("Resend command (%s) service VM\n", resend_buf);
send_message_by_uart(hCom2, resend_buf, strlen(resend_buf));
resend_time--;