summary refs log tree commit diff
path: root/src/linux.rs
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@chromium.org>2018-02-16 16:25:54 -0800
committerchrome-bot <chrome-bot@chromium.org>2018-02-26 22:07:08 -0800
commitcd4053364d26029e4de560407803df842e96b7c0 (patch)
tree72cc5f83ff631232ab31ccdfe16cdb8c836cbb19 /src/linux.rs
parent328bfd29592461ded96d42556c3141100348ea1c (diff)
downloadcrosvm-cd4053364d26029e4de560407803df842e96b7c0.tar
crosvm-cd4053364d26029e4de560407803df842e96b7c0.tar.gz
crosvm-cd4053364d26029e4de560407803df842e96b7c0.tar.bz2
crosvm-cd4053364d26029e4de560407803df842e96b7c0.tar.lz
crosvm-cd4053364d26029e4de560407803df842e96b7c0.tar.xz
crosvm-cd4053364d26029e4de560407803df842e96b7c0.tar.zst
crosvm-cd4053364d26029e4de560407803df842e96b7c0.zip
sys_util: factor out signal manipulation from signalfd into signal
Move creating sigsets and blocking/unblocking signals form signalfd
module to signal module so they are usable by other parties as well.

BUG=chromium:800626
TEST=cargo test --features=plugin

Change-Id: I281ce784ed6cb341cc1e7cf2784f6fb1e8cc894d
Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/930461
Reviewed-by: Zach Reizner <zachr@chromium.org>
Diffstat (limited to 'src/linux.rs')
-rw-r--r--src/linux.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/linux.rs b/src/linux.rs
index b4c76d9..c29819e 100644
--- a/src/linux.rs
+++ b/src/linux.rs
@@ -536,7 +536,7 @@ fn setup_vcpu(kvm: &Kvm,
             unsafe {
                 extern "C" fn handle_signal() {}
                 // Our signal handler does nothing and is trivially async signal safe.
-                register_signal_handler(0, handle_signal)
+                register_signal_handler(SIGRTMIN() + 0, handle_signal)
                     .expect("failed to register vcpu signal handler");
             }
 
@@ -696,7 +696,7 @@ fn run_control(vm: &mut Vm,
     // re-enter the VM.
     kill_signaled.store(true, Ordering::SeqCst);
     for handle in vcpu_handles {
-        match handle.kill(0) {
+        match handle.kill(SIGRTMIN() + 0) {
             Ok(_) => {
                 if let Err(e) = handle.join() {
                     error!("failed to join vcpu thread: {:?}", e);