From fadeb98c6744a9a42d84d9b0dcb2ee95c25b0817 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Mon, 23 Nov 2020 11:00:57 +0100 Subject: [PATCH] cargo: Bulk update Includes updates for ssh2, cc, syn, tinyvec, backtrace micro-http and libssh2. Signed-off-by: Samuel Ortiz --- Cargo.lock | 30 +++++++++++++++--------------- Cargo.toml | 2 +- vmm/Cargo.toml | 2 +- vmm/src/vm.rs | 8 ++++---- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ccf1babdd..26fab532f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -111,9 +111,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.54" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28" +checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598" dependencies = [ "addr2line", "cfg-if 1.0.0", @@ -176,9 +176,9 @@ checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" [[package]] name = "cc" -version = "1.0.63" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9c6140b5a2c7db40ea56eb1821245e5362b44385c05b76288b1a599934ac87" +checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15" [[package]] name = "cfg-if" @@ -588,9 +588,9 @@ checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" [[package]] name = "libssh2-sys" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca46220853ba1c512fc82826d0834d87b06bcd3c2a42241b7de72f3d2fe17056" +checksum = "df40b13fe7ea1be9b9dffa365a51273816c345fc1811478b57ed7d964fbfc4ce" dependencies = [ "cc", "libc", @@ -662,7 +662,7 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "micro_http" version = "0.1.0" -source = "git+https://github.com/firecracker-microvm/micro-http#59ab64440a95f7b16253fef67b5201c2ec4adaf7" +source = "git+https://github.com/firecracker-microvm/micro-http?branch=master#59ab64440a95f7b16253fef67b5201c2ec4adaf7" dependencies = [ "epoll", ] @@ -1169,9 +1169,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.1.16" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604508c1418b99dfe1925ca9224829bb2a8a9a04dda655cc01fcad46f4ab05ed" +checksum = "0773858436514a64f71a805243784199cdd9e40044cfd6e44106598bf9560aaf" dependencies = [ "libc", "signal-hook-registry", @@ -1200,9 +1200,9 @@ checksum = "7acad6f34eb9e8a259d3283d1e8c1d34d7415943d4895f65cc73813c7396fc85" [[package]] name = "ssh2" -version = "0.8.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c516996bbb84de5dba6e118406c1e1429111cfb4d844e20e1290e5b6ebe6ad5" +checksum = "ed024de0a5e6944fe3080a3745e7a5649c5517ea2a6cfb16333f94f89c248985" dependencies = [ "bitflags 1.2.1", "libc", @@ -1218,9 +1218,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "syn" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" +checksum = "443b4178719c5a851e1bde36ce12da21d74a0e60b4d982ec3385a933c812f0f6" dependencies = [ "proc-macro2", "quote", @@ -1373,9 +1373,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b78a366903f506d2ad52ca8dc552102ffdd3e937ba8a227f024dc1d1eae28575" +checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" dependencies = [ "tinyvec_macros", ] diff --git a/Cargo.toml b/Cargo.toml index 8958dbe95..4925621bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ kvm-ioctls = { git = "https://github.com/cloud-hypervisor/kvm-ioctls", branch = kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch", features = ["with-serde", "fam-wrappers"] } [dev-dependencies] -ssh2 = "0.8.3" +ssh2 = "0.9.0" dirs = "3.0.1" credibility = "0.1.3" tempdir = "0.3.7" diff --git a/vmm/Cargo.toml b/vmm/Cargo.toml index 15ffe14dd..e3dcc25fc 100644 --- a/vmm/Cargo.toml +++ b/vmm/Cargo.toml @@ -35,7 +35,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.1.16" +signal-hook = "0.2.0" tempfile = "3.1.0" thiserror = "1.0" url = "2.2.0" diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs index a7190e140..2751f6bd7 100644 --- a/vmm/src/vm.rs +++ b/vmm/src/vm.rs @@ -50,7 +50,7 @@ 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::Signals, SIGINT, SIGTERM, SIGWINCH}; +use signal_hook::{iterator::backend::Handle, iterator::Signals, SIGINT, SIGTERM, SIGWINCH}; use std::cmp; use std::collections::{BTreeMap, HashMap}; use std::convert::TryInto; @@ -444,7 +444,7 @@ pub struct Vm { device_manager: Arc>, config: Arc>, on_tty: bool, - signals: Option, + signals: Option, state: RwLock, cpu_manager: Arc>, memory_manager: Arc>, @@ -1468,7 +1468,7 @@ impl Vm { let signals = Signals::new(&[SIGWINCH, SIGINT, SIGTERM]); match signals { Ok(signals) => { - self.signals = Some(signals.clone()); + self.signals = Some(signals.handle()); let exit_evt = self.exit_evt.try_clone().map_err(Error::EventFdClone)?; let on_tty = self.on_tty; let signal_handler_seccomp_filter = @@ -1894,7 +1894,7 @@ impl Snapshottable for Vm { let signals = Signals::new(&[SIGWINCH, SIGINT, SIGTERM]); match signals { Ok(signals) => { - self.signals = Some(signals.clone()); + self.signals = Some(signals.handle()); let on_tty = self.on_tty; let signal_handler_seccomp_filter =