From 282a1001ef4b1ddf9438e85cf0d4d8a803ed9112 Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Tue, 16 Aug 2022 13:08:24 +0100
Subject: [PATCH] vmm: x86_64: Rename load_firmware() to reflect its purpose

This function only supports loading legacy, non-PVH firmware binaries.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
---
 vmm/src/vm.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs
index ea870f282..87278d5c8 100644
--- a/vmm/src/vm.rs
+++ b/vmm/src/vm.rs
@@ -989,7 +989,7 @@ impl Vm {
     }
 
     #[cfg(target_arch = "x86_64")]
-    fn load_firmware(
+    fn load_legacy_firmware(
         mut firmware: File,
         memory_manager: &Arc<Mutex<MemoryManager>>,
     ) -> Result<EntryPoint> {
@@ -1055,7 +1055,9 @@ impl Vm {
         ) {
             Ok(entry_addr) => entry_addr,
             Err(e) => match e {
-                Elf(InvalidElfMagicNumber) => return Self::load_firmware(kernel, &memory_manager),
+                Elf(InvalidElfMagicNumber) => {
+                    return Self::load_legacy_firmware(kernel, &memory_manager)
+                }
                 _ => {
                     return Err(Error::KernelLoad(e));
                 }