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

signal SIGINT: map SIGINT to watchdog reset

Browse Source 
Map SIGINT(2) to watchdog reset.
NOTE:
We required guest to do a full reset after detect the recent last
reset type is watchdog. This is used to resume the passthru devices
in UOS.

Tracked-On: #3103
Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
This commit is contained in:
Yin Fengwei 2019-04-18 15:18:34 +08:00 committed by ACRN System Integration
parent 634e310f9b
commit f2d654cc44
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devicemodel/core/main.c
View File

@ -678,8 +678,9 @@ num_vcpus_allowed(struct vmctx *ctx)
static void static void
sig_handler_term(int signo) sig_handler_term(int signo)
{ {
printf("Receive SIGINT to terminate application...\n"); printf("Receive SIGINT to full reset application...\n");
vm_set_suspend_mode(VM_SUSPEND_POWEROFF); vm_set_watchdog_bite();
vm_set_suspend_mode(VM_SUSPEND_FULL_RESET);
mevent_notify(); mevent_notify();
} }

6
devicemodel/hw/pci/wdt_i6300esb.c
View File

@ -387,6 +387,12 @@ pci_wdt_deinit(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
} }
void
vm_set_watchdog_bite(void)
{
wdt_timeout = 1;
}
/* stop/reset watchdog will be invoked during guest enter/exit S3. /* stop/reset watchdog will be invoked during guest enter/exit S3.
* We stop watchdog timer when guest enter S3 to avoid watchdog trigger * We stop watchdog timer when guest enter S3 to avoid watchdog trigger
* guest reset when guest is in S3 state. * guest reset when guest is in S3 state.

1
devicemodel/include/vmmapi.h
View File

@ -143,6 +143,7 @@ int vm_set_vcpu_regs(struct vmctx *ctx, struct acrn_set_vcpu_regs *cpu_regs);
int vm_get_cpu_state(struct vmctx *ctx, void *state_buf); int vm_get_cpu_state(struct vmctx *ctx, void *state_buf);
int vm_intr_monitor(struct vmctx *ctx, void *intr_buf); int vm_intr_monitor(struct vmctx *ctx, void *intr_buf);
void vm_set_watchdog_bite(void);
void vm_stop_watchdog(struct vmctx *ctx); void vm_stop_watchdog(struct vmctx *ctx);
void vm_reset_watchdog(struct vmctx *ctx); void vm_reset_watchdog(struct vmctx *ctx);