mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-28 17:44:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

crosvm: Remove --no-legacy flag.

Browse source 
This will land after references to --no-legacy flag disappears.

BUG=b:236574949
TEST=boot volteer-manatee

Change-Id: Ic2b8c601f7a0d193f52b8b096195341ca88f4ef2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3715084
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Junichi Uekawa <uekawa@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Junichi Uekawa 2022-06-21 14:26:53 +09:00 committed by Chromeos LUCI
parent 88b3f563f8
commit 1c80e0621f
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/crosvm/cmdline.rs
View file

@ -685,10 +685,6 @@ pub struct RunCommand {
#[argh(switch)]
/// don't use legacy KBD devices emulation
pub no_i8042: bool,
#[cfg(unix)]
#[argh(switch)]
/// don't use legacy KBD/RTC devices emulation
pub no_legacy: bool,
#[argh(switch)]
/// don't create RNG device in the guest
pub no_rng: bool,
@ -1458,9 +1454,6 @@ impl TryFrom<RunCommand> for super::config::Config {
#[cfg(unix)]
{
cfg.no_i8042 = cmd.no_legacy;
cfg.no_rtc = cmd.no_legacy;
if cmd.vhost_vsock_device.is_some() && cmd.vhost_vsock_fd.is_some() {
return Err(
"Only one of vhost-vsock-device vhost-vsock-fd has to be specified".to_string(),
@ -1566,8 +1559,8 @@ impl TryFrom<RunCommand> for super::config::Config {
cfg.force_s2idle = cmd.s2idle;
cfg.pcie_ecam = cmd.pcie_ecam;
cfg.pci_low_start = cmd.pci_low_start;
cfg.no_i8042 |= cmd.no_i8042;
cfg.no_rtc |= cmd.no_rtc;
cfg.no_i8042 = cmd.no_i8042;
cfg.no_rtc = cmd.no_rtc;
for (index, msr_config) in cmd.userspace_msr {
if cfg.userspace_msr.insert(index, msr_config).is_some() {