github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-19 18:01:01 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: move the bytes_to_megs and megs_to_bytes to utils

Browse Source 
Since those two functions would be used by other hypervisors,
thus move them into the utils crate.

Signed-off-by: Fupan Li <fupan.lfp@antgroup.com>
This commit is contained in:
Fupan Li 2025-06-17 10:53:55 +08:00 committed by Fupan Li
parent 89dcc8fb27
commit ceaae3049c
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/runtime-rs/crates/hypervisor/src/qemu/inner.rs
View File

@ -7,10 +7,12 @@ use super::cmdline_generator::{get_network_device, QemuCmdLine, QMP_SOCKET_FILE}
use super::qmp::Qmp;
use crate::device::topology::PCIePort;
use crate::{
device::driver::ProtectionDeviceConfig, hypervisor_persist::HypervisorState,
utils::enter_netns, HypervisorConfig, MemoryConfig, VcpuThreadIds, VsockDevice,
HYPERVISOR_QEMU,
device::driver::ProtectionDeviceConfig, hypervisor_persist::HypervisorState, HypervisorConfig,
MemoryConfig, VcpuThreadIds, VsockDevice, HYPERVISOR_QEMU,
};
use crate::utils::{bytes_to_megs, enter_netns, megs_to_bytes};
use anyhow::{anyhow, Context, Result};
use async_trait::async_trait;
use kata_sys_util::netns::NetnsGuard;
@ -453,15 +455,6 @@ impl QemuInner {
"QemuInner::resize_memory(): asked to resize memory to {} MB", new_total_mem_mb
);
// stick to the apparent de facto convention and represent megabytes
// as u32 and bytes as u64
fn bytes_to_megs(bytes: u64) -> u32 {
(bytes / (1 << 20)) as u32
}
fn megs_to_bytes(bytes: u32) -> u64 {
bytes as u64 * (1 << 20)
}
let qmp = match self.qmp {
Some(ref mut qmp) => qmp,
None => {

8
src/runtime-rs/crates/hypervisor/src/utils.rs
View File

@ -192,6 +192,14 @@ impl std::fmt::Display for SocketAddress {
}
}
pub fn bytes_to_megs(bytes: u64) -> u32 {
(bytes / (1 << 20)) as u32
}
pub fn megs_to_bytes(bytes: u32) -> u64 {
bytes as u64 * (1 << 20)
}
#[cfg(test)]
mod tests {
use super::create_fds;