kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Bump zerocopy and acpi_tables

Browse Source 
Manually bump zerocopy to 0.8.24 since our dependabot could not perform
the upgrade properly.

Manually bump acpi_tabls as well since it's depending on zerocopy.

Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>
This commit is contained in:
Ruoqing He
2025-04-10 17:53:24 +00:00
committed by RuoqingHe
parent 1a5dcc5e70
commit af28569611
7 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vmm/src/acpi.rs
View File

@@ -19,7 +19,7 @@ use bitflags::bitflags;
use pci::PciBdf;
use tracer::trace_scoped;
use vm_memory::{Address, Bytes, GuestAddress, GuestMemoryRegion};
use zerocopy::AsBytes;
use zerocopy::{FromBytes, Immutable, IntoBytes};
use crate::cpu::CpuManager;
use crate::device_manager::DeviceManager;
@@ -45,7 +45,7 @@ pub const ACPI_APIC_GENERIC_TRANSLATOR: u8 = 15;
#[allow(dead_code)]
#[repr(C, packed)]
#[derive(Default, AsBytes)]
#[derive(Default, IntoBytes, Immutable, FromBytes)]
struct PciRangeEntry {
pub base_address: u64,
pub segment: u16,
@@ -56,7 +56,7 @@ struct PciRangeEntry {
#[allow(dead_code)]
#[repr(C, packed)]
#[derive(Default, AsBytes)]
#[derive(Default, IntoBytes, Immutable, FromBytes)]
struct MemoryAffinity {
pub type_: u8,
pub length: u8,
@@ -73,7 +73,7 @@ struct MemoryAffinity {
#[allow(dead_code)]
#[repr(C, packed)]
#[derive(Default, AsBytes)]
#[derive(Default, IntoBytes, Immutable, FromBytes)]
struct ProcessorLocalX2ApicAffinity {
pub type_: u8,
pub length: u8,
@@ -87,7 +87,7 @@ struct ProcessorLocalX2ApicAffinity {
#[allow(dead_code)]
#[repr(C, packed)]
#[derive(Default, AsBytes)]
#[derive(Default, IntoBytes, Immutable, FromBytes)]
struct ProcessorGiccAffinity {
pub type_: u8,
pub length: u8,
@@ -147,7 +147,7 @@ impl MemoryAffinity {
#[allow(dead_code)]
#[repr(C, packed)]
#[derive(Default, AsBytes)]
#[derive(Default, IntoBytes, Immutable, FromBytes)]
struct ViotVirtioPciNode {
pub type_: u8,
_reserved: u8,
@@ -159,7 +159,7 @@ struct ViotVirtioPciNode {
#[allow(dead_code)]
#[repr(C, packed)]
#[derive(Default, AsBytes)]
#[derive(Default, IntoBytes, Immutable, FromBytes)]
struct ViotPciRangeNode {
pub type_: u8,
_reserved: u8,

18
vmm/src/cpu.rs
View File

@@ -72,7 +72,7 @@ use vm_migration::{
};
use vmm_sys_util::eventfd::EventFd;
use vmm_sys_util::signal::{register_signal_handler, SIGRTMIN};
use zerocopy::AsBytes;
use zerocopy::{FromBytes, Immutable, IntoBytes};
#[cfg(all(target_arch = "x86_64", feature = "guest_debug"))]
use crate::coredump::{
@@ -207,7 +207,7 @@ pub type Result<T> = result::Result<T, Error>;
#[cfg(target_arch = "x86_64")]
#[allow(dead_code)]
#[repr(C, packed)]
#[derive(AsBytes)]
#[derive(IntoBytes, Immutable, FromBytes)]
struct LocalX2Apic {
pub r#type: u8,
pub length: u8,
@@ -219,7 +219,7 @@ struct LocalX2Apic {
#[allow(dead_code)]
#[repr(C, packed)]
#[derive(Default, AsBytes)]
#[derive(Default, IntoBytes, Immutable, FromBytes)]
struct Ioapic {
pub r#type: u8,
pub length: u8,
@@ -232,7 +232,7 @@ struct Ioapic {
#[cfg(target_arch = "aarch64")]
#[allow(dead_code)]
#[repr(C, packed)]
#[derive(AsBytes)]
#[derive(IntoBytes, Immutable, FromBytes)]
struct GicC {
pub r#type: u8,
pub length: u8,
@@ -257,7 +257,7 @@ struct GicC {
#[cfg(target_arch = "aarch64")]
#[allow(dead_code)]
#[repr(C, packed)]
#[derive(AsBytes)]
#[derive(IntoBytes, Immutable, FromBytes)]
struct GicD {
pub r#type: u8,
pub length: u8,
@@ -272,7 +272,7 @@ struct GicD {
#[cfg(target_arch = "aarch64")]
#[allow(dead_code)]
#[repr(C, packed)]
#[derive(AsBytes)]
#[derive(IntoBytes, Immutable, FromBytes)]
struct GicR {
pub r#type: u8,
pub length: u8,
@@ -284,7 +284,7 @@ struct GicR {
#[cfg(target_arch = "aarch64")]
#[allow(dead_code)]
#[repr(C, packed)]
#[derive(AsBytes)]
#[derive(IntoBytes, Immutable, FromBytes)]
struct GicIts {
pub r#type: u8,
pub length: u8,
@@ -297,7 +297,7 @@ struct GicIts {
#[cfg(target_arch = "aarch64")]
#[allow(dead_code)]
#[repr(C, packed)]
#[derive(AsBytes)]
#[derive(IntoBytes, Immutable, FromBytes)]
struct ProcessorHierarchyNode {
pub r#type: u8,
pub length: u8,
@@ -310,7 +310,7 @@ struct ProcessorHierarchyNode {
#[allow(dead_code)]
#[repr(C, packed)]
#[derive(Default, AsBytes)]
#[derive(Default, IntoBytes, Immutable, FromBytes)]
struct InterruptSourceOverride {
pub r#type: u8,
pub length: u8,

2
vmm/src/igvm/igvm_loader.rs
View File

@@ -17,7 +17,7 @@ use igvm_defs::{
use igvm_defs::{MemoryMapEntryType, IGVM_VHS_MEMORY_MAP_ENTRY};
use mshv_bindings::*;
use thiserror::Error;
use zerocopy::AsBytes;
use zerocopy::IntoBytes;
use crate::cpu::CpuManager;
use crate::igvm::loader::Loader;

2
vmm/src/igvm/mod.rs
View File

@@ -29,7 +29,7 @@ pub mod igvm_loader;
mod loader;
use igvm::snp_defs::SevVmsa;
use igvm_defs::IGVM_VHS_SNP_ID_BLOCK;
use zerocopy::FromZeroes;
use zerocopy::FromZeros;
#[derive(Debug, Clone)]
pub struct IgvmLoadedInfo {