summary refs log tree commit diff
path: root/src/linux.rs
diff options
context:
space:
mode:
authorFletcher Woodruff <fletcherw@chromium.org>2019-10-02 13:11:34 -0600
committerCommit Bot <commit-bot@chromium.org>2019-10-03 06:57:34 +0000
commit82ff397489cc9fcc6bee1cdc98aa5eede18f8978 (patch)
tree85fdae43df3cc74ef018c3a8eb3c2c6f91d7970c /src/linux.rs
parentf9b035d50c431c2a544ad1cb91ca5121165ae7aa (diff)
downloadcrosvm-82ff397489cc9fcc6bee1cdc98aa5eede18f8978.tar
crosvm-82ff397489cc9fcc6bee1cdc98aa5eede18f8978.tar.gz
crosvm-82ff397489cc9fcc6bee1cdc98aa5eede18f8978.tar.bz2
crosvm-82ff397489cc9fcc6bee1cdc98aa5eede18f8978.tar.lz
crosvm-82ff397489cc9fcc6bee1cdc98aa5eede18f8978.tar.xz
crosvm-82ff397489cc9fcc6bee1cdc98aa5eede18f8978.tar.zst
crosvm-82ff397489cc9fcc6bee1cdc98aa5eede18f8978.zip
sys_util: allow adding handlers for all signals
Currently, sys_util's register_signal_handler only permits handlers for
real-time signals. Rename that function to register_rt_signal_handler
and add a new register_signal_handler that supports all signals, then
update references to the old name.

BUG=chromium:1008990
TEST=builds

Change-Id: I455e14c562cd1f2ca4b308b4e38c503845321926
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1836185
Tested-by: Fletcher Woodruff <fletcherw@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Commit-Queue: Fletcher Woodruff <fletcherw@chromium.org>
Diffstat (limited to 'src/linux.rs')
-rw-r--r--src/linux.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/linux.rs b/src/linux.rs
index 5133a7c..f6af012 100644
--- a/src/linux.rs
+++ b/src/linux.rs
@@ -44,10 +44,10 @@ use sys_util::net::{UnixSeqpacket, UnixSeqpacketListener, UnlinkUnixSeqpacketLis
 
 use sys_util::{
     self, block_signal, clear_signal, drop_capabilities, error, flock, get_blocked_signals,
-    get_group_id, get_user_id, getegid, geteuid, info, register_signal_handler, set_cpu_affinity,
-    validate_raw_fd, warn, EventFd, FlockOperation, GuestAddress, GuestMemory, Killable,
-    MemoryMapping, PollContext, PollToken, Protection, SignalFd, Terminal, TimerFd, WatchingEvents,
-    SIGRTMIN,
+    get_group_id, get_user_id, getegid, geteuid, info, register_rt_signal_handler,
+    set_cpu_affinity, validate_raw_fd, warn, EventFd, FlockOperation, GuestAddress, GuestMemory,
+    Killable, MemoryMapping, PollContext, PollToken, Protection, SignalFd, Terminal, TimerFd,
+    WatchingEvents, SIGRTMIN,
 };
 use vhost;
 use vm_control::{
@@ -1085,7 +1085,7 @@ fn setup_vcpu_signal_handler() -> Result<()> {
     unsafe {
         extern "C" fn handle_signal() {}
         // Our signal handler does nothing and is trivially async signal safe.
-        register_signal_handler(SIGRTMIN() + 0, handle_signal)
+        register_rt_signal_handler(SIGRTMIN() + 0, handle_signal)
             .map_err(Error::RegisterSignalHandler)?;
     }
     block_signal(SIGRTMIN() + 0).map_err(Error::BlockSignal)?;