Merge branch 'main' into main-live-migration-and-msync

loopholelabs · Jun 20, 2024 · 8c94c2e · 8c94c2e
2 parents 946d3ca + 1e98736
commit 8c94c2e
Show file tree

Hide file tree

Showing 65 changed files with 330 additions and 369 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/resources/chroot.sh b/resources/chroot.sh
@@ -11,7 +11,7 @@ PS4='+\t '
 
 cp -ruv $rootfs/* /
 
-packages="udev systemd-sysv openssh-server iproute2 curl socat python3-minimal iperf3 iputils-ping fio kmod tmux hwloc-nox vim-tiny trace-cmd linuxptp"
+packages="udev systemd-sysv openssh-server iproute2 curl socat python3-minimal iperf3 iputils-ping fio kmod tmux hwloc-nox vim-tiny trace-cmd linuxptp strace"
 
 # msr-tools is only supported on x86-64.
 arch=$(uname -m)

diff --git a/src/clippy-tracing/Cargo.toml b/src/clippy-tracing/Cargo.toml
@@ -10,7 +10,7 @@ name = "clippy-tracing"
 bench = false
 
 [dependencies]
-clap = { version = "4.5.4", features = ["derive"] }
+clap = { version = "4.5.7", features = ["derive"] }
 itertools = "0.13.0"
 proc-macro2 = { version = "1.0.85", features = ["span-locations"] }
 quote = "1.0.36"

diff --git a/src/cpu-template-helper/Cargo.toml b/src/cpu-template-helper/Cargo.toml
@@ -10,7 +10,7 @@ name = "cpu-template-helper"
 bench = false
 
 [dependencies]
-clap = { version = "4.5.4", features = ["derive", "string"] }
+clap = { version = "4.5.7", features = ["derive", "string"] }
 displaydoc = "0.2.4"
 libc = "0.2.155"
 log-instrument = { path = "../log-instrument", optional = true }

diff --git a/src/firecracker/Cargo.toml b/src/firecracker/Cargo.toml
@@ -34,7 +34,7 @@ vmm = { path = "../vmm" }
 [dev-dependencies]
 cargo_toml = "0.20.2"
 libc = "0.2.155"
-regex = { version = "1.10.4", default-features = false, features = ["std", "unicode-perl"] }
+regex = { version = "1.10.5", default-features = false, features = ["std", "unicode-perl"] }
 
 # Dev-Dependencies for uffd examples
 serde = { version = "1.0.203", features = ["derive"] }

diff --git a/src/firecracker/src/api_server/parsed_request.rs b/src/firecracker/src/api_server/parsed_request.rs
@@ -276,7 +276,7 @@ pub(crate) enum RequestError {
     #[error("API Resource IDs can only contain alphanumeric characters and underscores.")]
     InvalidID,
     // The HTTP method & request path combination is not valid.
-    #[error("Invalid request method and/or path: {} {0}.", std::str::from_utf8(.1.raw()).expect("Cannot convert from UTF-8"))]
+    #[error("Invalid request method and/or path: {} {0}.", .1.to_str())]
     InvalidPathMethod(String, Method),
     // An error occurred when deserializing the json body of a request.
     #[error("An error occurred when deserializing the json body of a request: {0}.")]
@@ -508,7 +508,7 @@ pub mod tests {
         response.write_all(&mut buf).unwrap();
         let body = ApiServer::json_fault_message(format!(
             "Invalid request method and/or path: {} {}.",
-            std::str::from_utf8(Method::Get.raw()).unwrap(),
+            Method::Get.to_str(),
             "path"
         ));
         let expected_response = http_response(&body, 400);

diff --git a/src/jailer/Cargo.toml b/src/jailer/Cargo.toml
@@ -15,7 +15,7 @@ bench = false
 libc = "0.2.155"
 log-instrument = { path = "../log-instrument", optional = true }
 nix = { version = "0.29.0", default-features = false, features = ["dir"] }
-regex = { version = "1.10.4", default-features = false, features = ["std"] }
+regex = { version = "1.10.5", default-features = false, features = ["std"] }
 thiserror = "1.0.61"
 
 utils = { path = "../utils" }

diff --git a/src/snapshot-editor/Cargo.toml b/src/snapshot-editor/Cargo.toml
@@ -10,7 +10,7 @@ name = "snapshot-editor"
 bench = false
 
 [dependencies]
-clap = { version = "4.5.4", features = ["derive", "string"] }
+clap = { version = "4.5.7", features = ["derive", "string"] }
 displaydoc = "0.2.4"
 
 fc_utils = { package = "utils", path = "../utils" }