Merge upstream main into vsock control-plane PR#55
Merged
aniketmaurya merged 2 commits intocodex/github-mention-feature]-add-vsock-based-control-plane-forfrom Mar 8, 2026
Merged
Conversation
…ss_rules, and other upstream updates Co-authored-by: aniketmaurya <21018714+aniketmaurya@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Add vsock control plane support for Firecracker
Merge upstream main into vsock control-plane PR
Mar 8, 2026
146c784
into
codex/github-mention-feature]-add-vsock-based-control-plane-for
1 check passed
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.
The vsock PR branch had diverged from
mainby two commits that added overlapping changes totypes.py,api.py, andvm.py.Summary
Resolved conflicts by incorporating all upstream changes while preserving vsock additions:
types.py: Addedextra_drives: list[Path],network_rate_limit_mbps, updated VM ID regex (now permits_), andvalidate_extra_drives/_validate_file_pathvalidators alongside existingVsockConfig+vsockfield.api.py: Mergedrate_limit_mbpstoken-bucket logic intoadd_network_interfacealongside existingadd_vsock.vm.py: Added extra-drives attachment loop,rate_limit_mbpspassthrough, andremove_egress_rulescleanup call alongside existing vsock provisioning.network.py,build.py,doctor.py,README.md, and all affected test files as-is.Related Issues
Testing
pytest tests/test_vsock.py tests/test_types.py tests/test_vm.py— 59 tests passChecklist
🔒 GitHub Advanced Security automatically protects Copilot coding agent pull requests. You can protect all pull requests by enabling Advanced Security for your repositories. Learn more about Advanced Security.