Commit 8b4f28c
committed
Partial fix for running udc-qpr-dev with host_substitution=all
This accommodates the different file names in udc-qpr-dev.
There is an outstanding issue that run_cvd passes new flags to crosvm
that don't exist in the udc-dev version of crosvm, specifically:
```
log_tee(2421652) I 03-20 15:54:15 2421652 2421652 log_tee.cpp:167] [2026-03-20T15:54:15.353288776-07:00 INFO crosvm] crosvm started.
log_tee(2421652) E 03-20 15:54:15 2421652 2421652 log_tee.cpp:158] [2026-03-20T15:54:15.353444901-07:00 ERROR crosvm] arg parsing failed: Unrecognized argument: --vhost-user
log_tee(2421652) E 03-20 15:54:15 2421652 2421652 log_tee.cpp:158]
log_tee(2421652) E 03-20 15:54:15 2421652 2421652 log_tee.cpp:158] [2026-03-20T15:54:15.353464208-07:00 INFO crosvm] invalid argument
run_cvd(2421601) I 03-20 15:54:15 2421604 2421604 process_monitor.cc:81] Detected unexpected exit of monitored subprocess /var/tmp/cvd/270178/1774047250279517/artifacts/host_tools/bin/process_restarter
run_cvd(2421601) I 03-20 15:54:15 2421604 2421604 process_monitor.cc:83] Subprocess /var/tmp/cvd/270178/1774047250279517/artifacts/host_tools/bin/process_restarter (2421653) has exited with exit code 35
log_tee(2421668) I 03-20 15:54:15 2421668 2421668 log_tee.cpp:167] [2026-03-20T15:54:15.356759303-07:00 INFO crosvm] crosvm started.
log_tee(2421668) E 03-20 15:54:15 2421668 2421668 log_tee.cpp:158] [2026-03-20T15:54:15.356936379-07:00 ERROR crosvm] arg parsing failed: Unrecognized argument: --vhost-user-connect-timeout-ms
log_tee(2421668) E 03-20 15:54:15 2421668 2421668 log_tee.cpp:158]
log_tee(2421668) E 03-20 15:54:15 2421668 2421668 log_tee.cpp:158] [2026-03-20T15:54:15.356955304-07:00 INFO crosvm] invalid argument
run_cvd(2421601) I 03-20 15:54:15 2421604 2421604 process_monitor.cc:81] Detected unexpected exit of monitored subprocess /var/tmp/cvd/270178/1774047250279517/artifacts/host_tools/bin/process_restarter
run_cvd(2421601) I 03-20 15:54:15 2421604 2421604 process_monitor.cc:83] Subprocess /var/tmp/cvd/270178/1774047250279517/artifacts/host_tools/bin/process_restarter (2421679) has exited with exit code 35
run_cvd(2421601) E 03-20 15:54:15 2421604 2421604 process_monitor.cc:143] Stopping all monitored processes due to unexpected exit of critical process
```
Repro command:
```
bazel run //cuttlefish/package:cvd -- fetch \
--default_build=git_udc-qpr-dev/cf_x86_64_phone-userdebug \
--target_directory=$HOME/dl_udc \
--host_substitutions=all
bazel run //cuttlefish/package:cvd -- create \
--host_path=$HOME/dl_udc \
--product_path=$HOME/dl_udc \
--host_substitutions=all
```
Bug: b/4946624751 parent cba818f commit 8b4f28c
3 files changed
Lines changed: 31 additions & 10 deletions
File tree
- base/cvd/cuttlefish/host
- commands/cvd/fetch
- libs/config
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
| 64 | + | |
| 65 | + | |
64 | 66 | | |
65 | 67 | | |
66 | 68 | | |
| |||
80 | 82 | | |
81 | 83 | | |
82 | 84 | | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
83 | 88 | | |
84 | 89 | | |
85 | 90 | | |
86 | 91 | | |
87 | 92 | | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
| 93 | + | |
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
367 | 367 | | |
368 | 368 | | |
369 | 369 | | |
370 | | - | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
371 | 374 | | |
372 | 375 | | |
373 | 376 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| |||
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
31 | | - | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
32 | 40 | | |
33 | 41 | | |
34 | 42 | | |
| |||
156 | 164 | | |
157 | 165 | | |
158 | 166 | | |
159 | | - | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
160 | 173 | | |
161 | 174 | | |
162 | 175 | | |
163 | 176 | | |
164 | 177 | | |
165 | 178 | | |
166 | 179 | | |
167 | | - | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
168 | 186 | | |
169 | 187 | | |
170 | 188 | | |
| |||
0 commit comments