diff options
| author | Lepton Wu <lepton@chromium.org> | 2019-03-14 11:38:31 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-14 20:53:52 -0700 |
| commit | 9105e9fbe54afcbda54676e6de7410c4a2d0a07d (patch) | |
| tree | 90384038edf3750d49e7ffce76ad40f39257bbf8 /src/main.rs | |
| parent | 4725a399f794709c97bb62f4e1cd8a5b6bfafd5c (diff) | |
| download | crosvm-9105e9fbe54afcbda54676e6de7410c4a2d0a07d.tar crosvm-9105e9fbe54afcbda54676e6de7410c4a2d0a07d.tar.gz crosvm-9105e9fbe54afcbda54676e6de7410c4a2d0a07d.tar.bz2 crosvm-9105e9fbe54afcbda54676e6de7410c4a2d0a07d.tar.lz crosvm-9105e9fbe54afcbda54676e6de7410c4a2d0a07d.tar.xz crosvm-9105e9fbe54afcbda54676e6de7410c4a2d0a07d.tar.zst crosvm-9105e9fbe54afcbda54676e6de7410c4a2d0a07d.zip | |
Remove "multiprocess" argument.
Both "multiprocess" and "disable-sandbox" control the same config and actually they have same final effects. So just remove "multiprocess" argument and also rename "multiprocess" to "sandbox" to make it more clear. BUG=None TEST=`cros_run_unit_tests --board=eve --packages=crosvm` Change-Id: I313d110af48b43231b1426332b63868cb0218490 Reviewed-on: https://chromium-review.googlesource.com/1524375 Commit-Ready: Lepton Wu <lepton@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Zach Reizner <zachr@chromium.org>
Diffstat (limited to 'src/main.rs')
| -rw-r--r-- | src/main.rs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/main.rs b/src/main.rs index 1971e1a..a0cc1c2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -120,7 +120,7 @@ pub struct Config { wayland_socket_path: Option<PathBuf>, wayland_dmabuf: bool, shared_dirs: Vec<(PathBuf, String)>, - multiprocess: bool, + sandbox: bool, seccomp_policy_dir: PathBuf, gpu: bool, software_tpm: bool, @@ -160,7 +160,7 @@ impl Default for Config { wayland_socket_path: None, wayland_dmabuf: false, shared_dirs: Vec::new(), - multiprocess: !cfg!(feature = "default-no-sandbox"), + sandbox: !cfg!(feature = "default-no-sandbox"), seccomp_policy_dir: PathBuf::from(SECCOMP_POLICY_DIR), cras_audio: false, null_audio: false, @@ -395,11 +395,8 @@ fn set_argument(cfg: &mut Config, name: &str, value: Option<&str>) -> argument:: } cfg.socket_path = Some(socket_path); } - "multiprocess" => { - cfg.multiprocess = true; - } "disable-sandbox" => { - cfg.multiprocess = false; + cfg.sandbox = false; } "cid" => { if cfg.cid.is_some() { @@ -684,7 +681,6 @@ fn run_vm(args: std::env::Args) -> std::result::Result<(), ()> { "socket", "PATH", "Path to put the control socket. If PATH is a directory, a name will be generated."), - Argument::short_flag('u', "multiprocess", "Run each device in a child process(default)."), Argument::flag("disable-sandbox", "Run all devices in one, non-sandboxed process."), Argument::value("cid", "CID", "Context ID for virtual sockets."), Argument::value("shared-dir", "PATH:TAG", |