From f3c8f827cc78b7f552ad70a85658df60473d9bbf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 25 Jun 2020 06:20:12 +0000 Subject: [PATCH] build(deps): bump linux-loader from `2a62f21` to `ec930d7` Bumps [linux-loader](https://github.com/rust-vmm/linux-loader) from `2a62f21` to `ec930d7`. - [Release notes](https://github.com/rust-vmm/linux-loader/releases) - [Commits](https://github.com/rust-vmm/linux-loader/compare/2a62f21b441716332df048762c3b15700f72563f...ec930d700f43458f191ee50404810a155accb0ec) Signed-off-by: Sebastien Boeuf Signed-off-by: dependabot-preview[bot] --- Cargo.lock | 2 +- vmm/src/vm.rs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index da9ebacc8..cfec8cb68 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -570,7 +570,7 @@ dependencies = [ [[package]] name = "linux-loader" version = "0.1.0" -source = "git+https://github.com/rust-vmm/linux-loader#2a62f21b441716332df048762c3b15700f72563f" +source = "git+https://github.com/rust-vmm/linux-loader#ec930d700f43458f191ee50404810a155accb0ec" dependencies = [ "vm-memory", ] diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs index 6e155ecf7..f74f63bba 100644 --- a/vmm/src/vm.rs +++ b/vmm/src/vm.rs @@ -43,6 +43,8 @@ use devices::HotPlugNotificationFlags; use linux_loader::cmdline::Cmdline; #[cfg(target_arch = "x86_64")] use linux_loader::loader::elf::Error::InvalidElfMagicNumber; +#[cfg(target_arch = "x86_64")] +use linux_loader::loader::elf::PvhBootCapability::PvhEntryPresent; use linux_loader::loader::KernelLoader; use signal_hook::{iterator::Signals, SIGINT, SIGTERM, SIGWINCH}; use std::collections::HashMap; @@ -529,7 +531,7 @@ impl Vm { let entry_point_addr: GuestAddress; let boot_prot: BootProtocol; - if let Some(pvh_entry_addr) = entry_addr.pvh_entry_addr { + if let PvhEntryPresent(pvh_entry_addr) = entry_addr.pvh_boot_cap { // Use the PVH kernel entry point to boot the guest entry_point_addr = pvh_entry_addr; boot_prot = BootProtocol::PvhBoot;