From a99ad348260cd949ab70c182e20b014e61ea293b Mon Sep 17 00:00:00 2001 From: Alexandre Courbot Date: Tue, 5 Jul 2022 10:58:46 +0900 Subject: [PATCH] crosvm: cmdline: remove JailConfig from `run` arguments This member is never used since jail configuration is set up using other flags to remain compatible with the way `run` was working pre-argh. Furthermore, having it here makes a `jail-config` command-line option appears in the help text that is a no-op. BUG=None TEST=cargo build Change-Id: I715ac80270e7b775926c7ca8759e22e5f7c15014 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3744909 Tested-by: kokoro Reviewed-by: Junichi Uekawa Commit-Queue: Alexandre Courbot --- src/crosvm/cmdline.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/crosvm/cmdline.rs b/src/crosvm/cmdline.rs index 59eb0843e7..9add35e11e 100644 --- a/src/crosvm/cmdline.rs +++ b/src/crosvm/cmdline.rs @@ -59,7 +59,7 @@ use crate::crosvm::config::{ numbered_disk_option, parse_battery_options, parse_bus_id_addr, parse_cpu_affinity, parse_cpu_capacity, parse_cpu_set, parse_file_backed_mapping, parse_mmio_address_range, parse_pstore, parse_serial_options, parse_stub_pci_parameters, Executable, - FileBackedMappingParameters, JailConfig, TouchDeviceOption, VhostUserFsOption, VhostUserOption, + FileBackedMappingParameters, TouchDeviceOption, VhostUserFsOption, VhostUserOption, VhostUserWlOption, VvuOption, }; #[cfg(feature = "direct")] @@ -685,9 +685,6 @@ pub struct RunCommand { #[argh(switch)] /// allow to enable ITMT scheduling feature in VM. The success of enabling depends on HWP and ACPI CPPC support on hardware pub itmt: bool, - #[argh(option)] - /// jail config - pub jail_config: Option, #[cfg(unix)] #[argh(option, long = "kvm-device", arg_name = "PATH")] /// path to the KVM device. (default /dev/kvm)