Snap for 11219529 from 08474bc4f43a0c38822f173bf10f945d2447c0af to mainline-tzdata4-release
Change-Id: I74c6160fb0c2a9ec500c04fd6a47045c266d3a46
diff --git a/host/libs/vm_manager/crosvm_builder.cpp b/host/libs/vm_manager/crosvm_builder.cpp
index cb7fbc4..0d7658e 100644
--- a/host/libs/vm_manager/crosvm_builder.cpp
+++ b/host/libs/vm_manager/crosvm_builder.cpp
@@ -36,16 +36,11 @@
// Store this value so it persists after std::move(this->Cmd())
auto crosvm = command_.Executable();
command_.SetStopper([crosvm, control_socket](Subprocess* proc) {
- Command stop_cmd(crosvm);
- stop_cmd.AddParameter("stop");
- stop_cmd.AddParameter(control_socket);
- if (stop_cmd.Start().Wait() == 0) {
- return StopperResult::kStopSuccess;
- }
LOG(WARNING) << "Failed to stop VMM nicely, attempting to KILL";
- return KillSubprocess(proc) == StopperResult::kStopSuccess
- ? StopperResult::kStopCrash
- : StopperResult::kStopFailure;
+ auto result = KillSubprocess(proc);
+ unlink(control_socket.c_str());
+ return result == StopperResult::kStopSuccess ? StopperResult::kStopCrash
+ : StopperResult::kStopFailure;
});
command_.AddParameter("--socket=", control_socket);
}
diff --git a/host/libs/vm_manager/crosvm_manager.cpp b/host/libs/vm_manager/crosvm_manager.cpp
index bf95250..68609a3 100644
--- a/host/libs/vm_manager/crosvm_manager.cpp
+++ b/host/libs/vm_manager/crosvm_manager.cpp
@@ -120,6 +120,8 @@
crosvm_cmd.Cmd().AddParameter("--no-smt");
}
+ crosvm_cmd.Cmd().AddParameter("--core-scheduling=false");
+
if (config.vhost_net()) {
crosvm_cmd.Cmd().AddParameter("--vhost-net");
}