Merge pull request #1656 from rust-osdev/bishop-ovmf-shell

xtask: Add --ovmf-shell arg

Author: phip1611

xtask/src/opt.rs

@@ -194,6 +194,10 @@ pub struct QemuOpt {
     #[clap(long, action)]
     pub ovmf_vars: Option<PathBuf>,
 
+    /// Path of an OVMF shell application.
+    #[clap(long, action)]
+    pub ovmf_shell: Option<PathBuf>,
+
     /// Run an example instead of the main binary.
     #[clap(long, action)]
     pub example: Option<String>,

xtask/src/qemu.rs

@@ -62,7 +62,7 @@ fn get_user_provided_path(file_type: FileType, opt: &QemuOpt) -> Option<PathBuf>
             var_name = ENV_VAR_OVMF_VARS;
         }
         FileType::Shell => {
-            opt_path = &None;
+            opt_path = &opt.ovmf_shell;
             var_name = ENV_VAR_OVMF_SHELL;
         }
     }