github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-25 23:13:26 +00:00
Code Issues Projects Releases Wiki Activity

tools: acrn-mngr: add delay to allow user to prevent VM autostart for debug

Browse Source 
There is an enhancement requirement about the VM auto-start for debug:
allowing the end user to optionally prevent automatic and immediate launching
of all Guest VM.

This commit adds a parameter to acrnd indicating the delay time before VM
auto-start, within the delayed period, user could stop acrnd to prevent the VM
auto-start. The default delay time is 0.

And definition of MACROs and static varialbes are moved to the beginning of
the source file.

Tracked-On: #2947
Signed-off-by: Yan, Like <like.yan@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Yan, Like 2019-04-11 16:52:38 +08:00 committed by Eddie Dong
parent 8c2ab95f49
commit e216f3060c
1 changed files with 67 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
tools/acrn-manager/acrnd.c
View File

@ -15,11 +15,18 @@
#include <dirent.h> #include <dirent.h>
#include <stdbool.h> #include <stdbool.h>
#include <errno.h> #include <errno.h>
#include <limits.h>
#include "mevent.h" #include "mevent.h"
#include "acrnctl.h" #include "acrnctl.h"
#include "acrn_mngr.h" #include "acrn_mngr.h"
#include "ioc.h" #include "ioc.h"
#define ACRND_NAME "acrnd"
#define SOS_LCS_SOCK "sos-lcs"
#define HW_IOC_PATH "/dev/cbc-early-signals"
#define VMS_STOP_TIMEOUT 20U /* Time to wait VMs to stop */
#define SOCK_TIMEOUT 2U
/* acrnd worker timer */ /* acrnd worker timer */
struct work_arg { struct work_arg {
@ -43,7 +50,11 @@ static unsigned int acrnd_stop_timeout;
static unsigned char platform_has_hw_ioc; static unsigned char platform_has_hw_ioc;
static int sigterm = 0; /* Exit acrnd when recevied SIGTERM and stop all vms */ static int sigterm = 0; /* Exit acrnd when recevied SIGTERM and stop all vms */
#define VMS_STOP_TIMEOUT 20 /* Wait VMS_STOP_TIMEOUT sec to stop all vms */
static int logfile = 1;
#ifdef MNGR_DEBUG
static int autostart_delay = 0;
#endif
/* acrnd_add_work(), add a worker function. /* acrnd_add_work(), add a worker function.
* @func, the worker function, will be called with work_mutex hold. * @func, the worker function, will be called with work_mutex hold.
@ -222,8 +233,6 @@ static int load_timer_list(void)
return ret; return ret;
} }
static int logfile = 1;
static void acrnd_run_vm(char *name) static void acrnd_run_vm(char *name)
{ {
/*If do not use logfile, then output to stdout, /*If do not use logfile, then output to stdout,
@ -304,11 +313,6 @@ static int wakeup_suspended_vms(unsigned wakeup_reason)
return ret ? -1 : 0; return ret ? -1 : 0;
} }
#define SOS_LCS_SOCK "sos-lcs"
#define DEFAULT_TIMEOUT 2U
#define ACRND_NAME "acrnd"
#define HW_IOC_PATH "/dev/cbc-early-signals"
static int acrnd_fd = -1; static int acrnd_fd = -1;
unsigned get_sos_wakeup_reason(void) unsigned get_sos_wakeup_reason(void)
@ -328,7 +332,7 @@ unsigned get_sos_wakeup_reason(void)
req.msgid = WAKEUP_REASON; req.msgid = WAKEUP_REASON;
req.timestamp = time(NULL); req.timestamp = time(NULL);
if (mngr_send_msg(client_fd, &req, &ack, DEFAULT_TIMEOUT) <= 0) if (mngr_send_msg(client_fd, &req, &ack, SOCK_TIMEOUT) <= 0)
fprintf(stderr, "Failed to get wakeup_reason from SOS, err(%d)\n", ret); fprintf(stderr, "Failed to get wakeup_reason from SOS, err(%d)\n", ret);
else else
ret = ack.data.reason; ret = ack.data.reason;
@ -393,7 +397,7 @@ static int set_sos_timer(time_t due_time)
RETRY: RETRY:
ret = ret =
mngr_send_msg(client_fd, &req, &ack, DEFAULT_TIMEOUT); mngr_send_msg(client_fd, &req, &ack, SOCK_TIMEOUT);
while (ret <= 0 && retry < 5) { while (ret <= 0 && retry < 5) {
printf("Fail to set sos wakeup timer(err:%d), retry %d...\n", printf("Fail to set sos wakeup timer(err:%d), retry %d...\n",
ret, retry++); ret, retry++);
@ -639,6 +643,11 @@ int init_vm(void)
unsigned int wakeup_reason = 0; unsigned int wakeup_reason = 0;
int ret; int ret;
#ifdef MNGR_DEBUG
printf("VM auto-start in %ds. \"systemctl stop acrnd\" to interrupt the auto-start.\n", autostart_delay);
sleep(autostart_delay);
#endif
/* init all UOSs, according wakeup_reason */ /* init all UOSs, according wakeup_reason */
if (platform_has_hw_ioc) { if (platform_has_hw_ioc) {
wakeup_reason = get_sos_wakeup_reason(); wakeup_reason = get_sos_wakeup_reason();
@ -666,22 +675,64 @@ static void sigterm_handler(int signo)
sigterm = 1; sigterm = 1;
} }
static const char optString[] = "t"; static const char optString[] = "td:h";
int main(int argc, char *argv[]) static void display_usage(void)
{ {
int opt, ret; printf("acrnd - Deamon for ACRN VM Management\n"
"[Usage] acrnd [-t] [-d delay] [-h]\n\n"
"[Options]\n"
"\t-h: print this message\n"
"\t-t: print messages to stdout\n"
#ifdef MNGR_DEBUG
"\t-d: delay time of auto start, <0-60> in second.\n"
#endif
"\n");
}
static int parse_opt(int argc, char *argv[])
{
int opt, ret = 0;
while ((opt = getopt(argc, argv, optString)) != -1) { while ((opt = getopt(argc, argv, optString)) != -1) {
switch (opt) { switch (opt) {
case 't': case 't':
logfile = 0; logfile = 0;
break; break;
#ifdef MNGR_DEBUG
case 'd':
ret = strtol(optarg, NULL, 10);
if ((errno == ERANGE && (ret == LONG_MAX || ret == LONG_MIN))
|| (errno != 0 && ret == 0)
|| (ret < 0 || ret > 60)) {
printf("'-d' invalid parameter: %s\n", optarg);
return -EINVAL;
}
autostart_delay = ret;
ret = 0;
break;
#endif
case 'h':
display_usage();
ret = -EINVAL;
break;
default: default:
printf("Ingrone unknown opt: %c\n", opt); printf("Ingrone unknown opt: %c\n", opt);
ret = -EINVAL;
} }
} }
return ret;
}
int main(int argc, char *argv[])
{
int ret;
if (parse_opt(argc, argv))
return -1;
if (!access(HW_IOC_PATH, F_OK)) { if (!access(HW_IOC_PATH, F_OK)) {
platform_has_hw_ioc = 1; platform_has_hw_ioc = 1;
} else { } else {