diff --git a/doc/openvmm-upstream-roadmap.md b/doc/openvmm-upstream-roadmap.md index 98836da9f..cb787aa6c 100644 --- a/doc/openvmm-upstream-roadmap.md +++ b/doc/openvmm-upstream-roadmap.md @@ -7,18 +7,18 @@ `b2676222b383bf50c7022f6a5983920421469a47`; see [Upstream status](#upstream-status). - Mapped fork tip: `3cdf4fe3834cfb90b9ee685875493bc9bff1b7a4`, position 135. The graph, PR summary, and commit mapping below cover positions 001-135 and the PR20 fixup at position 152. -- NVX's pinned OpenVMM revision: `4713c539ac989c5760415f8441bdb85ae9be3e82`, position 213. - Position 213, which microsoft/openvmm#4887 proposes for `feature/microvm/dev`, is one commit on - position 212, `de29849a4`, which microsoft/openvmm#4886 proposes as one commit on position 211, - `5aa8b0285`, which microsoft/openvmm#4894 proposes as one commit on position 210, `eda13d80a`, - the head of the `feature/microvm/release/v4.0` branch of microsoft/openvmm, to which - `feature/microvm/dev` also points. The v4.0 reorganization moved the 205 commits of +- NVX's pinned OpenVMM revision: `7454ae523ba5beba2e41eb3454bf20912cdbc235`, position 214. + Position 214, which microsoft/openvmm#4910 proposes for `feature/microvm/dev`, is one commit on + position 213, `4713c539a`, the head of that branch since microsoft/openvmm#4894, + microsoft/openvmm#4886, and microsoft/openvmm#4887 merged positions 211, 212, and 213 onto + position 210, `eda13d80a`, the head of the `feature/microvm/release/v4.0` branch of + microsoft/openvmm. The v4.0 reorganization moved the 205 commits of `feature/microvm/release/v3.0` and the NVX pin before it, `35e76265f`, onto `c6d3da0ff`. It dropped the eight commits whose changes upstream had landed or superseded, retired the fallible device start that microsoft/nvx#1232 replaces with awaited device restoration, folded that restoration into the commits that it changes, and added 14 commits that give each ABI that the chain introduces a single version; see [The v4.0 reorganization](#the-v40-reorganization). The - pin is 78 commits past the mapped tip on the same first-parent chain. Positions 136-213, except + pin is 79 commits past the mapped tip on the same first-parent chain. Positions 136-214, except the PR20 fixup at position 152, are not yet assigned to PRs; see [Commits after the mapped tip](#commits-after-the-mapped-tip). - Upstream main: `ca6b2b177da5e33ae1bcac72986b31d6b039811c` (2026-11-02), one commit past the @@ -647,7 +647,8 @@ c6d3da0ff -> sandbox block roles [192] -> virtio feature masks [193-194] -> IOAPIC interrupt lines [195-196] -> ABI restart [197-210] -> boot console exit drain [211] -> portb without host input [212-213] - -> 4713c539a (NVX pin) + -> Windows SNP test job [214] + -> 7454ae523 (NVX pin) ``` For upstream review, PR01-PR07 and PR14 can be rebased independently onto current upstream main, @@ -663,12 +664,12 @@ see [The v3.0 reorganization](#the-v30-reorganization). ## Commits after the mapped tip -The NVX pin extends the chain past position 135 without merges. Of the 78 later commits, position +The NVX pin extends the chain past position 135 without merges. Of the 79 later commits, position 152 is a PR20 fixup, and the others are not yet classified or assigned to PRs. Each of positions 136-191 combines the v2.4 commits that the table lists, as v3.0 positions 145-200 did, which developed one concept; "(part)" marks a v2.4 fixup that split across commits. Positions 192-196 followed the v3.0 reorganization, positions 197-210 are the ABI restart of the v4.0 -reorganization, and positions 211-213 followed it, so they combine none. +reorganization, and positions 211-214 followed it, so they combine none. | Position | Commit | v3.0 position | v2.4 positions | Topic | | ---: | --- | ---: | --- | --- | @@ -750,6 +751,7 @@ reorganization, and positions 211-213 followed it, so they combine none. | 211 | `5aa8b0285` | - | - | microVM: drain the boot console's terminal output at guest exit (microsoft/openvmm#4894) | | 212 | `de29849a4` | - | - | vmm_tests: drive the microVM guests without portb input (microsoft/openvmm#4886) | | 213 | `4713c539a` | - | - | microVM: remove portb's host input (microsoft/openvmm#4887) | +| 214 | `7454ae523` | - | - | ci: ignore test failures in the Windows SNP VMM test job (microsoft/openvmm#4910) | The remarks that say whether commits apply to upstream main record what the v3.0 reorganization found on its base, `b2676222b`, at the positions that the commits have now. @@ -835,6 +837,14 @@ Positions 212 and 213 change only the microVM portb device, its CLI and test har of PR15, PR17, and PR25, and their Guide pages: replaying them on upstream main conflicts in all nine of their files, six of which upstream main lacks, so they follow those PRs upstream. +Position 214 changes only the parameters of the checkin gates' `x64-windows-amd-snp` VMM test job, +which it lets pass when its tests fail: the Hyper-V SNP tests fail intermittently on the job's +self-hosted host, and the gates already leave the job out of what they require. Positions 131 and +132 of the fork tail and position 191 also change the checkin gates, but position 214 changes none +of what they add. It applies to upstream main, `ca6b2b177`, as it is, and `flowey_hvlite` +type-checks there, so it can go upstream on its own; as with positions 190 and 191, the chain +keeps it until upstream fixes the tests' flakiness. + ## PR summary Each count is of v4.0 commits, which include the fixups that the v3.0 reorganization folded into diff --git a/openvmm b/openvmm index 4713c539a..7454ae523 160000 --- a/openvmm +++ b/openvmm @@ -1 +1 @@ -Subproject commit 4713c539ac989c5760415f8441bdb85ae9be3e82 +Subproject commit 7454ae523ba5beba2e41eb3454bf20912cdbc235