Skip to content

Commit bcfc7d8

Browse files
authored
Merge branch 'feature/secret-hiding' into ci/report-kernel-as-upstream
2 parents 4d6743b + ad06919 commit bcfc7d8

File tree

25 files changed

+540
-633
lines changed

25 files changed

+540
-633
lines changed

Cargo.lock

Lines changed: 35 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/acpi-tables/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ license = "Apache-2.0"
1010
displaydoc = "0.2.5"
1111
thiserror = "2.0.12"
1212
vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-bitmap"] }
13-
zerocopy = { version = "0.8.23", features = ["derive"] }
13+
zerocopy = { version = "0.8.24", features = ["derive"] }
1414

1515
[lib]
1616
bench = false

src/clippy-tracing/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ syn = { version = "2.0.100", features = ["full", "extra-traits", "visit", "visit
1818
walkdir = "2.5.0"
1919

2020
[dev-dependencies]
21-
uuid = { version = "1.15.1", features = ["v4"] }
21+
uuid = { version = "1.16.0", features = ["v4"] }
2222

2323
[lints]
2424
workspace = true

src/log-instrument/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ name = "five"
2828
name = "six"
2929

3030
[dependencies]
31-
log = "0.4.26"
31+
log = "0.4.27"
3232
log-instrument-macros = { path = "../log-instrument-macros" }
3333

3434
[dev-dependencies]

src/seccompiler/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ libc = "0.2.171"
2323
serde = { version = "1.0.219", features = ["derive"] }
2424
serde_json = "1.0.140"
2525
thiserror = "2.0.12"
26-
zerocopy = { version = "0.8.23" }
26+
zerocopy = { version = "0.8.24" }
2727

2828
[lints]
2929
workspace = true

src/vmm/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ kvm-bindings = { version = "0.11.1", features = ["fam-wrappers", "serde"] }
2626
kvm-ioctls = "0.21.0"
2727
libc = "0.2.171"
2828
linux-loader = "0.13.0"
29-
log = { version = "0.4.26", features = ["std", "serde"] }
29+
log = { version = "0.4.27", features = ["std", "serde"] }
3030
log-instrument = { path = "../log-instrument", optional = true }
3131
memfd = "0.6.3"
3232
micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
@@ -44,7 +44,7 @@ vm-allocator = "0.1.0"
4444
vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-bitmap"] }
4545
vm-superio = "0.8.0"
4646
vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
47-
zerocopy = { version = "0.8.23" }
47+
zerocopy = { version = "0.8.24" }
4848

4949
[target.'cfg(target_arch = "aarch64")'.dependencies]
5050
vm-fdt = "0.3.0"

src/vmm/src/arch/aarch64/fdt.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ use std::fmt::Debug;
1212
use vm_fdt::{Error as VmFdtError, FdtWriter, FdtWriterNode};
1313
use vm_memory::GuestMemoryError;
1414

15-
use super::super::{DeviceType, InitrdConfig};
15+
use super::super::DeviceType;
1616
use super::cache_info::{CacheEntry, read_cache_config};
1717
use super::gic::GICDevice;
1818
use crate::device_manager::mmio::MMIODeviceInfo;
1919
use crate::devices::acpi::vmgenid::{VMGENID_MEM_SIZE, VmGenId};
20+
use crate::initrd::InitrdConfig;
2021
use crate::vstate::memory::{Address, GuestMemory, GuestMemoryMmap};
2122

2223
// This is a value for uniquely identifying the FDT node declaring the interrupt controller.

0 commit comments

Comments
 (0)