From c4dc25de0979d06661532a0ba611509054137fde Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Fri, 25 Sep 2020 14:10:17 +0100 Subject: [PATCH] hypervisor: kvm: aarch64: Trigger reset upon KVM_SYSTEM_EVENT_RESET This will trigger Vm::vm_reboot to make the VM reboot. Signed-off-by: Rob Bradford --- hypervisor/src/kvm/mod.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hypervisor/src/kvm/mod.rs b/hypervisor/src/kvm/mod.rs index d818ec7c6..b03e39d8e 100644 --- a/hypervisor/src/kvm/mod.rs +++ b/hypervisor/src/kvm/mod.rs @@ -723,10 +723,12 @@ impl cpu::Vcpu for KvmVcpu { #[cfg(target_arch = "aarch64")] VcpuExit::SystemEvent(event_type, flags) => { - use kvm_bindings::KVM_SYSTEM_EVENT_SHUTDOWN; + use kvm_bindings::{KVM_SYSTEM_EVENT_RESET, KVM_SYSTEM_EVENT_SHUTDOWN}; // On Aarch64, when the VM is shutdown, run() returns // VcpuExit::SystemEvent with reason KVM_SYSTEM_EVENT_SHUTDOWN - if event_type == KVM_SYSTEM_EVENT_SHUTDOWN { + if event_type == KVM_SYSTEM_EVENT_SHUTDOWN + || event_type == KVM_SYSTEM_EVENT_RESET + { Ok(cpu::VmExit::Reset) } else { Err(cpu::HypervisorCpuError::RunVcpu(anyhow!(