Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 45 additions & 34 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/acpi-tables/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license = "Apache-2.0"
displaydoc = "0.2.5"
thiserror = "1.0.64"
vm-memory = { version = "0.15.0", features = ["backend-mmap", "backend-bitmap"] }
zerocopy = { version = "0.7.35", features = ["derive"] }
zerocopy = { version = "0.8.2", features = ["derive"] }

[lib]
bench = false
Expand Down
2 changes: 1 addition & 1 deletion src/acpi-tables/src/dsdt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use std::mem::size_of;

use vm_memory::{Address, Bytes, GuestAddress, GuestMemory};
use zerocopy::AsBytes;
use zerocopy::IntoBytes;

use crate::{checksum, AcpiError, Result, Sdt, SdtHeader};

Expand Down
4 changes: 2 additions & 2 deletions src/acpi-tables/src/fadt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

use vm_memory::{Bytes, GuestAddress, GuestMemory};
use zerocopy::little_endian::{U16, U32, U64};
use zerocopy::AsBytes;
use zerocopy::{Immutable, IntoBytes};

use crate::{checksum, GenericAddressStructure, Result, Sdt, SdtHeader};

Expand Down Expand Up @@ -42,7 +42,7 @@
/// More information about this table can be found in the ACPI specification:
/// https://uefi.org/specs/ACPI/6.5/05_ACPI_Software_Programming_Model.html#fixed-acpi-description-table-fadt
#[repr(packed)]
#[derive(Debug, Copy, Clone, Default, AsBytes)]
#[derive(Debug, Copy, Clone, Default, IntoBytes, Immutable)]

Check warning on line 45 in src/acpi-tables/src/fadt.rs

View check run for this annotation

Codecov / codecov/patch

src/acpi-tables/src/fadt.rs#L45

