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

vmm: preserve underlying errors in vm.rs instead of dropping them

Browse Source 
Several error mappings in vm.rs dropped the underlying error with
map_err(|_| ...), making failures harder to diagnose. Preserve the
source error by adding #[source] fields to InitramfsLoad and ErrorNmi.

- InitramfsLoad: now wraps std::io::Error from seek/rewind operations
- ErrorNmi: now wraps cpu::Error from the CPU manager nmi() call

Partially addresses #7563

Signed-off-by: Keith Adler <kadler@cloudflare.com>
This commit is contained in:
Keith Adler
2026-04-16 03:33:25 -05:00
committed by Rob Bradford
parent 1ab877882d
commit e2c51042d3
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vmm/src/vm.rs
View File

@@ -129,7 +129,13 @@ pub enum Error {
UefiLoad(#[source] arch::riscv64::uefi::Error),
#[error("Cannot load the initramfs into memory")]
InitramfsLoad,
InitramfsLoad(#[source] std::io::Error),
#[error("Cannot determine initramfs load address")]
InitramfsAddress(#[source] arch::Error),
#[error("Cannot read initramfs into guest memory")]
InitramfsRead(#[source] vm_memory::GuestMemoryError),
#[error("Cannot load the kernel command line in memory")]
LoadCmdLine(#[source] linux_loader::loader::Error),
@@ -334,7 +340,7 @@ pub enum Error {
IgvmLoad(#[source] igvm_loader::Error),
#[error("Error injecting NMI")]
ErrorNmi,
ErrorNmi(#[source] cpu::Error),
#[error("Error resuming the VM")]
ResumeVm(#[source] hypervisor::HypervisorVmError),
@@ -1362,18 +1368,18 @@ impl Vm {
let initramfs = self.initramfs.as_mut().unwrap();
let size: usize = initramfs
.seek(SeekFrom::End(0))
.map_err(|_| Error::InitramfsLoad)?
.map_err(Error::InitramfsLoad)?
.try_into()
.unwrap();
initramfs.rewind().map_err(|_| Error::InitramfsLoad)?;
initramfs.rewind().map_err(Error::InitramfsLoad)?;
let address =
arch::initramfs_load_addr(guest_mem, size).map_err(|_| Error::InitramfsLoad)?;
arch::initramfs_load_addr(guest_mem, size).map_err(Error::InitramfsAddress)?;
let address = GuestAddress(address);
guest_mem
.read_volatile_from(address, initramfs, size)
.map_err(|_| Error::InitramfsLoad)?;
.map_err(Error::InitramfsRead)?;
info!("Initramfs loaded: address = 0x{:x}", address.0);
Ok(arch::InitramfsConfig { address, size })
@@ -3032,7 +3038,7 @@ impl Vm {
.lock()
.unwrap()
.nmi()
.map_err(|_| Error::ErrorNmi);
.map_err(Error::ErrorNmi);
}
}