vmm:AArch64: move uefi_flash to memory manager

uefi_flash is used when load firmware, that is load payload depends on
device manager. move uefi_flash to memory manager can eliminate the
dependency.

Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
Signed-off-by: Michael Zhao <michael.zhao@arm.com>
This commit is contained in:
Michael Zhao
2022-08-30 20:01:09 +08:00
committed by Rob Bradford
parent 9b1452f258
commit b65639fad3
3 changed files with 51 additions and 52 deletions
+1 -1
View File
@@ -953,7 +953,7 @@ impl Vm {
#[cfg(target_arch = "aarch64")]
fn load_firmware(&self, mut firmware: &File) -> Result<()> {
let uefi_flash = self.device_manager.lock().as_ref().unwrap().uefi_flash();
let uefi_flash = self.memory_manager.lock().as_ref().unwrap().uefi_flash();
let mem = uefi_flash.memory();
arch::aarch64::uefi::load_uefi(mem.deref(), arch::layout::UEFI_START, &mut firmware)
.map_err(Error::UefiLoad)?;