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: Encompass guest payload configuration in PayloadConfig

Browse Source 
Introduce a new top level member of VmConfig called PayloadConfig that
(currently) encompasses the kernel, commandline and initramfs for the
guest to use.

In future this can be extended for firmware use. The existing
"--kernel", "--cmdline" and "initramfs" CLI parameters now fill the
PayloadConfig.

Any config supplied which uses the now deprecated config members have
those members mapped to the new version with a warning.

See: #4445

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2022-08-10 11:24:31 +01:00
parent 5810e3bee8
commit cef51a9de0
4 changed files with 146 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
vmm/src/config.rs
View File

@@ -2248,6 +2248,16 @@ impl RestoreConfig {
}
}
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
pub struct PayloadConfig {
#[serde(default)]
pub kernel: Option<PathBuf>,
#[serde(default)]
pub cmdline: Option<String>,
#[serde(default)]
pub initramfs: Option<PathBuf>,
}
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
pub struct VmConfig {
#[serde(default)]
@@ -2259,6 +2269,8 @@ pub struct VmConfig {
pub initramfs: Option<InitramfsConfig>,
#[serde(default)]
pub cmdline: CmdlineConfig,
#[serde(default)]
pub payload: Option<PayloadConfig>,
pub disks: Option<Vec<DiskConfig>>,
pub net: Option<Vec<NetConfig>>,
#[serde(default)]
@@ -2312,13 +2324,28 @@ impl VmConfig {
pub fn validate(&mut self) -> ValidationResult<BTreeSet<String>> {
let mut id_list = BTreeSet::new();
if self.kernel.is_some() {
warn!("The \"VmConfig\" members \"kernel\", \"cmdline\" and \"initramfs\" are deprecated. Use \"payload\" member instead.");
self.payload = Some(PayloadConfig {
kernel: self.kernel.take().map(|k| k.path),
cmdline: if self.cmdline.args.is_empty() {
None
} else {
Some(self.cmdline.args.drain(..).collect())
},
initramfs: self.initramfs.take().map(|i| i.path),
})
}
#[cfg(not(feature = "tdx"))]
self.kernel.as_ref().ok_or(ValidationError::KernelMissing)?;
self.payload
.as_ref()
.ok_or(ValidationError::KernelMissing)?;
#[cfg(feature = "tdx")]
{
let tdx_enabled = self.tdx.is_some();
if !tdx_enabled && self.kernel.is_none() {
if !tdx_enabled && self.payload.is_none() {
return Err(ValidationError::KernelMissing);
}
if tdx_enabled && (self.cpus.max_vcpus != self.cpus.boot_vcpus) {
@@ -2644,19 +2671,15 @@ impl VmConfig {
numa = Some(numa_config_list);
}
let mut kernel: Option<KernelConfig> = None;
if let Some(k) = vm_params.kernel {
kernel = Some(KernelConfig {
path: PathBuf::from(k),
});
}
let mut initramfs: Option<InitramfsConfig> = None;
if let Some(k) = vm_params.initramfs {
initramfs = Some(InitramfsConfig {
path: PathBuf::from(k),
});
}
let payload = if vm_params.kernel.is_some() {
Some(PayloadConfig {
kernel: vm_params.kernel.map(PathBuf::from),
initramfs: vm_params.initramfs.map(PathBuf::from),
cmdline: vm_params.cmdline.map(|s| s.to_string()),
})
} else {
None
};
#[cfg(feature = "tdx")]
let tdx = vm_params.tdx.map(TdxConfig::parse).transpose()?;
@@ -2667,9 +2690,10 @@ impl VmConfig {
let mut config = VmConfig {
cpus: CpusConfig::parse(vm_params.cpus)?,
memory: MemoryConfig::parse(vm_params.memory, vm_params.memory_zones)?,
kernel,
initramfs,
cmdline: CmdlineConfig::parse(vm_params.cmdline)?,
kernel: None,
initramfs: None,
cmdline: CmdlineConfig::default(),
payload,
disks,
net,
rng,
@@ -3257,13 +3281,15 @@ mod tests {
prefault: false,
zones: None,
},
kernel: Some(KernelConfig {
path: PathBuf::from("/path/to/kernel"),
}),
initramfs: None,
kernel: None,
cmdline: CmdlineConfig {
args: String::from(""),
args: String::default(),
},
initramfs: None,
payload: Some(PayloadConfig {
kernel: Some(PathBuf::from("/path/to/kernel")),
..Default::default()
}),
disks: None,
net: None,
rng: RngConfig {
@@ -3310,7 +3336,7 @@ mod tests {
);
let mut invalid_config = valid_config.clone();
invalid_config.kernel = None;
invalid_config.payload = None;
assert_eq!(
invalid_config.validate(),
Err(ValidationError::KernelMissing)

16
vmm/src/lib.rs
View File

@@ -1968,8 +1968,8 @@ const DEVICE_MANAGER_SNAPSHOT_ID: &str = "device-manager";
mod unit_tests {
use super::*;
use config::{
CmdlineConfig, ConsoleConfig, ConsoleOutputMode, CpusConfig, HotplugMethod, KernelConfig,
MemoryConfig, RngConfig, VmConfig,
CmdlineConfig, ConsoleConfig, ConsoleOutputMode, CpusConfig, HotplugMethod, MemoryConfig,
PayloadConfig, RngConfig, VmConfig,
};
fn create_dummy_vmm() -> Vmm {
@@ -2010,13 +2010,15 @@ mod unit_tests {
prefault: false,
zones: None,
},
kernel: Some(KernelConfig {
path: PathBuf::from("/path/to/kernel"),
}),
initramfs: None,
kernel: None,
cmdline: CmdlineConfig {
args: String::from(""),
args: String::default(),
},
initramfs: None,
payload: Some(PayloadConfig {
kernel: Some(PathBuf::from("/path/to/kernel")),
..Default::default()
}),
disks: None,
net: None,
rng: RngConfig {

35
vmm/src/vm.rs
View File

@@ -494,12 +494,19 @@ impl Vm {
restoring: bool,
timestamp: Instant,
) -> Result<Self> {
let boot_id_list = config
.lock()
.unwrap()
.validate()
.map_err(Error::ConfigValidation)?;
let kernel = config
.lock()
.unwrap()
.kernel
.payload
.as_ref()
.map(|k| File::open(&k.path))
.map(|p| p.kernel.as_ref().map(File::open))
.unwrap_or_default()
.transpose()
.map_err(Error::KernelFile)?;
@@ -510,12 +517,6 @@ impl Vm {
None
};
let boot_id_list = config
.lock()
.unwrap()
.validate()
.map_err(Error::ConfigValidation)?;
info!("Booting VM from config: {:?}", &config);
// Create NUMA nodes based on NumaConfig.
@@ -593,9 +594,10 @@ impl Vm {
let initramfs = config
.lock()
.unwrap()
.initramfs
.payload
.as_ref()
.map(|i| File::open(&i.path))
.map(|p| p.initramfs.as_ref().map(File::open))
.unwrap_or_default()
.transpose()
.map_err(Error::InitramfsFile)?;
@@ -932,9 +934,16 @@ impl Vm {
#[cfg(target_arch = "aarch64")] device_manager: &Arc<Mutex<DeviceManager>>,
) -> Result<Cmdline> {
let mut cmdline = Cmdline::new(arch::CMDLINE_MAX_SIZE);
cmdline
.insert_str(&config.lock().unwrap().cmdline.args)
.map_err(Error::CmdLineInsertStr)?;
if let Some(s) = config
.lock()
.unwrap()
.payload
.as_ref()
.map(|p| p.cmdline.as_ref())
.unwrap_or_default()
{
cmdline.insert_str(s).map_err(Error::CmdLineInsertStr)?;
}
#[cfg(target_arch = "aarch64")]
for entry in device_manager.lock().unwrap().cmdline_additions() {