Added line #L45 was not covered by tests
pub struct Fadt {
header: SdtHeader,
firmware_control: U32,
Expand Down
6 changes: 3 additions & 3 deletions src/acpi-tables/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
pub use rsdp::Rsdp;
pub use xsdt::Xsdt;
use zerocopy::little_endian::{U32, U64};
use zerocopy::AsBytes;
use zerocopy::{Immutable, IntoBytes};

// This is the creator ID that we will embed in ACPI tables that are created using this crate.
const FC_ACPI_CREATOR_ID: [u8; 4] = *b"FCAT";
Expand Down Expand Up @@ -50,7 +50,7 @@

/// ACPI type representing memory addresses
#[repr(packed)]
#[derive(AsBytes, Clone, Copy, Debug, Default)]
#[derive(IntoBytes, Immutable, Clone, Copy, Debug, Default)]

Check warning on line 53 in src/acpi-tables/src/lib.rs

View check run for this annotation

Codecov / codecov/patch

src/acpi-tables/src/lib.rs#L53

Added line #L53 was not covered by tests
pub struct GenericAddressStructure {
pub address_space_id: u8,
pub register_bit_width: u8,
Expand Down Expand Up @@ -79,7 +79,7 @@

/// Header included in all System Descriptor Tables
#[repr(packed)]
#[derive(Clone, Debug, Copy, Default, AsBytes)]
#[derive(Clone, Debug, Copy, Default, IntoBytes, Immutable)]

Check warning on line 82 in src/acpi-tables/src/lib.rs

View check run for this annotation

Codecov / codecov/patch

src/acpi-tables/src/lib.rs#L82

Added line #L82 was not covered by tests
pub struct SdtHeader {
pub signature: [u8; 4],
pub length: U32,
Expand Down
8 changes: 4 additions & 4 deletions src/acpi-tables/src/madt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

use vm_memory::{Address, Bytes, GuestAddress, GuestMemory};
use zerocopy::little_endian::U32;
use zerocopy::AsBytes;
use zerocopy::{Immutable, IntoBytes};

use crate::{checksum, AcpiError, Result, Sdt, SdtHeader};

Expand All @@ -18,7 +18,7 @@
// everything with an underscore prefix
#[allow(dead_code)]
#[repr(packed)]
#[derive(Copy, Clone, Debug, Default, AsBytes)]
#[derive(Copy, Clone, Debug, Default, IntoBytes, Immutable)]

Check warning on line 21 in src/acpi-tables/src/madt.rs

View check run for this annotation

Codecov / codecov/patch

src/acpi-tables/src/madt.rs#L21

Added line #L21 was not covered by tests
pub struct LocalAPIC {
r#type: u8,
length: u8,
Expand All @@ -44,7 +44,7 @@
// everything with an underscore prefix
#[allow(dead_code)]
#[repr(packed)]
#[derive(Copy, Clone, Debug, Default, AsBytes)]
#[derive(Copy, Clone, Debug, Default, IntoBytes, Immutable)]

Check warning on line 47 in src/acpi-tables/src/madt.rs

View check run for this annotation

Codecov / codecov/patch

src/acpi-tables/src/madt.rs#L47

Added line #L47 was not covered by tests
pub struct IoAPIC {
r#type: u8,
length: u8,
Expand Down Expand Up @@ -72,7 +72,7 @@
// everything with an underscore prefix
#[allow(dead_code)]
#[repr(packed)]
#[derive(Debug, AsBytes)]
#[derive(Debug, IntoBytes, Immutable)]

Check warning on line 75 in src/acpi-tables/src/madt.rs

View check run for this annotation

Codecov / codecov/patch

src/acpi-tables/src/madt.rs#L75

Added line #L75 was not covered by tests
struct MadtHeader {
sdt: SdtHeader,
base_address: U32,
Expand Down
4 changes: 2 additions & 2 deletions src/acpi-tables/src/rsdp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

use vm_memory::{Bytes, GuestAddress, GuestMemory};
use zerocopy::little_endian::{U32, U64};
use zerocopy::AsBytes;
use zerocopy::{Immutable, IntoBytes};

use crate::{checksum, Result, Sdt};

Expand All @@ -22,7 +22,7 @@
/// More information about this structure can be found in the ACPI specification:
/// https://uefi.org/specs/ACPI/6.5/05_ACPI_Software_Programming_Model.html#root-system-description-pointer-rsdp
#[repr(packed)]
#[derive(Clone, Copy, Debug, Default, AsBytes)]
#[derive(Clone, Copy, Debug, Default, IntoBytes, Immutable)]

Check warning on line 25 in src/acpi-tables/src/rsdp.rs

View check run for this annotation

Codecov / codecov/patch

src/acpi-tables/src/rsdp.rs#L25

Added line #L25 was not covered by tests
pub struct Rsdp {
signature: [u8; 8],
checksum: u8,
Expand Down
2 changes: 1 addition & 1 deletion src/acpi-tables/src/xsdt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use std::mem::size_of;

use vm_memory::{Address, Bytes, GuestAddress, GuestMemory};
use zerocopy::AsBytes;
use zerocopy::IntoBytes;

use crate::{checksum, AcpiError, Result, Sdt, SdtHeader};

Expand Down
4 changes: 2 additions & 2 deletions src/clippy-tracing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ name = "clippy-tracing"
bench = false

[dependencies]
clap = { version = "4.5.18", features = ["derive"] }
clap = { version = "4.5.19", features = ["derive"] }
itertools = "0.13.0"
proc-macro2 = { version = "1.0.86", features = ["span-locations"] }
proc-macro2 = { version = "1.0.87", features = ["span-locations"] }
quote = "1.0.37"
syn = { version = "2.0.79", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] }
walkdir = "2.5.0"
Expand Down
2 changes: 1 addition & 1 deletion src/cpu-template-helper/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name = "cpu-template-helper"
bench = false

[dependencies]
clap = { version = "4.5.18", features = ["derive", "string"] }
clap = { version = "4.5.19", features = ["derive", "string"] }
displaydoc = "0.2.5"
libc = "0.2.159"
log-instrument = { path = "../log-instrument", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion src/log-instrument-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ proc-macro = true
bench = false

[dependencies]
proc-macro2 = "1.0.86"
proc-macro2 = "1.0.87"
quote = "1.0.37"
syn = { version = "2.0.79", features = ["full", "extra-traits"] }

Expand Down
2 changes: 1 addition & 1 deletion src/snapshot-editor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name = "snapshot-editor"
bench = false

[dependencies]
clap = { version = "4.5.18", features = ["derive", "string"] }
clap = { version = "4.5.19", features = ["derive", "string"] }
displaydoc = "0.2.5"

fc_utils = { package = "utils", path = "../utils" }
Expand Down
4 changes: 2 additions & 2 deletions src/vmm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bench = false
[dependencies]
acpi_tables = { path = "../acpi-tables" }
aes-gcm = { version = "0.10.1", default-features = false, features = ["aes"] }
aws-lc-rs = { version = "1.9.0", features = ["bindgen"] }
aws-lc-rs = { version = "1.10.0", features = ["bindgen"] }
base64 = "0.22.1"
bincode = "1.2.1"
bitflags = "2.6.0"
Expand Down Expand Up @@ -43,7 +43,7 @@ vm-allocator = "0.1.0"
vm-memory = { version = "0.15.0", features = ["backend-mmap", "backend-bitmap"] }
vm-superio = "0.8.0"
vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
zerocopy = { version = "0.7.35" }
zerocopy = { version = "0.8.2" }

[target.'cfg(target_arch = "aarch64")'.dependencies]
vm-fdt = "0.3.0"
Expand Down
2 changes: 1 addition & 1 deletion src/vmm/src/acpi/x86_64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use acpi_tables::fadt::{
use acpi_tables::madt::{IoAPIC, LocalAPIC};
use acpi_tables::Fadt;
use vm_memory::GuestAddress;
use zerocopy::AsBytes;
use zerocopy::IntoBytes;

use crate::arch::x86_64::layout;
use crate::device_manager::legacy::PortIODeviceManager;
Expand Down
Loading