mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2026-08-05 02:19:16 +00:00
vmm: allow IGVM payload alongside a kernel
Previously, the payload validation rejected an IGVM file combined with a kernel or firmware. Relax this constraint to allow an IGVM carrying a firmware (e.g Oak stage0) to be paired with a separate kernel image. This enables fw_cfg-style boot where stage0 loads a kernel provided through fw_cfg rather than embedded in the IGVM file itself. Signed-off-by: Ruben Hakobyan <hruben@meta.com>
This commit is contained in:
committed by
Rob Bradford
parent
cdbe43f423
commit
c31f5d4998
@@ -849,7 +849,7 @@ impl PayloadConfig {
|
|||||||
#[cfg(feature = "igvm")]
|
#[cfg(feature = "igvm")]
|
||||||
{
|
{
|
||||||
if self.igvm.is_some() {
|
if self.igvm.is_some() {
|
||||||
if self.firmware.is_some() || self.kernel.is_some() {
|
if self.firmware.is_some() {
|
||||||
return Err(PayloadConfigError::IgvmPlusOtherPayloads);
|
return Err(PayloadConfigError::IgvmPlusOtherPayloads);
|
||||||
}
|
}
|
||||||
return Ok(());
|
return Ok(());
|
||||||
|
|||||||
Reference in New Issue
Block a user