External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-05 21:15:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Fallback to legacy boot if PVH is enabled along with initramfs

Browse Source 
For now, the codebase does not support booting from initramfs with PVH
boot protocol, therefore we need to fallback to the legacy boot.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2020-03-26 10:50:48 +01:00
parent 5157ba10d1
commit 785812d976
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vmm/src/vm.rs
View File

@ -513,9 +513,20 @@ impl Vm {
let mut entry_point_addr: GuestAddress = entry_addr.kernel_load; let mut entry_point_addr: GuestAddress = entry_addr.kernel_load;
let boot_prot = if entry_addr.pvh_entry_addr.is_some() { let boot_prot = if entry_addr.pvh_entry_addr.is_some() {
// entry_addr.pvh_entry_addr field is safe to unwrap here // Handle the case where PVH is set but the user wants to
entry_point_addr = entry_addr.pvh_entry_addr.unwrap(); // boot an initramfs. At this point in time, our code does
BootProtocol::PvhBoot // not support initramfs along with PVH, hence we make the
// code fallback to the legacy Linux boot.
if initramfs_config.is_some() {
warn!(
"PVH not supported with initramfs, falling back to legacy Linux boot"
);
BootProtocol::LinuxBoot
} else {
// entry_addr.pvh_entry_addr field is safe to unwrap here
entry_point_addr = entry_addr.pvh_entry_addr.unwrap();
BootProtocol::PvhBoot
}
} else { } else {
BootProtocol::LinuxBoot BootProtocol::LinuxBoot
}; };