cuttlefish: Add netsim_modem CLI flag and route cellular modem over VSOCK to netsimd#2745
Open
schilit wants to merge 1 commit into
Open
cuttlefish: Add netsim_modem CLI flag and route cellular modem over VSOCK to netsimd#2745schilit wants to merge 1 commit into
schilit wants to merge 1 commit into
Conversation
Databean
approved these changes
Jun 23, 2026
5546173 to
6ee7a3b
Compare
Author
|
@Databean looks like an unrelated test is failing (?): |
Member
|
|
Collaborator
|
Hi Bill, can you update this series with what you've posted on https://googleplex-android-review.git.corp.google.com/c/device/google/cuttlefish/+/40406246 ? |
f6e5993 to
0fee293
Compare
Author
|
Updated with the changes from the Gerrit CL 40406246 (VSOCK routing). |
Enables netsim to act as the cellular modem simulator for Cuttlefish by passing VSOCK connections directly to netsimd:
1. CLI & Instance Configuration:
- Adds '--netsim_modem' flag to launch_cvd to route cellular modem traffic to netsim.
- Disables the legacy standalone modem_simulator process when '--netsim_modem' or '--netsim' is active.
- Records modem simulator instance count and SIM type in CuttlefishConfig.
2. VSOCK Server Routing ('netsim_server.cpp'):
- Creates a VSOCK server socket ('SharedFD::VsockServer') listening on each guest modem simulator port.
- Configures the CELLULAR chip in netsimd's startup JSON ('-s'), passing the inherited listening file descriptor as 'vsockFd' and the SIM configuration as 'simType'.
Refactored netsim radio enabling to use per-instance config checks in netsim_server.cpp to support mixed-mode multi-instance clusters, and removed the global netsim_radio_enabled config.
Bug: 514348948
Bug: 530300761
Bug: 532125591
Test: launch_cvd --netsim_modem
0fee293 to
39f648a
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Enables netsim to act as the cellular modem simulator for Cuttlefish by passing VSOCK connections directly to netsimd:
CLI & Instance Configuration:
VSOCK Server Routing ('netsim_server.cpp'):
Refactored netsim radio enabling to use per-instance config checks in netsim_server.cpp to support mixed-mode multi-instance clusters, and removed the global netsim_radio_enabled config.
Bug: 514348948
Bug: 530300761
Bug: 532125591
Test: launch_cvd --netsim_modem
Assisted-by: Jetski:pro