mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-12-26 13:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

crosvm: support VM shutdown via SystemEvent

Browse source 
ARM systems don't have an exit event fd like x86, instead one of the Vcpus
will exit with the SystemEvent reason and put a code into the kvm run
union of either shutdown, reboot, or crash.  We currently don't handle
reboot or crash differently but can do so in the future.

BUG=chromium:797868
TEST=./build_test passes on all architectures
TEST=crosvm runs on kevin - manually test shutdown via maitred

Change-Id: I455cbe1ac653f61a1e9eae1ce22922d14cff4e3c
Reviewed-on: https://chromium-review.googlesource.com/982531
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Sonny Rao <sonnyrao@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
This commit is contained in:
Sonny Rao 2018-03-27 17:12:58 -07:00 committed by chrome-bot
parent 62a4063aa6
commit 6ce158fb86
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kvm/src/lib.rs
View file

@ -696,7 +696,9 @@ pub enum VcpuExit<'a> {
Watchdog,
S390Tsch,
Epr,
SystemEvent,
/// The cpu triggered a system level event which is specified by the type field.
/// The possible events are shutdown, reset, or crash.
SystemEvent(u32 /* event_type*/, u64 /* flags */),
}
/// A wrapper around creating and using a VCPU.
@ -803,7 +805,13 @@ impl Vcpu {
KVM_EXIT_WATCHDOG => Ok(VcpuExit::Watchdog),
KVM_EXIT_S390_TSCH => Ok(VcpuExit::S390Tsch),
KVM_EXIT_EPR => Ok(VcpuExit::Epr),
KVM_EXIT_SYSTEM_EVENT => Ok(VcpuExit::SystemEvent),
KVM_EXIT_SYSTEM_EVENT => {
// Safe because we know the exit reason told us this union
// field is valid
let event_type = unsafe { run.__bindgen_anon_1.system_event.type_ };
let event_flags = unsafe { run.__bindgen_anon_1.system_event.flags };
Ok(VcpuExit::SystemEvent(event_type, event_flags))
},
r => panic!("unknown kvm exit reason: {}", r),
}
} else {

3
src/linux.rs
View file

@ -468,6 +468,9 @@ fn run_vcpu(vcpu: Vcpu,
}
VcpuExit::Hlt => break,
VcpuExit::Shutdown => break,
VcpuExit::SystemEvent(_, _) =>
//TODO handle reboot and crash events
kill_signaled.store(true, Ordering::SeqCst),
r => warn!("unexpected vcpu exit: {:?}", r),
}
}