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: Make disk path optional

Browse Source 
When using "--disk" with a vhost socket and not using self spawning then
it is not necessary or helpful to specify the path.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2020-03-13 10:25:17 +00:00
parent 477d924528
commit 7e599b4450
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vmm/src/device_manager.rs
+25 -4
View File
@@ -255,6 +255,9 @@ pub enum DeviceManagerError {
/// Incorrect device ID as it is already used by another device.
DeviceIdAlreadyInUse,
// No disk path was specified when one was expected
NoDiskPath,
}
pub type DeviceManagerResult<T> = result::Result<T, DeviceManagerError>;
@@ -1026,7 +1029,12 @@ impl DeviceManager {
"--block-backend",
&format!(
"image={},sock={},num_queues={},queue_size={}",
disk_cfg.path.to_str().unwrap(),
disk_cfg
.path
.as_ref()
.ok_or(DeviceManagerError::NoDiskPath)?
.to_str()
.unwrap(),
&sock,
disk_cfg.num_queues,
disk_cfg.queue_size
@@ -1083,7 +1091,12 @@ impl DeviceManager {
}
// Open block device path
let image: File = options
.open(&disk_cfg.path)
.open(
&disk_cfg
.path
.as_ref()
.ok_or(DeviceManagerError::NoDiskPath)?,
)
.map_err(DeviceManagerError::Disk)?;
let mut raw_img = vm_virtio::RawFile::new(image, disk_cfg.direct);
@@ -1094,7 +1107,11 @@ impl DeviceManager {
ImageType::Raw => {
let dev = vm_virtio::Block::new(
raw_img,
disk_cfg.path.clone(),
disk_cfg
.path
.as_ref()
.ok_or(DeviceManagerError::NoDiskPath)?
.clone(),
disk_cfg.readonly,
disk_cfg.iommu,
disk_cfg.num_queues,
@@ -1116,7 +1133,11 @@ impl DeviceManager {
.map_err(DeviceManagerError::QcowDeviceCreate)?;
let dev = vm_virtio::Block::new(
qcow_img,
disk_cfg.path.clone(),
disk_cfg
.path
.as_ref()
.ok_or(DeviceManagerError::NoDiskPath)?
.clone(),
disk_cfg.readonly,
disk_cfg.iommu,
disk_cfg.num_queues,