mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-10 12:09:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmdline: run: Rename cmd.pvm_fw to its flag name

Browse source 
Make the variable clearer by renaming it to represent the information it
holds i.e. the firmware file AND the fact that the VM is unprotected.
And to avoid confusing it with cfg.pvm_fw and components.pvm_fw, which
both actually hold the protected VM firmware (resp. path and image).

Note: no functional change intended.

BUG=b:243646855
TEST=build

Change-Id: Ieabc2f05798c3a0e969348d6dbd9a87ffb3a8ad0
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3867612
Commit-Queue: Pierre-Clément Tosi <ptosi@google.com>
Tested-by: Pierre-Clément Tosi <ptosi@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Pierre-Clément Tosi 2022-08-17 14:41:18 +01:00 committed by crosvm LUCI
parent d6e88c9bf9
commit ced4bfe1db
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/crosvm/cmdline.rs
View file

@ -883,10 +883,6 @@ pub struct RunCommand {
#[argh(switch)]
/// enable virtio-pvclock.
pub pvclock: bool,
// Must be `Some` iff `protected_vm == ProtectionType::UnprotectedWithFirmware`.
#[argh(option, long = "unprotected-vm-with-firmware", arg_name = "PATH")]
/// (EXPERIMENTAL/FOR DEBUGGING) Use VM firmware, but allow host access to guest memory
pub pvm_fw: Option<PathBuf>,
#[argh(
option,
arg_name = "PATH[,key=value[,key=value[,...]]",
@ -1103,6 +1099,10 @@ pub struct RunCommand {
#[argh(option, arg_name = "NAME[,...]")]
/// comma-separated names of the task profiles to apply to all threads in crosvm including the vCPU threads
pub task_profiles: Vec<String>,
// Must be `Some` iff `protected_vm == ProtectionType::UnprotectedWithFirmware`.
#[argh(option, long = "unprotected-vm-with-firmware", arg_name = "PATH")]
/// (EXPERIMENTAL/FOR DEBUGGING) Use VM firmware, but allow host access to guest memory
pub unprotected_vm_with_firmware: Option<PathBuf>,
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
#[argh(
option,
@ -1705,7 +1705,7 @@ impl TryFrom<RunCommand> for super::config::Config {
let protection_flags = [
cmd.protected_vm,
cmd.protected_vm_without_firmware,
cmd.pvm_fw.is_some(),
cmd.unprotected_vm_with_firmware.is_some(),
];
if protection_flags.into_iter().filter(|b| *b).count() > 1 {
@ -1726,7 +1726,7 @@ impl TryFrom<RunCommand> for super::config::Config {
cfg.usb = false;
// Protected VMs can't trust the RNG device, so don't provide it.
cfg.rng = false;
} else if let Some(p) = cmd.pvm_fw {
} else if let Some(p) = cmd.unprotected_vm_with_firmware {
if !p.exists() || !p.is_file() {
return Err(
"unprotected-vm-with-firmware path should be an existing file".to_string(),