From 73612401a520a7bcb4a757f45f29a1afc6ee118c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 3 Jan 2021 09:43:10 +0000 Subject: [PATCH] build(deps): bump signal-hook from 0.2.2 to 0.3.2 Manually changed to reflect changes in mutability of signals and rearrangement of constants. Bumps [signal-hook](https://github.com/vorner/signal-hook) from 0.2.2 to 0.3.2. - [Release notes](https://github.com/vorner/signal-hook/releases) - [Changelog](https://github.com/vorner/signal-hook/blob/master/CHANGELOG.md) - [Commits](https://github.com/vorner/signal-hook/compare/v0.2.2...v0.3.2) Signed-off-by: dependabot-preview[bot] Signed-off-by: Rob Bradford --- Cargo.lock | 8 ++++---- vmm/Cargo.toml | 2 +- vmm/src/vm.rs | 8 ++++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e4d6f0db7..a0bfb6eea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1148,9 +1148,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.2.2" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8133fd06d2c721d4168f9b76a9a7fd3a0bfc96df58cf7316c7fb9f23bd677f4e" +checksum = "8f12c113f6545af584585f757a384ce4e88e9c935c45ee05e3f09f48a7ce4195" dependencies = [ "libc", "signal-hook-registry", @@ -1158,9 +1158,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce32ea0c6c56d5eacaeb814fbed9960547021d3edd010ded1425f180536b20ab" +checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" dependencies = [ "libc", ] diff --git a/vmm/Cargo.toml b/vmm/Cargo.toml index 79b3e1465..e14f8c82e 100644 --- a/vmm/Cargo.toml +++ b/vmm/Cargo.toml @@ -36,7 +36,7 @@ seccomp = { git = "https://github.com/firecracker-microvm/firecracker", tag = "v serde = {version = ">=1.0.27", features = ["rc"] } serde_derive = ">=1.0.27" serde_json = ">=1.0.9" -signal-hook = "0.2.2" +signal-hook = "0.3.2" tempfile = "3.1.0" thiserror = "1.0" url = "2.2.0" diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs index 9b6b8aaf4..d05361314 100644 --- a/vmm/src/vm.rs +++ b/vmm/src/vm.rs @@ -51,7 +51,11 @@ use linux_loader::loader::elf::Error::InvalidElfMagicNumber; use linux_loader::loader::elf::PvhBootCapability::PvhEntryPresent; use linux_loader::loader::KernelLoader; use seccomp::{SeccompAction, SeccompFilter}; -use signal_hook::{iterator::backend::Handle, iterator::Signals, SIGINT, SIGTERM, SIGWINCH}; +use signal_hook::{ + consts::{SIGINT, SIGTERM, SIGWINCH}, + iterator::backend::Handle, + iterator::Signals, +}; use std::cmp; use std::collections::{BTreeMap, HashMap}; use std::convert::TryInto; @@ -1433,7 +1437,7 @@ impl Vm { } fn os_signal_handler( - signals: Signals, + mut signals: Signals, console_input_clone: Arc, on_tty: bool, exit_evt: EventFd,