github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-07-25 14:18:54 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: Add BlockModern arm in DeviceManager

Browse Source 
Add BlockModern handling in DeviceManager so that device index is
correctly released both in get_device_info and in the error path.

Signed-off-by: Alex Lyn <alex.lyn@antgroup.com>
This commit is contained in:
Alex Lyn
2026-06-26 20:24:44 +08:00
committed by Fabiano Fidêncio
parent 7da2ad712a
commit 65d580c2b0
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/runtime-rs/crates/hypervisor/src/device/device_manager.rs
View File

@@ -167,6 +167,13 @@ impl DeviceManager {
self.shared_info
.release_device_index(device.config.index, false);
}
DeviceType::BlockModern(device) => {
let (index, is_pmem) = {
let cfg = &device.lock().await.config;
(cfg.index, cfg.driver_option == *KATA_NVDIMM_DEV_TYPE)
};
self.shared_info.release_device_index(index, is_pmem);
}
_ => {
debug!(sl!(), "no need to do release device index.");
}
@@ -191,12 +198,15 @@ impl DeviceManager {
Ok(index) => {
if let Some(i) = index {
// release the declared device index
let is_pmem =
if let DeviceType::Block(blk) = device_guard.get_device_info().await {
let is_pmem = match device_guard.get_device_info().await {
DeviceType::Block(blk) => {
blk.config.driver_option == *KATA_NVDIMM_DEV_TYPE
} else {
false
};
}
DeviceType::BlockModern(dev) => {
dev.lock().await.config.driver_option == *KATA_NVDIMM_DEV_TYPE
}
_ => false,
};
self.shared_info.release_device_index(i, is_pmem);
}
Ok(())