Repository navigation
openvmm: pin microVM v7.1, rebased onto upstream main - #1748
Open
Pedro Henrique Penna (ppenna) wants to merge 2 commits into
Open
Pedro Henrique Penna (ppenna) wants to merge 2 commits into
Pedro Henrique Penna (ppenna) wants to merge 2 commits into
Conversation
Pin the openvmm submodule to 85c3698f9, the head of the new feature/microvm/release/v7.1 branch of microsoft/openvmm. That branch rebases the 315-commit microVM chain of feature/microvm/dev, through the previous pin, 6e5303f94, from e6b458cc0 onto microsoft/openvmm main at 9a875b563, 14 upstream commits later. Upstream landed none of the chain's commits, so the rebase drops none, and every commit keeps its position. Replaying them conflicts at two. At position 060, microsoft/openvmm#4941 lets Petri boot an x64 Linux child through a native MSHV root with Pipette as its init, and the chain's microVM builder still admits Pipette as init only for the standard machine profile. At position 277, the invalid VP register errors of microsoft/openvmm#4942 join the chain's unsupported-state error in virt_mshv. A fixup at the tip, position 316, names sha2 without a version in the lock file entries that positions 069 and 133 add, since microsoft/openvmm#4941 left sha2 one version, and any cargo command that may update Cargo.lock otherwise rewrites them. The patches of the other 313 replayed commits are unchanged, apart from the context of position 007. The vectors, excerpts, contract versions, and CPU profiles that nvx copies from OpenVMM match the pin. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The feature/microvm/release/v7.1 rebase, which the previous commit pins, moved the 315-commit microVM chain from e6b458cc0 onto upstream main at 9a875b563 without dropping any commit, so every commit keeps its v7.0 position. Remap the scope, upstream status, graph, branch DAG, the commits after the mapped tip, PR summary, and commit mapping onto the rebased commits. Record the conflicts that the rebase resolved at positions 060 and 277, with microsoft/openvmm#4941 and microsoft/openvmm#4942, and the fixup at position 316, which folds into positions 069 and 133, and say that upstream main has no commits past the new base. As of 2026-11-18, none of the open upstream pull requests has merged, and none that was closed has reopened. The remarks on whether commits apply to upstream main record what was found on earlier bases; the rebase did not check them again. The pin, 85c3698f9, is position 316, 190 commits past the mapped tip. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
The roadmap omits deferred upstream commit 715927303 and incorrectly reports no post-base work, leaving the remaining rebase work undocumented.
1 open issue
What changed in this PR
This PR updates NVX’s OpenVMM pin to microVM v7.1, bringing in 14 upstream commits while preserving the existing microVM chain. NVX application code and public APIs remain unchanged.
Changes:
- Rebases all 315 chain commits without drops or reordering, resolving two conflicts and adding one lock-file fixup.
- Remaps the roadmap’s commit hashes, base, tip, and pin while preserving existing positions.
- Documents the conflict resolutions and where the new fixup should be folded in a future reorganization.
| File | Description |
|---|---|
doc/openvmm-upstream-roadmap.md |
Updates v7.1 commit mappings and records rebase conflicts and the lock-file fixup. |
Review effort: Balanced
Comment on lines
+1207
to
+1212
| Upstream main has no commits past the fork base: as of 2026-11-18, its head is the fork base, | ||
| `9a875b563`. Of the 14 commits that upstream main had past the v7.0 base, `e6b458cc0`, the v7.1 | ||
| rebase resolved `9b05d16fd` (microsoft/openvmm#4941) at position 060 and `20582cf41` | ||
| (microsoft/openvmm#4942) at position 277; see | ||
| [Conflicts of the v7.1 rebase](#conflicts-of-the-v71-rebase). The other 12 merged with the chain | ||
| without conflicts. |
This branch has not been deployed
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.

What does this pull request change?
This PR pins
openvmmto microVM v7.1. That is the 315-commit microVM chain offeature/microvm/dev, rebased as a minor release onto the latest upstream OpenVMMmain, plus one fixup at its tip:Cargo.lockentries to an upstream change that caused no conflict.NVX's code does not change. The vectors, excerpts, contract versions, and CPU profiles that
nvxcopies from OpenVMM match the pin.9ef5801ac): movesopenvmmfrom6e5303f94to85c3698f9, and nothing else.a720ecc40): mapsdoc/openvmm-upstream-roadmap.mdonto the rebased commits. It records the conflicts and the fixup, and the open upstream pull requests as of 2026-11-18: none merged, and none that closed reopened.Start with OpenVMM pin below, then the roadmap's Conflicts of the v7.1 rebase.
Left out: the release has not landed in OpenVMM yet.
feature/microvm/devstill points to the previous pin,6e5303f94, andfeature/microvm/release/v7.0to1b25c5bbc; see Landing order. Both must move before this PR merges.Why is this change needed?
The rebase keeps the chain on current upstream
main, so its pull requests to upstream stay reviewable there. It also brings NVX the 14 upstream commits since the v7.0 base, among them:mesh_remotesplits the file descriptors of large events across packets);mesh_nodesends remote events without holding locks);plan9enforces request and response buffer boundaries);disk_layered,scsidisk, andnvmerefuse writes, UNMAP, and SGL commands that they cannot serve);ttrpcremoves stale vsock sockets before binding);virt_mshvhandles invalid VP register exits).A minor rebase fits: nothing dropped, the two conflicts are small, and the one break that no conflict exposed is a lock-file entry. A reorganization (v8.0) would fold that fixup into positions 069 and 133 and renumber the roadmap for no change in behavior, so the fold waits for the next one.
A release completes no issue, so this pull request carries the
no-issuelabel.How was this change validated?
OpenVMM
python scripts\openvmm_release.py check-chain --dir <v7.1 worktree> --new-base 9a875b563 --old-base e6b458cc0 --old-head 6e5303f94passes. It shows 316 commits, 0 merges, and 316 good SSH signatures. Each replayed commit keeps its author, date, subject, and trailers.openvmm_release.py check-commits --commits ...passes at all four:rustfmt --checkon the changed.rsfiles,cargo check --locked --workspace --all-targets, andcargo xtask fmt --pass lints.cargo check --locked --workspace --all-targets --exclude vtpm_utilpasses at all four.vtpm_util's vendored OpenSSL needs a native Perl.cargo xtask fmt --pass lintspasses at 060, 277, and 315, and the fullcargo xtask fmtpasses at 316.85c3698f9:cargo xtask fmtpasses all of its passes, verify-flowey among them, on Linux and Windows.cargo clippy --workspace --all-targets -- -D warningspasses on Linux, and on Windows withoutvtpm_util,guest_test_uefi, andopentmk_executor. The hosts' default Rust 1.98 fails Clippy only on its newchunks_exact_to_as_chunkslint, in upstream code that the chain does not touch (pal,device_emulators,ucs2).cargo nextest run --profile agentpasses 414 of 414 tests on Linux (13 skipped) and 317 of 317 on Windows. It covers the 11 packages that the conflicts and the fixup change, or that build on them:petri,petri-tool,incubator,prep_steps,burette,virt_mshv,openvmm_hypervisors,openvmm_resources,tmk_vmm,cpu_profile,openvmm_helpers.cargo xflowey vmm-tests-run --filter "test(microvm)"passes 7 of 7 on KVM (WSL2 Ubuntu) and 7 of 7 on WHP (Windows 11).Cargo.lockanymore.unit tests [x64-linux],unit tests [x64-windows], andrun vmm-testsonx64-linux-amd-kvm,x64-linux-intel-mshv,x64-windows-intel, andx64-windows-amd.xtask fmton both platforms,cargo hack, and every build: 30 of its 36 jobs.run vmm-perfjobs were still running when this was written.run vmm-tests [x64-windows-amd-snp]. 6 of its 88 tests hit petri's 600-second test timeout while booting a Hyper-V OpenHCL SNP guest, and nothing else failed.mainand on the previous chain heads. Every sampled run fails it: 1 to 4 tests on each of seven upstreammainpushes of 2026-11-17 and 2026-11-18, including the new base9a875b563(run 44331768548, 2 tests). It also failed 15 tests on the previous pin6e5303f94(run 44227888038) and 21 on v7.0's1b25c5bbc(run 43935939262).snp_boot,snp_boot_single_proc,snp_ak_retry,snp_vmbus_relay_force_mnf). The other two,snp_reboot_into_guest_vsmandsnp_vmbus_relay, time out the same way.NVX
python scripts\nvx.py verifypasses.python scripts\openvmm_pin.py check-roadmap --worktreepasses (316 positions, 319 references).python scripts\openvmm_pin.py check-branch --target origin/devpasses: two verified commits, standalone, no coordinated files.python scripts\check_markdown_links.pyandgit diff --checkpass.python scripts\local_gates.py --base origin/dev --run --keep-going --only test-changes markdown-links test-layout openvmm-vectors openvmm-cpu-profiles nvx-clipasses all six gates. It ran withNVXset to a local release build ofnvxand Git'susr\binonPATH:test-changes: 0 changes to existing tests;openvmm-vectors: 4 passed;openvmm-cpu-profiles: 1 passed;nvx-cli: 2309 and 84 Python tests OK, 89 and 11 skipped.python scripts\nvx.py check-openvmm-ci, theopenvmm-cigate thatlocal_gates.pyalso selects, passes: it finds the pin's six required jobs passed in run 44358359786.test-microvm: each run used OpenVMM built at the pin withpython scripts\nvx.py build-openvmm, over the guest artifacts of releasev0.1.0-dev.41b10586a5b0, whichnvx downloadinstalled.build/openvmm.provenance.jsonnames85c3698f9with a clean source, and the binary's SHA-256 changed from the release's.python scripts\nvx.py test-microvm --backend whppasses 60 of 60 scenario runs.python3 scripts/nvx.py test-microvm --backend kvmcannot run there, at this pin or at the previous one.--cpu-profile autoselects the built-inintel.alderlake.v1profile for this CPU, which WSL2's nested KVM cannot boot. The first scenario fails with[E_PROFILE_UNSUPPORTED] the backend does not support CPU profile intel.alderlake.v1: MSR 0x10a bits 8, 17 are not supported.6e5303f94, fails the same cold boot with the same error.vmm_core/cpu_profile,vmm_core/virt_kvm, andvmm_core/virt/src/x86are identical at both pins. So the failure is the host's limit, which doc/usage.md's CPU profiles section describes, not a regression.nvx run --hypervisor kvm --cpu-profile hostat the pin boots the Alpine guest (ALPINE-MICROVM-BOOT-OK,NVX-GUEST-BOOT-OK), runs a command on its console, and exits 0 through/sbin/nvx-exit 0.Backend, host OS, host type, and guest:
intel.alderlake.v1profile: no run printed theNVX-CPU-PROFILE-FALLBACKwarning.Left to CI:
test-microvmon KVM and MSHV, on the CI runners, whose CPUs built-in profiles serve. The MSHV test host was unreachable; OpenVMM CI's MSHV jobs pass.Checklist
python3 scripts/check_test_layout.pychecks.python3 scripts/check_test_changes.py --base origin/devlists no changeto an existing test, or a Changes to existing tests section below
explains each one.
.github/copilot-instructions.mdand the skills when a convention orworkflow changes.
nvxupdatesnvx-rs/public-api/withpython3 scripts/public_api.py --update.description says how the change versions or migrates them.
The pin changes no NVX code, tests, or public API. The roadmap is the documentation it affects. The snapshot manifest, contract versions, and vectors that
nvxchecks match the pin.OpenVMM pin
OpenVMM source
85c3698f94e8c8308ac1b09e99b31b17ae50a037, position 316. It is the head offeature/microvm/release/v7.1, a new branch.6e5303f94, the head offeature/microvm/dev, which openvmm: pin the refusal of a malformed snapshot ID #1741 pinned. It holds the 296 commits offeature/microvm/release/v7.0(1b25c5bbc) and the 19 that OpenVMM pull requests merged after it, through [DO NOT REVIEW] openvmm_helpers: refuse a malformed snapshot ID by its field openvmm#5141.mainat9a875b563(2026-11-18), 14 commits past the v7.0 basee6b458cc0.mainsince: one commit,715927303(repo: Clean up guest arch cfgs, use cfg_select openvmm#5082,repo: Clean up guest arch cfgs, use cfg_select), which merged after the rebase began.git merge-tree --write-tree 85c3698f9 715927303conflicts in 10 files, so it goes into the next release.feature/microvm/dev: [DO NOT REVIEW] microvm: enable governed ARM64 cold boot on WHP openvmm#5045 and the draft [DO NOT REVIEW] cpu_profile: add NVIDIA N1X WHP profile openvmm#5096, both[DO NOT REVIEW], are not part of this release. Oncefeature/microvm/devmoves, they need a rebase onto it. NVX has no other open pull request that moves the gitlink.What changed in OpenVMM
No drops.
openvmm_release.py dropsfinds no chain commit whose patch upstream has, and none of the roadmap's open upstream pull requests merged.Two conflicts, resolved in place:
65258e052petri, vmm_tests: add a microVM builder, portb harness, and cold-boot testuses_pipette_as_initkeeps upstream's condition (non-OpenHCL Linux direct boot, or an MSHV base initrd). It applies the chain'smicrovm::uses_pipette_as_initgate, which admits only the standard machine profile, to both, before it requires a Pipette binary.eaf039eedvirt: save a guest's user-wait, debug, and feature MSRsvirt_mshv'sErrorInnerkeeps upstream'sInvalidVpRegisterValueandInvalidVpRegisterMessage, followed by the chain's x86-64UnsupportedState.One fixup at the tip, to fold into the commits that it names at the next reorganization:
85c3698f9cpu_profile, openvmm_helpers: name sha2 as upstream's lock file doesHere is why the fixup is needed:
sha20.10 fromCargo.lock, which leaves 0.11.0 the only version, so upstream's lock file now namessha2without a version.openvmm_helpers: define the authoritative microVM machine contract) and 133 (cpu_profile: fingerprint backend CPU surfaces and pin CPU profiles) addsha2to their crates' dependencies. Their entries still name itsha2 0.11.0.cargo check --lockedaccepts that, because it compares the resolves rather than the text. But any cargo command that may update the lock file rewrites the two lines and leaves the checkout dirty. The replay showed this in both release worktrees.Upstream's other 12 commits apply without conflicts.
What changed in NVX
The gitlink and the roadmap, as What does this pull request change? describes. The comparisons of what
nvxcopies from OpenVMM pass at the pin:cargo test --test openvmm_vectors -- --ignored(4 passed) and--test openvmm_cpu_profiles(1 passed). So the gitlink commit carries no coordinated change.Equivalence
Patches:
git range-diff e6b458cc0..6e5303f94 9a875b563..85c3698f9pairs all 315 replayed commits in order:virt_mshv: make RUN_VP cancellation race-free).The fixup, 316, is new. No commit is dropped or reordered.
Tree:
git merge-tree --write-tree 6e5303f94 9a875b563is a three-way textual merge of upstream's 14 commits into the previous pin. It conflicts in the two files of the resolutions. The pin's tree differs from it in seven files:Cargo.lock, from the fixup;openvmm-*workflows..gitattributesmerges them withmerge=flowey-theirs, somerge-treetakes upstream's copies and drops the chain's changes. The pin's copies carry upstream's changes and the chain's together, and the verify-flowey pass ofcargo xtask fmtaccepts them.Roadmap positions
Every commit keeps its v7.0 position. The mapped tip is still position 126,
c928e8dc1. The pin is position 316, 190 commits past it, and positions 127-301 and 303-316 are not yet assigned to roadmap PRs.Landing order
Done: OpenVMM CI passed NVX's six required jobs on the pin (run 44358359786), and
python scripts\nvx.py check-openvmm-cipasses.Pending: fast-forward
feature/microvm/release/v7.0from1b25c5bbcto the previous pin,6e5303f94, without force. Every revision of the old line that NVX pinned then stays on a branch thatgit submodule updateof an older NVX commit can fetch.Pending: move
feature/microvm/devfrom6e5303f94to the pin,85c3698f9, with a lease on6e5303f94, because.gitmodulestracks that branch. Steps 2 and 3 are one command, which waits for a maintainer's go-ahead:python scripts/openvmm_release.py land --remote origin --old-head 6e5303f9457b1d1f2dc45ced689ab09311325f1f --new-head 85c3698f94e8c8308ac1b09e99b31b17ae50a037 --prev-release feature/microvm/release/v7.0 --pushIt stops if
feature/microvm/devmoved in the meantime. Then the new commits go onto the release, and the release is validated, published, and pinned again.Pending: this PR merges through the merge queue once steps 2 and 3 are done and a maintainer approves it.
NVX head:
a720ecc40d6e9b3a70b34a549cf78837725de719, ondevat4c1bfa09ed9.