Merge branch 'main' into snapshot-ab

firecracker-microvm · Sep 12, 2023 · 07023b2 · 07023b2
2 parents 1894c1d + 3adf2aa
commit 07023b2
Show file tree

Hide file tree

Showing 13 changed files with 106 additions and 83 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,19 @@
+# All markdown files
+*.md @xmarcalx @kalyazin @pb8o @sudanl0
+
+# But not the ones in docs/
+docs/*.md
+
+# Except these specific ones
+docs/getting-started.md @xmarcalx @kalyazin @pb8o @sudanl0
+docs/prod-host-setup.md @xmarcalx @kalyazin @pb8o @sudanl0
+
+# Also cover all "*policy*.md" documents
+**/*policy*.md @xmarcalx @kalyazin @pb8o @sudanl0
+**/*POLICY*.md @xmarcalx @kalyazin @pb8o @sudanl0
+
+# Also these non-md files in the repository root
+THIRD_PARTY @xmarcalx @kalyazin @pb8o @sudanl0
+LICENSE @xmarcalx @kalyazin @pb8o @sudanl0
+NOTICE @xmarcalx @kalyazin @pb8o @sudanl0
+PGP-KEY.asc @xmarcalx @kalyazin @pb8o @sudanl0
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/cpu-template-helper/Cargo.toml b/src/cpu-template-helper/Cargo.toml
@@ -12,11 +12,11 @@ name = "cpu-template-helper"
 bench = false
 
 [dependencies]
-clap = { version = "4.4.1", features = ["derive", "string"] }
+clap = { version = "4.4.2", features = ["derive", "string"] }
 libc = "0.2.147"
 serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.105"
-thiserror = "1.0.47"
+serde_json = "1.0.106"
+thiserror = "1.0.48"
 
 vmm = { path = "../vmm" }
 

diff --git a/src/firecracker/Cargo.toml b/src/firecracker/Cargo.toml
@@ -15,8 +15,8 @@ bench = false
 [dependencies]
 event-manager = "0.3.0"
 libc = "0.2.147"
-serde_json = "1.0.105"
-thiserror = "1.0.47"
+serde_json = "1.0.106"
+thiserror = "1.0.48"
 timerfd = "1.5.0"
 
 api_server = { path = "../api_server" }
@@ -29,11 +29,11 @@ vmm = { path = "../vmm" }
 
 [dev-dependencies]
 cargo_toml = "0.15.3"
-regex = { version = "1.9.4", default-features = false, features = ["std", "unicode-perl"] }
+regex = { version = "1.9.5", default-features = false, features = ["std", "unicode-perl"] }
 
 # Dev-Dependencies for uffd examples
 serde = { version = "1.0.188", features = ["derive"] }
-userfaultfd = "0.6.0"
+userfaultfd = "0.6.1"
 
 [[example]]
 name = "uffd_malicious_handler"

diff --git a/src/jailer/Cargo.toml b/src/jailer/Cargo.toml
@@ -15,7 +15,7 @@ bench = false
 [dependencies]
 libc = "0.2.147"
 nix = { version = "0.27.1", default-features = false, features = ["dir"] }
-regex = { version = "1.9.4", default-features = false, features = ["std"] }
-thiserror = "1.0.47"
+regex = { version = "1.9.5", default-features = false, features = ["std"] }
+thiserror = "1.0.48"
 
 utils = { path = "../utils" }
diff --git a/src/rebase-snap/Cargo.toml b/src/rebase-snap/Cargo.toml
@@ -12,6 +12,6 @@ bench = false
 
 [dependencies]
 libc = "0.2.147"
-thiserror = "1.0.47"
+thiserror = "1.0.48"
 
 utils = { path = "../utils" }
diff --git a/src/seccompiler/Cargo.toml b/src/seccompiler/Cargo.toml
@@ -20,7 +20,7 @@ bench = false
 bincode = "1.2.1"
 libc = "0.2.147"
 serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.105"
-thiserror = "1.0.47"
+serde_json = "1.0.106"
+thiserror = "1.0.48"
 
 utils = { path = "../utils" }
diff --git a/src/snapshot-editor/Cargo.toml b/src/snapshot-editor/Cargo.toml
@@ -11,11 +11,11 @@ name = "snapshot-editor"
 bench = false
 
 [dependencies]
-clap = { version = "4.4.1", features = ["derive", "string"] }
+clap = { version = "4.4.2", features = ["derive", "string"] }
 clap-num = "1.0.2"
 libc = "0.2.147"
 snapshot = { path = "../snapshot" }
-thiserror = "1.0.44"
+thiserror = "1.0.48"
 vmm = { path = "../vmm" }
 
 fc_utils = { package = "utils", path = "../utils" }
diff --git a/tests/data/msr/msr_list_T2CL_INTEL_CASCADELAKE_6.1host_4.14guest.csv b/tests/data/msr/msr_list_T2CL_INTEL_CASCADELAKE_6.1host_4.14guest.csv
@@ -18,7 +18,7 @@ MSR_ADDR,VALUE
 0xcd,0x3
 0xce,0x80000000
 0xfe,0x508
-0x10a,0xaa0eb
+0x10a,0x40aa0eb
 0x11e,0xbe702111
 0x122,0x3
 0x140,0x0

diff --git a/tests/data/msr/msr_list_T2CL_INTEL_CASCADELAKE_6.1host_5.10guest.csv b/tests/data/msr/msr_list_T2CL_INTEL_CASCADELAKE_6.1host_5.10guest.csv
@@ -18,7 +18,7 @@ MSR_ADDR,VALUE
 0xcd,0x3
 0xce,0x80000000
 0xfe,0x508
-0x10a,0xaa0eb
+0x10a,0x40aa0eb
 0x11e,0xbe702111
 0x122,0x3
 0x140,0x0

diff --git a/tests/data/msr/msr_list_T2CL_INTEL_ICELAKE_6.1host_4.14guest.csv b/tests/data/msr/msr_list_T2CL_INTEL_ICELAKE_6.1host_4.14guest.csv
@@ -18,7 +18,7 @@ MSR_ADDR,VALUE
 0xcd,0x3
 0xce,0x80000000
 0xfe,0x508
-0x10a,0x2a0eb
+0x10a,0x402a0eb
 0x11e,0xbe702111
 0x122,0x3
 0x140,0x0