github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-04-09 05:23:43 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: Add format argument to hotplug_block_device method

Browse Source 
Add format argument to hotplug_block_device for flexibly specifying
different block formats.
With this, we can support kinds of formats, currently raw and vmdk are
supported, and some other formats will be supported in future.

Aside the formats, the corresponding handling logics are also required
to properly handle its options needed in QMP blockdev-add.

Signed-off-by: Alex Lyn <alex.lyn@antgroup.com>
This commit is contained in:
Alex Lyn
2026-04-07 15:51:17 +08:00
parent 4707bd26c9
commit d980dbbb0a
2 changed files with 59 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -866,6 +866,7 @@ impl QemuInner {
),
block_device.config.is_readonly,
block_device.config.no_drop,
&format!("{}", block_device.config.format),
)
.context("hotplug block device")?;

77
src/runtime-rs/crates/hypervisor/src/qemu/qmp.rs
View File

@@ -14,7 +14,8 @@ use kata_types::rootless::is_rootless;
use nix::sys::socket::{sendmsg, ControlMessage, MsgFlags};
use qapi_qmp::{
self as qmp, BlockdevAioOptions, BlockdevOptions, BlockdevOptionsBase,
BlockdevOptionsGenericFormat, BlockdevOptionsRaw, BlockdevRef, MigrationInfo, PciDeviceInfo,
BlockdevOptionsGenericCOWFormat, BlockdevOptionsGenericFormat, BlockdevOptionsRaw, BlockdevRef,
MigrationInfo, PciDeviceInfo,
};
use qapi_qmp::{migrate, migrate_incoming, migrate_set_capabilities};
use qapi_qmp::{MigrationCapability, MigrationCapabilityStatus};
@@ -642,6 +643,7 @@ impl Qmp {
is_direct: Option<bool>,
is_readonly: bool,
no_drop: bool,
format: &str,
) -> Result<(Option<PciPath>, Option<String>)> {
// `blockdev-add`
let node_name = format!("drive-{index}");
@@ -690,27 +692,64 @@ impl Qmp {
}
};
let blockdev_options_raw = BlockdevOptions::raw {
base: BlockdevOptionsBase {
detect_zeroes: None,
cache: None,
discard: None,
force_share: None,
auto_read_only: None,
node_name: Some(node_name.clone()),
read_only: None,
},
raw: BlockdevOptionsRaw {
base: BlockdevOptionsGenericFormat {
file: BlockdevRef::definition(Box::new(blockdev_file)),
},
offset: None,
size: None,
},
let blockdev_options = match format {
"raw" => {
// Use raw format for regular block devices
BlockdevOptions::raw {
base: BlockdevOptionsBase {
detect_zeroes: None,
cache: None,
discard: None,
force_share: None,
auto_read_only: None,
node_name: Some(node_name.clone()),
read_only: None,
},
raw: BlockdevOptionsRaw {
base: BlockdevOptionsGenericFormat {
file: BlockdevRef::definition(Box::new(blockdev_file)),
},
offset: None,
size: None,
},
}
}
"vmdk" => {
// Use VMDK format driver for VMDK descriptor files
// The VMDK driver will parse the descriptor and handle multi-extent files
info!(
sl!(),
"hotplug_block_device: using VMDK format driver for {}", path_on_host
);
BlockdevOptions::vmdk {
base: BlockdevOptionsBase {
detect_zeroes: None,
cache: None,
discard: None,
force_share: None,
auto_read_only: None,
node_name: Some(node_name.clone()),
read_only: None,
},
vmdk: BlockdevOptionsGenericCOWFormat {
base: BlockdevOptionsGenericFormat {
file: BlockdevRef::definition(Box::new(blockdev_file)),
},
backing: None,
},
}
}
other => {
warn!(
sl!(),
"unrecognized format '{}', defaulting to raw for {}", other, path_on_host
);
return Err(anyhow!("unrecognized block device format: {}", other));
}
};
self.qmp
.execute(&qapi_qmp::blockdev_add(blockdev_options_raw))
.execute(&qapi_qmp::blockdev_add(blockdev_options))
.map_err(|e| anyhow!("blockdev-add backend {:?}", e))
.map(|_| ())?;