summary refs log tree commit diff
path: root/src/main.rs
diff options
context:
space:
mode:
authorStephen Barber <smbarber@chromium.org>2018-02-15 09:22:22 -0800
committerchrome-bot <chrome-bot@chromium.org>2018-02-15 21:43:45 -0800
commitee0d67cc5ef36f278d5a0926d491498f125c0afa (patch)
treefd59453d10a2b78a4c8d015ee1330fd096c494c0 /src/main.rs
parent8091a2a525f4a9de2f5493d396ce904779a7715f (diff)
downloadcrosvm-ee0d67cc5ef36f278d5a0926d491498f125c0afa.tar
crosvm-ee0d67cc5ef36f278d5a0926d491498f125c0afa.tar.gz
crosvm-ee0d67cc5ef36f278d5a0926d491498f125c0afa.tar.bz2
crosvm-ee0d67cc5ef36f278d5a0926d491498f125c0afa.tar.lz
crosvm-ee0d67cc5ef36f278d5a0926d491498f125c0afa.tar.xz
crosvm-ee0d67cc5ef36f278d5a0926d491498f125c0afa.tar.zst
crosvm-ee0d67cc5ef36f278d5a0926d491498f125c0afa.zip
crosvm: fix run_vm return values for plugin
BUG=none
TEST=crosvm builds with plugin enabled

Change-Id: Ic54550e59d3d3b0e7b09cd3f18496ca790d29f7d
Reviewed-on: https://chromium-review.googlesource.com/922281
Commit-Ready: Stephen Barber <smbarber@chromium.org>
Tested-by: Stephen Barber <smbarber@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main.rs b/src/main.rs
index cf0047f..0e95db6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -378,10 +378,13 @@ fn run_vm(args: std::env::Args) -> std::result::Result<(), ()> {
         #[cfg(feature = "plugin")]
         Ok(()) if cfg.plugin.is_some() => {
             match plugin::run_config(cfg) {
-                Ok(_) => info!("crosvm and plugin have exited normally"),
+                Ok(_) => {
+                    info!("crosvm and plugin have exited normally");
+                    Ok(())
+                }
                 Err(e) => {
                     error!("{}", e);
-                    return 1;
+                    Err(())
                 }
             }
         }