Skip to content

Commit 90bc0f6

Browse files
committed
Don't wait on disabled dependencies.
When not using cvdalloc, the launcher will be disabled, but since cvdalloc is a VmmDependency, crosvm will attempt to wait on it. This fails immediately so there isn't an actual problem except for logspam, but we shouldn't bother to wait on disabled dependencies in the first place.
1 parent a53f91d commit 90bc0f6

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

base/cvd/cuttlefish/host/libs/vm_manager/crosvm_manager.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,9 @@ Result<std::vector<MonitorCommand>> CrosvmManager::StartCommands(
512512
CrosvmBuilder crosvm_cmd;
513513
crosvm_cmd.Cmd().AddPrerequisite([&dependencyCommands]() -> Result<void> {
514514
for (auto dependencyCommand : dependencyCommands) {
515+
if (!dependencyCommand->Enabled()) {
516+
continue;
517+
}
515518
CF_EXPECT(dependencyCommand->WaitForAvailability());
516519
}
517520

base/cvd/cuttlefish/host/libs/vm_manager/qemu_manager.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,9 @@ Result<std::vector<MonitorCommand>> QemuManager::StartCommands(
251251

252252
qemu_cmd.AddPrerequisite([&dependency_commands]() -> Result<void> {
253253
for (auto dependencyCommand : dependency_commands) {
254+
if (!dependencyCommand->Enabled()) {
255+
continue;
256+
}
254257
CF_EXPECT(dependencyCommand->WaitForAvailability());
255258
}
256259

0 commit comments

Comments
 (0)