From 0a86d8265d147ed89d44f60db536903259df65e2 Mon Sep 17 00:00:00 2001 From: Pedro Henrique Penna Date: Fri, 13 Nov 2026 01:10:45 -0800 Subject: [PATCH 1/2] openvmm: pin microVM v6.1, rebased onto upstream main Pin the openvmm submodule to 73cf40357, the head of the new feature/microvm/release/v6.1 branch of microsoft/openvmm. That branch rebases the 268-commit microVM chain of feature/microvm/dev, through the previous pin, 5ca20ee08, from ba105dd7f onto microsoft/openvmm main at 7d90c4104, 44 upstream commits later. Upstream landed seven of the chain's commits, so the rebase drops v6.0 positions 002, 008, 009, and 014, which microsoft/openvmm#4595, microsoft/openvmm#4591, microsoft/openvmm#4604, and microsoft/openvmm#4609 merged, and 051-053, whose MP table builder and firmware-less Linux direct boot microsoft/openvmm#4554 merged in a revised form. Replaying the other 261 conflicts at 16 positions, 11 of them with microsoft/openvmm#4553, upstream's SaveVM and RestoreVM for the management RPC, which records a snapshot ID in the manifest's field 18 and changes the snapshot publication that the chain replaces. The rebase publishes upstream's snapshots through the chain's staged publication, gives a microVM capture the zero snapshot ID, and has RestoreVM refuse a microVM, which restores from its authoritative manifest through CreateVM instead. Eight fixups at its tip adapt the chain to upstream changes that no conflict exposed: the user SID queries at upstream's path, upstream's MP-table boot module, and six for microsoft/openvmm#4553. The last two save the VM of upstream's ttrpc interface test with a VMBus NIC, since the chain's virtio-net saves only a NIC with a static identity and feature contract, and drop the page cache of each independent copy that the chain's snapshot publication makes: on MSHV, with the snapshot on ext4, the VM that the test restores in place from such a copy of its memory stopped as soon as it resumed while the copy's pages were still cached. OpenVMM's snapshot manifests therefore carry field 18, which mesh writes even when the ID is zero, and nvx-rs's reader of a template's manifest refuses fields that it does not know. Accept field 18 and check only that it holds 16 bytes, since a microVM capture leaves it zero and a template depends on nothing in it, and test that a manifest without it, one of an earlier OpenVMM, still reads, as does one with an ID that is not zero. The other vectors, excerpts, contract versions, and CPU profiles that nvx-rs copies from OpenVMM match the pin. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- nvx-rs/README.md | 9 ++++--- nvx-rs/src/host/template/manifest.rs | 17 ++++++++++-- nvx-rs/src/host/template/manifest/tests.rs | 31 ++++++++++++++++++++-- nvx-rs/src/host/template/tests.rs | 14 +++++++--- openvmm | 2 +- 5 files changed, 60 insertions(+), 13 deletions(-) diff --git a/nvx-rs/README.md b/nvx-rs/README.md index 129fdf622..e7cb2e8b7 100644 --- a/nvx-rs/README.md +++ b/nvx-rs/README.md @@ -701,10 +701,11 @@ capture, at most `MAX_MANIFEST_LEN` bytes of a regular file that is not a link or other reparse point, and refuses another snapshot format version, an unknown, mistyped, or repeated field, truncated bytes, and a capture that is not a template's: a platform-tier capture for clones, with a read-only `distro` whose -identity is unbound, a fresh scratch, and the dormant filesystem slot. The -restores of [`run`](#run) read the host attachments of the machine contract of -any microVM snapshot's manifest through the same reader, with every check but -those that make a manifest a template's. +identity is unbound, a fresh scratch, and the dormant filesystem slot. Of the +snapshot ID that OpenVMM's SaveVM records, which a microVM capture leaves zero, +it checks only the length. The restores of [`run`](#run) read the host +attachments of the machine contract of any microVM snapshot's manifest through +the same reader, with every check but those that make a manifest a template's. `CaptureClass` holds the invariant inputs of a capture, known before it: the runtime, the guest's build, the backend, the requested CPU profile, the diff --git a/nvx-rs/src/host/template/manifest.rs b/nvx-rs/src/host/template/manifest.rs index 166043aa2..be8294eb7 100644 --- a/nvx-rs/src/host/template/manifest.rs +++ b/nvx-rs/src/host/template/manifest.rs @@ -116,6 +116,9 @@ const SHA256_LEN: usize = 32; /// Bytes of a host or boot identity. const HOST_IDENTITY_LEN: usize = 16; +/// Bytes of a snapshot ID, a GUID. +const SNAPSHOT_ID_LEN: usize = 16; + /// Nanoseconds in a second. const NANOS_PER_SECOND: i32 = 1_000_000_000; @@ -663,7 +666,8 @@ impl Machine { /// format does not have, a field that is not of its type or that appears twice, truncated bytes, /// and a manifest that is not a template's: a platform-tier capture of a microVM, for clones, with /// a read-only `distro` whose identity is unbound, a fresh scratch, and the dormant filesystem -/// slot. It never reads another artifact of the snapshot. +/// slot. Of the snapshot ID in field 18, which OpenVMM's SaveVM records and a microVM capture +/// leaves zero, it checks only the length. It never reads another artifact of the snapshot. /// /// A template's [`TemplateKey`](super::TemplateKey) projects its machine. The rest is the /// capture's own: when it was taken, its [`TimeContract`]'s anchor, host, boot, and lineage @@ -1019,7 +1023,7 @@ fn decode_manifest(data: &[u8]) -> Result { decode( data, what, - &[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], + &[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18], &[], |field| { match field.number { @@ -1042,6 +1046,15 @@ fn decode_manifest(data: &[u8]) -> Result { 13 => raw.tier = field.text().map_err(&wire)?.to_owned(), 14 => raw.restore_policy = field.text().map_err(&wire)?.to_owned(), 15 => raw.consumed_sections = field.uint32().map_err(&wire)?, + 18 => { + let id = field.bytes().map_err(&wire)?; + if id.len() != SNAPSHOT_ID_LEN { + return Err(format!( + "{what} has a snapshot ID of {} bytes, not {SNAPSHOT_ID_LEN}", + id.len() + )); + } + } _ => unreachable!("the message refuses unknown fields"), } Ok(()) diff --git a/nvx-rs/src/host/template/manifest/tests.rs b/nvx-rs/src/host/template/manifest/tests.rs index 02ff0f900..b7279f75d 100644 --- a/nvx-rs/src/host/template/manifest/tests.rs +++ b/nvx-rs/src/host/template/manifest/tests.rs @@ -325,8 +325,8 @@ fn other_versions_of_the_format_are_unsupported() { #[test] fn fields_that_the_format_does_not_have_are_refused() { let template = ManifestSpec::template(); - // Fields 16 and later do not exist yet. - for number in [16, 17, 18, 63, 64, 1000] { + // Fields 16 and 17, and 19 and later, do not exist yet. + for number in [16, 17, 19, 20, 63, 64, 1000] { let message = refusal( &template.encode_with(Proto::default().varint(number, 1)), ErrorCode::Io, @@ -369,6 +369,25 @@ fn fields_that_the_format_does_not_have_are_refused() { ); } +#[test] +fn only_the_length_of_the_snapshot_id_is_checked() { + // A manifest of an earlier OpenVMM has no snapshot ID, and one that SaveVM wrote has one + // that is not zero. + let template = parse(&ManifestSpec::template()); + for snapshot_id in [None, Some(vec![0xa5; 16])] { + let mut spec = ManifestSpec::template(); + spec.snapshot_id = snapshot_id; + assert_eq!(parse(&spec), template); + } + for len in [0, 15, 17] { + assert_refused( + |spec| spec.snapshot_id = Some(vec![0; len]), + ErrorCode::Io, + &format!("it has a snapshot ID of {len} bytes, not 16"), + ); + } +} + #[test] fn malformed_manifests_are_refused() { let template = ManifestSpec::template(); @@ -427,7 +446,15 @@ fn malformed_manifests_are_refused() { #[test] fn truncated_manifests_are_refused() { let bytes = ManifestSpec::template().encode(); + // The snapshot ID comes last, so the manifest without it, one of an earlier OpenVMM, is the one + // prefix that is whole. + let mut earlier = ManifestSpec::template(); + earlier.snapshot_id = None; + let earlier = earlier.encode(); for len in 0..bytes.len() { + if bytes[..len] == earlier[..] { + continue; + } let error = TemplateManifest::parse(&bytes[..len]).expect_err("a truncated manifest is refused"); // A manifest that ends between its fields lacks some, such as its format magic. diff --git a/nvx-rs/src/host/template/tests.rs b/nvx-rs/src/host/template/tests.rs index 1badb2835..611211131 100644 --- a/nvx-rs/src/host/template/tests.rs +++ b/nvx-rs/src/host/template/tests.rs @@ -600,6 +600,8 @@ pub(super) struct ManifestSpec { pub(super) restore_policy: String, /// Field 17. pub(super) consumed_sections: u32, + /// Field 18: the snapshot ID, which a microVM capture leaves zero, if it is written. + pub(super) snapshot_id: Option>, } /// The kernel command line of the template of [`ManifestSpec::template`]. @@ -817,6 +819,7 @@ impl ManifestSpec { tier: "platform".to_owned(), restore_policy: "clone".to_owned(), consumed_sections: 1, + snapshot_id: Some(vec![0; 16]), } } @@ -929,15 +932,18 @@ impl ManifestSpec { if let Some(contract) = &self.contract { message = message.message(9, contract.encode()); } - message + message = message .bytes(10, &self.magic) .varint(11, self.schema_version.into()) .text(12, &self.root_type) .text(13, &self.tier) .text(14, &self.restore_policy) - .varint(15, self.consumed_sections.into()) - .raw(&extra.finish()) - .finish() + .varint(15, self.consumed_sections.into()); + // `mesh` writes the snapshot ID, a fixed-size value, even when it is zero. + if let Some(snapshot_id) = &self.snapshot_id { + message = message.always_bytes(18, snapshot_id); + } + message.raw(&extra.finish()).finish() } /// Encodes the manifest. diff --git a/openvmm b/openvmm index 5ca20ee08..73cf40357 160000 --- a/openvmm +++ b/openvmm @@ -1 +1 @@ -Subproject commit 5ca20ee081c255bed107e58b6dc5b5b769b6101d +Subproject commit 73cf403574a8907ee94dab0ab9d648152b832b05 From 79e93568a9f8eafb2b88de372bf3b67ed1bbf22f Mon Sep 17 00:00:00 2001 From: Pedro Henrique Penna Date: Fri, 13 Nov 2026 03:01:30 -0800 Subject: [PATCH 2/2] doc: map the OpenVMM roadmap onto the microVM v6.1 rebase The feature/microvm/release/v6.1 rebase, which the previous commit pins, moved the microVM chain from ba105dd7f onto upstream main at 7d90c4104 and dropped the seven commits that upstream landed, so positions from 003 on are lower than in v6.0: by one through v6.0 position 007, by three through 013, by four through 050, and by seven from 054 on. Remap the scope, upstream status, graph, branch DAG, the commits after the mapped tip, PR summary, and commit mapping onto the rebased commits, and name each commit's v6.0 position in the table of commits after the mapped tip and in the mapping. Record the dropped commits and the forms in which upstream landed them, which leave nothing of PR04, the 16 conflicts that the rebase resolved and the workflows that it regenerated at position 121, and the eight fixups at positions 262-269, each with the commits that it folds into. As of 2026-11-13, microsoft/openvmm#4611 and microsoft/openvmm#4615 are closed, and seven of the ten open upstream pull requests are drafts. The remarks on whether commits apply to upstream main record what was found on ba105dd7f and earlier bases; the rebase did not check them again. The pin, 73cf40357, is position 269, 145 commits past the mapped tip. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- doc/openvmm-upstream-roadmap.md | 2296 ++++++++++++++++--------------- 1 file changed, 1217 insertions(+), 1079 deletions(-) diff --git a/doc/openvmm-upstream-roadmap.md b/doc/openvmm-upstream-roadmap.md index e46e82245..d46426931 100644 --- a/doc/openvmm-upstream-roadmap.md +++ b/doc/openvmm-upstream-roadmap.md @@ -2,78 +2,55 @@ ## Scope -- OpenVMM fork base: `ba105dd7f00499acc1862456c179c0930cb2c8f7`, upstream main on 2026-11-06. - The `feature/microvm/release/v5.1` rebase moved the chain there from - `61994293a9e5e3bcc1d685d708cf462920eed030`, and the `feature/microvm/release/v6.0` - reorganization kept it there; see [Upstream status](#upstream-status). -- Mapped fork tip: `7677ad8d56a59864475012b63b6f01a22575c30d`, position 131. The graph, PR - summary, and commit mapping below cover positions 001-131, the PR09 fixups at positions - 241-243, the PR13 fixup at position 247, the PR18 fixup at position 248, the PR20 fixup at - position 249, and the PR19 fixup at position 250. -- NVX's pinned OpenVMM revision: `5ca20ee081c255bed107e58b6dc5b5b769b6101d`, position 268, the - head of microsoft/openvmm#5073, whose commit follows position 267, `60e160369`, the head of - `feature/microvm/dev`, which microsoft/openvmm#5072 merged after position 266, `6f57a6d61`, - which microsoft/openvmm#5067 merged with position 265 after position 264, - `8eede133c`, which microsoft/openvmm#5065 merged after position 263, `5d656d854`, - which microsoft/openvmm#5061 merged after position 262, `c2c21ddb2`, - which microsoft/openvmm#5056 merged after position 261, `c72fc56a3`, - which microsoft/openvmm#5055 merged with positions 259 and 260 after - position 258, `024ecee62`, which microsoft/openvmm#5053 merged with positions 256 and 257 after - position 255, `90f87319d`, which microsoft/openvmm#5052 merged with position 254 after position - 253, `3cd9f149b`, which microsoft/openvmm#5046 merged after position 252, `9f10ce7a8`, - which microsoft/openvmm#5044 merged after position 251, `174da3a0d`, - which microsoft/openvmm#5042 merged after position 250, `23136b647`, - which microsoft/openvmm#5041 merged after position 249, `fb4f34126`, - which microsoft/openvmm#5038 merged after position 248, `58d3c3b1d`, - which microsoft/openvmm#5026 merged after position 247, `61cdd6397`, - which microsoft/openvmm#5022 merged after position 246, `cd5cd3814`, - which microsoft/openvmm#5016 merged after position 245, `a8a0e3517`, which - microsoft/openvmm#5013 merged with positions 243 and 244 after position 242, `6ddd6ca50`, which - microsoft/openvmm#5012 merged with position 241 after position 240, `4c2697aef`, which - microsoft/openvmm#5010 merged with - position 239 after position 238, `46bfe02ed`, which microsoft/openvmm#5005 merged after - position 237, `cba21d109`, which microsoft/openvmm#5004 merged after position 236, - `ac3dc27a7`, which microsoft/openvmm#5003 merged after position 235, `b4028c1aa`, which - microsoft/openvmm#5001 merged after position 234, `f41a1ecfc`, which microsoft/openvmm#4997 - merged after position 233, `d501e5066`, which microsoft/openvmm#4996 merged after position 232, - `6cb6ba87c`, which microsoft/openvmm#4995 merged after position 231, `98e5b3ca5`, which - microsoft/openvmm#4994 merged with position 230 after position 229, `ed8fc0713`, which - microsoft/openvmm#4993 merged after position 228, `d6addf8c1`, which - microsoft/openvmm#4992 merged after position 227, `154548a0e`, which - microsoft/openvmm#4991 merged after position 226, `881619911`, which - microsoft/openvmm#4989 merged after position 225, `99aac19b3`, which - microsoft/openvmm#4988 merged after position 224, `adb7c8bc8`, which - microsoft/openvmm#4987 merged after position 223, `90f9e6180`. Positions 221-223, the - three commits of microsoft/openvmm#4986, follow position 220, `cf6c03977`, the head of - `feature/microvm/release/v6.0`. - The v6.0 reorganization regrouped the 223 commits of `feature/microvm/dev` at the NVX pin before - that, `3f2ab4c2f`, the head of `feature/microvm/release/v5.1`, into 220 commits on the same fork - base: it folded the PR20 fixup at v5.1 position 148 into position 097 and the PR12 fixup at v5.1 - position 221 into positions 035 and 036, and combined v5.1 positions 222 and 223, the two commits - of microsoft/openvmm#4984, into position 220. Positions 001-147 keep their positions, v5.1 - positions 149-220 are positions 148-219, and the tree of position 220 is the tree of - `3f2ab4c2f`; see [The v6.0 reorganization](#the-v60-reorganization). The pin is 137 commits past - the mapped tip on the same first-parent chain. Positions 132-240, 244-246, and 251-268 are not - yet assigned to PRs, positions 241-243 are PR09 fixups, position 247 is a PR13 fixup, position 248 - is a PR18 fixup, position 249 is a PR20 fixup, and position 250 is a PR19 fixup; see +- OpenVMM fork base: `7d90c41044077e31ca060df9206532f579f24716`, upstream main on 2026-11-13. + The `feature/microvm/release/v6.1` rebase moved the chain there from + `ba105dd7f00499acc1862456c179c0930cb2c8f7`, upstream main on 2026-11-06, where the + `feature/microvm/release/v5.1` rebase had moved it and the `feature/microvm/release/v6.0` + reorganization kept it; see [Upstream status](#upstream-status). +- Mapped fork tip: `7f31de5352aed253234f87995423406d29dcaa29`, position 124. The graph, PR + summary, and commit mapping below cover positions 001-124, the PR09 fixups at positions + 234-236, the PR13 fixup at position 240, the PR18 fixup at position 241, the PR20 fixup at + position 242, and the PR19 fixup at position 243. +- NVX's pinned OpenVMM revision: `73cf403574a8907ee94dab0ab9d648152b832b05`, position 269, the + head of `feature/microvm/release/v6.1`. The v6.1 rebase replayed the 268 commits of + `feature/microvm/dev` at NVX's previous pin, `5ca20ee08`, whose first 220 commits are those of + `feature/microvm/release/v6.0`, onto the new fork base without the seven whose changes upstream + had landed, and added eight fixups at its tip, positions 262-269. A commit's position is its + v6.0 position less the number of dropped commits before it: v6.0 positions 003-007 are + positions 002-006, 010-013 are 007-010, 015-050 are 011-046, and 054-268 are 047-261; see + [Conflicts of the v6.1 rebase](#conflicts-of-the-v61-rebase). The pin is 145 commits past the + mapped tip on the same first-parent chain. Positions 125-233, 237-239, and 244-269 are not yet + assigned to PRs, positions 234-236 are PR09 fixups, position 240 is a PR13 fixup, position 241 + is a PR18 fixup, position 242 is a PR20 fixup, and position 243 is a PR19 fixup; see [Commits after the mapped tip](#commits-after-the-mapped-tip). -- Upstream main: `ba105dd7f00499acc1862456c179c0930cb2c8f7` (2026-11-06), the fork base itself; +- Upstream main: `7d90c41044077e31ca060df9206532f579f24716` (2026-11-13), the fork base itself; see [Upstream main past the fork base](#upstream-main-past-the-fork-base). ## Upstream status +The `feature/microvm/release/v6.1` rebase moved the 268-commit chain of `feature/microvm/dev`, +through NVX's previous pin `5ca20ee08`, from `ba105dd7f` onto `7d90c4104`, 44 upstream commits +later. It dropped v6.0 positions 002, 008, 009, 014, and 051-053, whose changes upstream had +landed, all but 002 after review changes; [Landed upstream](#landed-upstream) lists them. +Replaying the remaining 261 commits had conflicts at 16 positions, 11 of them with +microsoft/openvmm#4553, upstream's SaveVM and RestoreVM, which changes the snapshot manifest and +publication of PR11, and the generated workflows of one more needed regenerating; +[Conflicts of the v6.1 rebase](#conflicts-of-the-v61-rebase) lists them. Eight fixups at its tip, +positions 262-269, adapt the chain to upstream changes that no textual conflict exposed. The +patches of 220 replayed commits are unchanged, and those of 25 more differ only in context. + The `feature/microvm/release/v6.0` reorganization kept the 223-commit chain of `feature/microvm/dev`, through NVX's previous pin `3f2ab4c2f`, on `ba105dd7f`, which upstream main -has not passed, so it dropped no commit and nothing conflicted with upstream. It folded the PR20 -fixup at v5.1 position 148 into position 097 and the PR12 fixup at v5.1 position 221 into -positions 035 and 036, combined v5.1 positions 222 and 223 into position 220, and checked that -every commit builds; the pin's tree is the tree of `3f2ab4c2f`. See +had not passed, so it dropped no commit and nothing conflicted with upstream. It folded the PR20 +fixup at v5.1 position 148 into v6.0 position 097 and the PR12 fixup at v5.1 position 221 into +v6.0 positions 035 and 036, combined v5.1 positions 222 and 223 into v6.0 position 220, and +checked that every commit builds; the pin's tree is the tree of `3f2ab4c2f`. See [The v6.0 reorganization](#the-v60-reorganization). The `feature/microvm/release/v5.1` rebase moved the 219-commit chain of `feature/microvm/dev`, through NVX's previous pin `db42fde04`, from `61994293a` onto `ba105dd7f`, nine upstream commits later. Upstream had landed none of its commits, so it dropped none, and every commit kept its -position. Replaying the chain conflicted only at v5.1 position 183, now position 182, which +position. Replaying the chain conflicted only at v5.1 position 183, now position 175, which [Conflicts of the v5.1 rebase](#conflicts-of-the-v51-rebase) lists; the other 218 commits replayed with unchanged patches, and no upstream change broke the chain without a textual conflict, so the rebase added no fixups. @@ -136,6 +113,13 @@ which changed the diffs of 50 of them. | Dropped by | Former position | Fork commit | Roadmap PR | Upstream PR | Upstream commit | | --- | ---: | --- | --- | --- | --- | +| v6.1 | 002 | `707747c16` - flowey: distinguish native Windows and WSL nextest paths | PR01 | microsoft/openvmm#4595 | `5d3ab02f0` | +| v6.1 | 008 | `299a04d4f` - pal: query Unix socket peer credentials | PR03 | microsoft/openvmm#4591 | `42d4fe619` | +| v6.1 | 009 | `a0e70d99e` - pal: resolve the process token user SID | PR04 | microsoft/openvmm#4604 | `6937acefb` | +| v6.1 | 014 | `5ed5f7a22` - serial_socket: keep Windows named-pipe listeners reconnectable | PR06 | microsoft/openvmm#4609 | `f5ef11b8a` | +| v6.1 | 051 | `6cea1ae18` - loader: let static ELF loading reuse a caller buffer | PR14 | microsoft/openvmm#4554, which supersedes it | `e4728b7f4` | +| v6.1 | 052 | `4ccef3c27` - loader: add an Intel MP 1.4 table builder | PR14 | microsoft/openvmm#4554 | `e4728b7f4` | +| v6.1 | 053 | `b585c7300` - loader: add firmware-less Linux direct boot with MP tables | PR14 | microsoft/openvmm#4554 | `e4728b7f4` | | v5.0 | 004 | `6476a457f` - consomme: make TCP window-reopen validation deterministic | PR01 | microsoft/openvmm#4598 | `19485f88e` | | v5.0 | 017 | `ea1153ef4` - consomme: bound active TCP, UDP, and ICMP flows | PR07 | microsoft/openvmm#4600 | `e89a7e22d` | | v5.0 | 023 | `0692a461c` - openvmm_core: stop the devices before tearing down the VM | PR09 | microsoft/openvmm#4863, which supersedes it | `0c9697277` | @@ -172,12 +156,30 @@ which changed the diffs of 50 of them. A former position counts in the branch that the rebase started from: `microvm/v2.1` for the v2.2 rebase, `feature/microvm/release/v2.2` for the v2.3 rebase, `feature/microvm/release/v2.3` for the v2.4 rebase, `feature/microvm/release/v2.4` for the v3.0 reorganization, -`feature/microvm/release/v3.0` for the v4.0 reorganization, and `feature/microvm/dev` at +`feature/microvm/release/v3.0` for the v4.0 reorganization, `feature/microvm/dev` at `e1ca353eb`, whose first 210 commits are those of `feature/microvm/release/v4.0`, for the v5.0 -reorganization. +reorganization, and `feature/microvm/dev` at `5ca20ee08`, whose first 220 commits are those of +`feature/microvm/release/v6.0`, for the v6.1 rebase. microsoft/openvmm#4661 names the `acpi_rsdp_addr` field of `boot_params` exactly as position 074 -did, so the v2.3 rebase dropped 074 as empty. microsoft/openvmm#4554 still carries it, ahead of -positions 051-053. +did, so the v2.3 rebase dropped 074 as empty. microsoft/openvmm#4554 carried it ahead of v6.0 +positions 051-053 until it merged. + +The v6.1 rebase took upstream's versions of its drops and adapted the later commits to them. +microsoft/openvmm#4595 is identical to v6.0 position 002, and microsoft/openvmm#4591 adds tests to +v6.0 position 008's `credentials` module of `pal`, whose API the chain uses unchanged. +microsoft/openvmm#4604 resolves the token user SID in `pal::windows::security` itself rather +than in the `user_sid` module of v6.0 position 009, so the fixup at position 262 calls it there. +microsoft/openvmm#4609 returns a failed write, flush, or close of a Windows named pipe and returns +its backend to listening, as v6.0 position 014 did, with reconnection tests of its own in place of +014's, so position 103's call of `disconnect_current` in 014's test moved into upstream's. +microsoft/openvmm#4554 merged the MP table +builder and the firmware-less Linux direct boot of v6.0 positions 052 and 053 after review moved +the boot into `loader::linux::mptable_boot`, rebuilt the table with `zerocopy` from the MP +specification's structures, numbered the I/O APIC after the processors, and loaded the kernel and +initrd through upstream's `load_kernel_and_initrd_x64`, without the buffer reuse that v6.0 +position 051 added for it. Position 183's routing of every IOAPIC input moved onto that builder, +and the fixup at position 263 loads the microVM through `mptable_boot`; see +[Conflicts of the v6.1 rebase](#conflicts-of-the-v61-rebase). microsoft/openvmm#4863 gives devices a consuming teardown. The VM worker's run drains pending device removals, and its pause stops the state units before the worker tears down the chipset @@ -202,8 +204,8 @@ part of a written copy-on-write view. microsoft/openvmm#4582 answers a pipe's pe through `PipeExt::get_pipe_peer_process_id` instead of the chain's `pal::windows::pipe::peer` module, which also had `is_pipe`. microsoft/openvmm#4586 fast-forwards more counting modes, and microsoft/openvmm#4606 forwards console input in `repl.rs` instead of the `headless` module, which -position 117 creates for the chain's own use, and ends the run when a stdin that is not a -terminal ends, which position 117 confines to machines other than the microVM. +position 110 creates for the chain's own use, and ends the run when a stdin that is not a +terminal ends, which position 110 confines to machines other than the microVM. microsoft/openvmm#4587 is identical to v2.3 position 005. microsoft/openvmm#4522 fixes the lost-PIC-interrupt bug of v2.1 position 022 in a different way. @@ -217,45 +219,47 @@ builds captured. Upstream also landed parts of commits that remain in the chain: - microsoft/openvmm#4556 (`96647c331`) derives `Clone` for `ProtobufMessage` and `ProtobufAny`. - Position 005 keeps its subject but now only adds `ProtobufAny::value_len` and checks a + Position 004 keeps its subject but now only adds `ProtobufAny::value_len` and checks a clone in the round-trip test. - microsoft/openvmm#4524 (`9cf109547`) adds the generic `PartitionTimeControl` contract, MSHV - and WHP implementations, and full-VM freeze/thaw lifecycle calls. Position 027 reuses the + and WHP implementations, and full-VM freeze/thaw lifecycle calls. Position 023 reuses the MSHV implementation, through fallible freeze and thaw helpers, instead of private plumbing. - Positions 025-029 keep the exact TSC-frequency exposure, snapshot downtime handling, - and restored-vCPU synchronization that upstream lacks, and position 097 synchronizes only + Positions 021-025 keep the exact TSC-frequency exposure, snapshot downtime handling, + and restored-vCPU synchronization that upstream lacks, and position 090 synchronizes only the VPs that a restore creates. - microsoft/openvmm#4704 (`1c093df84`) adds the architectural `TscDeadline` VP state element, the `tsc_deadline` partition capability, and the KVM, MSHV, WHP, and OpenHCL register - accessors that v2.4 position 038 also added. Position 024 now uses upstream's, so it keeps + accessors that v2.4 position 038 also added. Position 020 now uses upstream's, so it keeps the `tsc_deadline` field of the CPU compatibility contract, the finalized MSHV partition's - report of no TSC-deadline support, and the LAPIC timer helpers that position 147 deletes - in favor of those that position 139 adds for the time ABI. Upstream compares a restored - deadline on partitions that can freeze time, as WHP can, whereas 024 never compared it, so the - WHP state access of position 028, which reads the deadline before the APIC state, + report of no TSC-deadline support, and the LAPIC timer helpers that position 140 deletes + in favor of those that position 132 adds for the time ABI. Upstream compares a restored + deadline on partitions that can freeze time, as WHP can, whereas 020 never compared it, so the + WHP state access of position 024, which reads the deadline before the APIC state, discards that read when it restores the deadline. - microsoft/openvmm#4764 (`29f0adceb`) makes every lxutil volume resolve paths beneath its root - without following a host symbolic link, as position 130 did for a confined volume, and - microsoft/openvmm#4783 (`7c92b147e`) rejects unsafe opens. Position 130 now only adds + without following a host symbolic link, as position 123 did for a confined volume, and + microsoft/openvmm#4783 (`7c92b147e`) rejects unsafe opens. Position 123 now only adds `LxVolumeOptions::confine_paths`, which makes a Windows volume create LX symlinks, and runs its confinement tests against upstream's implementation. A share therefore needs `openat2`, Linux 5.6 or later, where the chain fell back to opening each component with `O_NOFOLLOW`. ### Open upstream pull requests -As of 2026-11-08, every commit of PR01-PR06, PR09, and PR14 except positions 001, 005, and 016 is -in an open upstream pull request; the commits that upstream has since merged are under -[Landed upstream](#landed-upstream), and PR07 and PR08 have landed whole. Each pull request carries -one commit, except microsoft/openvmm#4554, which carries positions 051-053 after the `boot_params` -field that microsoft/openvmm#4661 has since landed; its ELF and initrd validation was split out -during review and landed as microsoft/openvmm#4667 (`a87971184`). Of those 17 pull requests, -only microsoft/openvmm#4607 is a draft, again since 2026-11-06, and only microsoft/openvmm#4554 has -an approving review. +As of 2026-11-13, every commit of PR01-PR03, PR05, PR06, and PR09 except positions 001, 003, 004, +and 012 is in an open upstream pull request; the commits that upstream has merged are under +[Landed upstream](#landed-upstream), and PR04, PR07, and PR08 have landed whole. Each pull request +carries one commit. Of those 10 pull requests, only microsoft/openvmm#4597, microsoft/openvmm#4613, +and microsoft/openvmm#4618 are ready for review: microsoft/openvmm#4607 has been a draft again +since 2026-11-06, and the other six since 2026-11-10. None has an approving review. microsoft/openvmm#4451, which proposed position 001, was closed without merging, and the -remainder of position 005 has not been proposed. microsoft/openvmm#4619, microsoft/openvmm#4622, -and microsoft/openvmm#4623, which proposed the fallible unit start, device start, and VM resume of -v3.0 positions 026-028, were closed in favor of microsoft/nvx#1232: position 015 now only rolls -back a partial start, v3.0 position 027 is retired, and position 016's resume stays fallible; see +remainder of position 004 has not been proposed. microsoft/openvmm#4615, which proposed position +003, was closed on 2026-11-10, since a Windows servicing release fixes the WHP behavior that it +works around; the chain keeps it. PR14's remaining commit, position 047, is in no pull request +either: microsoft/openvmm#4611, which proposed it, was closed on 2026-11-10, after review suggested +combining it with the commit that needs it. microsoft/openvmm#4619, microsoft/openvmm#4622, and +microsoft/openvmm#4623, which proposed the fallible unit start, device start, and VM resume of +v3.0 positions 026-028, were closed in favor of microsoft/nvx#1232: position 011 now only rolls +back a partial start, v3.0 position 027 is retired, and position 012's resume stays fallible; see [The v4.0 reorganization](#the-v40-reorganization). PR10-PR13 and PR15-PR27 have no upstream pull requests yet. @@ -264,74 +268,177 @@ snapshot quiesce added no safety: microsoft/openvmm#4625, which proposed its bou transactions, was closed, and the v5.0 reorganization retired the commit and folded the quiesce without a deadline into the commits that it changes; see [The v5.0 reorganization](#the-v50-reorganization). microsoft/openvmm#4872, opened on 2026-11-03, -proposes position 015's rollback of a partial start, with review changes that the chain lacks, +proposes position 011's rollback of a partial start, with review changes that the chain lacks, apart from its handling of a unit in a terminal state, its teardown after a failed restart, and -its rollback's stop in reverse dependency order, which the PR09 fixups at positions 241-243 carry. -microsoft/openvmm#4626, which proposes position 018's input gate without a deadline, as the chain -now has it, builds on it. So does microsoft/openvmm#4937, which makes `StateUnits::stop` fail -instead of panicking when a unit's task has ended, as position 244 does in the chain. Position 244 -also adapts the chain's own callers of `StateUnits::stop`, such as the microVM worker's snapshot -quiesce, and makes `VmRpc::Pause` fail where #4937's VM worker panics on a failed stop. +its rollback's stop in reverse dependency order, which the PR09 fixups at positions 234-236 carry. +microsoft/openvmm#4626, which proposes position 014's input gate without a deadline, as the chain +now has it, builds on it. So does microsoft/openvmm#4937, a draft since 2026-11-10, which makes +`StateUnits::stop` fail instead of panicking when a unit's task has ended, as position 237 does in +the chain. Position 237 also adapts the chain's own callers of `StateUnits::stop`, such as the +microVM worker's snapshot quiesce, and makes `VmRpc::Pause` fail where #4937's VM worker panics on +a failed stop. On 2026-11-05, microsoft/openvmm#4605 merged as `48e0681e9`, narrowed in review to the read path: a read error is traced, drops the socket, and is reported as EOF, while writes keep upstream's handling, which reports a broken pipe as a successful write and keeps the socket. Review settled disconnect detection in virtio-console instead, with microsoft/openvmm#4778, which every fork base -since v2.4 includes. Position 041, which carried the pull request's first revision and drops the +since v2.4 includes. Position 037, which carried the pull request's first revision and drops the socket and returns the error on any failed write, therefore has no upstream pull request. The chain keeps it for output rather than disconnects: a virtio-console with the `Retain` policy of PR13's -position 042 and the portb console of PR15's position 060 keep the guest output written after their +position 038 and the portb console of PR15's position 053 keep the guest output written after their peer leaves only when that write fails, and on Linux a write to an AF_UNIX peer that has closed fails with `EPIPE`, which upstream's backend reports as successful. Dropping it as microsoft/openvmm#4605's commit would make `Retain` consoles and portb lose that output on Linux. The v5.0 reorganization therefore dropped v4.0 position 217, which cherry-picked `48e0681e9` for -PR06, and moved v4.0 position 015 into PR13 as position 041, ahead of the policy that needs it, +PR06, and moved v4.0 position 015 into PR13 as position 037, ahead of the policy that needs it, with v4.0 position 218, which explains and tests that write handling, folded into it. PR13's -position 043 took the test of v4.0 position 219 that a `Retain` console keeps that output for the +position 039 took the test of v4.0 position 219 that a `Retain` console keeps that output for the next peer. -Position 014's microsoft/openvmm#4609 has the same split: it drops a Windows named pipe on a failed -write, flush, or close, while upstream's named-pipe backend reports a broken pipe on a write as -successful, and a `Retain` console on a named pipe needs that write handling for the same reason. -Position 014 stays whole in PR06. If the review of microsoft/openvmm#4609 narrows it as that of -microsoft/openvmm#4605 did, its write handling joins position 041 in PR13. - -microsoft/openvmm#4553, upstream's SaveVM and RestoreVM for the management RPC, proposes no chain -commit either. It records a snapshot ID in the manifest's field 18, to which it moved the ID from -field 8, the chain's `state_size_bytes`, after microsoft/nvx#1210 raised the clash, and it reserves -fields 19 and 20 for `compatibility_bundle_digest` and `memory_artifacts`; position 231 keeps those -three fields free. It also changes `write_snapshot` in the snapshot publication of -`openvmm_helpers`, which PR11's positions 031-033 and later chain commits change. A rebase onto it -therefore adds `snapshot_id` to the chain's `SnapshotManifest` and reconciles the publication, and -NVX's pin of that rebase needs `nvx-rs`'s reader of a template's manifest, which refuses fields -that it does not know, to accept field 18. +microsoft/openvmm#4609, which v6.0 position 014 carried, had the same split, but its review kept +the write handling: since it merged as `f5ef11b8a` on 2026-11-11, a Windows named pipe returns a +failed write, flush, or close and drops its client, so a `Retain` console on a named pipe keeps +that output too. The v6.1 rebase therefore dropped 014 as landed. + +On 2026-11-10, microsoft/openvmm#4553, upstream's SaveVM and RestoreVM for the management RPC, +which proposes no chain commit, merged as `64828d2b5`. It records a snapshot ID in the manifest's +field 18, to which it moved the ID from field 8, the chain's `state_size_bytes`, after +microsoft/nvx#1210 raised the clash, and it reserves fields 19 and 20 for +`compatibility_bundle_digest` and `memory_artifacts`, all three of which position 224 had kept +free. It also changes `write_snapshot` in the snapshot publication of `openvmm_helpers`, which +PR11's positions 027-029 and later chain commits change. The v6.1 rebase therefore gives the +chain's `SnapshotManifest` upstream's `snapshot_id`, which a microVM capture leaves zero, publishes +upstream's snapshots through the chain's staged publication, and keeps microVMs out of RestoreVM; +see [Conflicts of the v6.1 rebase](#conflicts-of-the-v61-rebase). NVX's pin of the rebase has +`nvx-rs`'s reader of a template's manifest, which refuses fields that it does not know, accept +field 18. | Roadmap PR | Positions | Upstream pull requests, in position order | | --- | ---: | --- | -| PR01 | 002-004 | microsoft/openvmm#4595, microsoft/openvmm#4618, microsoft/openvmm#4615 | -| PR02 | 006 | microsoft/openvmm#4558 | -| PR03 | 007-008 | microsoft/openvmm#4589, microsoft/openvmm#4591 | -| PR04 | 009 | microsoft/openvmm#4604 | -| PR05 | 010-012 | microsoft/openvmm#4536, microsoft/openvmm#4607, microsoft/openvmm#4613 | -| PR06 | 013-014 | microsoft/openvmm#4597, microsoft/openvmm#4609 | -| PR09 | 015, 017, 018 | microsoft/openvmm#4872, microsoft/openvmm#4624, microsoft/openvmm#4626 | -| PR14 | 051-054 | microsoft/openvmm#4554 (051-053), microsoft/openvmm#4611 | - -Stacked pull requests carry their prerequisites' commits: microsoft/openvmm#4609 builds on -microsoft/openvmm#4585, which has merged; microsoft/openvmm#4613 builds on microsoft/openvmm#4536; -and microsoft/openvmm#4626 builds on microsoft/openvmm#4872. +| PR01 | 002 | microsoft/openvmm#4618 | +| PR02 | 005 | microsoft/openvmm#4558 | +| PR03 | 006 | microsoft/openvmm#4589 | +| PR05 | 007-009 | microsoft/openvmm#4536, microsoft/openvmm#4607, microsoft/openvmm#4613 | +| PR06 | 010 | microsoft/openvmm#4597 | +| PR09 | 011, 013, 014 | microsoft/openvmm#4872, microsoft/openvmm#4624, microsoft/openvmm#4626 | + +Stacked pull requests carry their prerequisites' commits: microsoft/openvmm#4613 builds on +microsoft/openvmm#4536, and microsoft/openvmm#4626 builds on microsoft/openvmm#4872. Most of these pull requests have gained review commits that the fork chain does not carry. When one merges, the next rebase should drop its fork commit, as the `microvm/v2.2`, -`feature/microvm/release/v2.3`, and `feature/microvm/release/v2.4` rebases and the v3.0, v4.0, and -v5.0 reorganizations dropped the 32 above, and adapt later commits to the merged form. +`feature/microvm/release/v2.3`, `feature/microvm/release/v2.4`, and +`feature/microvm/release/v6.1` rebases and the v3.0, v4.0, and v5.0 reorganizations dropped the +39 above, and adapt later commits to the merged form. -The v3.0 reorganization folded fixups into positions 006, 011, 012, and 054, and the v4.0 -reorganization changed positions 015 and 018, whose pull requests lack those changes; see +The v3.0 reorganization folded fixups into positions 005, 008, 009, and 047, and the v4.0 +reorganization changed positions 011 and 014, whose pull requests lack those changes; see [The v4.0 reorganization](#the-v40-reorganization) and -[The v3.0 reorganization](#the-v30-reorganization). The v5.0 reorganization adapted positions 003, -006, 013, 015, and 018 to upstream main, and folded into position 018 the removal of its input +[The v3.0 reorganization](#the-v30-reorganization). The v5.0 reorganization adapted positions 002, +005, 010, 011, and 014 to upstream main, and folded into position 014 the removal of its input gate's deadline, which microsoft/openvmm#4626 already lacks; see -[The v5.0 reorganization](#the-v50-reorganization). +[The v5.0 reorganization](#the-v50-reorganization). The v6.1 rebase adapted position 006 to +microsoft/openvmm#4591; see [Conflicts of the v6.1 rebase](#conflicts-of-the-v61-rebase). + +### Conflicts of the v6.1 rebase + +A v6.0 position in this section counts in `feature/microvm/dev` at `5ca20ee08`, whose first 220 +commits are those of `feature/microvm/release/v6.0`, and a position without a release is a v6.1 +position. The v6.1 rebase dropped seven commits, so a commit's position is its v6.0 position less +the number of dropped commits before it: v6.0 positions 003-007 are positions 002-006, 010-013 are +007-010, 015-050 are 011-046, and 054-268 are 047-261. A position from 003 on in a section on an +earlier release counts in that release. + +The `feature/microvm/release/v6.1` rebase replayed the 261 remaining commits onto `7d90c4104` +with conflicts at 16 positions, which it resolved in place. The table lists each resolution at its +v6.1 position. + +| Position | v6.1 commit | v6.0 commit | Upstream PR | Resolution | +| ---: | --- | --- | --- | --- | +| 006 | `50018e52e` | 007 `432f59f81` - pal: bound Linux descriptor-table pre-expansion | microsoft/openvmm#4591 | Keeps upstream's `credentials` module beside the commit's Linux-only `fd_table` module, in name order | +| 027 | `9a8d99b0b` | 031 `f1d03f428` - openvmm_helpers: version the snapshot manifest format and bound its decoding | microsoft/openvmm#4553 | The manifest keeps upstream's `snapshot_id`, field 18, after the commit's fields, and the commit's `Default` gives it the zero GUID; the CLI save and the save-to-disk VMM test set their snapshot IDs and take the rest from `Default`; `write_snapshot` takes upstream's refusal of an existing destination, its cleanup, and its manifest-last order, checks the saved-state size limit before it claims the destination, and records `state_size_bytes` in the manifest that it writes last; the round-trip test checks both the ID and the recorded length | +| 028 | `119345ead` | 032 `f6cdb703a` - openvmm_helpers: publish snapshots atomically through durable staging | microsoft/openvmm#4553 | The commit's staged publication replaces upstream's in-place write, cleanup, and hard link, and keeps upstream's public `check_snapshot_destination`, which SaveVM calls before it pauses the VM; upstream's tests stay, apart from `write_snapshot_creates_dir`, which the commit removes since the parent must exist: the existing-snapshot test backs the manifest's 1024 bytes of RAM, and the cleanup test fails while it copies `memory.bin`, after `state.bin` is staged, and checks that no staging directory remains; the guides describe the copy and the staged rename, with upstream's advice to keep the backing file outside the snapshot directory | +| 032 | `fff152a23` | 036 `49a1a98b9` - openvmm: restore RAM through a private CoW mapping and retain generation handles | microsoft/openvmm#4553 | The management RPC's launch keeps upstream's saved state and shared memory, which RestoreVM prepares from the snapshot, and passes the commit's defaults for other management launches, a shared mapping and no restore guards, so RestoreVM still runs guest RAM in place from `memory.bin` | +| 057 | `cd065f0c0` | 064 `87811096f` - openvmm_entry: expose `--machine microvm` | microsoft/openvmm#5018, microsoft/openvmm#4147, microsoft/openvmm#4554 | Upstream's `supports_acpi_power_button`, which decides from the load mode and gives the microVM's MP-table boot no power button, replaces the commit's check of the machine profile in the helper that microsoft/openvmm#5018 removed; the microVM's load mode precedes upstream's IGVM branch, without the restore branch that microsoft/openvmm#4147 removed; the Linux direct boot guide keeps upstream's description of `load_x86_mptable`, which `--machine microvm` now uses, before the commit's layout | +| 069 | `f8a051525` | 076 `652724750` - openvmm_entry: capture guest-requested microVM snapshots | microsoft/openvmm#4553 | The CLI's save keeps upstream's return of the snapshot ID and refuses a microVM first, as the commit has it; the snapshots guide takes the commit's description of the RAM file's promotion and publication, with upstream's advice to keep the backing file outside the snapshot directory and its statement that existing data is never overwritten | +| 086 | `7868666b8` | 093 `65f8b0d31` - openvmm: add clone and resume tiers with single-use resume claims | microsoft/openvmm#4553 | The manifest's tier, restore policy, and consumed sections, fields 15-17 until position 198 numbers them 13-15, precede upstream's `snapshot_id`, field 18, in the manifest and in its `Default` | +| 103 | `56b65cb4f` | 110 `1414c1a56` - serial_socket: report Unix and named-pipe peer identities | microsoft/openvmm#4609 | Upstream's named-pipe tests replace the reconnect test of v6.0 position 014, which the rebase dropped; the commit's call of `disconnect_current`, a no-op once the client has gone, moves into upstream's `reconnects_after_client_close`, after the failed write leaves the backend listening, and upstream's `reconnects_after_close_failure` stays as it is | +| 117 | `669e4aecd` | 124 `5fde97978` - vmservice: create, capture, and restore microVMs over the management RPC | microsoft/openvmm#4553 | CreateVM parses its microVM settings with the commit's `CreateVm` and creates the VM through upstream's `create_vm_inner`, which takes them beside upstream's restore parameters; RestoreVM restores only a standard VM and refuses a microVM, which restores from its authoritative manifest through CreateVM; a microVM refuses upstream's memory backing file; the worker takes upstream's restored state and shared memory, or else the microVM's, and the controller upstream's backing file, or else the microVM's RAM file; the service keeps upstream's SaveVM state beside the commit's pending readiness; the ttrpc test's upstream-built configuration fills the new virtio-fs fields with defaults | +| 118 | `9ef38e9ec` | 125 `502f72235` - ttrpc: propagate nonzero guest exit status | microsoft/openvmm#4553 | Upstream's `save_vm` stays ahead of the controller-event handler, which takes the commit's fallible signature | +| 120 | `4527dbc00` | 127 `75d359f4c` - ci: restrict privileged, self-hosted, and publishing jobs to microsoft/openvmm | microsoft/openvmm#5057 | The commit's fork gates take the runner, `.0`, of upstream's `(GhRunner, NextestProfile)` pools wherever microsoft/openvmm#5057 made the pool functions return one; `cargo xflowey regen` reproduces the merged workflows, and `cargo xtask fmt --pass verify-flowey` passes | +| 183 | `3a891414e` | 190 `282c72377` - microVM: route every IOAPIC input in the MP table | microsoft/openvmm#4554 | The commit's routing of IOAPIC inputs 16 and up moves onto upstream's `zerocopy` table builder: `MpTableConfig::ioapic_inputs` and `Error::TooFewIoApicInputs` join upstream's, the entry count adds the inputs past the ISA IRQs, and each of those inputs gets an `IoInterruptEntry` of its own number, active high and edge triggered through a new `spec::INTERRUPT_FLAG_EDGE_TRIGGERED`, aimed at upstream's I/O APIC, whose ID follows the processors' instead of being 0; upstream's tests pass 24 inputs, or 16 where they pin the ISA-only bytes, and the commit's tests expect upstream's I/O APIC ID | +| 221 | `68cb32387` | 228 `d6addf8c1` - vmservice: carry microVM blocks, network, RAM file, and share policy | microsoft/openvmm#4553 | The commit's `MemoryConfig.backing_file_path`, field 10, is upstream's, which is `optional` and which a standard VM takes for SaveVM, so the microVM conversion reads the optional value and a standard request no longer refuses it; CreateVM converts a microVM request as the commit does, and builds a standard VM through the commit's `create_standard_vm`, which takes upstream's restore parameters and returns the restored snapshot's ID beside the launch; RestoreVM builds a standard request from its configuration, refuses a microVM, and launches through the commit's `launch_vm`, which records the backing file that SaveVM needs for a standard VM only, beside upstream's saved-snapshot state | +| 224 | `03c6c0cef` | 231 `98e5b3ca5` - openvmm_helpers: reserve the manifest fields that upstream assigns | microsoft/openvmm#4553 | The manifest carries upstream's `snapshot_id` in field 18, which the commit only reserved, and the commit's reservation of fields 19 and 20 joins upstream's comment; the Guide's rule for extending the format still keeps 18-20 from new fields | +| 227 | `32b73e83b` | 234 `f41a1ecfc` - openvmm_helpers: don't publish a snapshot over an empty directory | microsoft/openvmm#4553 | The snapshots guide keeps upstream's statement that existing data is never overwritten beside the commit's refusal of a destination that appears during the capture | +| 232 | `9cb3c8206` | 239 `b5d20bf84` - petri: let a microVM test be its snapshot controller | microsoft/openvmm#4553 | Petri's worker launch takes upstream's saved state and then the commit's microVM snapshot channels | + +Position 121, v6.0 position 128 `88c55fa8f` - ci: run the checkin gates on the feature/microvm +branches, replayed its generated workflows without a conflict, but the merge displaced the SIVM +IGVM build and publish steps that microsoft/openvmm#4940 adds, so the rebase regenerated the three +workflows from the commit's flowey sources with `cargo xflowey regen`, which leaves the commit's +patch as it was. + +Upstream changes also broke the chain without a textual conflict. Eight fixups at the tip adapt +the chain to them; fold each into the commits that it names at the next reorganization, or before +submission. + +| Position | Fixup | Upstream PR | Fold into | +| ---: | --- | --- | --- | +| 262 | `55adb5c93` - serial_socket, openvmm_entry: resolve user SIDs at upstream's path | microsoft/openvmm#4604 | 103 and 110 | +| 263 | `b9a8f7f6e` - openvmm_core: load microVMs through upstream's MP-table boot module | microsoft/openvmm#4554 | 055 and 176 | +| 264 | `7b98adc6d` - openvmm_entry, openvmm_helpers: read upstream's snapshots through OpenedSnapshot | microsoft/openvmm#4553 | 031 | +| 265 | `5460c8e05` - openvmm_entry, openvmm_helpers: record no snapshot ID in microVM captures | microsoft/openvmm#4553 | 069 and 119 | +| 266 | `649aeacf0` - ttrpc: give the guest exit test's service upstream's SaveVM state | microsoft/openvmm#4553 | 118 | +| 267 | `4a1d9b07a` - Guide, openvmm_entry: describe upstream's snapshots with the chain's publication | microsoft/openvmm#4553 | 028, 032, and 069 | +| 268 | `63688dd58` - vmm_tests: save the ttrpc interface test's VM with a VMBus NIC | microsoft/openvmm#4553 | 044 | +| 269 | `73cf40357` - openvmm_helpers: drop an independent snapshot copy's page cache | microsoft/openvmm#4553 | 028 | + +Position 262 calls the token user SID queries of microsoft/openvmm#4604 in +`pal::windows::security`, where upstream merged them, from the peer identities and the control +console of PR23's positions 103 and 110. Position 263 loads the microVM's kernel and computes +its e820 RAM ranges through upstream's `loader::linux::mptable_boot` instead of the chain's +`loader::linux::microvm`, for PR15's position 055 and the device DMA ranges of position 176. +Position 264 has RestoreVM open its snapshot once with PR12's `OpenedSnapshot`, which checks that +`memory.bin` has the manifest's length, instead of upstream's path-based `read_snapshot`, which +position 031 replaced; it checks the expected snapshot ID against that manifest and closes the +snapshot's artifacts before the restore maps `memory.bin`. Position 265 gives the manifests that +the microVM capture of PR17's position 069 and the benchmark of PR26's position 119 build field by +field the zero snapshot ID, which the manifest defines as none, since only RestoreVM, which +refuses a microVM, checks an expected ID. Position 266 initializes upstream's SaveVM state in the +service of the guest exit test of PR25's position 118, and position 267 describes upstream's SaveVM +and the command line's save with the staged copy of PR11's position 028, which never hard-links +the memory backing file into the snapshot, and the command line's restore with the private +copy-on-write mapping of PR12's position 032, which leaves the snapshot unchanged. RestoreVM still +runs `memory.bin` in place, and so restores a snapshot once, as upstream's guide says. Position 268 +gives the save and restore iteration of upstream's ttrpc interface test a VMBus NIC and moves the +test's virtio-frontend NIC to its third iteration, which does not save: PR13's position 044 lets +virtio-net save only a NIC bound to a static identity and feature contract, which the management +RPC does not configure, so SaveVM refused the test's VM on KVM and MSHV in OpenVMM CI. Position +269 has `copy_exact`, from PR11's position 028, drop the page cache of each independent copy that +it makes, of `memory.bin` or of a paired scratch image, once the copy is flushed. On MSHV, with the +snapshot on ext4, the VM that the ttrpc interface test restores through RestoreVM stopped as soon +as it resumed, on a memory intercept that an interrupt's delivery caused and that the emulator +refuses, unless the snapshot hard-linked the backing file, as upstream's does, or the copy's pages +had left the page cache; on tmpfs, it passed either way. NVX's templates publish `memory.bin` by +hard link wherever the filesystem allows one and pair no scratch, so their captures and clones +make no such copy. + +The chain has no merges, and every commit has a good signature. Against v6.0, a range diff finds +the patches of 220 commits unchanged, those of the 16 resolved commits changed, and those of 25 +more changed only in their context. At the 16 resolved commits, the eight fixups, and positions +002, 121, and 179, which change the pipelines, rustfmt on the files that the commit changes and +`cargo xtask fmt --pass lints` pass on x86_64 Linux and x86_64 Windows, and +`cargo xtask fmt --pass verify-flowey` passes at positions 002, 120, 121, and 179. There, +`cargo check --locked --workspace --all-targets` passes at positions 002, 006, 027, 028, and +266-269 on both hosts, and from position 032 to position 265 it fails only with the breaks that the +fixups at positions 262-266 repair; on Windows, it and Clippy leave out `guest_test_uefi` and +`opentmk_executor`, which upstream's Clippy job checks for their UEFI targets alone, and +`vtpm_util`, whose TPM needs OpenSSL, as upstream's Windows jobs do. At position 267, +`cargo xtask fmt` passes, Clippy with `-D warnings` passes on both hosts, the unit tests of the 20 +packages that the conflicts and fixups change or build on pass on Linux and, apart from a +`sparse_mmap` test that fails on upstream main on that host too, on Windows, and the microVM VMM +tests pass on WHP; position 268 changes only a VMM test, whose package's Clippy passes there. At +position 269, Clippy and the unit tests of `openvmm_helpers` pass on both hosts, and the ttrpc +interface test, which failed on MSHV at position 268 with its snapshot on ext4, passes there twice. ### The v6.0 reorganization @@ -405,7 +512,7 @@ The `feature/microvm/release/v5.1` rebase replayed the 219 commits of `feature/m `db42fde04`, whose first 212 commits are those of `feature/microvm/release/v5.0`, onto `ba105dd7f` with a conflict at one position, which it resolved in place. Every commit kept its position, so the table lists the resolution at the position that the commit had in v5.0 too. It is position 182 in -v6.0. +v6.0 and position 175 in v6.1. | Position | v5.1 commit | v5.0 commit | Upstream PR | Resolution | | ---: | --- | --- | --- | --- | @@ -846,11 +953,15 @@ returns nothing, which position 026 makes fallible with `StateUnit::start`. ### Upstream main past the fork base -Upstream main has no commits past the fork base: as of 2026-11-08, its head is the fork base, -`ba105dd7f`. The v5.1 rebase resolved `1e882b9a4` (microsoft/openvmm#4944), one of the nine commits -that upstream main had past the v5.0 base, at v5.1 position 183, now position 182; see -[Conflicts of the v5.1 rebase](#conflicts-of-the-v51-rebase). The other eight merged with the chain -without conflicts. +Upstream main has no commits past the fork base: as of 2026-11-13, its head is the fork base, +`7d90c4104`. Of the 44 commits that upstream main had past the v6.0 base, `ba105dd7f`, the v6.1 +rebase dropped the chain commits that five had landed, microsoft/openvmm#4554, +microsoft/openvmm#4591, microsoft/openvmm#4595, microsoft/openvmm#4604, and microsoft/openvmm#4609; +resolved conflicts with microsoft/openvmm#4147, microsoft/openvmm#4553, microsoft/openvmm#4554, +microsoft/openvmm#4591, microsoft/openvmm#4609, microsoft/openvmm#5018, and microsoft/openvmm#5057; +regenerated the workflows that microsoft/openvmm#4940 changes; and added fixups for +microsoft/openvmm#4553, microsoft/openvmm#4554, and microsoft/openvmm#4604; see [Conflicts of the +v6.1 rebase](#conflicts-of-the-v61-rebase). The other 34 merged with the chain without conflicts. ## Legend @@ -870,20 +981,19 @@ upstream pull requests. ```mermaid flowchart TB - LB["Landed upstream before the base
32 fork commits, dropped by
the v2.2, v2.3, and v2.4 rebases,
v3.0, v4.0, and v5.0"] + LB["Landed upstream before the base
39 fork commits, dropped by
the v2.2, v2.3, v2.4, and v6.1 rebases,
v3.0, v4.0, and v5.0"] LPART["Partly superseded upstream
microsoft/openvmm#4703, #4704, and #4764
adopted by the commits that they overlap"] - B["OpenVMM fork base
ba105dd7f"] + B["OpenVMM fork base
7d90c4104"] F["Recommended foundation fan-in
before the microVM profile stack"] subgraph Independent["Parallel foundation PRs in upstream review"] direction LR - P01["PR01
Build/test infrastructure
U - 4 commits, 3 in review"] + P01["PR01
Build/test infrastructure
U - 3 commits, 1 in review"] P02["PR02
Mesh + sparse_mmap
U - 2 commits, 1 in review"] - P03["PR03
PAL on Unix
U - 2 commits, 2 in review"] - P04["PR04
PAL/PAL async on Windows
U - 1 commit, 1 in review"] + P03["PR03
PAL on Unix
U - 1 commit, 1 in review"] P05["PR05
Hypervisor fixes
U - 3 commits, 3 in review"] - P06["PR06
Device hardening
U - 2 commits, 2 in review"] - P14["PR14
Direct-boot loader
U - 4 commits, 4 in review"] + P06["PR06
Device hardening
U - 1 commit, 1 in review"] + P14["PR14
Direct-boot loader
U - 1 commit"] end subgraph Generic["Generic snapshot and persistence chain"] @@ -918,7 +1028,6 @@ flowchart TB B --> P01 B --> P02 B --> P03 - B --> P04 B --> P05 B --> P06 B --> P09 @@ -933,7 +1042,6 @@ flowchart TB P01 --> F P02 --> F P03 --> F - P04 --> F P05 --> F P06 --> F P13 --> F @@ -955,8 +1063,6 @@ flowchart TB P26 --> Z P13 -. "PR21 core can start early" .-> P21 - P03 -. "PR23 protocol/broker can start early" .-> P23 - P04 -. "PR23 protocol/broker can start early" .-> P23 P13 -. "PR23 protocol/broker can start early" .-> P23 classDef upstream fill:#dbeafe,stroke:#2563eb,color:#111827; @@ -968,7 +1074,7 @@ flowchart TB class B,F gate; class LB,LPART landed; - class P01,P02,P03,P04,P05,P06,P09,P10,P11,P12,P13,P14,P26 upstream; + class P01,P02,P03,P05,P06,P09,P10,P11,P12,P13,P14,P26 upstream; class P15,P16,P17,P18,P20,P22,P25,P27 profile; class P19,P21,P23,P24 product; class Z fork; @@ -979,970 +1085,992 @@ flowchart TB The physical branch is one first-parent chain: ```text -ba105dd7f - -> PR01 [001-004] -> PR02 [005-006] -> PR03 [007-008] - -> PR04 [009] -> PR05 [010-012] -> PR06 [013-014] - -> PR09 [015-018] -> PR10 [019-029] -> PR11 [030-033] - -> PR12 [034-038] -> PR13 [039-050] -> PR14 [051-054] - -> PR15 [055-065] -> PR16 [066-069] -> PR17 [070-080] - -> PR18 [081-090] -> PR19 [091-093] -> PR20 [094-100] - -> PR21 [101-106] -> PR22 [107-108] -> PR23 [109-118] - -> PR24 [119-123] -> PR25 [124-125] -> PR26 [126] - -> fork tail [127-129] -> PR27 [130-131] - -> 7677ad8d5 (mapped tip) - -> time ABI v1 and CPU profiles [132-148] -> CPU profiles [149-154] - -> VM time [155-157] -> time ABI checks [158-159] - -> time ABI 2 [160] -> management and test profiles [161-162] - -> host filesystem [163-165] -> storage [166-167] - -> network [168] -> host filesystem [169-173] - -> network [174] -> storage [175-177] - -> network [178-179] -> host filesystem [180] - -> network [181] -> device DMA [182-183] - -> command lines [184] -> KVP test [185-186] - -> sandbox block roles [187] -> virtio feature masks [188-189] - -> IOAPIC interrupt lines [190-191] -> ABI restart [192-205] - -> boot console exit drain [206] -> portb without host input [207-208] - -> long Windows paths [209] -> state change wait logging [210] - -> port forward bind code [211] -> virtio queue starts after restore [212-214] - -> storage generation block identity [215-216] - -> device start confirmation [217-218] -> long Windows report paths [219] - -> guest TSC offset within its bound [220] - -> Granite Rapids CPU profile [221-223] - -> second Turin CPU profile [224] - -> microVM consoles without TCP [225] - -> undelivered portb output kept [226] - -> restore listener of a disconnected boot console [227] - -> management RPC with the command line's microVM settings [228] - -> staged manifest removed before a failed capture resumes [229] - -> earlier snapshot formats refused before decoding [230] - -> manifest fields reserved for upstream [231] - -> unknown paired-scratch restore mode refused [232] - -> clone's activation record carried in the restore packet [233] - -> no-replace snapshot publication on every target [234] - -> kernel tuning admitted on platform command lines [235] - -> memory-expansion ranges placed without overflow [236] - -> FIFO artifacts refused without waiting for a writer [237] - -> device input gated without closing devices to the vCPUs [238] - -> quiesced microVM run again only through its rollback [239-240] - -> PR09 fixups [241-243] - -> state changes failed rather than panicking on a lost unit [244-245] - -> PCI restore tests before the first start [246] - -> PR13 fixup [247] - -> PR18 fixup [248] - -> PR20 fixup [249] - -> PR19 fixup [250] - -> direct-claimed scratch attached in place [251] - -> clock tokens split at Linux's whitespace [252] - -> 365-day maximum snapshot downtime [253] - -> restored VM time run from the TSCs' restart [254-255] - -> LAPIC timer restores without drift or a downtime refire [256-258] - -> LAPIC timer captures that keep a taken timer from refiring [259-261] - -> restore phase logs through a host clock step back [262] - -> PIT low/high counts without a control word [263] - -> PIT time below 100 ns counted once [264] - -> PIT restore rejecting a control word with RW = 0 [265-266] - -> RTC port reads wider than a byte zero-extended [267] - -> periodic timer's missed periods skipped at once [268] - -> 5ca20ee08 (NVX pin) +7d90c4104 + -> PR01 [001-003] -> PR02 [004-005] -> PR03 [006] + -> PR05 [007-009] -> PR06 [010] + -> PR09 [011-014] -> PR10 [015-025] -> PR11 [026-029] + -> PR12 [030-034] -> PR13 [035-046] -> PR14 [047] + -> PR15 [048-058] -> PR16 [059-062] -> PR17 [063-073] + -> PR18 [074-083] -> PR19 [084-086] -> PR20 [087-093] + -> PR21 [094-099] -> PR22 [100-101] -> PR23 [102-111] + -> PR24 [112-116] -> PR25 [117-118] -> PR26 [119] + -> fork tail [120-122] -> PR27 [123-124] + -> 7f31de535 (mapped tip) + -> time ABI v1 and CPU profiles [125-141] -> CPU profiles [142-147] + -> VM time [148-150] -> time ABI checks [151-152] + -> time ABI 2 [153] -> management and test profiles [154-155] + -> host filesystem [156-158] -> storage [159-160] + -> network [161] -> host filesystem [162-166] + -> network [167] -> storage [168-170] + -> network [171-172] -> host filesystem [173] + -> network [174] -> device DMA [175-176] + -> command lines [177] -> KVP test [178-179] + -> sandbox block roles [180] -> virtio feature masks [181-182] + -> IOAPIC interrupt lines [183-184] -> ABI restart [185-198] + -> boot console exit drain [199] -> portb without host input [200-201] + -> long Windows paths [202] -> state change wait logging [203] + -> port forward bind code [204] -> virtio queue starts after restore [205-207] + -> storage generation block identity [208-209] + -> device start confirmation [210-211] -> long Windows report paths [212] + -> guest TSC offset within its bound [213] + -> Granite Rapids CPU profile [214-216] + -> second Turin CPU profile [217] + -> microVM consoles without TCP [218] + -> undelivered portb output kept [219] + -> restore listener of a disconnected boot console [220] + -> management RPC with the command line's microVM settings [221] + -> staged manifest removed before a failed capture resumes [222] + -> earlier snapshot formats refused before decoding [223] + -> manifest fields reserved for upstream [224] + -> unknown paired-scratch restore mode refused [225] + -> clone's activation record carried in the restore packet [226] + -> no-replace snapshot publication on every target [227] + -> kernel tuning admitted on platform command lines [228] + -> memory-expansion ranges placed without overflow [229] + -> FIFO artifacts refused without waiting for a writer [230] + -> device input gated without closing devices to the vCPUs [231] + -> quiesced microVM run again only through its rollback [232-233] + -> PR09 fixups [234-236] + -> state changes failed rather than panicking on a lost unit [237-238] + -> PCI restore tests before the first start [239] + -> PR13 fixup [240] + -> PR18 fixup [241] + -> PR20 fixup [242] + -> PR19 fixup [243] + -> direct-claimed scratch attached in place [244] + -> clock tokens split at Linux's whitespace [245] + -> 365-day maximum snapshot downtime [246] + -> restored VM time run from the TSCs' restart [247-248] + -> LAPIC timer restores without drift or a downtime refire [249-251] + -> LAPIC timer captures that keep a taken timer from refiring [252-254] + -> restore phase logs through a host clock step back [255] + -> PIT low/high counts without a control word [256] + -> PIT time below 100 ns counted once [257] + -> PIT restore rejecting a control word with RW = 0 [258-259] + -> RTC port reads wider than a byte zero-extended [260] + -> periodic timer's missed periods skipped at once [261] + -> v6.1 rebase fixups [262-269] + -> 73cf40357 (NVX pin) ``` -For upstream review, PR01-PR06 and PR14 can be rebased independently onto current upstream main, -and nearly all of their commits are already in upstream review; see -[Open upstream pull requests](#open-upstream-pull-requests). PR07 and PR08 have landed. PR09-PR13 -form the generic dependency chain shown above. The recommended product queue then fans those -foundations into PR15 and keeps PR15-PR26 ordered. PR21's generic enforcement commits can be -prepared after PR13; PR23's protocol and broker commits can be prepared after PR03, PR04, and PR13. -The fork tail, positions 127-129, remains outside the upstream queue. PR27 can be prepared once +For upstream review, PR01-PR03, PR05, PR06, and PR14 can be rebased independently onto current +upstream main, and most of their commits are already in upstream review; see +[Open upstream pull requests](#open-upstream-pull-requests). PR04, PR07, and PR08 have landed. +PR09-PR13 form the generic dependency chain shown above. The recommended product queue then fans +those foundations into PR15 and keeps PR15-PR26 ordered. PR21's generic enforcement commits can be +prepared after PR13, and PR23's protocol and broker commits too, since the peer credentials and +user SIDs that they take from PR03 and PR04 have landed upstream. +The fork tail, positions 120-122, remains outside the upstream queue. PR27 can be prepared once PR22 lands; its generic confinement commit can be submitted independently if preferred. The v6.0 reorganization folded the PR20 and PR12 fixups into the commits that they fix; see -[The v6.0 reorganization](#the-v60-reorganization). Fold positions 241-243 into PR09's position 015 -before submission, which adds the terminal state that position 241 handles, the restart's handling -of a failed start that position 242 changes, and the rollback whose stop position 243 orders; -position 241's check of a time advance, with its test, folds into PR10's position 019, which adds -the time advance, and position 243's description of the snapshot rollback's start into PR17's -position 072, which adds that rollback. Fold position 247 into PR13's positions 043 and 048 before +[The v6.0 reorganization](#the-v60-reorganization). Fold positions 234-236 into PR09's position 011 +before submission, which adds the terminal state that position 234 handles, the restart's handling +of a failed start that position 235 changes, and the rollback whose stop position 236 orders; +position 234's check of a time advance, with its test, folds into PR10's position 015, which adds +the time advance, and position 236's description of the snapshot rollback's start into PR17's +position 065, which adds that rollback. Fold position 240 into PR13's positions 039 and 044 before submission, which add the console's and virtio-net's input gates and the resets that cleared them; -its documentation of `VirtioDevice`'s gate folds into PR13's position 040, which adds that gate, -its virtio-fs change, with its tests, into PR18's position 088, which adds virtio-fs's request -admission and its reset, its broker test into PR23's position 113, its virtio-fs queue test into -position 172, its documentation of `ChangeDeviceState`'s gate into PR09's position 018, and its -sentence of the snapshot guide into PR20's position 095, which adds the post-restore gate. Fold -position 248 into PR18's position 083 before submission, which adds the network identity, the +its documentation of `VirtioDevice`'s gate folds into PR13's position 036, which adds that gate, +its virtio-fs change, with its tests, into PR18's position 081, which adds virtio-fs's request +admission and its reset, its broker test into PR23's position 106, its virtio-fs queue test into +position 165, its documentation of `ChangeDeviceState`'s gate into PR09's position 014, and its +sentence of the snapshot guide into PR20's position 088, which adds the post-restore gate. Fold +position 241 into PR18's position 076 before submission, which adds the network identity, the range of prefixes that its parser accepts, and the command-line check that derives its netmask; -its test's virtio-fs device folds into position 202, which reserves the virtio-fs slot on every -command line. Fold position 249 into PR20's position 098 before submission, which adds the +its test's virtio-fs device folds into position 195, which reserves the virtio-fs slot on every +command line. Fold position 242 into PR20's position 091 before submission, which adds the snapshot and restore RAM ranges, the check that they have a RAM capacity, and the merge of -adjacent ranges at load; its test's time ABI parameters fold into position 147, which makes the -microVM profile require them. Fold position 250 into PR19's position 093 before submission, which +adjacent ranges at load; its test's time ABI parameters fold into position 140, which makes the +microVM profile require them. Fold position 243 into PR19's position 086 before submission, which adds the single-use resume claim and takes it after artifact validation; its test's FIFO case -folds into position 237, which opens artifacts without waiting for a FIFO's writer and adds the -helper that the case uses. +folds into position 230, which opens artifacts without waiting for a FIFO's writer and adds the +helper that the case uses. Fold the v6.1 rebase's fixups at positions 262-269 into the commits +that [Conflicts of the v6.1 rebase](#conflicts-of-the-v61-rebase) names before submission, PR23's +positions 103 and 110, PR15's position 055, PR12's positions 031 and 032, PR17's position 069, +PR26's position 119, PR25's position 118, PR11's position 028, and PR13's position 044 among them. ## Commits after the mapped tip -The NVX pin extends the chain past position 131 without merges. Of the 137 later commits, -positions 241-243 are PR09 fixups, position 247 is a PR13 fixup, position 248 is a PR18 fixup, -position 249 is a PR20 fixup, position 250 is a PR19 fixup, and the others are not yet classified -or assigned to PRs. -Each of positions 132-186 combines the v2.4 commits that the table lists, as v3.0 positions 145-160 +The NVX pin extends the chain past position 124 without merges. Of the 145 later commits, +positions 234-236 are PR09 fixups, position 240 is a PR13 fixup, position 241 is a PR18 fixup, +position 242 is a PR20 fixup, position 243 is a PR19 fixup, positions 262-269 are the fixups of +the v6.1 rebase, and the others are not yet classified or assigned to PRs. +Each of positions 125-179 combines the v2.4 commits that the table lists, as v3.0 positions 145-160 and 162-200 did, which developed one concept; "(part)" marks a v2.4 fixup that split across -commits. Positions 187-191 followed the v3.0 reorganization, positions 192-205 are the ABI restart -of the v4.0 reorganization, positions 206-211 followed it, positions 212-218 followed the v5.0 -reorganization, positions 219 and 220 followed the v5.1 rebase, and positions 221-268 followed the -v6.0 reorganization, so they combine none, apart from position 220, which combines v5.1 positions -222 and 223. Each commit has the position that it -had in v5.1 through position 147, and one less from v5.1 position 149 on; see -[The v6.0 reorganization](#the-v60-reorganization). A v4.0 position counts in `feature/microvm/dev` -at `e1ca353eb`, whose first 210 commits are those of `feature/microvm/release/v4.0`. - -| Position | Commit | v5.1 position | v4.0 position | v3.0 position | v2.4 positions | Topic | -| ---: | --- | ---: | ---: | ---: | --- | --- | -| 132 | `4026ea5f9` | 132 | 136 | 145 | 149, 150, 382 (part), 317 (part) | virt: add the NVX time ABI v1 scaffolding | -| 133 | `912c46ca1` | 133 | 137 | 146 | 151, 152 | virt_kvm: implement the NVX time ABI backend | -| 134 | `99a078f58` | 134 | 138 | 147 | 153, 325 (part), 373 (part) | virt_mshv: implement the NVX time ABI backend | -| 135 | `a27b24d49` | 135 | 139 | 148 | 154, 157, 159, 160 | openvmm_core: add the time ABI platform behind --x-time-abi-v1 | -| 136 | `281b42850` | 136 | 140 | 149 | 155, 158 | openvmm_helpers: add snapshot manifest version 6 for the time ABI | -| 137 | `c879dc968` | 137 | 141 | 150 | 156 | chipset: serve restore packet v4 and time samples on portb | -| 138 | `fe6b48a31` | 138 | 142 | 151 | 161, 162, 163, 164, 166, 167, 179 | cpu_profile: fingerprint backend CPU surfaces and pin CPU profiles | -| 139 | `77a5a4c04` | 139 | 143 | 152 | 165, 314 (part), 168, 169, 170, 171, 173, 174, 175, 176, 180, 319 | openvmm: preflight, capture, and restore the time ABI clocks | -| 140 | `1cc61fa98` | 140 | 144 | 153 | 172 | virt_whp: implement the NVX time ABI backend | -| 141 | `08e08c535` | 141 | 145 | 154 | 177 | openvmm_entry: add the --cpu-fingerprint tool | -| 142 | `aff3d1c25` | 142 | 146 | 155 | 178, 181, 182, 183, 184, 185 | openvmm: carry the selected CPU profile in the time ABI configuration | -| 143 | `cc6aa9085` | 143 | 147 | 156 | 186, 187, 325 (part), 196 | virt_mshv, virt_whp: deliver LAPIC vectors written to a halted VP's IRR | -| 144 | `1d9dcc917` | 144 | 148 | 157 | 188, 189, 190, 191, 192, 193, 373 (part), 194, 195, 197, 198, 199 | openvmm: program the complete effective CPUID of time ABI CPU profiles | -| 145 | `3ccb25c4b` | 145 | 149 | 158 | 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212 | virt: make the CPUID entries that a CPU profile omits read zero | -| 146 | `2f7203165` | 146 | 150 | 159 | 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235 | virt: complete the time ABI's topology leaves and VP 0's CPUID view | -| 147 | `7370afb79` | 147 | 151 | 160 | 236, 237, 238, 373 (part), 239, 240, 241, 242, 243, 244, 324 (part) | openvmm: make the NVX time ABI the only microVM time path | -| 148 | `7674c09da` | 149 | 153 | 162 | 245, 246, 247, 248, 249, 250, 318, 251, 252, 253, 254, 255, 256, 257, 258, 259 | virt: build the time ABI effective CPUID in one place | -| 149 | `2ab0f8c30` | 150 | 154 | 163 | 262, 263, 264 | openvmm: pin an Alder Lake CPU profile and add opt-in host profiles | -| 150 | `8d5aa7135` | 151 | 155 | 164 | 267, 268, 269, 270, 271, 373 (part), 272 | cpu_profile: pin AMD Milan, Genoa, and Turin CPU profiles | -| 151 | `41e784963` | 152 | 156 | 165 | 274 | virt_whp: let WHP answer CPUID leaves 0 and 1 without exits | -| 152 | `e1822e182` | 153 | 157 | 166 | 278 | openvmm_core: fall back from --cpu-profile auto to a host profile | -| 153 | `8489edaf9` | 154 | 158 | 167 | 338, 339 | cpu_profile: pin amd.genoa.v2 for Genoa hosts without the TSA immunities | -| 154 | `e41c453b8` | 155 | 159 | 168 | 350, 351 | cpu_profile: verify pinned profiles, including their CPU time bits | -| 155 | `b27456e81` | 156 | 160 | 169 | 290 | vmm_core: preserve halt state across snapshots | -| 156 | `c9e0b838b` | 157 | 161 | 170 | 291, 292 | openvmm: preserve snapshot VM clock cut across save/restore | -| 157 | `66f024ba7` | 158 | 162 | 171 | 358, 359 | vmcore: map VM times beyond the host clock to its latest time | -| 158 | `3f8f664a9` | 159 | 163 | 172 | 299, 314 (part) | openvmm: make the time ABI documentation standalone | -| 159 | `70f438ae1` | 160 | 164 | 173 | 352, 353, 354, 355, 356, 357 | openvmm_core: name every CPUID difference in E_CPU_SURFACE errors | -| 160 | `0a554e1a6` | 161 | 165 | 174 | 363, 364, 365, 366, 367, 368 | virt: publish host UTC and its clock correction in time ABI 2 | -| 161 | `96c5c1541` | 162 | 166 | 175 | 322, 377 (part) | vmservice: select the microVM CPU profile over the management RPC | -| 162 | `9c8a32fae` | 163 | 167 | 176 | 323 | petri, vmm_tests: fall back to the host CPU profile where auto's is unsupported | -| 163 | `0ee292143` | 164 | 168 | 177 | 260, 261, 320 (part) | virtiofs: perform microVM share requests as the guest caller | -| 164 | `f06a80e58` | 165 | 169 | 178 | 265, 266 | microVM: attach a second virtio-fs share with its own slot | -| 165 | `d65689c76` | 166 | 170 | 179 | 273, 320 (part) | virtiofs: add a per-subtree access policy to microVM shares | -| 166 | `2f43839a7` | 167 | 171 | 180 | 275, 276, 277, 317 (part), 320 (part), 329 (part) | openvmm_entry: bind microVM snapshots to their generation and scratch | -| 167 | `0a7a47d4f` | 168 | 172 | 181 | 279, 320 (part) | openvmm_entry: permit RAM-backed microVM overlays without scratch | -| 168 | `285b267af` | 169 | 173 | 182 | 280, 320 (part), 281, 282 | microVM: select egress rules by protocol and port range, and add IPv6 | -| 169 | `d1c6925df` | 170 | 174 | 183 | 283, 320 (part), 284, 285, 286 | microVM: share several host directories through one virtio-fs slot | -| 170 | `54d6d3ec8` | 171 | 175 | 184 | 287, 320 (part), 288, 289 | microVM: export single host files as aggregate virtio-fs children | -| 171 | `1c27fe2bf` | 172 | 176 | 185 | 293 | virtiofs: test RENAME_EXCHANGE node names and snapshots | -| 172 | `d38614a97` | 173 | 177 | 186 | 334, 335 (part) | virtiofs: test microVM queues that start or stop with host input gated | -| 173 | `bda4c83ad` | 174 | 178 | 187 | 294, 320 (part), 295 | microVM: accept host paths with commas in --mount | -| 174 | `57d403f62` | 175 | 179 | 188 | 296, 320 (part), 297, 379 (part), 298, 300 | microVM: publish guest listeners to private networks and host loopback | -| 175 | `ceca65e4a` | 176 | 180 | 189 | 331 | disk_zerofill: present a fixed geometry over a shorter or absent disk | -| 176 | `5107dccec` | 177 | 181 | 190 | 332, 333 | microVM: let a platform restore present a shorter distro and no scratch | -| 177 | `02cc56786` | 178 | 182 | 191 | 340, 341, 342 | disk_blob: bound, retry, and inspect HTTP blob requests | -| 178 | `4659e51b0` | 179 | 183 | 192 | 336, 337 | microVM: let a platform restore install a new policy on a NIC template | -| 179 | `9434b485b` | 180 | 184 | 193 | 360 | microVM: reject explicit host-loopback access on a /30 IPv4 network | -| 180 | `903052eac` | 181 | 185 | 194 | 343, 344 | microVM: let a platform restore attach an aggregate to a dormant slot | -| 181 | `4d2dafa34` | 182 | 186 | 195 | 369, 370 | microVM: install a new network policy at an untiered restore | -| 182 | `3e9f7784d` | 183 | 187 | 196 | 345, 346 | guestmem, virtio: admit only a set of ranges to a device's memory | -| 183 | `6545a51df` | 184 | 188 | 197 | 347, 348, 349 | microVM: restrict virtio device DMA to the RAM ranges of the e820 map | -| 184 | `17c067f3a` | 185 | 189 | 198 | 302, 303, 304, 305, 306, 307 | microVM: refuse command lines that the guest kernel would truncate | -| 185 | `4bf288a37` | 186 | 190 | 199 | 361 | vmm_tests: Fix kvp test flakiness by updating windows version | -| 186 | `b7977243e` | 187 | 191 | 200 | 362 | ci: run the Windows Server 2025 KVP test on Linux KVM | -| 187 | `0cee7baab` | 188 | 192 | 201 | - | microVM: remove the runtime and custom sandbox block roles (microsoft/openvmm#4839) | -| 188 | `4a2a01b01` | 189 | 193 | 202 | - | microVM: give every virtio device class an exact feature mask (microsoft/openvmm#4840) | -| 189 | `56ffc172a` | 190 | 194 | 203 | - | microVM: drop access-platform and the console size in microVM ABI 3 (microsoft/openvmm#4840) | -| 190 | `282c72377` | 191 | 195 | 204 | - | microVM: route every IOAPIC input in the MP table (microsoft/openvmm#4842) | -| 191 | `d32df137e` | 192 | 196 | 205 | - | microVM: give each virtio slot its own IOAPIC input in ABI 3 (microsoft/openvmm#4842) | -| 192 | `fffd9ca10` | 193 | 197 | - | - | microVM: restart the microVM ABI and boot layout at version 1 | -| 193 | `7b3d7e213` | 194 | 198 | - | - | microVM: restart the time ABI, time sample, and restore packet at version 1 | -| 194 | `9769dd87f` | 195 | 199 | - | - | openvmm_entry: remove the no-op --restore-entropy switch | -| 195 | `ddb3fb81d` | 196 | 200 | - | - | openvmm_helpers: make the snapshot manifest version 2 | -| 196 | `3fe82dcdb` | 197 | 201 | - | - | virtio_console: give the saved state a single schema version | -| 197 | `d966083c7` | 198 | 202 | - | - | net_backend_resources: give the egress policy digest a single encoding | -| 198 | `471d88a43` | 199 | 203 | - | - | microVM: give every NIC an IPv6 identity | -| 199 | `2a03ba750` | 200 | 204 | - | - | virtiofs: restart the microVM saved-state schema at 1 | -| 200 | `f721a7996` | 201 | 205 | - | - | chipset: drop the retired RTC transaction state | -| 201 | `1902122bc` | 202 | 206 | - | - | openvmm: require the snapshot's VM-time cut | -| 202 | `72b6f4432` | 203 | 207 | - | - | microVM: always reserve the virtio-fs slot | -| 203 | `5da373d98` | 204 | 208 | - | - | vmservice: give the microVM fields upstream-compatible numbers | -| 204 | `df648413d` | 205 | 209 | - | - | microVM: drop the history from the layout and snapshot helpers | -| 205 | `14f7266c9` | 206 | 210 | - | - | openvmm_helpers: number the snapshot's fields without gaps | -| 206 | `dedb1081e` | 207 | 211 | - | - | microVM: drain the boot console's terminal output at guest exit (microsoft/openvmm#4894) | -| 207 | `d72ec948f` | 208 | 212 | - | - | vmm_tests: drive the microVM guests without portb input (microsoft/openvmm#4886) | -| 208 | `71c377f5f` | 209 | 213 | - | - | microVM: remove portb's host input (microsoft/openvmm#4887) | -| 209 | `5bcb6ad24` | 210 | 214 | - | - | pal: support long paths in secure file and directory creation (microsoft/openvmm#4916) | -| 210 | `c025dd7ec` | 211 | 215 | - | - | state_unit: log the units that a state change waits for (microsoft/openvmm#4921) | -| 211 | `cef329edd` | 212 | 220 | - | - | net_consomme: give a port forward that cannot bind a stable code (microsoft/openvmm#4951) | -| 212 | `415685420` | 213 | - | - | - | virtio_net: fail the queue start when the endpoint cannot create queues (microsoft/openvmm#4953) | -| 213 | `7e6aa5cef` | 214 | - | - | - | virtio: test removal before start and stop/start queue progress (microsoft/openvmm#4954) | -| 214 | `ae0f2bbc4` | 215 | - | - | - | virtio: document how a queue that fails to start after restore is reported (microsoft/openvmm#4955) | -| 215 | `1d826caca` | 216 | - | - | - | microVM: identify snapshot blocks only by storage generation (microsoft/openvmm#4970) | -| 216 | `7c1a7b61f` | 217 | - | - | - | microVM: check the storage generation of a restore's sandbox blocks (microsoft/openvmm#4970) | -| 217 | `6f8f74f7f` | 218 | - | - | - | virtio: keep the progress of queues that a failed start stops (microsoft/openvmm#4968) | -| 218 | `49afa32c0` | 219 | - | - | - | vmcore: confirm device starts before the VM runs (microsoft/openvmm#4969) | -| 219 | `82cc6db18` | 220 | - | - | - | microVM: publish the outcome report below long Windows paths (microsoft/openvmm#4981) | -| 220 | `cf6c03977` | 222, 223 | - | - | - | virt: read the guest TSC offset until it is within its bound (microsoft/openvmm#4984) | -| 221 | `af3298f5d` | - | - | - | - | cpu_profile: clear AMX's features without its XSAVE state (microsoft/openvmm#4986) | -| 222 | `86e1617fc` | - | - | - | - | cpu_profile: clear AVX10, whose leaf 0x24 keeps no data (microsoft/openvmm#4986) | -| 223 | `90f9e6180` | - | - | - | - | cpu_profile: pin intel.graniterapids.v1 for Granite Rapids (microsoft/openvmm#4986) | -| 224 | `adb7c8bc8` | - | - | - | - | cpu_profile: pin amd.turin.v2 for Turin hosts without the TSA immunities (microsoft/openvmm#4987) | -| 225 | `99aac19b3` | - | - | - | - | openvmm_entry: refuse TCP endpoints for microVM consoles (microsoft/openvmm#4988) | -| 226 | `881619911` | - | - | - | - | chipset: keep undelivered microVM portb output (microsoft/openvmm#4989) | -| 227 | `154548a0e` | - | - | - | - | microvm: let a restore attach a listener to a disconnected boot console (microsoft/openvmm#4991) | -| 228 | `d6addf8c1` | - | - | - | - | vmservice: carry microVM blocks, network, RAM file, and share policy (microsoft/openvmm#4992) | -| 229 | `ed8fc0713` | - | - | - | - | openvmm_helpers: don't resume beside a restorable staged snapshot (microsoft/openvmm#4993) | -| 230 | `8a994544a` | - | - | - | - | openvmm_helpers: refuse earlier snapshot formats before decoding them (microsoft/openvmm#4994) | -| 231 | `98e5b3ca5` | - | - | - | - | openvmm_helpers: reserve the manifest fields that upstream assigns (microsoft/openvmm#4994) | -| 232 | `6cb6ba87c` | - | - | - | - | openvmm_helpers: refuse an unknown paired-scratch restore mode (microsoft/openvmm#4995) | -| 233 | `d501e5066` | - | - | - | - | microvm: carry a clone's activation record in the restore packet (microsoft/openvmm#4996) | -| 234 | `f41a1ecfc` | - | - | - | - | openvmm_helpers: don't publish a snapshot over an empty directory (microsoft/openvmm#4997) | -| 235 | `b4028c1aa` | - | - | - | - | openvmm_helpers: admit kernel tuning on platform command lines (microsoft/openvmm#5001) | -| 236 | `ac3dc27a7` | - | - | - | - | openvmm_helpers: compute memory-expansion ranges without overflow (microsoft/openvmm#5003) | -| 237 | `cba21d109` | - | - | - | - | openvmm_helpers: refuse a FIFO artifact without waiting for a writer (microsoft/openvmm#5004) | -| 238 | `46bfe02ed` | - | - | - | - | vmotherboard: gate a device's input without closing it to the vCPUs (microsoft/openvmm#5005) | -| 239 | `b5d20bf84` | - | - | - | - | petri: let a microVM test be its snapshot controller (microsoft/openvmm#5010) | -| 240 | `4c2697aef` | - | - | - | - | openvmm_core: run a quiesced microVM again only through its rollback (microsoft/openvmm#5010) | -| 241 | `78e752de1` | - | - | - | - | state_unit: handle a unit in a terminal state instead of panicking (microsoft/openvmm#5012); fold into 015, its time advance check into 019 | -| 242 | `6ddd6ca50` | - | - | - | - | openvmm_core: tear the VM down when a restart cannot resume it (microsoft/openvmm#5012); fold into 015 | -| 243 | `2fcd1573d` | - | - | - | - | state_unit: roll back a partial start without panicking on a lost unit (microsoft/openvmm#5013); fold into 015, its snapshot rollback description into 072 | -| 244 | `5a750a862` | - | - | - | - | state_unit: fail a stop instead of panicking when a unit is lost (microsoft/openvmm#5013) | -| 245 | `a8a0e3517` | - | - | - | - | state_unit: fail a reset, save, restore, or time advance on a lost unit (microsoft/openvmm#5013) | -| 246 | `cd5cd3814` | - | - | - | - | virtio: test PCI re-save before start and missing queue progress (microsoft/openvmm#5016) | -| 247 | `61cdd6397` | - | - | - | - | virtio: keep a held input gate across a device reset (microsoft/openvmm#5022); fold into 043 and 048, its virtio-fs change into 088 | -| 248 | `58d3c3b1d` | - | - | - | - | microVM: refuse a decoded network prefix outside /1 to /30 (microsoft/openvmm#5026); fold into 083, its test's virtio-fs device into 202 | -| 249 | `fb4f34126` | - | - | - | - | microVM: refuse an unaligned or reversed decoded snapshot RAM range (microsoft/openvmm#5038); fold into 098, its test's time ABI parameters into 147 | -| 250 | `23136b647` | - | - | - | - | openvmm_helpers: check paired scratch when opening a snapshot (microsoft/openvmm#5041); fold into 093, its test's FIFO case into 237 | -| 251 | `174da3a0d` | - | - | - | - | microVM: attach direct-claimed scratch in place instead of linking it (microsoft/openvmm#5042) | -| 252 | `9f10ce7a8` | - | - | - | - | virt: split clock-token command lines at every Linux whitespace byte (microsoft/openvmm#5044) | -| 253 | `3cd9f149b` | - | - | - | - | virt: accept a snapshot downtime of up to 365 days (microsoft/openvmm#5046) | -| 254 | `bce9b3673` | - | - | - | - | virt: report when the synchronized TSC set lets the TSCs run (microsoft/openvmm#5052) | -| 255 | `90f87319d` | - | - | - | - | openvmm: run restored VM time from the instant the TSCs resume (microsoft/openvmm#5052) | -| 256 | `2a0401c43` | - | - | - | - | virt_kvm: share the guest RAM of the real-mode KVM tests (microsoft/openvmm#5053) | -| 257 | `21a76f878` | - | - | - | - | virt_kvm: do not fire an expired LAPIC timer whose interrupt is pending (microsoft/openvmm#5053) | -| 258 | `024ecee62` | - | - | - | - | vmm_core, virt: run a restored LAPIC timer from the time ABI anchors (microsoft/openvmm#5053) | -| 259 | `727cad63f` | - | - | - | - | kvm: deliver the interrupts that KVM holds without running the VP (microsoft/openvmm#5055) | -| 260 | `9f14b54fd` | - | - | - | - | virt_kvm: keep a restore from firing a taken one-shot LAPIC timer again (microsoft/openvmm#5055) | -| 261 | `c72fc56a3` | - | - | - | - | virt_kvm: build the LAPIC timer KVM tests for musl (microsoft/openvmm#5055); fold into 260 | -| 262 | `c2c21ddb2` | - | - | - | - | microVM: saturate the time ABI restore's logged phase durations (microsoft/openvmm#5056) | -| 263 | `5d656d854` | - | - | - | - | chipset: start each PIT low/high count with its low byte (microsoft/openvmm#5061) | -| 264 | `8eede133c` | - | - | - | - | chipset: keep the sub-100 ns part of the PIT's last tick time (microsoft/openvmm#5065) | -| 265 | `607407fa9` | - | - | - | - | chipset: reject a saved PIT control word with RW = 0 (microsoft/openvmm#5067) | -| 266 | `6f57a6d61` | - | - | - | - | chipset: keep the PIT restore tests within Linux's open file limit (microsoft/openvmm#5067); fold into 265 | -| 267 | `60e160369` | - | - | - | - | chipset: zero-extend wide reads of the RTC's ports (microsoft/openvmm#5072) | -| 268 | `5ca20ee08` | - | - | - | - | vmcore: skip a periodic timer's missed periods at once (microsoft/openvmm#5073) | - -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. - -Some of these commits change mapped work rather than add to it. Position 147 removes the +commits. Positions 180-184 followed the v3.0 reorganization, positions 185-198 are the ABI restart +of the v4.0 reorganization, positions 199-204 followed it, positions 205-211 followed the v5.0 +reorganization, positions 212 and 213 followed the v5.1 rebase, positions 214-261 followed the +v6.0 reorganization, and positions 262-269 are the v6.1 rebase's fixups, so they combine none, +apart from position 213, which combines v5.1 positions 222 and 223. Each commit's position is its +v6.0 position less seven, the number of commits that the v6.1 rebase dropped before it, and its +v6.0 position is its v5.1 position through 147 and one less from v5.1 position 149 on; see +[Conflicts of the v6.1 rebase](#conflicts-of-the-v61-rebase) and +[The v6.0 reorganization](#the-v60-reorganization). A v6.0 position counts in +`feature/microvm/dev` at `5ca20ee08`, whose first 220 commits are those of +`feature/microvm/release/v6.0`, and a v4.0 position counts in `feature/microvm/dev` at +`e1ca353eb`, whose first 210 commits are those of `feature/microvm/release/v4.0`. + +| Position | Commit | v6.0 position | v5.1 position | v4.0 position | v3.0 position | v2.4 positions | Topic | +| ---: | --- | ---: | ---: | ---: | ---: | --- | --- | +| 125 | `3fac2c101` | 132 | 132 | 136 | 145 | 149, 150, 382 (part), 317 (part) | virt: add the NVX time ABI v1 scaffolding | +| 126 | `eb1707a51` | 133 | 133 | 137 | 146 | 151, 152 | virt_kvm: implement the NVX time ABI backend | +| 127 | `ec148f7ec` | 134 | 134 | 138 | 147 | 153, 325 (part), 373 (part) | virt_mshv: implement the NVX time ABI backend | +| 128 | `8e5e646e3` | 135 | 135 | 139 | 148 | 154, 157, 159, 160 | openvmm_core: add the time ABI platform behind --x-time-abi-v1 | +| 129 | `95481b3f5` | 136 | 136 | 140 | 149 | 155, 158 | openvmm_helpers: add snapshot manifest version 6 for the time ABI | +| 130 | `281a7326a` | 137 | 137 | 141 | 150 | 156 | chipset: serve restore packet v4 and time samples on portb | +| 131 | `2b4547e81` | 138 | 138 | 142 | 151 | 161, 162, 163, 164, 166, 167, 179 | cpu_profile: fingerprint backend CPU surfaces and pin CPU profiles | +| 132 | `633108a3e` | 139 | 139 | 143 | 152 | 165, 314 (part), 168, 169, 170, 171, 173, 174, 175, 176, 180, 319 | openvmm: preflight, capture, and restore the time ABI clocks | +| 133 | `1b58b35b3` | 140 | 140 | 144 | 153 | 172 | virt_whp: implement the NVX time ABI backend | +| 134 | `4dedb2d5e` | 141 | 141 | 145 | 154 | 177 | openvmm_entry: add the --cpu-fingerprint tool | +| 135 | `3193f6e66` | 142 | 142 | 146 | 155 | 178, 181, 182, 183, 184, 185 | openvmm: carry the selected CPU profile in the time ABI configuration | +| 136 | `bfb1c3df6` | 143 | 143 | 147 | 156 | 186, 187, 325 (part), 196 | virt_mshv, virt_whp: deliver LAPIC vectors written to a halted VP's IRR | +| 137 | `5b41af47c` | 144 | 144 | 148 | 157 | 188, 189, 190, 191, 192, 193, 373 (part), 194, 195, 197, 198, 199 | openvmm: program the complete effective CPUID of time ABI CPU profiles | +| 138 | `1df3d732f` | 145 | 145 | 149 | 158 | 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212 | virt: make the CPUID entries that a CPU profile omits read zero | +| 139 | `021ebf1d6` | 146 | 146 | 150 | 159 | 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235 | virt: complete the time ABI's topology leaves and VP 0's CPUID view | +| 140 | `825c0dd3e` | 147 | 147 | 151 | 160 | 236, 237, 238, 373 (part), 239, 240, 241, 242, 243, 244, 324 (part) | openvmm: make the NVX time ABI the only microVM time path | +| 141 | `7b426cc92` | 148 | 149 | 153 | 162 | 245, 246, 247, 248, 249, 250, 318, 251, 252, 253, 254, 255, 256, 257, 258, 259 | virt: build the time ABI effective CPUID in one place | +| 142 | `7375acf48` | 149 | 150 | 154 | 163 | 262, 263, 264 | openvmm: pin an Alder Lake CPU profile and add opt-in host profiles | +| 143 | `69696886e` | 150 | 151 | 155 | 164 | 267, 268, 269, 270, 271, 373 (part), 272 | cpu_profile: pin AMD Milan, Genoa, and Turin CPU profiles | +| 144 | `0eff540db` | 151 | 152 | 156 | 165 | 274 | virt_whp: let WHP answer CPUID leaves 0 and 1 without exits | +| 145 | `1de25abfc` | 152 | 153 | 157 | 166 | 278 | openvmm_core: fall back from --cpu-profile auto to a host profile | +| 146 | `f79e22e5a` | 153 | 154 | 158 | 167 | 338, 339 | cpu_profile: pin amd.genoa.v2 for Genoa hosts without the TSA immunities | +| 147 | `423fcd7f6` | 154 | 155 | 159 | 168 | 350, 351 | cpu_profile: verify pinned profiles, including their CPU time bits | +| 148 | `8580cad00` | 155 | 156 | 160 | 169 | 290 | vmm_core: preserve halt state across snapshots | +| 149 | `a02d02e0a` | 156 | 157 | 161 | 170 | 291, 292 | openvmm: preserve snapshot VM clock cut across save/restore | +| 150 | `1f7d85020` | 157 | 158 | 162 | 171 | 358, 359 | vmcore: map VM times beyond the host clock to its latest time | +| 151 | `3a22b75dd` | 158 | 159 | 163 | 172 | 299, 314 (part) | openvmm: make the time ABI documentation standalone | +| 152 | `cc9db2fed` | 159 | 160 | 164 | 173 | 352, 353, 354, 355, 356, 357 | openvmm_core: name every CPUID difference in E_CPU_SURFACE errors | +| 153 | `e062398f5` | 160 | 161 | 165 | 174 | 363, 364, 365, 366, 367, 368 | virt: publish host UTC and its clock correction in time ABI 2 | +| 154 | `b4a26b8f7` | 161 | 162 | 166 | 175 | 322, 377 (part) | vmservice: select the microVM CPU profile over the management RPC | +| 155 | `687cf753b` | 162 | 163 | 167 | 176 | 323 | petri, vmm_tests: fall back to the host CPU profile where auto's is unsupported | +| 156 | `ac8569c67` | 163 | 164 | 168 | 177 | 260, 261, 320 (part) | virtiofs: perform microVM share requests as the guest caller | +| 157 | `0a4e859fb` | 164 | 165 | 169 | 178 | 265, 266 | microVM: attach a second virtio-fs share with its own slot | +| 158 | `257530b34` | 165 | 166 | 170 | 179 | 273, 320 (part) | virtiofs: add a per-subtree access policy to microVM shares | +| 159 | `08893264b` | 166 | 167 | 171 | 180 | 275, 276, 277, 317 (part), 320 (part), 329 (part) | openvmm_entry: bind microVM snapshots to their generation and scratch | +| 160 | `60bac7b58` | 167 | 168 | 172 | 181 | 279, 320 (part) | openvmm_entry: permit RAM-backed microVM overlays without scratch | +| 161 | `279c2712d` | 168 | 169 | 173 | 182 | 280, 320 (part), 281, 282 | microVM: select egress rules by protocol and port range, and add IPv6 | +| 162 | `ec2b7e01f` | 169 | 170 | 174 | 183 | 283, 320 (part), 284, 285, 286 | microVM: share several host directories through one virtio-fs slot | +| 163 | `6b38fffd1` | 170 | 171 | 175 | 184 | 287, 320 (part), 288, 289 | microVM: export single host files as aggregate virtio-fs children | +| 164 | `1724b5a16` | 171 | 172 | 176 | 185 | 293 | virtiofs: test RENAME_EXCHANGE node names and snapshots | +| 165 | `1eb49b466` | 172 | 173 | 177 | 186 | 334, 335 (part) | virtiofs: test microVM queues that start or stop with host input gated | +| 166 | `a3ceeb478` | 173 | 174 | 178 | 187 | 294, 320 (part), 295 | microVM: accept host paths with commas in --mount | +| 167 | `bf0a2afb1` | 174 | 175 | 179 | 188 | 296, 320 (part), 297, 379 (part), 298, 300 | microVM: publish guest listeners to private networks and host loopback | +| 168 | `60b3fff6a` | 175 | 176 | 180 | 189 | 331 | disk_zerofill: present a fixed geometry over a shorter or absent disk | +| 169 | `55082abf0` | 176 | 177 | 181 | 190 | 332, 333 | microVM: let a platform restore present a shorter distro and no scratch | +| 170 | `4f0cb8721` | 177 | 178 | 182 | 191 | 340, 341, 342 | disk_blob: bound, retry, and inspect HTTP blob requests | +| 171 | `92331138e` | 178 | 179 | 183 | 192 | 336, 337 | microVM: let a platform restore install a new policy on a NIC template | +| 172 | `3410c5ef8` | 179 | 180 | 184 | 193 | 360 | microVM: reject explicit host-loopback access on a /30 IPv4 network | +| 173 | `e70c4af27` | 180 | 181 | 185 | 194 | 343, 344 | microVM: let a platform restore attach an aggregate to a dormant slot | +| 174 | `c3b428824` | 181 | 182 | 186 | 195 | 369, 370 | microVM: install a new network policy at an untiered restore | +| 175 | `d8acfbe5e` | 182 | 183 | 187 | 196 | 345, 346 | guestmem, virtio: admit only a set of ranges to a device's memory | +| 176 | `a5f8d2eda` | 183 | 184 | 188 | 197 | 347, 348, 349 | microVM: restrict virtio device DMA to the RAM ranges of the e820 map | +| 177 | `1b02e09ad` | 184 | 185 | 189 | 198 | 302, 303, 304, 305, 306, 307 | microVM: refuse command lines that the guest kernel would truncate | +| 178 | `c490ef7f6` | 185 | 186 | 190 | 199 | 361 | vmm_tests: Fix kvp test flakiness by updating windows version | +| 179 | `11688662a` | 186 | 187 | 191 | 200 | 362 | ci: run the Windows Server 2025 KVP test on Linux KVM | +| 180 | `63b88c95a` | 187 | 188 | 192 | 201 | - | microVM: remove the runtime and custom sandbox block roles (microsoft/openvmm#4839) | +| 181 | `edf8334cb` | 188 | 189 | 193 | 202 | - | microVM: give every virtio device class an exact feature mask (microsoft/openvmm#4840) | +| 182 | `00577e626` | 189 | 190 | 194 | 203 | - | microVM: drop access-platform and the console size in microVM ABI 3 (microsoft/openvmm#4840) | +| 183 | `3a891414e` | 190 | 191 | 195 | 204 | - | microVM: route every IOAPIC input in the MP table (microsoft/openvmm#4842) | +| 184 | `86fc24b60` | 191 | 192 | 196 | 205 | - | microVM: give each virtio slot its own IOAPIC input in ABI 3 (microsoft/openvmm#4842) | +| 185 | `59e7c81a9` | 192 | 193 | 197 | - | - | microVM: restart the microVM ABI and boot layout at version 1 | +| 186 | `cebed82b0` | 193 | 194 | 198 | - | - | microVM: restart the time ABI, time sample, and restore packet at version 1 | +| 187 | `e0e239642` | 194 | 195 | 199 | - | - | openvmm_entry: remove the no-op --restore-entropy switch | +| 188 | `832ed0e4f` | 195 | 196 | 200 | - | - | openvmm_helpers: make the snapshot manifest version 2 | +| 189 | `23f682c57` | 196 | 197 | 201 | - | - | virtio_console: give the saved state a single schema version | +| 190 | `9bd688c6f` | 197 | 198 | 202 | - | - | net_backend_resources: give the egress policy digest a single encoding | +| 191 | `66b22879c` | 198 | 199 | 203 | - | - | microVM: give every NIC an IPv6 identity | +| 192 | `833d6ae74` | 199 | 200 | 204 | - | - | virtiofs: restart the microVM saved-state schema at 1 | +| 193 | `63112c385` | 200 | 201 | 205 | - | - | chipset: drop the retired RTC transaction state | +| 194 | `ea1ac0fba` | 201 | 202 | 206 | - | - | openvmm: require the snapshot's VM-time cut | +| 195 | `040565d00` | 202 | 203 | 207 | - | - | microVM: always reserve the virtio-fs slot | +| 196 | `42d6fe030` | 203 | 204 | 208 | - | - | vmservice: give the microVM fields upstream-compatible numbers | +| 197 | `366eb7c9b` | 204 | 205 | 209 | - | - | microVM: drop the history from the layout and snapshot helpers | +| 198 | `db5f8d6cb` | 205 | 206 | 210 | - | - | openvmm_helpers: number the snapshot's fields without gaps | +| 199 | `bb3ae12ae` | 206 | 207 | 211 | - | - | microVM: drain the boot console's terminal output at guest exit (microsoft/openvmm#4894) | +| 200 | `aba883dd8` | 207 | 208 | 212 | - | - | vmm_tests: drive the microVM guests without portb input (microsoft/openvmm#4886) | +| 201 | `21f1f7da9` | 208 | 209 | 213 | - | - | microVM: remove portb's host input (microsoft/openvmm#4887) | +| 202 | `f21e63a14` | 209 | 210 | 214 | - | - | pal: support long paths in secure file and directory creation (microsoft/openvmm#4916) | +| 203 | `f3750d6c3` | 210 | 211 | 215 | - | - | state_unit: log the units that a state change waits for (microsoft/openvmm#4921) | +| 204 | `229570095` | 211 | 212 | 220 | - | - | net_consomme: give a port forward that cannot bind a stable code (microsoft/openvmm#4951) | +| 205 | `ff1b6bd43` | 212 | 213 | - | - | - | virtio_net: fail the queue start when the endpoint cannot create queues (microsoft/openvmm#4953) | +| 206 | `880b791f4` | 213 | 214 | - | - | - | virtio: test removal before start and stop/start queue progress (microsoft/openvmm#4954) | +| 207 | `de6410d08` | 214 | 215 | - | - | - | virtio: document how a queue that fails to start after restore is reported (microsoft/openvmm#4955) | +| 208 | `8177ff238` | 215 | 216 | - | - | - | microVM: identify snapshot blocks only by storage generation (microsoft/openvmm#4970) | +| 209 | `2f5bc661f` | 216 | 217 | - | - | - | microVM: check the storage generation of a restore's sandbox blocks (microsoft/openvmm#4970) | +| 210 | `703aba8f4` | 217 | 218 | - | - | - | virtio: keep the progress of queues that a failed start stops (microsoft/openvmm#4968) | +| 211 | `e6da114f5` | 218 | 219 | - | - | - | vmcore: confirm device starts before the VM runs (microsoft/openvmm#4969) | +| 212 | `f81f4dc80` | 219 | 220 | - | - | - | microVM: publish the outcome report below long Windows paths (microsoft/openvmm#4981) | +| 213 | `6e2f46891` | 220 | 222, 223 | - | - | - | virt: read the guest TSC offset until it is within its bound (microsoft/openvmm#4984) | +| 214 | `5720246e7` | 221 | - | - | - | - | cpu_profile: clear AMX's features without its XSAVE state (microsoft/openvmm#4986) | +| 215 | `bee2ac855` | 222 | - | - | - | - | cpu_profile: clear AVX10, whose leaf 0x24 keeps no data (microsoft/openvmm#4986) | +| 216 | `a77d4e8fa` | 223 | - | - | - | - | cpu_profile: pin intel.graniterapids.v1 for Granite Rapids (microsoft/openvmm#4986) | +| 217 | `ee556c8f3` | 224 | - | - | - | - | cpu_profile: pin amd.turin.v2 for Turin hosts without the TSA immunities (microsoft/openvmm#4987) | +| 218 | `bf32674d3` | 225 | - | - | - | - | openvmm_entry: refuse TCP endpoints for microVM consoles (microsoft/openvmm#4988) | +| 219 | `a310e3200` | 226 | - | - | - | - | chipset: keep undelivered microVM portb output (microsoft/openvmm#4989) | +| 220 | `81b72b49d` | 227 | - | - | - | - | microvm: let a restore attach a listener to a disconnected boot console (microsoft/openvmm#4991) | +| 221 | `68cb32387` | 228 | - | - | - | - | vmservice: carry microVM blocks, network, RAM file, and share policy (microsoft/openvmm#4992) | +| 222 | `a94e433ff` | 229 | - | - | - | - | openvmm_helpers: don't resume beside a restorable staged snapshot (microsoft/openvmm#4993) | +| 223 | `47b1cfbb7` | 230 | - | - | - | - | openvmm_helpers: refuse earlier snapshot formats before decoding them (microsoft/openvmm#4994) | +| 224 | `03c6c0cef` | 231 | - | - | - | - | openvmm_helpers: reserve the manifest fields that upstream assigns (microsoft/openvmm#4994) | +| 225 | `542d54f3a` | 232 | - | - | - | - | openvmm_helpers: refuse an unknown paired-scratch restore mode (microsoft/openvmm#4995) | +| 226 | `0a0a8aaa1` | 233 | - | - | - | - | microvm: carry a clone's activation record in the restore packet (microsoft/openvmm#4996) | +| 227 | `32b73e83b` | 234 | - | - | - | - | openvmm_helpers: don't publish a snapshot over an empty directory (microsoft/openvmm#4997) | +| 228 | `ee2cc7e79` | 235 | - | - | - | - | openvmm_helpers: admit kernel tuning on platform command lines (microsoft/openvmm#5001) | +| 229 | `df5010ffe` | 236 | - | - | - | - | openvmm_helpers: compute memory-expansion ranges without overflow (microsoft/openvmm#5003) | +| 230 | `571e7ee22` | 237 | - | - | - | - | openvmm_helpers: refuse a FIFO artifact without waiting for a writer (microsoft/openvmm#5004) | +| 231 | `7926299a1` | 238 | - | - | - | - | vmotherboard: gate a device's input without closing it to the vCPUs (microsoft/openvmm#5005) | +| 232 | `9cb3c8206` | 239 | - | - | - | - | petri: let a microVM test be its snapshot controller (microsoft/openvmm#5010) | +| 233 | `6d314ae1c` | 240 | - | - | - | - | openvmm_core: run a quiesced microVM again only through its rollback (microsoft/openvmm#5010) | +| 234 | `dcc3065ad` | 241 | - | - | - | - | state_unit: handle a unit in a terminal state instead of panicking (microsoft/openvmm#5012); fold into 011, its time advance check into 015 | +| 235 | `b62b21163` | 242 | - | - | - | - | openvmm_core: tear the VM down when a restart cannot resume it (microsoft/openvmm#5012); fold into 011 | +| 236 | `e1433b346` | 243 | - | - | - | - | state_unit: roll back a partial start without panicking on a lost unit (microsoft/openvmm#5013); fold into 011, its snapshot rollback description into 065 | +| 237 | `dddae01eb` | 244 | - | - | - | - | state_unit: fail a stop instead of panicking when a unit is lost (microsoft/openvmm#5013) | +| 238 | `5249a48dc` | 245 | - | - | - | - | state_unit: fail a reset, save, restore, or time advance on a lost unit (microsoft/openvmm#5013) | +| 239 | `2ff4fea82` | 246 | - | - | - | - | virtio: test PCI re-save before start and missing queue progress (microsoft/openvmm#5016) | +| 240 | `459c28110` | 247 | - | - | - | - | virtio: keep a held input gate across a device reset (microsoft/openvmm#5022); fold into 039 and 044, its virtio-fs change into 081 | +| 241 | `066b40f14` | 248 | - | - | - | - | microVM: refuse a decoded network prefix outside /1 to /30 (microsoft/openvmm#5026); fold into 076, its test's virtio-fs device into 195 | +| 242 | `1ec79d60f` | 249 | - | - | - | - | microVM: refuse an unaligned or reversed decoded snapshot RAM range (microsoft/openvmm#5038); fold into 091, its test's time ABI parameters into 140 | +| 243 | `67000c096` | 250 | - | - | - | - | openvmm_helpers: check paired scratch when opening a snapshot (microsoft/openvmm#5041); fold into 086, its test's FIFO case into 230 | +| 244 | `28b293cb1` | 251 | - | - | - | - | microVM: attach direct-claimed scratch in place instead of linking it (microsoft/openvmm#5042) | +| 245 | `40b8c49dd` | 252 | - | - | - | - | virt: split clock-token command lines at every Linux whitespace byte (microsoft/openvmm#5044) | +| 246 | `673154fb3` | 253 | - | - | - | - | virt: accept a snapshot downtime of up to 365 days (microsoft/openvmm#5046) | +| 247 | `62d2aec37` | 254 | - | - | - | - | virt: report when the synchronized TSC set lets the TSCs run (microsoft/openvmm#5052) | +| 248 | `95d87f47a` | 255 | - | - | - | - | openvmm: run restored VM time from the instant the TSCs resume (microsoft/openvmm#5052) | +| 249 | `ca7cd3b5e` | 256 | - | - | - | - | virt_kvm: share the guest RAM of the real-mode KVM tests (microsoft/openvmm#5053) | +| 250 | `4d22fb488` | 257 | - | - | - | - | virt_kvm: do not fire an expired LAPIC timer whose interrupt is pending (microsoft/openvmm#5053) | +| 251 | `ba2764ce8` | 258 | - | - | - | - | vmm_core, virt: run a restored LAPIC timer from the time ABI anchors (microsoft/openvmm#5053) | +| 252 | `20d910035` | 259 | - | - | - | - | kvm: deliver the interrupts that KVM holds without running the VP (microsoft/openvmm#5055) | +| 253 | `a47886197` | 260 | - | - | - | - | virt_kvm: keep a restore from firing a taken one-shot LAPIC timer again (microsoft/openvmm#5055) | +| 254 | `93c4f651e` | 261 | - | - | - | - | virt_kvm: build the LAPIC timer KVM tests for musl (microsoft/openvmm#5055); fold into 253 | +| 255 | `10f30429d` | 262 | - | - | - | - | microVM: saturate the time ABI restore's logged phase durations (microsoft/openvmm#5056) | +| 256 | `426fdb5d7` | 263 | - | - | - | - | chipset: start each PIT low/high count with its low byte (microsoft/openvmm#5061) | +| 257 | `9aad3ee42` | 264 | - | - | - | - | chipset: keep the sub-100 ns part of the PIT's last tick time (microsoft/openvmm#5065) | +| 258 | `d0d644396` | 265 | - | - | - | - | chipset: reject a saved PIT control word with RW = 0 (microsoft/openvmm#5067) | +| 259 | `3cad2668f` | 266 | - | - | - | - | chipset: keep the PIT restore tests within Linux's open file limit (microsoft/openvmm#5067); fold into 258 | +| 260 | `c58d77c9d` | 267 | - | - | - | - | chipset: zero-extend wide reads of the RTC's ports (microsoft/openvmm#5072) | +| 261 | `f2389fd16` | 268 | - | - | - | - | vmcore: skip a periodic timer's missed periods at once (microsoft/openvmm#5073) | +| 262 | `55adb5c93` | - | - | - | - | - | serial_socket, openvmm_entry: resolve user SIDs at upstream's path (v6.1 rebase fixup for microsoft/openvmm#4604); fold into 103 and 110 | +| 263 | `b9a8f7f6e` | - | - | - | - | - | openvmm_core: load microVMs through upstream's MP-table boot module (v6.1 rebase fixup for microsoft/openvmm#4554); fold into 055 and 176 | +| 264 | `7b98adc6d` | - | - | - | - | - | openvmm_entry, openvmm_helpers: read upstream's snapshots through OpenedSnapshot (v6.1 rebase fixup for microsoft/openvmm#4553); fold into 031 | +| 265 | `5460c8e05` | - | - | - | - | - | openvmm_entry, openvmm_helpers: record no snapshot ID in microVM captures (v6.1 rebase fixup for microsoft/openvmm#4553); fold into 069 and 119 | +| 266 | `649aeacf0` | - | - | - | - | - | ttrpc: give the guest exit test's service upstream's SaveVM state (v6.1 rebase fixup for microsoft/openvmm#4553); fold into 118 | +| 267 | `4a1d9b07a` | - | - | - | - | - | Guide, openvmm_entry: describe upstream's snapshots with the chain's publication (v6.1 rebase fixup for microsoft/openvmm#4553); fold into 028, 032, and 069 | +| 268 | `63688dd58` | - | - | - | - | - | vmm_tests: save the ttrpc interface test's VM with a VMBus NIC (v6.1 rebase fixup for microsoft/openvmm#4553); fold into 044 | +| 269 | `73cf40357` | - | - | - | - | - | openvmm_helpers: drop an independent snapshot copy's page cache (v6.1 rebase fixup for microsoft/openvmm#4553); fold into 028 | + +The remarks that say whether commits apply to upstream main record what was found on upstream +main when each commit was mapped: the v3.0 reorganization's base, `b2676222b`, for the commits +that it regrouped, and later fork bases, up to `ba105dd7f`, for later commits. They name the +positions that the commits have now, but the v6.1 rebase did not check them again on `7d90c4104`. + +Some of these commits change mapped work rather than add to it. Position 140 removes the legacy microVM clock paths, changing files that PR10 and PR17 also change, and makes manifest version 6 the only snapshot format, changing files that PR11 and PR17 also change. Position -176 changes the sandbox block attachment of PR19's position 092 and the restore of -position 166. Position 178 changes the snapshot network policy and the forward refusal -of PR21's position 106 and the snapshot refusals of position 174. Position 180 -changes the dormant-slot restore of PR18's position 090, as the aggregates of position -169 restricted it. Position 187 removes the `runtime` and `custom` sandbox block roles that PR19's -position 091 adds, with the slots and IRQs that PR16's position 067 places for them and the -shared-status words that PR16's position 069 gives them, which stay unassigned, and the role -names and layer counts of PR19's position 092's snapshot capture and restore. Positions 188 and -189 change the feature masks of the devices that PR16's position 067 places, the console's -fall-through among them, and that PR18's positions 082, 083, and 087, PR19's position 091, and -PR23's position 116 give the NIC, the filesystem, the sandbox blocks, and the consoles and record -in the snapshot contract. Position 189 also moves the microVM ABI version of PR17's position 074 -to 3, which PR20's position 095 and PR25's position 124 check. Position 190 extends the MP table -builder of PR14's position 052, which microsoft/openvmm#4554 proposes upstream, and its tests and -those of PR14's positions 053 and 054, to route every IOAPIC input, and passes the microVM's 24 -inputs from the loader of PR15's position 062. Position 191 moves every virtio slot from the ISA -IRQ that PR16's position 067 gives it, and the NIC from the backend-specific IRQ that PR18's -position 083 selects, to the IOAPIC input of its window, which changes the interrupts and -discovery tokens that PR17's position 074 records in the snapshot contract and that the slots of -PR18, PR19, and PR23 use. Position 206 extends the portb exit drain of PR24's position 119 to the -relay that copies the boot console of PR16's position 067 to the terminal, and gives the -management RPC's drain of PR25's position 124 no such relay. Position 207 makes the guests of the -microVM cold-boot test and portb harness of PR15's position 065, of the check of PR17's position -080 that an unconfigured snapshot request continues, and of the management RPC's microVM test of -PR25's position 124 run without portb's host input, and removes the harness's input. Position 208 -then removes that input: the receive path of the portb console of PR15's position 060, which -PR20's position 094 shares with the restore records and PR20's position 095 gates, and the -console input that PR15's position 064 gives the device on the CLI. Since those reads also -noticed a departed peer of a listening endpoint, position 208 has the device poll the backend for -it instead. Position 210 documents and tests that the input quiesce of PR09's position 018 logs -each unit that has not answered, as the CLI guide now says of a capture. Position 213 adds tests to -the virtio saved-state tests of PR13's position 039, and position 214 extends the restore -descriptions that PR18's position 089 and PR25's position 124 add to the CLI and management RPC +169 changes the sandbox block attachment of PR19's position 085 and the restore of +position 159. Position 171 changes the snapshot network policy and the forward refusal +of PR21's position 099 and the snapshot refusals of position 167. Position 173 +changes the dormant-slot restore of PR18's position 083, as the aggregates of position +162 restricted it. Position 180 removes the `runtime` and `custom` sandbox block roles that PR19's +position 084 adds, with the slots and IRQs that PR16's position 060 places for them and the +shared-status words that PR16's position 062 gives them, which stay unassigned, and the role +names and layer counts of PR19's position 085's snapshot capture and restore. Positions 181 and +182 change the feature masks of the devices that PR16's position 060 places, the console's +fall-through among them, and that PR18's positions 075, 076, and 080, PR19's position 084, and +PR23's position 109 give the NIC, the filesystem, the sandbox blocks, and the consoles and record +in the snapshot contract. Position 182 also moves the microVM ABI version of PR17's position 067 +to 3, which PR20's position 088 and PR25's position 117 check. Position 183 extends the MP table +builder that microsoft/openvmm#4554 merged in place of v6.0 position 052, its tests, those of +upstream's firmware-less direct boot, and those of PR14's position 047, to route every IOAPIC +input, and passes the microVM's 24 inputs from the loader of PR15's position 055. Position 184 moves +every virtio slot from the ISA IRQ that PR16's position 060 gives it, and the NIC from the +backend-specific IRQ that PR18's position 076 selects, to the IOAPIC input of its window, which +changes the interrupts and discovery tokens that PR17's position 067 records in the snapshot +contract and that the slots of PR18, PR19, and PR23 use. Position 199 extends the portb exit drain +of PR24's position 112 to the relay that copies the boot console of PR16's position 060 to the +terminal, and gives the management RPC's drain of PR25's position 117 no such relay. Position 200 +makes the guests of the microVM cold-boot test and portb harness of PR15's position 058, of the +check of PR17's position 073 that an unconfigured snapshot request continues, and of the management +RPC's microVM test of PR25's position 117 run without portb's host input, and removes the harness's +input. Position 201 then removes that input: the receive path of the portb console of PR15's +position 053, which PR20's position 087 shares with the restore records and PR20's position 088 +gates, and the console input that PR15's position 057 gives the device on the CLI. Since those reads +also noticed a departed peer of a listening endpoint, position 201 has the device poll the backend +for it instead. Position 203 documents and tests that the input quiesce of PR09's position 014 logs +each unit that has not answered, as the CLI guide now says of a capture. Position 206 adds tests to +the virtio saved-state tests of PR13's position 035, and position 207 extends the restore +descriptions that PR18's position 082 and PR25's position 117 add to the CLI and management RPC guides, and the restore section of the snapshot guide after the readiness event of PR12's position -037, which PR20's position 095 gates. Position 215 removes the SHA-256 identity of sandbox blocks, -with the whole-file hashing and the verified copy that PR19's position 092 adds, and the -`--snapshot-block-identity` option and default that position 166 adds, whose storage generation -becomes a bound block's only identity. It also has the block contract of position 166 record a -platform capture's layers unbound, which PR19's position 093 did in the capture, and changes -position 176's test of an absent scratch. Position 216 adds a restore-time check of that generation -to position 166's restore. Position 217 changes the failed start that PR13's position 039 gives the -virtio device task, which now keeps the progress of the queues that it stops. Position 218 changes -PR09's position 015, whose start now confirms each unit's start before it starts the unit's -dependents, and PR13's position 039, whose transports now leave a start's answer to that -confirmation instead of taking it in `poll_device`, and replaces one of position 039's tests; it -adds its confirmation next to the input quiesce of PR09's position 018 in the files that position -018 changes, and rewrites position 214's documentation. Position 219 changes the outcome report -publication of PR24's position 122, which on Windows now publishes the report through the -extended-length form of its path, and moves the extended-length encoding that position 209 gives -`pal`'s secure creation into `pal`'s file system module, which both now use. Position 225 removes +033, which PR20's position 088 gates. Position 208 removes the SHA-256 identity of sandbox blocks, +with the whole-file hashing and the verified copy that PR19's position 085 adds, and the +`--snapshot-block-identity` option and default that position 159 adds, whose storage generation +becomes a bound block's only identity. It also has the block contract of position 159 record a +platform capture's layers unbound, which PR19's position 086 did in the capture, and changes +position 169's test of an absent scratch. Position 209 adds a restore-time check of that generation +to position 159's restore. Position 210 changes the failed start that PR13's position 035 gives the +virtio device task, which now keeps the progress of the queues that it stops. Position 211 changes +PR09's position 011, whose start now confirms each unit's start before it starts the unit's +dependents, and PR13's position 035, whose transports now leave a start's answer to that +confirmation instead of taking it in `poll_device`, and replaces one of position 035's tests; it +adds its confirmation next to the input quiesce of PR09's position 014 in the files that position +014 changes, and rewrites position 207's documentation. Position 212 changes the outcome report +publication of PR24's position 115, which on Windows now publishes the report through the +extended-length form of its path, and moves the extended-length encoding that position 202 gives +`pal`'s secure creation into `pal`'s file system module, which both now use. Position 218 removes the TCP endpoints of microVM consoles, which the CLI guide described: the TCP listener that PR16's -position 067 gives the microVM's virtio console; the TCP client, the checks of loopback addresses +position 060 gives the microVM's virtio console; the TCP client, the checks of loopback addresses and stable ports, and the `tcp` identities of the boot console's attachment, its restore, and the -snapshot contract of PR17's position 074, which PR18's position 082 adds; the `Tcp` backend kind -of the console attachments of PR13's position 042; and the TCP backends that the management RPC's -restore of PR25's position 124 rebuilds. Position 226 changes the output of the portb console of -PR15's position 060, which dropped the output that it held when a write to its endpoint failed +snapshot contract of PR17's position 067, which PR18's position 075 adds; the `Tcp` backend kind +of the console attachments of PR13's position 038; and the TCP backends that the management RPC's +restore of PR25's position 117 rebuilds. Position 219 changes the output of the portb console of +PR15's position 053, which dropped the output that it held when a write to its endpoint failed with an error other than a broken pipe, and whose stop wrote that output to an endpoint without a -peer, which discards it; the sentence of the CLI guide on that output, which PR25's position 125 -adds; and the test endpoint and tests of position 208. Position 227 lets a restore attach a -listener to a disconnected boot console, which the restore of PR18's position 082 kept -disconnected: it extends the restore of the boot console's attachment that position 082 adds and -PR23's position 117 generalizes, beside the listener rebinding of PR23's position 118, whose -alignment of the machine contract in the restore check of PR17's position 079 it extends; the -disconnect policy that the virtio console's handle of PR16's position 067 takes from the -attachment; the validation of the console attachments of PR13's position 042, which now accepts a +peer, which discards it; the sentence of the CLI guide on that output, which PR25's position 118 +adds; and the test endpoint and tests of position 201. Position 220 lets a restore attach a +listener to a disconnected boot console, which the restore of PR18's position 075 kept +disconnected: it extends the restore of the boot console's attachment that position 075 adds and +PR23's position 110 generalizes, beside the listener rebinding of PR23's position 111, whose +alignment of the machine contract in the restore check of PR17's position 072 it extends; the +disconnect policy that the virtio console's handle of PR16's position 060 takes from the +attachment; the validation of the console attachments of PR13's position 038, which now accepts a listener that discards output while disconnected; and the management RPC's restore of PR25's -position 124, which now takes the disconnect policy from the attachment, as the CLI's does. -Position 228 replaces the management RPC's microVM module of position 124, which the fork tail's -position 129 and positions 161, 203, 225, and 227 change, with a conversion of a request into the -options of the microVM CLI of PR15's position 064, whose launch, capture, and restore it then -runs: it adds to the protocol that position 124 extends and position 203 renumbers the fields of -the sandbox blocks and tiers of PR19's positions 091-093, of the NIC and policy of PR18's position -083 and PR21's position 106, of a RAM backing file, of the share policy of PR22's position 108 and -positions 163, 165, 169, and 170, and of a boot console with no endpoint; it changes the CLI's +position 117, which now takes the disconnect policy from the attachment, as the CLI's does. +Position 221 replaces the management RPC's microVM module of position 117, which the fork tail's +position 122 and positions 154, 196, 218, and 220 change, with a conversion of a request into the +options of the microVM CLI of PR15's position 057, whose launch, capture, and restore it then +runs: it adds to the protocol that position 117 extends and position 196 renumbers the fields of +the sandbox blocks and tiers of PR19's positions 084-086, of the NIC and policy of PR18's position +076 and PR21's position 099, of a RAM backing file, which microsoft/openvmm#4553 has since added +to the same field for SaveVM, of the share policy of PR22's position 101 and +positions 156, 158, 162, and 163, and of a boot console with no endpoint; it changes the CLI's configuration builder, which takes portb's endpoint from the RPC, and its storage builder and network endpoint, which take the microVM's resources; and it removes the exports and accessors -that only position 124's module used, the console restore that positions 225 and 227 changed -among them. Position 229 changes the rollback of a failed publication that PR11's position 032 -adds and its position 033 extends with the live RAM alias: the cleanup of the staging directory +that only position 117's module used, the console restore that positions 218 and 220 changed +among them. Position 222 changes the rollback of a failed publication that PR11's position 028 +adds and its position 029 extends with the live RAM alias: the cleanup of the staging directory now removes its manifest first, and a cleanup that cannot prove the manifest gone returns position -033's uncertain outcome, on which the controller of PR17's position 076 terminates the source, -where position 032 let it resume beside a snapshot that restore could open. It also rewords that +029's uncertain outcome, on which the controller of PR17's position 069 terminates the source, +where position 028 let it resume beside a snapshot that restore could open. It also rewords that outcome's message, the controller's log, and the sentences on a failed publication that position -076 adds to the snapshot and snapshot format guides. Position 230 changes the manifest's decoding, -which PR11's position 031 bounds and checks and PR12's position 035 moves to the snapshot directory -that it opens: positions 195 and 205 restarted the manifest at version 2 and numbered its fields +069 adds to the snapshot and snapshot format guides. Position 223 changes the manifest's decoding, +which PR11's position 027 bounds and checks and PR12's position 031 moves to the snapshot directory +that it opens: positions 188 and 198 restarted the manifest at version 2 and numbered its fields without gaps, which gives some fields of earlier formats other types, so restore now decodes the version and then the magic, each alone, and refuses any other with `E_SNAPSHOT_VERSION` before it -decodes the rest, and the version and magic checks of position 031's header check become helpers +decodes the rest, and the version and magic checks of position 027's header check become helpers that both share. It also says why in the manifest section of the snapshot format guide, which -position 195 rewrote. Position 231 adds a comment to the manifest's fields, which position 205 +position 188 rewrote. Position 224 adds a comment to the manifest's fields, which position 198 numbers, and a sentence to the snapshot format guide's rule for extending the manifest, that keep -fields 18-20 for upstream's SaveVM and RestoreVM, microsoft/openvmm#4553. Position 232 changes the -restore-mode match that position 166 adds to the capture-tier check of PR19's position 093: +fields 18-20 for upstream's SaveVM and RestoreVM, microsoft/openvmm#4553; since the v6.1 rebase, +field 18 holds upstream's `snapshot_id`, and upstream reserves 19 and 20. Position 225 changes the +restore-mode match that position 159 adds to the capture-tier check of PR19's position 086: restore runs that check before the machine contract's shape check, so the match now refuses a mode that it does not know with the shape check's error, where it panicked on the assumption that the -shape check had refused the mode. Position 233 lets a platform restore end the restore packet with -its clone's activation record: it defines bit 5 of the packet's flags, which position 193 reserved -when it restarted the packet at version 1, beside the network settings of position 181; adds -`--restore-activation-record`, which the restore preparation of PR17's position 079 reads before -any vCPU runs, only for the platform tier of PR19's position 093, and with the post-restore gate of -PR20's position 095; adds the field that the management RPC's conversion of position 228 turns into -that option, in the protocol that PR25's position 124 extends; and adds a test of the restore -packet that the portb device of PR15's position 060 serves since position 137. Position 234 changes -the no-replace rename of the snapshot publication that PR11's position 032 adds, which renamed +shape check had refused the mode. Position 226 lets a platform restore end the restore packet with +its clone's activation record: it defines bit 5 of the packet's flags, which position 186 reserved +when it restarted the packet at version 1, beside the network settings of position 174; adds +`--restore-activation-record`, which the restore preparation of PR17's position 072 reads before +any vCPU runs, only for the platform tier of PR19's position 086, and with the post-restore gate of +PR20's position 088; adds the field that the management RPC's conversion of position 221 turns into +that option, in the protocol that PR25's position 117 extends; and adds a test of the restore +packet that the portb device of PR15's position 053 serves since position 130. Position 227 changes +the no-replace rename of the snapshot publication that PR11's position 028 adds, which renamed without replacing only in Linux glibc builds and replaced an empty destination directory elsewhere: every target now renames through `pal`, which the commit gives a no-replace rename on -Unix and on Windows, the latter on the extended-length encoding that position 219 moves into -`pal`'s file system module. It also adds a test beside position 032's test of a destination -created after staging, and extends the snapshot guide's sentence that PR17's position 076 adds. -Position 235 changes the platform tier's check of a snapshot's command line, which PR19's position -093 adds and PR20's position 097, PR23's position 116, and positions 147 and 168 change: the +Unix and on Windows, the latter on the extended-length encoding that position 212 moves into +`pal`'s file system module. It also adds a test beside position 028's test of a destination +created after staging, and extends the snapshot guide's sentence that PR17's position 069 adds. +Position 228 changes the platform tier's check of a snapshot's command line, which PR19's position +086 adds and PR20's position 090, PR23's position 109, and positions 140 and 161 change: the allowlist of the command line's tokens also admits a closed set of kernel tuning parameters, and -the check refuses a command line that repeats one of them, after position 097's check of the -boot-online processor count. It also extends the `--snapshot-tier` entry that position 093 adds to -the CLI reference. Position 236 changes how the canonical memory-expansion ranges that PR20's -position 099 adds to the machine contract of PR17's position 074 compute their start, which -overflowed for a base RAM of at least 2^64 - 4 GiB, and adds a test beside position 099's tests -of the memory capacity. Position 237 changes the artifact openers of the snapshot file system -module that PR11's position 032 adds, with the path-based opener and the type check, and its -position 033 extends with the directory-relative opener, through which PR12's position 035 -restores: on Unix both now open with `O_NONBLOCK`, so that position 032's type check refuses a +the check refuses a command line that repeats one of them, after position 090's check of the +boot-online processor count. It also extends the `--snapshot-tier` entry that position 086 adds to +the CLI reference. Position 229 changes how the canonical memory-expansion ranges that PR20's +position 092 adds to the machine contract of PR17's position 067 compute their start, which +overflowed for a base RAM of at least 2^64 - 4 GiB, and adds a test beside position 092's tests +of the memory capacity. Position 230 changes the artifact openers of the snapshot file system +module that PR11's position 028 adds, with the path-based opener and the type check, and its +position 029 extends with the directory-relative opener, through which PR12's position 031 +restores: on Unix both now open with `O_NONBLOCK`, so that position 028's type check refuses a FIFO without waiting for a writer, and then make a regular file's descriptor blocking again. It -also adds tests beside position 032's tests of the module and position 035's tests of a restore's -artifacts, and extends the restore paragraph that PR12's position 036 adds to the snapshot format -guide. Position 238 changes the input gate that PR09's position 018 adds: the chipset device unit, +also adds tests beside position 028's tests of the module and position 031's tests of a restore's +artifacts, and extends the restore paragraph that PR12's position 032 adds to the snapshot format +guide. Position 231 changes the input gate that PR09's position 014 adds: the chipset device unit, which changed a device's gate with the device's mutex closed, as it changes the device's other states, now makes the gate's synchronous part under the device's ordinary lock and awaits the rest without the device, since the vCPUs run through a gate change. It changes the gate's methods of -`ChangeDeviceState`, the erased chipset devices, and the remote device proxy, which position 018 -adds, and the virtio transports' forwarding of the gate, which PR13's position 040 adds, and adds -tests of the unit, both virtio transports, and the proxy. Positions 239 and 240 change the -snapshot boundary of PR17. Position 239 lets a VMM test be the snapshot controller: it gives the -snapshot-request port's handle in petri, which PR17's position 076 adds without a channel, and -petri's launch of the VM worker, which position 072 gives the boundary's parameters, a boundary's -channels, which the petri microVM support of PR15's position 065 keeps for the test, and adds such -a test beside position 065's cold-boot test. Position 240 has the snapshot quiesce and the -boundary's release, which position 072 adds to the VM worker, refuse a VM outside a boundary and -the boundary of a quiesced VM, so that only position 072's rollback runs a quiesced VM again. It -extends the snapshot guide's paragraph on the RPCs that a boundary refuses, which position 076 -adds, and adds tests beside position 239's. Positions 241 and 242 change what PR09's position 015 +`ChangeDeviceState`, the erased chipset devices, and the remote device proxy, which position 014 +adds, and the virtio transports' forwarding of the gate, which PR13's position 036 adds, and adds +tests of the unit, both virtio transports, and the proxy. Positions 232 and 233 change the +snapshot boundary of PR17. Position 232 lets a VMM test be the snapshot controller: it gives the +snapshot-request port's handle in petri, which PR17's position 069 adds without a channel, and +petri's launch of the VM worker, which position 065 gives the boundary's parameters, a boundary's +channels, which the petri microVM support of PR15's position 058 keeps for the test, and adds such +a test beside position 058's cold-boot test. Position 233 has the snapshot quiesce and the +boundary's release, which position 065 adds to the VM worker, refuse a VM outside a boundary and +the boundary of a quiesced VM, so that only position 065's rollback runs a quiesced VM again. It +extends the snapshot guide's paragraph on the RPCs that a boundary refuses, which position 069 +adds, and adds tests beside position 232's. Positions 234 and 235 change what PR09's position 011 adds, the terminal state in which its start leaves a unit whose task does not answer, which only a -later start refused, and the restart's start again after a failed save. Position 241 has a stop of +later start refused, and the restart's start again after a failed save. Position 234 has a stop of the state units also stop such a unit, which may be running, and keep it in that state, and has a -reset, save, or restore, and the time advance that PR10's position 019 adds, fail while a unit is -in it. It rewrites position 015's description of that state and adds tests in a new file. Position -242 has the VM worker tear the VM down when that restart's start fails, rather than keep serving a +reset, save, or restore, and the time advance that PR10's position 015 adds, fail while a unit is +in it. It rewrites position 011's description of that state and adds tests in a new file. Position +235 has the VM worker tear the VM down when that restart's start fails, rather than keep serving a VM that it marks running over stopped units, and has the worker's teardown stop the state units -when they run, where upstream's microsoft/openvmm#4863 stops them when the VM runs. Position 243 -changes position 015's rollback too: it stops the units that started again in reverse dependency +when they run, where upstream's microsoft/openvmm#4863 stops them when the VM runs. Position 236 +changes position 011's rollback too: it stops the units that started again in reverse dependency order, so that a started unit that a unit that is not stopped depends on keeps running, and leaves a started unit whose task does not answer that stop in the terminal state, rather than panicking, -with the units kept running for a later stop. It rewrites position 015's description of the -rollback, adds tests beside position 015's, and extends the description of the snapshot rollback's -start, which PR17's position 072 adds to the VM worker. Position 244 has `StateUnits::stop` fail, +with the units kept running for a later stop. It rewrites position 011's description of the +rollback, adds tests beside position 011's, and extends the description of the snapshot rollback's +start, which PR17's position 065 adds to the VM worker. Position 237 has `StateUnits::stop` fail, rather than panic, when a unit does not answer, leaving that unit in a new terminal state, and -moves position 243's ordered stop into a module that the stop and the rollback share. It changes -the callers that the chain adds or changes: the restart and the teardown that position 242 -changes; the snapshot quiesce and boundary of PR17's position 072, whose quiesce error it extends, -the boundary's request filter of position 073, and the VM controller's capture of position 076; -the restore readiness failure of PR12's position 037 and the gate timeout of PR20's position 095; +moves position 236's ordered stop into a module that the stop and the rollback share. It changes +the callers that the chain adds or changes: the restart and the teardown that position 235 +changes; the snapshot quiesce and boundary of PR17's position 065, whose quiesce error it extends, +the boundary's request filter of position 066, and the VM controller's capture of position 069; +the restore readiness failure of PR12's position 033 and the gate timeout of PR20's position 088; and, in OpenHCL, the stops of a pause, a save, a restart, and servicing, beside the start that -position 015 makes fallible. It makes `VmRpc::Pause` failable, as position 016 makes -`VmRpc::Resume`, and has position 241's tests check the stop's result. Position 245 has a reset, a -save, a restore, and the time advance of PR10's position 019 fail, rather than panic, when a unit -does not answer, leaving that unit in a terminal state of the operation, which position 241's -check of terminal units then refuses, and adds tests in a new file. Position 246 adds the PCI -counterparts of two MMIO tests to the virtio saved-state tests of PR13's position 039, which -positions 213 and 218 also extend, and corrects the module documentation of the virtio-net -saved-state tests that PR13's position 048 adds, which still described the deferred restore of -device-private state that position 039's rewrite for microsoft/nvx#1232 retired. Position 247 -changes what PR13's positions 043 and 048 and PR18's position 088 add with the saved state of the +position 011 makes fallible. It makes `VmRpc::Pause` failable, as position 012 makes +`VmRpc::Resume`, and has position 234's tests check the stop's result. Position 238 has a reset, a +save, a restore, and the time advance of PR10's position 015 fail, rather than panic, when a unit +does not answer, leaving that unit in a terminal state of the operation, which position 234's +check of terminal units then refuses, and adds tests in a new file. Position 239 adds the PCI +counterparts of two MMIO tests to the virtio saved-state tests of PR13's position 035, which +positions 206 and 211 also extend, and corrects the module documentation of the virtio-net +saved-state tests that PR13's position 044 adds, which still described the deferred restore of +device-private state that position 035's rewrite for microsoft/nvx#1232 retired. Position 240 +changes what PR13's positions 039 and 044 and PR18's position 081 add with the saved state of the console, virtio-net, and virtio-fs: the reset of each device, which those positions add or extend, cleared the device's input gate, and now keeps it, so that only resuming input releases it. It -states that rule on the gate's methods of `VirtioDevice`, which PR13's position 040 adds, and of -`ChangeDeviceState`, which PR09's position 018 adds and position 238 changes, extends the snapshot -guide's paragraph on the post-restore gate that PR20's position 095 adds, and adds tests beside -those of PR13's positions 043 and 048, PR18's positions 088 and 090, PR23's position 113, and -position 172, and a new module of console tests. Position 248 checks the prefix of the network -identity that PR18's position 083 adds in `validate_machine_config`, which PR15's position 062 -adds, before the command-line check of position 083 derives the identity's netmask, and gives -that position's parser the same range. Position 249 checks the snapshot and restore RAM ranges -that PR20's position 098 adds, in `validate_machine_config`, which PR15's position 062 adds, -against the alignment and order that `MemoryRange::new` asserts when position 098's load merges -them. Position 250 has the open of a snapshot that PR12's position 035 adds also open the paired -`scratch.img` that PR19's position 092 adds, with position 092's opener, so that the open refuses +states that rule on the gate's methods of `VirtioDevice`, which PR13's position 036 adds, and of +`ChangeDeviceState`, which PR09's position 014 adds and position 231 changes, extends the snapshot +guide's paragraph on the post-restore gate that PR20's position 088 adds, and adds tests beside +those of PR13's positions 039 and 044, PR18's positions 081 and 083, PR23's position 106, and +position 165, and a new module of console tests. Position 241 checks the prefix of the network +identity that PR18's position 076 adds in `validate_machine_config`, which PR15's position 055 +adds, before the command-line check of position 076 derives the identity's netmask, and gives +that position's parser the same range. Position 242 checks the snapshot and restore RAM ranges +that PR20's position 091 adds, in `validate_machine_config`, which PR15's position 055 adds, +against the alignment and order that `MemoryRange::new` asserts when position 091's load merges +them. Position 243 has the open of a snapshot that PR12's position 031 adds also open the paired +`scratch.img` that PR19's position 085 adds, with position 085's opener, so that the open refuses one that is not a regular file of its recorded length before the single-use resume claim of -position 093 can consume the snapshot. Position 251 changes the direct-claimed scratch restore that -position 166 adds to the paired scratch restore of PR19's position 092, which hard-linked a -checkpoint's scratch into a private directory before the claim of position 093: the restore now +position 086 can consume the snapshot. Position 244 changes the direct-claimed scratch restore that +position 159 adds to the paired scratch restore of PR19's position 085, which hard-linked a +checkpoint's scratch into a private directory before the claim of position 086: the restore now opens the opened generation's scratch for writing through the snapshot directory that position -035 opens, with a writable variant of that position's directory-relative openers, which position -237 makes refuse a FIFO without waiting, and carries the handle in the restore inputs of PR17's -position 079 to the sandbox blocks of PR19's position 091, whose storage builder attaches it -through the part of position 092's block attachment that takes an opened file. It removes -position 166's link helper and the path-based opener of a given length that position 092 adds and -only that helper used, replaces position 166's test of the link, extends position 237's test of -the openers, adds tests beside those that position 147 adds to the microVM restore module, and -changes the CLI reference's sentence on direct-claimed scratch, which position 166 adds. -Position 254 has the synchronized TSC set of the time ABI backends of positions 133, 134, and 140 -report the host instant from which the TSCs run, which the time ABI restore of position 139 passes, -with position 255, to the time advance that PR10's position 019 adds: `StateUnits::advance_time`, +031 opens, with a writable variant of that position's directory-relative openers, which position +230 makes refuse a FIFO without waiting, and carries the handle in the restore inputs of PR17's +position 072 to the sandbox blocks of PR19's position 084, whose storage builder attaches it +through the part of position 085's block attachment that takes an opened file. It removes +position 159's link helper and the path-based opener of a given length that position 085 adds and +only that helper used, replaces position 159's test of the link, extends position 230's test of +the openers, adds tests beside those that position 140 adds to the microVM restore module, and +changes the CLI reference's sentence on direct-claimed scratch, which position 159 adds. +Position 247 has the synchronized TSC set of the time ABI backends of positions 126, 127, and 133 +report the host instant from which the TSCs run, which the time ABI restore of position 132 passes, +with position 248, to the time advance that PR10's position 015 adds: `StateUnits::advance_time`, `StateUnit::advance_time`, and `VmTimeKeeper::advance` take that instant, from which the keeper's -next start runs VM time, and the chipset's state unit, whose time advance position 019 adds, takes -it too. Position 255 also has the tests of positions 241, 244, and 245 pass an instant, and extends -the snapshot guide's paragraph on the VM-time cut that positions 156 and 201 write. +next start runs VM time, and the chipset's state unit, whose time advance position 015 adds, takes +it too. Position 248 also has the tests of positions 234, 237, and 238 pass an instant, and extends +the snapshot guide's paragraph on the VM-time cut that positions 149 and 194 write. Assigning the later commits therefore means revisiting those PRs, not only appending new ones. -Position 177, by contrast, changes only `disk_blob`, which upstream main and the fork base +Position 170, by contrast, changes only `disk_blob`, which upstream main and the fork base have alike and no other commit of the chain changes, so it can go upstream on its own. Position -182 likewise changes only `guestmem` and the virtio queue's check, and can go upstream on its -own; position 183 builds on the fork's virtio-mmio shared interrupt-status transport, -MP-table loader, and microVM worker. Position 154 changes only `cpu_profile`, the fork's CPU +175 likewise changes only `guestmem` and the virtio queue's check, and can go upstream on its +own; position 176 builds on the fork's virtio-mmio shared interrupt-status transport, +MP-table loader, and microVM worker. Position 147 changes only `cpu_profile`, the fork's CPU profile crate that the time ABI series adds, one of its test helpers in `virt_mshv`, and the -snapshot guide, so it builds on that fork-only code. Position 159 changes only the CPU checks -of the VM worker's time ABI and the snapshot guide's description of them. Position 157 +snapshot guide, so it builds on that fork-only code. Position 152 changes only the CPU checks +of the VM worker's time ABI and the snapshot guide's description of them. Position 150 changes only the VM time keeper of `vmcore`, whose `vmtime.rs` upstream main and the fork base have -alike, and applies to upstream main as it is, so it can go upstream on its own. Position 179 +alike, and applies to upstream main as it is, so it can go upstream on its own. Position 172 changes only how the microVM options bind their network policy to the NIC's identity and the CLI -and Consomme references, so it builds on the fork-only commits of positions 174 and -178. Position 185 makes the change of microsoft/openvmm#4803 unchanged, and position -186 stages the Server 2025 image for the x64 Linux KVM job, which runs the test, and +and Consomme references, so it builds on the fork-only commits of positions 167 and +171. Position 178 makes the change of microsoft/openvmm#4803 unchanged, and position +179 stages the Server 2025 image for the x64 Linux KVM job, which runs the test, and excludes the test and its image from the x64 Linux MSHV job, where Server 2025's required initial reset fails. microsoft/openvmm#4803 was closed without merging, so the chain keeps both until -upstream fixes the test's flakiness. Position 160 +upstream fixes the test's flakiness. Position 153 moves the time ABI to version 2: it changes the time ABI backends of KVM, MSHV, and WHP, the portb device's time sample, the restore packet, and the microVM worker's time-abi unit, all of -which the time ABI series added, so it follows that series upstream. Position 181 changes -the tier check of position 178's restore that installs a new policy and extends restore -packet 5 of position 160, so it builds on those fork-only commits. Position 187 changes only the +which the time ABI series added, so it follows that series upstream. Position 174 changes +the tier check of position 171's restore that installs a new policy and extends restore +packet 5 of position 153, so it builds on those fork-only commits. Position 180 changes only the microVM profile, CLI, and snapshot contract that PR16 and PR19 add, and their Guide pages, so it -does not apply to upstream main and follows those PRs upstream. Positions 188 and 189 likewise +does not apply to upstream main and follows those PRs upstream. Positions 181 and 182 likewise change only the microVM profile, its worker's device configuration, its snapshot contract, and its management RPC profile, which PR16-PR20, PR23, and PR25 add, and their Guide pages: replaying them on `b2676222b` conflicts in all nine of their files, so they follow those PRs upstream. -Positions 190 and 191 change the MP-table loader of PR14 and the microVM profile, worker, CLI, and +Positions 183 and 184 change the MP-table loader of PR14 and the microVM profile, worker, CLI, and snapshot contract of PR15-PR19 and PR23, and their Guide pages: replaying them on `b2676222b` conflicts in 16 of their 17 files, so they follow those PRs upstream. The 17th, the IOAPIC's -`chipset` tests, which position 190 extends with a save and restore of the inputs past the ISA +`chipset` tests, which position 183 extends with a save and restore of the inputs past the ISA IRQs, applies to upstream main without conflicts. -Positions 192-205 change only ABIs that the chain introduces: the microVM ABI and boot layout, +Positions 185-198 change only ABIs that the chain introduces: the microVM ABI and boot layout, the time ABI, its time samples and restore packet, the snapshot manifest and machine contract, the saved states of virtio-console, virtio-fs, and the RTC, the egress policy digest, the NIC's identity, the virtio-fs slot, and the management RPC's microVM fields, so they follow the PRs that introduce those ABIs upstream. -Position 206 changes only the microVM CLI's output drain and host consoles, the anonymous serial +Position 199 changes only the microVM CLI's output drain and host consoles, the anonymous serial pair that they use, and the CLI guide: replaying it on upstream main, `ba105dd7f`, conflicts in five of its seven files, four of which upstream main lacks, so it follows those PRs upstream. -Positions 207 and 208 change only the microVM portb device, its CLI and test harness, the VMM tests +Positions 200 and 201 change only the microVM portb device, its CLI and test harness, the VMM tests 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 209 makes the secure file and directory creation of `pal`, which upstream main has, take +Position 202 makes the secure file and directory creation of `pal`, which upstream main has, take long Windows paths, and adds tests of it to `pal` and to the snapshot publication of -`openvmm_helpers`. PR04's position 009 also changes that `pal` file, and PR11's positions 031-033, -PR17's position 076, PR19's position 092, and positions 139, 147, and 166 that publication file, -but position 209 changes nothing that they add. Replaying it on upstream main conflicts only in the -publication file, whose new tests use the paired scratch of PR19's position 092 and the exact-file -RAM of PR11's position 033. Its `pal` change alone applies to upstream main without conflicts, and -`pal` builds there and passes its tests on Windows, so that change can go upstream on its own. - -Position 210 changes `state_unit`'s state change requests and their tests and, since the v5.0 +`openvmm_helpers`. microsoft/openvmm#4604, which landed PR04, also changes that `pal` file, and +PR11's positions 027-029, PR17's position 069, PR19's position 085, and positions 132, 140, and 159 +that publication file, but position 202 changes nothing that they add. Replaying it on upstream main +conflicts only in the publication file, whose new tests use the paired scratch of PR19's position +085 and the exact-file RAM of PR11's position 029. Its `pal` change alone applies to upstream main +without conflicts, and `pal` builds there and passes its tests on Windows, so that change can go +upstream on its own. + +Position 203 changes `state_unit`'s state change requests and their tests and, since the v5.0 reorganization folded into it the test that a slow input quiesce names its unit, the input -quiesce of PR09's position 018, its tests, and the CLI guide. Replaying it on upstream main -conflicts in four of its seven files: `state_unit`'s `lib.rs`, which PR09's positions 015, 017, and -018 and PR10's position 019 also change, the input quiesce module and its tests, which position -018 adds and upstream main lacks, and the CLI guide. So it follows PR09 upstream. +quiesce of PR09's position 014, its tests, and the CLI guide. Replaying it on upstream main +conflicts in four of its seven files: `state_unit`'s `lib.rs`, which PR09's positions 011, 013, and +014 and PR10's position 015 also change, the input quiesce module and its tests, which position +014 adds and upstream main lacks, and the CLI guide. So it follows PR09 upstream. -Position 211 leads the error with which the Consomme resolver, which upstream main has, reports a +Position 204 leads the error with which the Consomme resolver, which upstream main has, reports a port forward that it cannot bind with the stable code `E_PORT_FORWARD_BIND`, renames the helper with -which position 139's fatal error finds the first code of an error chain, and gives the code in the -Guide's sentences on the forwards of positions 174, 178, and 181 and on the time ABI codes of -position 147. It changes nothing that a mapped PR adds, but its resolver test builds a Consomme -handle with the fields that PR13's position 047 and positions 168 and 174 add. Replaying it on +which position 132's fatal error finds the first code of an error chain, and gives the code in the +Guide's sentences on the forwards of positions 167, 171, and 174 and on the time ABI codes of +position 140. It changes nothing that a mapped PR adds, but its resolver test builds a Consomme +handle with the fields that PR13's position 043 and positions 161 and 167 add. Replaying it on upstream main conflicts in all four of its files, one of which, the verification module of position -139, upstream main lacks, so it follows those commits upstream. +132, upstream main lacks, so it follows those commits upstream. -Position 212 changes virtio-net's queue start and coordinator, which upstream main has, and changes -nothing that PR13's position 048 or PR21's position 105 add to the same files. Replaying it on +Position 205 changes virtio-net's queue start and coordinator, which upstream main has, and changes +nothing that PR13's position 044 or PR21's position 098 add to the same files. Replaying it on upstream main, `ba105dd7f`, conflicts only where its coordinator field joins the input-gate field -of position 048 and where its test module joins those of positions 048 and 105, and its test starts -the receive queue with position 048's harness, so it follows PR13 upstream unless those lines are -adapted. Position 213 changes only the virtio saved-state tests of PR13's position 039, which -upstream main lacks, so it follows PR13 upstream. Position 214's documentation of +of position 044 and where its test module joins those of positions 044 and 098, and its test starts +the receive queue with position 044's harness, so it follows PR13 upstream unless those lines are +adapted. Position 206 changes only the virtio saved-state tests of PR13's position 035, which +upstream main lacks, so it follows PR13 upstream. Position 207's documentation of `VirtioDevice::start_queue` applies to upstream main without conflicts but refers to the -`restore_device` that PR13's position 039 adds, and its Guide paragraphs conflict there, since +`restore_device` that PR13's position 035 adds, and its Guide paragraphs conflict there, since they extend those of PR12, PR18, PR20, and PR25, so it follows those PRs upstream. -Positions 215 and 216 change only the microVM snapshot capture, publication, and restore, their CLI, +Positions 208 and 209 change only the microVM snapshot capture, publication, and restore, their CLI, block contracts, and manifest validation, and the Guide pages that describe them: replaying them on upstream main conflicts in all 13 of their files, eight of which upstream main lacks, those that -PR11's position 032, PR15's position 064, PR17's positions 074, 076, and 079, PR19's position 091, -and PR25's position 124 add, so they follow those PRs upstream. +PR11's position 028, PR15's position 057, PR17's positions 067, 069, and 072, PR19's position 084, +and PR25's position 117 add, so they follow those PRs upstream. -Positions 217 and 218 build on the chain too. Replaying position 217 on upstream main conflicts in -two of its three files: the device task, whose failed start PR13's position 039 adds, and the list -of the virtio test modules that the chain extends. Replaying position 218 on upstream main after it +Positions 210 and 211 build on the chain too. Replaying position 210 on upstream main conflicts in +two of its three files: the device task, whose failed start PR13's position 035 adds, and the list +of the virtio test modules that the chain extends. Replaying position 211 on upstream main after it conflicts in 15 of its 19 files, four of which upstream main lacks: `state_unit`'s start module -and its tests, which PR09's position 015 adds, the virtio saved-state tests of PR13's position 039, -and position 217's tests. Only `state_unit`'s requests, the virtio test transports, the chipset +and its tests, which PR09's position 011 adds, the virtio saved-state tests of PR13's position 035, +and position 210's tests. Only `state_unit`'s requests, the virtio test transports, the chipset device unit, and the device worker's request loop apply there. So both follow PR09 and PR13 upstream. -Position 219 builds on the chain too. Replaying it on upstream main conflicts in two of its three -files: the outcome report module, which PR24's position 122 adds and upstream main lacks, and -`pal`'s security module, whose encoding position 209 adds. Only its addition to `pal`'s file system +Position 212 builds on the chain too. Replaying it on upstream main conflicts in two of its three +files: the outcome report module, which PR24's position 115 adds and upstream main lacks, and +`pal`'s security module, whose encoding position 202 adds. Only its addition to `pal`'s file system module applies there. So its report change follows PR24 upstream, and its `pal` change follows -position 209's. +position 202's. -Position 220 changes only the time ABI's measurement of the guest TSC offset, which reads on +Position 213 changes only the time ABI's measurement of the guest TSC offset, which reads on while the offset's uncertainty, half its tightest bracket, is over 50 µs, until a read is within that bound, and fails the start with `E_TSC_ANCHOR` if none is within it after 10 seconds. It -changes `virt`'s TSC module, which position 160 adds, the backend trait of position 132, and the -MSHV and WHP backends of positions 134 and 140, files that no other commits than positions 132-160 -and 193 change, and the paragraph on time samples that position 160 adds to the Guide's snapshots -page, in the section that position 147 adds. It changes nothing that a mapped PR adds. Replaying it +changes `virt`'s TSC module, which position 153 adds, the backend trait of position 125, and the +MSHV and WHP backends of positions 127 and 133, files that no other commits than positions 125-153 +and 186 change, and the paragraph on time samples that position 153 adds to the Guide's snapshots +page, in the section that position 140 adds. It changes nothing that a mapped PR adds. Replaying it on upstream main conflicts in all five of its files: upstream main lacks the four of the time ABI and that section of the snapshots page, so it follows the time ABI series upstream. -Positions 221-223 change only the CPU profiles. Positions 221 and 222 clear AMX's features without -AMX's XSAVE states, and AVX10, in the derivation policy of position 138, which positions 150 and -153 extended. Position 223 pins `intel.graniterapids.v1` as positions 149, 150, and 153 pinned +Positions 214-216 change only the CPU profiles. Positions 214 and 215 clear AMX's features without +AMX's XSAVE states, and AVX10, in the derivation policy of position 131, which positions 143 and +146 extended. Position 216 pins `intel.graniterapids.v1` as positions 142, 143, and 146 pinned theirs, in the generations, static data, fixtures, and tests of the `cpu_profile` crate, which -position 138 adds and positions 146, 149, 150, 153, and 154 change. It also extends the test of -the topology leaves of the effective CPUID that position 146 adds, moves the tests of the fallback -of positions 152 and 162 in `openvmm_core` and petri to another unserved CPU, adds the profile to -the WHP partition tests that position 153 last extended, and lists it on the Guide's snapshots -page, in the section that position 147 adds and position 220 last changed. They change nothing that +position 131 adds and positions 139, 142, 143, 146, and 147 change. It also extends the test of +the topology leaves of the effective CPUID that position 139 adds, moves the tests of the fallback +of positions 145 and 155 in `openvmm_core` and petri to another unserved CPU, adds the profile to +the WHP partition tests that position 146 last extended, and lists it on the Guide's snapshots +page, in the section that position 140 adds and position 213 last changed. They change nothing that a mapped PR adds. Replaying them on upstream main conflicts in all nine of their files that existed before them: upstream main lacks the `cpu_profile` crate, the time ABI, and that section of the snapshots page, so they follow the time ABI series upstream. -Position 224 changes only the CPU profiles. It pins `amd.turin.v2`, a second revision of the -Turin profile of position 150, as position 153 pinned `amd.genoa.v2`, in the static data, -fixtures, and tests of the `cpu_profile` crate, which position 138 adds and positions 146, 149, -150, 153, 154, and 221-223 change. It also adds the revision to the WHP partition tests that -position 223 last extended, and lists it on the Guide's snapshots page, in the section that -position 147 adds and position 223 last changed. It changes nothing that a mapped PR adds. +Position 217 changes only the CPU profiles. It pins `amd.turin.v2`, a second revision of the +Turin profile of position 143, as position 146 pinned `amd.genoa.v2`, in the static data, +fixtures, and tests of the `cpu_profile` crate, which position 131 adds and positions 139, 142, +143, 146, 147, and 214-216 change. It also adds the revision to the WHP partition tests that +position 216 last extended, and lists it on the Guide's snapshots page, in the section that +position 140 adds and position 216 last changed. It changes nothing that a mapped PR adds. Replaying it on upstream main conflicts in all seven of its files that existed before it, for the same reasons, so it follows the time ABI series upstream. -Position 225 changes only the endpoints of the microVM consoles: their attachments, which PR13's -position 042 adds and no other commit changes; the microVM CLI's options, configuration, and -module, which PR15's position 064 adds, and its console module, which PR18's position 082 adds and -PR23's positions 117 and 118 and PR25's position 124 change; the management RPC's microVM module, -which position 124 adds; the snapshot contract, which PR17's position 074 adds; and the CLI guide's +Position 218 changes only the endpoints of the microVM consoles: their attachments, which PR13's +position 038 adds and no other commit changes; the microVM CLI's options, configuration, and +module, which PR15's position 057 adds, and its console module, which PR18's position 075 adds and +PR23's positions 110 and 111 and PR25's position 117 change; the management RPC's microVM module, +which position 117 adds; the snapshot contract, which PR17's position 067 adds; and the CLI guide's `--virtio-console`, serial backend, and `--host-loopback` entries. Many later commits also change the CLI's files, the management RPC's module, and the snapshot contract. Replaying it on upstream main conflicts in all eight of its files, seven of which upstream main lacks, those that positions -042, 064, 074, 082, and 124 add, so it follows PR13, PR15, PR17, PR18, and PR25 upstream. - -Position 226 changes only `chipset`'s microVM module, which PR15's positions 060 and 061, PR17's -position 071, PR19's position 092, PR20's positions 094, 095, 097, and 099, PR24's position 119, -and positions 137, 139, 147, 160, 181, 193, 195, and 208 also change, and the CLI guide. In the -module it changes only the write and the stop of the portb console, which position 060 adds and -position 208 last changed, and position 208's test endpoint; in the guide, only the sentence on -portb's output in the `--snapshot-destination` entry, which PR25's position 125 adds. Replaying it +038, 057, 067, 075, and 117 add, so it follows PR13, PR15, PR17, PR18, and PR25 upstream. + +Position 219 changes only `chipset`'s microVM module, which PR15's positions 053 and 054, PR17's +position 064, PR19's position 085, PR20's positions 087, 088, 090, and 092, PR24's position 112, +and positions 130, 132, 140, 153, 174, 186, 188, and 201 also change, and the CLI guide. In the +module it changes only the write and the stop of the portb console, which position 053 adds and +position 201 last changed, and position 201's test endpoint; in the guide, only the sentence on +portb's output in the `--snapshot-destination` entry, which PR25's position 118 adds. Replaying it on upstream main conflicts in both of its files: upstream main lacks the module and that entry, so it follows PR15 and PR25 upstream. -Position 227 changes only the restore of the microVM boot console's attachment: the console -module, which PR18's position 082 adds and PR23's positions 117 and 118, PR25's position 124, and -position 225 change; the restore check, which PR17's position 079 adds; the microVM CLI's -configuration and module, which PR15's position 064 adds; the management RPC's microVM module, -which position 124 adds; the resolver of the console attachments, which PR13's position 042 adds +Position 220 changes only the restore of the microVM boot console's attachment: the console +module, which PR18's position 075 adds and PR23's positions 110 and 111, PR25's position 117, and +position 218 change; the restore check, which PR17's position 072 adds; the microVM CLI's +configuration and module, which PR15's position 057 adds; the management RPC's microVM module, +which position 117 adds; the resolver of the console attachments, which PR13's position 038 adds and no other commit changes; and the `--virtio-console none` entry of the CLI guide and the restore section of the snapshot guide. Replaying it on upstream main conflicts in all eight of its -files: upstream main lacks the six that positions 042, 064, 079, 082, and 124 add, and those +files: upstream main lacks the six that positions 038, 057, 072, 075, and 117 add, and those sections of the guides, so it follows PR13, PR15, PR16, PR17, PR18, PR23, and PR25 upstream. -Position 228 changes the management RPC's microVM module and protocol, which PR25's position 124 -adds and the fork tail's position 129 and positions 161, 203, 225, and 227 change, and the RPC's -server module, which upstream main has and many chain commits, position 124 among them, change; +Position 221 changes the management RPC's microVM module and protocol, which PR25's position 117 +adds and the fork tail's position 122 and positions 154, 196, 218, and 220 change, and the RPC's +server module, which upstream main has and many chain commits, position 117 among them, change; the microVM CLI's configuration, console, network, restore, and storage modules, which PR15's -position 064, PR17's position 079, PR18's positions 082 and 083, and PR19's position 091 add, and +position 057, PR17's position 072, PR18's positions 075 and 076, and PR19's position 084 add, and many later commits change; the CLI's options and entry point, the snapshot restore module that -PR12's position 036 adds, the TTRPC VMM tests, whose microVM module position 124 adds, and the +PR12's position 032 adds, the TTRPC VMM tests, whose microVM module position 117 adds, and the gRPC reference. Replaying it on upstream main conflicts in 16 of its 17 files: upstream main lacks the microVM modules, options, fields, and tests that those positions add, so it follows PR12, PR15, PR17, PR18, PR19, PR21, PR22, and PR25 upstream. -Position 229 changes only the snapshot publication of `openvmm_helpers`, which PR11's positions -031-033, PR17's position 076, PR19's position 092, and positions 139, 147, 166, 209, and 215 also -change, the microVM controller's capture, which position 076 adds, and the sentences on a failed -publication that position 076 adds to the snapshot and snapshot format guides. In the publication -file it changes only the cleanup and rollback of the staging directory that positions 032 and 033 +Position 222 changes only the snapshot publication of `openvmm_helpers`, which PR11's positions +027-029, PR17's position 069, PR19's position 085, and positions 132, 140, 159, 202, and 208 also +change, the microVM controller's capture, which position 069 adds, and the sentences on a failed +publication that position 069 adds to the snapshot and snapshot format guides. In the publication +file it changes only the cleanup and rollback of the staging directory that positions 028 and 029 add, and their tests. Replaying it on upstream main conflicts in all four of its files: upstream -main lacks the controller, the staging of positions 032 and 033, and those sentences, so it follows +main lacks the controller, the staging of positions 028 and 029, and those sentences, so it follows PR11 and PR17 upstream. -Positions 230 and 231 change only the snapshot manifest of `openvmm_helpers`, its format checks, -and its restore, which PR11's positions 031 and 032, PR12's position 035, PR17's positions 074 and -076, PR19's positions 092 and 093, and positions 136, 147, 166, 184, 195, 204, 205, and 215 also +Positions 223 and 224 change only the snapshot manifest of `openvmm_helpers`, its format checks, +and its restore, which PR11's positions 027 and 028, PR12's position 031, PR17's positions 067 and +069, PR19's positions 085 and 086, and positions 129, 140, 159, 177, 188, 197, 198, and 208 also change, and the snapshot format guide's sections on the manifest. In those files they change only -the manifest's decoding and header check, which positions 031 and 035 add, and comment on the -fields that position 205 numbers, and they add tests that use the machine contract of PR17's -position 074. Replaying them on upstream main conflicts in all four of their files: upstream main -lacks the format magic and header check of position 031, the restore of position 035, the machine -contract of position 074, and the fields that position 205 numbers, so they follow PR11, PR12, and +the manifest's decoding and header check, which positions 027 and 031 add, and comment on the +fields that position 198 numbers, and they add tests that use the machine contract of PR17's +position 067. Replaying them on upstream main conflicts in all four of their files: upstream main +lacks the format magic and header check of position 027, the restore of position 031, the machine +contract of position 067, and the fields that position 198 numbers, so they follow PR11, PR12, and PR17 upstream. -Position 232 changes only the capture-tier check of the microVM snapshot module of -`openvmm_helpers`, which PR17's position 074 adds and many later commits change, and adds a test -to the snapshot restore of `openvmm_helpers`, which PR11's position 031, PR12's position 035, -PR17's position 076, PR19's positions 092 and 093, and positions 147, 166, 184, 195, 204, 215, and -230 also change; the test uses the paired-scratch manifest of PR19's position 092 and the resume -claim of position 093. Replaying it on upstream main conflicts in both of its files: upstream main -lacks the microVM snapshot module of position 074 and the tiers and paired scratch that positions -092, 093, and 166 add to the restore, so it follows PR17 and PR19 upstream. - -Position 233 changes the restore packet of the time ABI series in `chipset_resources`, which -position 132 adds and positions 160, 181, and 193 change, and adds a test to the portb device that -serves it, which PR15's positions 060 and 061, PR17's position 071, PR19's position 092, PR20's -positions 094, 095, 097, and 099, PR24's position 119, and positions 137, 139, 147, 160, 181, 193, -195, 208, and 226 also change. It changes the microVM CLI of PR15's position 064, the restore -preparation of PR17's position 079, the management RPC's microVM conversion of position 228 and -the protocol of PR25's position 124, and their Guide pages. Replaying it on upstream main +Position 225 changes only the capture-tier check of the microVM snapshot module of +`openvmm_helpers`, which PR17's position 067 adds and many later commits change, and adds a test +to the snapshot restore of `openvmm_helpers`, which PR11's position 027, PR12's position 031, +PR17's position 069, PR19's positions 085 and 086, and positions 140, 159, 177, 188, 197, 208, and +223 also change; the test uses the paired-scratch manifest of PR19's position 085 and the resume +claim of position 086. Replaying it on upstream main conflicts in both of its files: upstream main +lacks the microVM snapshot module of position 067 and the tiers and paired scratch that positions +085, 086, and 159 add to the restore, so it follows PR17 and PR19 upstream. + +Position 226 changes the restore packet of the time ABI series in `chipset_resources`, which +position 125 adds and positions 153, 174, and 186 change, and adds a test to the portb device that +serves it, which PR15's positions 053 and 054, PR17's position 064, PR19's position 085, PR20's +positions 087, 088, 090, and 092, PR24's position 112, and positions 130, 132, 140, 153, 174, 186, +188, 201, and 219 also change. It changes the microVM CLI of PR15's position 057, the restore +preparation of PR17's position 072, the management RPC's microVM conversion of position 221 and +the protocol of PR25's position 117, and their Guide pages. Replaying it on upstream main conflicts in all nine of its files: upstream main lacks the time ABI series, the microVM CLI and -restore of PR15 and PR17, and the conversion of position 228, so it follows that series, PR15, +restore of PR15 and PR17, and the conversion of position 221, so it follows that series, PR15, PR17, PR19, PR20, and PR25 upstream. -Position 234 changes the snapshot publication of `openvmm_helpers`, which PR11's positions 031-033, -PR17's position 076, PR19's position 092, and positions 139, 147, 166, 209, 215, and 229 also -change, and the file system module that PR11's position 032 adds to it, which PR11's position 033, -PR12's position 035, PR19's positions 092 and 093, and positions 166 and 215 also change. It adds +Position 227 changes the snapshot publication of `openvmm_helpers`, which PR11's positions 027-029, +PR17's position 069, PR19's position 085, and positions 132, 140, 159, 202, 208, and 222 also +change, and the file system module that PR11's position 028 adds to it, which PR11's position 029, +PR12's position 031, PR19's positions 085 and 086, and positions 159 and 208 also change. It adds renames to `pal`'s Unix file system module, which no commit of the chain changes, and to its -Windows one, which position 219 changes, and extends a sentence that position 076 adds to the +Windows one, which position 212 changes, and extends a sentence that position 069 adds to the snapshot guide. Replaying it on upstream main conflicts in four of its six files: upstream main -writes snapshots without the staging and the file system module of position 032, and lacks the -extended-length encoding of position 219 and that sentence; only the Unix rename and `pal`'s +writes snapshots without the staging and the file system module of position 028, and lacks the +extended-length encoding of position 212 and that sentence; only the Unix rename and `pal`'s manifest apply there. So it follows PR11 and PR17 upstream, and its Windows rename follows position -219's `pal` change. - -Position 235 changes only the platform tier's check of the microVM snapshot module of -`openvmm_helpers`, which PR17's position 074 adds, PR19's position 093 gives the platform tier, and -PR20's position 097, PR23's position 116, and positions 147 and 168 change, and adds tests to that -module, which use the paired-scratch manifest of PR19's position 092, the platform tier of position -093, and the worker's platform command line of PR20's position 097. It also extends the -`--snapshot-tier` entry that position 093 adds to the CLI reference of PR15's position 064. +212's `pal` change. + +Position 228 changes only the platform tier's check of the microVM snapshot module of +`openvmm_helpers`, which PR17's position 067 adds, PR19's position 086 gives the platform tier, and +PR20's position 090, PR23's position 109, and positions 140 and 161 change, and adds tests to that +module, which use the paired-scratch manifest of PR19's position 085, the platform tier of position +086, and the worker's platform command line of PR20's position 090. It also extends the +`--snapshot-tier` entry that position 086 adds to the CLI reference of PR15's position 057. Replaying it on upstream main conflicts in both of its files: upstream main lacks the microVM -snapshot module of position 074, the tiers of position 093, and the microVM CLI of position 064, so +snapshot module of position 067, the tiers of position 086, and the microVM CLI of position 057, so it follows PR15, PR17, and PR19 upstream. -Position 236 changes only the memory-expansion ranges of the microVM snapshot module of -`openvmm_helpers`, which PR17's position 074 adds and PR20's position 099 extends with those -ranges, and adds a test to that module, which uses the expandable-memory manifest of position 099. +Position 229 changes only the memory-expansion ranges of the microVM snapshot module of +`openvmm_helpers`, which PR17's position 067 adds and PR20's position 092 extends with those +ranges, and adds a test to that module, which uses the expandable-memory manifest of position 092. Replaying it on upstream main conflicts in its only file: upstream main lacks the microVM snapshot -module of position 074 and the memory expansion of position 099, so it follows PR17 and PR20 +module of position 067 and the memory expansion of position 092, so it follows PR17 and PR20 upstream. -Position 237 changes only the artifact openers of the snapshot file system module of -`openvmm_helpers`, which PR11's positions 032 and 033 add and PR12's position 035, PR19's -positions 092 and 093, and positions 166, 215, and 234 also change, and adds tests to that module -and to the snapshot restore, the latter on the paired-scratch manifest of PR19's position 092 and -the resume claim of position 093. It also extends the restore paragraph that PR12's position 036 +Position 230 changes only the artifact openers of the snapshot file system module of +`openvmm_helpers`, which PR11's positions 028 and 029 add and PR12's position 031, PR19's +positions 085 and 086, and positions 159, 208, and 227 also change, and adds tests to that module +and to the snapshot restore, the latter on the paired-scratch manifest of PR19's position 085 and +the resume claim of position 086. It also extends the restore paragraph that PR12's position 032 adds to the snapshot format guide. Replaying it on upstream main conflicts in all three of its -files: upstream main lacks the file system module of position 032, the directory-relative restore -of position 035, and that paragraph, so it follows PR11, PR12, and PR19 upstream. +files: upstream main lacks the file system module of position 028, the directory-relative restore +of position 031, and that paragraph, so it follows PR11, PR12, and PR19 upstream. -Position 238 changes only the input gate that PR09's position 018 adds to `vmcore`'s device state, +Position 231 changes only the input gate that PR09's position 014 adds to `vmcore`'s device state, the chipset device unit, the erased chipset devices, and the remote device proxy, whose files -PR10's position 019 and position 218 also change, and the gate's forwarding through the virtio -transports, which PR13's positions 039 and 040 add and PR16's positions 066 and 068 and positions -183 and 218 also change. It adds tests of the unit, the transports, and the proxy, those of the +PR10's position 015 and position 211 also change, and the gate's forwarding through the virtio +transports, which PR13's positions 035 and 036 add and PR16's positions 059 and 061 and positions +176 and 211 also change. It adds tests of the unit, the transports, and the proxy, those of the transports in a new file. Replaying it on upstream main conflicts in eight of its nine files, all -but that new one, which applies cleanly: upstream main lacks the input gate of position 018 and its -forwarding by position 040, so it follows PR09 and PR13 upstream. - -Position 239 changes only petri's microVM support, which PR15's position 065 adds and PR17's -position 076 extends with the snapshot-request port's handle, and which PR16's position 067, PR20's -position 094, PR24's position 119, and positions 137, 147, 160, 162, 207, and 223 also change; -petri's runtime functions, which PR15's position 065 extends with the portb waits after its -positions 059 and 063, and position 207 changes; petri's launch of the VM worker, whose boundary -parameters PR17's position 072 adds, and which PR09's position 016, PR12's positions 036 and 037, -PR15's position 065, PR17's positions 075 and 078, PR20's positions 095 and 097, and positions 139 -and 147 also change; petri's start of the VM, which only PR13's position 048 also changes; and the -microVM VMM tests of position 065, which PR17's position 080 and position 207 also change. +but that new one, which applies cleanly: upstream main lacks the input gate of position 014 and its +forwarding by position 036, so it follows PR09 and PR13 upstream. + +Position 232 changes only petri's microVM support, which PR15's position 058 adds and PR17's +position 069 extends with the snapshot-request port's handle, and which PR16's position 060, PR20's +position 087, PR24's position 112, and positions 130, 140, 153, 155, 200, and 216 also change; +petri's runtime functions, which PR15's position 058 extends with the portb waits after its +positions 052 and 056, and position 200 changes; petri's launch of the VM worker, whose boundary +parameters PR17's position 065 adds, and which PR09's position 012, PR12's positions 032 and 033, +PR15's position 058, PR17's positions 068 and 071, PR20's positions 088 and 090, and positions 132 +and 140 also change; petri's start of the VM, which only PR13's position 044 also changes; and the +microVM VMM tests of position 058, which PR17's position 073 and position 200 also change. Replaying it on upstream main conflicts in four of its five files, all but petri's start of the -VM, which applies cleanly: upstream main lacks the petri microVM support of position 065, the -boundary parameters of position 072, and the port's handle of position 076, so it follows PR15 and +VM, which applies cleanly: upstream main lacks the petri microVM support of position 058, the +boundary parameters of position 065, and the port's handle of position 069, so it follows PR15 and PR17 upstream. -Position 240 changes only the snapshot quiesce and the boundary's release of the VM worker's -microVM module, which PR15's position 056 adds, PR17's position 072 gives the snapshot boundary, +Position 233 changes only the snapshot quiesce and the boundary's release of the VM worker's +microVM module, which PR15's position 049 adds, PR17's position 065 gives the snapshot boundary, and 27 other positions also change; extends the snapshot guide's paragraph on the RPCs that a -boundary refuses, which PR17's position 076 adds; and adds VMM tests beside position 239's. +boundary refuses, which PR17's position 069 adds; and adds VMM tests beside position 232's. Replaying it on upstream main conflicts in all three of its files: upstream main lacks the microVM -module of position 056, the boundary of position 072, that paragraph, and the tests of positions -065 and 239, so it follows PR15, PR17, and position 239 upstream. - -Positions 241 and 242 build on the chain too. Replaying them on upstream main conflicts in four of -their five files, all but position 241's new test file: upstream main lacks the start rollback of -position 015, whose module and `state_unit`'s `lib.rs` position 241 changes, the time advance of -PR10's position 019, and the restart's start again of position 015, which position 242 changes in -the VM worker. microsoft/openvmm#4872's head makes the same changes in its form of position 015, +module of position 049, the boundary of position 065, that paragraph, and the tests of positions +058 and 232, so it follows PR15, PR17, and position 232 upstream. + +Positions 234 and 235 build on the chain too. Replaying them on upstream main conflicts in four of +their five files, all but position 234's new test file: upstream main lacks the start rollback of +position 011, whose module and `state_unit`'s `lib.rs` position 234 changes, the time advance of +PR10's position 015, and the restart's start again of position 011, which position 235 changes in +the VM worker. microsoft/openvmm#4872's head makes the same changes in its form of position 011, apart from the time advance, which upstream lacks, with a check for the terminal state that follows its check that the units are stopped, and with a teardown stop that also tolerates a unit in the -terminal state whose task has ended. So they follow PR09 upstream, folded into position 015, and -position 241's time advance check into PR10's position 019. - -Positions 243-245 build on the chain too. Replaying position 243 on upstream main conflicts in all -three of its files: upstream main lacks the start rollback of position 015, its tests, and the -snapshot rollback of PR17's position 072, so it follows PR09 upstream, folded into position 015, -and its description of the snapshot rollback into position 072; microsoft/openvmm#4872's head -orders its rollback's stop the same way. Replaying position 244 conflicts in 12 of its 20 files, -since upstream main lacks, among others, the rollback and terminal states of positions 015, 241, -and 243, the fallible resume of position 016, and the microVM worker, snapshot boundary, and +terminal state whose task has ended. So they follow PR09 upstream, folded into position 011, and +position 234's time advance check into PR10's position 015. + +Positions 236-238 build on the chain too. Replaying position 236 on upstream main conflicts in all +three of its files: upstream main lacks the start rollback of position 011, its tests, and the +snapshot rollback of PR17's position 065, so it follows PR09 upstream, folded into position 011, +and its description of the snapshot rollback into position 065; microsoft/openvmm#4872's head +orders its rollback's stop the same way. Replaying position 237 conflicts in 12 of its 20 files, +since upstream main lacks, among others, the rollback and terminal states of positions 011, 234, +and 236, the fallible resume of position 012, and the microVM worker, snapshot boundary, and controller of PR15 and PR17; its new module and tests and its changes to OpenHCL, the VMRS dump, the ttrpc server, the VM controller's disk snapshot, and petri apply cleanly. microsoft/openvmm#4937 proposes its change of `StateUnits::stop` for upstream's code, on -microsoft/openvmm#4872, so it follows PR09 upstream. Replaying position 245 conflicts in two of its -three files, all but its new test file: upstream main lacks the terminal state of position 015, -which `state_unit`'s `lib.rs` extends, and the time advance of PR10's position 019, so it follows +microsoft/openvmm#4872, so it follows PR09 upstream. Replaying position 238 conflicts in two of its +three files, all but its new test file: upstream main lacks the terminal state of position 011, +which `state_unit`'s `lib.rs` extends, and the time advance of PR10's position 015, so it follows PR09 and PR10 upstream. -Position 246 changes only tests: the virtio saved-state tests that PR13's position 039 adds and -positions 213 and 218 also change, and the module documentation of the virtio-net saved-state tests -that PR13's position 048 adds. Replaying it on upstream main conflicts in both of its files: +Position 239 changes only tests: the virtio saved-state tests that PR13's position 035 adds and +positions 206 and 211 also change, and the module documentation of the virtio-net saved-state tests +that PR13's position 044 adds. Replaying it on upstream main conflicts in both of its files: upstream main lacks both test modules, so it follows PR13 upstream. -Position 247 changes only the input gates that PR13's positions 043 and 048 and PR18's position 088 +Position 240 changes only the input gates that PR13's positions 039 and 044 and PR18's position 081 give the console, virtio-net, and virtio-fs with their saved state, the documentation of the gate's -methods of `VirtioDevice` and `ChangeDeviceState`, which PR13's position 040 and PR09's position -018 add, and the snapshot guide's paragraph on the post-restore gate of PR20's position 095. It -adds tests beside those of the same positions, of PR18's position 090, of PR23's position 113, and -of position 172, and a new module of console tests, which drives the console through the +methods of `VirtioDevice` and `ChangeDeviceState`, which PR13's position 036 and PR09's position +014 add, and the snapshot guide's paragraph on the post-restore gate of PR20's position 088. It +adds tests beside those of the same positions, of PR18's position 083, of PR23's position 106, and +of position 165, and a new module of console tests, which drives the console through the virtio-mmio transport. Replaying it on upstream main conflicts in 13 of its 15 files, all but that new module and the development dependency that virtio-fs takes for its transport tests, which -apply cleanly: upstream main lacks the input gate of position 018, its forwarding by position 040, +apply cleanly: upstream main lacks the input gate of position 014, its forwarding by position 036, the devices' gates, and the test harnesses that its tests extend, those of the console's broker of -PR23's position 113 and of virtio-fs's gated queues of position 172 among them. So it follows PR13 -upstream, folded into positions 043 and 048, and its parts into PR09's position 018, PR13's -position 040, PR18's position 088, PR20's position 095, PR23's position 113, and position 172. - -Position 248 changes only the network identity of the microVM machine contract module of -`openvmm_defs`, which PR15's position 055 adds and 37 other positions also change: it checks the -prefix of the identity that `validate_machine_config`, which PR15's position 062 adds, receives, -before the command-line check that PR18's position 083 adds derives the identity's netmask, and -gives the identity's parser, which position 083 also adds, the same range. Its test builds the -command line with the virtio discovery of PR16's position 067, and gives the configuration the -virtio-fs device whose slot position 202 reserves on every command line. Replaying it on upstream -main conflicts in its only file: upstream main lacks the microVM module of position 055 and the -network identity of position 083, so it follows PR18 upstream, folded into position 083, and its -test's virtio-fs device into position 202. - -Position 249 changes only the snapshot RAM ranges of the microVM machine contract module of -`openvmm_defs`, which PR15's position 055 adds and 38 other positions also change: it checks the -snapshot and restore RAM ranges that PR20's position 098 adds and that `validate_machine_config`, -which PR15's position 062 adds, receives, after position 098's check that they have a RAM -capacity, against what `MemoryRange::new` asserts when position 098's load merges them. Its test -completes the configuration of position 248's test into one that `validate_machine_config` -accepts, with the chipset devices of position 062 and PR17's position 076, and the time ABI -parameters that position 147 requires. Replaying it on upstream main conflicts in its only file: -upstream main lacks the microVM module of position 055 and the snapshot RAM ranges of position -098, so it follows PR20 upstream, folded into position 098, and its test's time ABI parameters -into position 147. - -Position 250 changes only the snapshot restore of `openvmm_helpers`, which PR11's position 031, -PR12's position 035, PR17's position 076, PR19's positions 092 and 093, and positions 147, 166, -184, 195, 204, 215, 230, 232, and 237 also change: it opens the paired scratch of position 092 in -the open of position 035, which the claim of position 093 follows. Its test uses the -paired-scratch manifest of position 092, the resume claim of position 093, and, for its FIFO -case, the helper of position 237. Replaying it on upstream main conflicts in its only file: -upstream main lacks the directory-relative restore of position 035 and the paired scratch and -claims of positions 092 and 093, so it follows PR12 and PR19 upstream, folded into position 093, -and its test's FIFO case into position 237. - -Position 251 changes the restore-side snapshot access of `openvmm_helpers`, which PR12's position -035 adds, and the microVM restore and storage builder of `openvmm_entry`, which PR17's position -079 and PR19's positions 091 and 092 add, and adds a read-write open to `pal`'s handle-relative +PR23's position 106 and of virtio-fs's gated queues of position 165 among them. So it follows PR13 +upstream, folded into positions 039 and 044, and its parts into PR09's position 014, PR13's +position 036, PR18's position 081, PR20's position 088, PR23's position 106, and position 165. + +Position 241 changes only the network identity of the microVM machine contract module of +`openvmm_defs`, which PR15's position 048 adds and 37 other positions also change: it checks the +prefix of the identity that `validate_machine_config`, which PR15's position 055 adds, receives, +before the command-line check that PR18's position 076 adds derives the identity's netmask, and +gives the identity's parser, which position 076 also adds, the same range. Its test builds the +command line with the virtio discovery of PR16's position 060, and gives the configuration the +virtio-fs device whose slot position 195 reserves on every command line. Replaying it on upstream +main conflicts in its only file: upstream main lacks the microVM module of position 048 and the +network identity of position 076, so it follows PR18 upstream, folded into position 076, and its +test's virtio-fs device into position 195. + +Position 242 changes only the snapshot RAM ranges of the microVM machine contract module of +`openvmm_defs`, which PR15's position 048 adds and 38 other positions also change: it checks the +snapshot and restore RAM ranges that PR20's position 091 adds and that `validate_machine_config`, +which PR15's position 055 adds, receives, after position 091's check that they have a RAM +capacity, against what `MemoryRange::new` asserts when position 091's load merges them. Its test +completes the configuration of position 241's test into one that `validate_machine_config` +accepts, with the chipset devices of position 055 and PR17's position 069, and the time ABI +parameters that position 140 requires. Replaying it on upstream main conflicts in its only file: +upstream main lacks the microVM module of position 048 and the snapshot RAM ranges of position +091, so it follows PR20 upstream, folded into position 091, and its test's time ABI parameters +into position 140. + +Position 243 changes only the snapshot restore of `openvmm_helpers`, which PR11's position 027, +PR12's position 031, PR17's position 069, PR19's positions 085 and 086, and positions 140, 159, +177, 188, 197, 208, 223, 225, and 230 also change: it opens the paired scratch of position 085 in +the open of position 031, which the claim of position 086 follows. Its test uses the +paired-scratch manifest of position 085, the resume claim of position 086, and, for its FIFO +case, the helper of position 230. Replaying it on upstream main conflicts in its only file: +upstream main lacks the directory-relative restore of position 031 and the paired scratch and +claims of positions 085 and 086, so it follows PR12 and PR19 upstream, folded into position 086, +and its test's FIFO case into position 230. + +Position 244 changes the restore-side snapshot access of `openvmm_helpers`, which PR12's position +031 adds, and the microVM restore and storage builder of `openvmm_entry`, which PR17's position +072 and PR19's positions 084 and 085 add, and adds a read-write open to `pal`'s handle-relative file access, which upstream main has. Replaying it on upstream main conflicts in 6 of its 7 files, all but that `pal` module: upstream main lacks the snapshot modules of PR11 and PR12, the microVM -restore of PR17, the sandbox blocks of PR19, and the direct-claimed scratch of position 166, so it -follows position 166 upstream, and its `pal` open, which applies to upstream main as it is, has no +restore of PR17, the sandbox blocks of PR19, and the direct-claimed scratch of position 159, so it +follows position 159 upstream, and its `pal` open, which applies to upstream main as it is, has no other user. -Position 252 changes only the time ABI's check of the clock tokens of a microVM's kernel command -line, which position 135 adds to the time ABI module of `virt` that position 132 adds and positions -139, 142, 144, 145, 148, 149, 152, 158, 160, and 193 also change: it splits the command line at +Position 245 changes only the time ABI's check of the clock tokens of a microVM's kernel command +line, which position 128 adds to the time ABI module of `virt` that position 125 adds and positions +132, 135, 137, 138, 141, 142, 145, 151, 153, and 186 also change: it splits the command line at every byte that Linux's `isspace` takes for whitespace, the vertical tab and 0xa0 among them, -rather than at ASCII whitespace, and adds tests beside position 135's. It changes nothing that a +rather than at ASCII whitespace, and adds tests beside position 128's. It changes nothing that a mapped PR adds. Replaying it on upstream main conflicts in its only file: upstream main lacks the time ABI, so it follows the time ABI series upstream. -Position 253 raises `MAX_DOWNTIME_NS`, the time ABI's longest accepted downtime, which position 132 +Position 246 raises `MAX_DOWNTIME_NS`, the time ABI's longest accepted downtime, which position 125 adds to the time ABI module of `virt`, from 30 days to 365 days, the fixed duration of 31,536,000 -seconds, and the downtime bound in the snapshot Guide's time compatibility list, which position 147 -adds. The checks that compare the anchor downtime of position 139 and the VM-time downtime of -positions 156 and 201 with it are unchanged. Its tests extend those of positions 132, 139, and 156, -in `virt` and in the snapshot time module of `openvmm_helpers`, which positions 136, 139, 142, -144-150, 156, 158, 160, 193, 195, and 201 also change. It changes nothing that a mapped PR adds. +seconds, and the downtime bound in the snapshot Guide's time compatibility list, which position 140 +adds. The checks that compare the anchor downtime of position 132 and the VM-time downtime of +positions 149 and 194 with it are unchanged. Its tests extend those of positions 125, 132, and 149, +in `virt` and in the snapshot time module of `openvmm_helpers`, which positions 129, 132, 135, +137-143, 149, 151, 153, 186, 188, and 194 also change. It changes nothing that a mapped PR adds. Replaying it on upstream main conflicts in all five of its files: upstream main lacks the time ABI, so it follows the time ABI series upstream. -Positions 254 and 255 change the synchronized TSC set of the time ABI backends of positions 133, -134, and 140, the time ABI restore of position 139, and the time advance of PR10's position 019, +Positions 247 and 248 change the synchronized TSC set of the time ABI backends of positions 126, +127, and 133, the time ABI restore of position 132, and the time advance of PR10's position 015, with its callers and tests. Replaying them on upstream main conflicts in 15 of their 16 files, all but the Guide's timekeeping page, whose description of `VmTimeKeeper` upstream main has alike: -upstream main lacks the time ABI of positions 132-140, the time advance of position 019, the tests -of positions 241, 244, and 245, and the snapshot guide's paragraph on the VM-time cut that -positions 147, 156, and 201 write, so they follow PR10 and the time ABI series upstream. - -Positions 256-258 change how a restore runs a one-shot LAPIC timer, and change nothing that a -mapped PR adds. Position 256 moves the guest RAM of the real-mode KVM tests of `virt_kvm`'s ExtINT -module, which upstream main has and position 138 also changes, into a test module that position -257's tests share. Replaying it on upstream main conflicts only in the module list of `virt_kvm`'s -x86-64 module, which PR10's positions 023 and 026, PR17's position 077, and positions 133, 138, -144, 147, 149, and 150 also change, where its test module joins the modules of positions 133 and -138; its new module and its change of the ExtINT tests apply there. - -Position 257 changes the KVM backend's `set_apic`, in a file that upstream main has and PR10's -position 026 and position 147 also change, and the Guide's timekeeping reference, which position -255 also changes. Replaying it on upstream main applies without conflicts, but its KVM tests use -position 256's guest RAM, position 139's LAPIC timer advance, position 132's TSC target, position -160's host TSC bracket, and the TSC accessors that PR10's position 026 adds to the `kvm` crate, +upstream main lacks the time ABI of positions 125-133, the time advance of position 015, the tests +of positions 234, 237, and 238, and the snapshot guide's paragraph on the VM-time cut that +positions 140, 149, and 194 write, so they follow PR10 and the time ABI series upstream. + +Positions 249-251 change how a restore runs a one-shot LAPIC timer, and change nothing that a +mapped PR adds. Position 249 moves the guest RAM of the real-mode KVM tests of `virt_kvm`'s ExtINT +module, which upstream main has and position 131 also changes, into a test module that position +250's tests share. Replaying it on upstream main conflicts only in the module list of `virt_kvm`'s +x86-64 module, which PR10's positions 019 and 022, PR17's position 070, and positions 126, 131, +137, 140, 142, and 143 also change, where its test module joins the modules of positions 126 and +131; its new module and its change of the ExtINT tests apply there. + +Position 250 changes the KVM backend's `set_apic`, in a file that upstream main has and PR10's +position 022 and position 140 also change, and the Guide's timekeeping reference, which position +248 also changes. Replaying it on upstream main applies without conflicts, but its KVM tests use +position 249's guest RAM, position 132's LAPIC timer advance, position 125's TSC target, position +153's host TSC bracket, and the TSC accessors that PR10's position 022 adds to the `kvm` crate, which upstream main lacks, so it follows them upstream. -Position 258 changes the time ABI restore of the LAPIC timers that position 139 adds to `virt`'s -VP snapshot module, the VP set, the partition unit, and the VM worker, which positions 146, 147, -155, 158, and 255 also change, and the snapshot guide's sentence on it that position 147 adds. It +Position 251 changes the time ABI restore of the LAPIC timers that position 132 adds to `virt`'s +VP snapshot module, the VP set, the partition unit, and the VM worker, which positions 139, 140, +148, 151, and 248 also change, and the snapshot guide's sentence on it that position 140 adds. It sets each timer again after the synchronized TSC set, so that the timer runs as the TSCs do, as -position 255's VM time does. It adds a LAPIC tick conversion to the rate module of position 132 -and extends position 257's KVM tests. Replaying it on upstream main conflicts in all 12 of its -files, seven of which upstream main lacks, those that PR10's positions 024 and 029, PR12's -position 036, and positions 132, 135, 139, and 256 add, so it follows the time ABI series +position 248's VM time does. It adds a LAPIC tick conversion to the rate module of position 125 +and extends position 250's KVM tests. Replaying it on upstream main conflicts in all 12 of its +files, seven of which upstream main lacks, those that PR10's positions 020 and 025, PR12's +position 032, and positions 125, 128, 132, and 249 add, so it follows the time ABI series upstream. -Positions 259-261 have the KVM backend tell a one-shot LAPIC timer whose interrupt the guest took +Positions 252-254 have the KVM backend tell a one-shot LAPIC timer whose interrupt the guest took apart from one whose expiry KVM holds when it saves a VP, and change nothing that a mapped PR -adds. Position 259 adds a call to the `kvm` crate's VP runner that has KVM deliver the interrupts +adds. Position 252 adds a call to the `kvm` crate's VP runner that has KVM deliver the interrupts that it holds without entering the guest, in a file that upstream main has and that PR10's -position 026 and positions 133, 138, 147, and 148 also change, none of them in the runner's +position 022 and positions 126, 131, 140, and 141 also change, none of them in the runner's `KVM_RUN` and exit decoding, which it changes and upstream main has. Replaying it on upstream main applies without conflicts, and the `kvm` crate type-checks there, so it can go upstream on its own. -Position 260 adds a LAPIC timer module to `virt_kvm`'s x86-64 backend, which the VP run loop, the +Position 253 adds a LAPIC timer module to `virt_kvm`'s x86-64 backend, which the VP run loop, the partition, and the VP state's `apic` and `set_apic` use, in files that upstream main has and that -PR10's positions 023 and 026, PR17's position 077, and positions 133, 138, 144, 147, 149, 150, -255, 256, 257, and 258 also change, and rewrites the paragraph of the Guide's timekeeping reference -that position 257 adds. Replaying it on upstream main conflicts in that paragraph, in the module -list of the x86-64 module, and in the VP state module, whose KVM LAPIC page from position 257 its -KVM tests use, with position 256's guest RAM and position 259's delivery, so it follows positions -256, 257, and 259 upstream. Position 261 changes only position 260's KVM tests, which it builds for -musl, for which the `libc` crate defines no `SIGEV_THREAD_ID`, so it folds into position 260. - -Position 262 changes only the time ABI's logs of how long the phases of a restore take: the -restore clock event of the VM worker's time ABI, which position 144 adds and position 146 gives its +PR10's positions 019 and 022, PR17's position 070, and positions 126, 131, 137, 140, 142, 143, +248, 249, 250, and 251 also change, and rewrites the paragraph of the Guide's timekeeping reference +that position 250 adds. Replaying it on upstream main conflicts in that paragraph, in the module +list of the x86-64 module, and in the VP state module, whose KVM LAPIC page from position 250 its +KVM tests use, with position 249's guest RAM and position 252's delivery, so it follows positions +249, 250, and 252 upstream. Position 254 changes only position 253's KVM tests, which it builds for +musl, for which the `libc` crate defines no `SIGEV_THREAD_ID`, so it folds into position 253. + +Position 255 changes only the time ABI's logs of how long the phases of a restore take: the +restore clock event of the VM worker's time ABI, which position 137 adds and position 139 gives its concurrent LAPIC and VM-time phases, and the synchronized TSC sets of the MSHV and WHP backends of -positions 134 and 140. It computes each of their phases that is the difference of two readings -with a helper that it adds to `virt`'s time ABI module of position 132, which gives 0 where the +positions 127 and 133. It computes each of their phases that is the difference of two readings +with a helper that it adds to `virt`'s time ABI module of position 125, which gives 0 where the host's monotonic clock stepped back past the phase's start and the subtraction panicked, in files -that positions 135, 138, 139, 142, 145, 147-150, 152, 153, 156, 158-160, 193, 201, 220, 223, 224, -252-255, and 258 also change. It changes nothing that a mapped PR adds. Replaying it on upstream +that positions 128, 131, 132, 135, 138, 140-143, 145, 146, 149, 151-153, 186, 194, 213, 216, 217, +245-248, and 251 also change. It changes nothing that a mapped PR adds. Replaying it on upstream main conflicts in all four of its files: upstream main lacks the time ABI, so it follows the time ABI series upstream. -Position 263 makes the PIT's count writes in the low-then-high access mode take each count's low +Position 256 makes the PIT's count writes in the low-then-high access mode take each count's low byte first, in `Timer::write`, code that upstream main has, and adds three tests, in a file that -PR10's position 022 and position 139 also change, neither of them in the code that it changes. It +PR10's position 018 and position 132 also change, neither of them in the code that it changes. It changes nothing that a mapped PR adds. Replaying it on upstream main applies without conflicts, and `chipset` type-checks there with its tests, which pass, so it can go upstream on its own. -Position 264 keeps the part of the PIT's last tick time below VM time's 100 ns resolution, which +Position 257 keeps the part of the PIT's last tick time below VM time's 100 ns resolution, which `PitDevice::evaluate` dropped and counted again, in the PIT's evaluation, wakeup, reset, and saved state, code that upstream main has, and adds six tests that extend the test helper of position -263, in a file that PR10's position 022 and positions 139 and 263 also change. It changes none of -the code of positions 022 and 139, and nothing that a mapped PR adds. Replaying it on upstream -main conflicts in that file, which lacks position 263's helper; after position 263, it conflicts -only where its tests follow position 139's test, so it follows position 263 upstream. +256, in a file that PR10's position 018 and positions 132 and 256 also change. It changes none of +the code of positions 018 and 132, and nothing that a mapped PR adds. Replaying it on upstream +main conflicts in that file, which lacks position 256's helper; after position 256, it conflicts +only where its tests follow position 132's test, so it follows position 256 upstream. -Position 265 makes `PitDevice::restore` reject a saved control word with RW = 0, the counter latch +Position 258 makes `PitDevice::restore` reject a saved control word with RW = 0, the counter latch command, before it changes any state, in code that upstream main has, and adds two tests on -position 263's test helper, in a file that PR10's position 022 and positions 139, 263, and 264 -also change. It changes none of the code of positions 022 and 139, and nothing that a mapped PR +position 256's test helper, in a file that PR10's position 018 and positions 132, 256, and 257 +also change. It changes none of the code of positions 018 and 132, and nothing that a mapped PR adds. Replaying it on upstream main conflicts in that file where it adds its error, its tests' -import, and its tests next to code of positions 139, 263, and 264, which upstream main lacks; its -check applies there. It follows position 264 upstream. Position 266 changes only position 265's +import, and its tests next to code of positions 132, 256, and 257, which upstream main lacks; its +check applies there. It follows position 257 upstream. Position 259 changes only position 258's tests, which created PITs for each case and so exhausted Linux's default limit of open files, so -it folds into position 265. +it folds into position 258. -Position 267 makes the RTC's `io_read` zero-extend a read of port `0x70` or `0x71` that is wider +Position 260 makes the RTC's `io_read` zero-extend a read of port `0x70` or `0x71` that is wider than a byte, whose upper bytes kept what the backend's buffer held, in code that upstream main -has, and adds a test, in a file that PR10's position 020, PR15's position 057, and position 200 +has, and adds a test, in a file that PR10's position 016, PR15's position 050, and position 193 also change, none of them in the code that it changes. It changes nothing that a mapped PR adds. Replaying it on upstream main applies without conflicts, and `chipset` type-checks there with its tests, which pass, so it can go upstream on its own. -Position 268 makes `VmTimerPeriodic`, the timer of the RTC's periodic and update-ended interrupts, +Position 261 makes `VmTimerPeriodic`, the timer of the RTC's periodic and update-ended interrupts, skip at once the deadlines that VM time passed, which its poll had passed one period per iteration, so that a restore after a long downtime stalled, and register its next deadline under the timer state's lock, in code that upstream main has, and adds tests, in a file that PR10's -position 019 and positions 156, 157, and 255 also change, none of them in the code that it +position 015 and positions 149, 150, and 248 also change, none of them in the code that it changes. It changes nothing that a mapped PR adds. Replaying it on upstream main applies without conflicts, and `vmcore` type-checks there with its tests, which pass, so it can go upstream on its own. ## PR summary -Each count is of v6.0 commits, which include the fixups that the v3.0, v4.0, v5.0, and v6.0 +Each count is of v6.1 commits, which include the fixups that the v3.0, v4.0, v5.0, and v6.0 reorganizations folded into them; see [The v6.0 reorganization](#the-v60-reorganization), [The v5.0 reorganization](#the-v50-reorganization), [The v4.0 reorganization](#the-v40-reorganization), and @@ -1950,59 +2078,62 @@ reorganizations folded into them; see [The v6.0 reorganization](#the-v60-reorgan | PR | Class | Topic | Actual positions | Actual commit range(s) | Count | Recommended direct dependency | | --- | --- | --- | ---: | --- | ---: | --- | -| PR01 | U | Build and test infrastructure | 001-004 | `82b29f30e..bec5bb375` | 4 | Current upstream | -| PR02 | U | Host primitives: mesh and sparse_mmap | 005-006 | `27eb3b1b5..020089bd3` | 2 | Current upstream | -| PR03 | U | Host primitives: PAL on Unix | 007-008 | `432f59f81..299a04d4f` | 2 | Current upstream | -| PR04 | U | Host primitives: PAL and PAL async on Windows | 009 | `a0e70d99e` | 1 | Current upstream | -| PR05 | U | Hypervisor backend fixes | 010-012 | `0b8ecf772..f59c09a4e` | 3 | Current upstream | -| PR06 | U | Device fixes and hardening | 013-014 | `6ee09d624..5ed5f7a22` | 2 | Current upstream | +| PR01 | U | Build and test infrastructure | 001-003 | `d96bb662a..912d8a680` | 3 | Current upstream | +| PR02 | U | Host primitives: mesh and sparse_mmap | 004-005 | `0e94f0e6a..79adbc493` | 2 | Current upstream | +| PR03 | U | Host primitives: PAL on Unix | 006 | `50018e52e` | 1 | Current upstream | +| PR04 | U | Host primitives: PAL and PAL async on Windows | - | all landed upstream | 0 | Current upstream | +| PR05 | U | Hypervisor backend fixes | 007-009 | `63edd3df6..47d953aa0` | 3 | Current upstream | +| PR06 | U | Device fixes and hardening | 010 | `bb16d715b` | 1 | Current upstream | | PR07 | U | Consomme resource bounding | - | all landed upstream | 0 | Current upstream | | PR08 | U | Preparatory refactors | - | all landed upstream | 0 | Current upstream | -| PR09 | U | Fallible VM lifecycle | 015-018; 241-243 (fixups) | `179106cd9..07a98b977`; `78e752de1..2fcd1573d` | 7 | Current upstream | -| PR10 | U | Portable CPU and clock state | 019-029 | `a1e113d12..ab67f39e2` | 11 | PR09 | -| PR11 | U | Snapshot publication protocol | 030-033 | `23e759e74..112512c35` | 4 | PR10 | -| PR12 | U | Immutable private-CoW restore | 034-038 | `6c89f4c94..3da713626` | 5 | PR10 | -| PR13 | U | Generic virtio persistence | 039-050; 247 (fixup) | `1f94f48f1..35a362441`; `61cdd6397` | 13 | PR11 + PR12 | -| PR14 | U | Firmware-less direct boot, loader half | 051-054 | `6cea1ae18..235bf44a0` | 4 | Current upstream | -| PR15 | P | microVM machine profile and minimal chipset | 055-065 | `d814dc8b1..ada37b9d4` | 11 | Foundation fan-in | -| PR16 | P | Fixed virtio-MMIO ABI and shared interrupt status | 066-069 | `1d0ded1ec..62a1fdcba` | 4 | PR15 | -| PR17 | P | microVM snapshot capture and authoritative restore | 070-080 | `fc16b2991..8fa1c8ccf` | 11 | PR16 | -| PR18 | P | microVM host attachments and device persistence | 081-090; 248 (fixup) | `0150d6240..9e845e726`; `58d3c3b1d` | 11 | PR17 | -| PR19 | N/P | Sandbox block roles and snapshot tiers | 091-093; 250 (fixup) | `ec3f530b8..65f8b0d31`; `23136b647` | 4 | PR18 | -| PR20 | P | Restore-time processor and memory activation | 094-100; 249 (fixup) | `7ea7ff8e6..e9e56474b`; `fb4f34126` | 8 | PR19 | -| PR21 | P/N | Network egress policy | 101-106 | `3ca445754..4eb910e1b` | 6 | PR20; core can start after PR13 | -| PR22 | P | Filesystem deny policy | 107-108 | `df424a368..c43e201c1` | 2 | PR21 | -| PR23 | N | Authenticated control console | 109-118 | `88b9f18f5..c3e6e68cc` | 10 | PR22; protocol/broker can start after PR03 + PR04 + PR13 | -| PR24 | N | Managed workload and outcome reporting | 119-123 | `95c94240e..724a94bfc` | 5 | PR23 | -| PR25 | P | Management plane | 124-125 | `5fde97978..502f72235` | 2 | PR24 | -| PR26 | U | Profiling benchmark | 126 | `a202c8bf1` | 1 | PR25 in the current stack | -| PR27 | U/P | Safe symlinks for writable microVM shares | 130-131 | `e4c23d26b..7677ad8d5` | 2 | PR22; position 130 can land independently | -| Fork tail | F | CI guards and NVX wire compatibility | 127-129 | `75d359f4c..1ab485e7c` | 3 | PR26; do not submit upstream | +| PR09 | U | Fallible VM lifecycle | 011-014; 234-236 (fixups) | `f2a3c2c20..c9777119a`; `dcc3065ad..e1433b346` | 7 | Current upstream | +| PR10 | U | Portable CPU and clock state | 015-025 | `dbeb3a372..f435f0d20` | 11 | PR09 | +| PR11 | U | Snapshot publication protocol | 026-029 | `33d3c96db..6f57af410` | 4 | PR10 | +| PR12 | U | Immutable private-CoW restore | 030-034 | `46beb573c..42371653d` | 5 | PR10 | +| PR13 | U | Generic virtio persistence | 035-046; 240 (fixup) | `7294e5c6c..fcb36de78`; `459c28110` | 13 | PR11 + PR12 | +| PR14 | U | Firmware-less direct boot, loader half | 047 | `5be7ccf5f` | 1 | Current upstream | +| PR15 | P | microVM machine profile and minimal chipset | 048-058 | `3993956e2..aaf5bbfb8` | 11 | Foundation fan-in | +| PR16 | P | Fixed virtio-MMIO ABI and shared interrupt status | 059-062 | `8c329db34..62327fb46` | 4 | PR15 | +| PR17 | P | microVM snapshot capture and authoritative restore | 063-073 | `9e4aee688..98e18ef7e` | 11 | PR16 | +| PR18 | P | microVM host attachments and device persistence | 074-083; 241 (fixup) | `4dd4f3709..90a1188b4`; `066b40f14` | 11 | PR17 | +| PR19 | N/P | Sandbox block roles and snapshot tiers | 084-086; 243 (fixup) | `cdc202d24..7868666b8`; `67000c096` | 4 | PR18 | +| PR20 | P | Restore-time processor and memory activation | 087-093; 242 (fixup) | `8dcea6902..fe67d7a96`; `1ec79d60f` | 8 | PR19 | +| PR21 | P/N | Network egress policy | 094-099 | `5f80ea328..eb1c0ac06` | 6 | PR20; core can start after PR13 | +| PR22 | P | Filesystem deny policy | 100-101 | `1ddbcd729..3a22e3fda` | 2 | PR21 | +| PR23 | N | Authenticated control console | 102-111 | `ffac0eafa..1afb9a678` | 10 | PR22; protocol/broker can start after PR13 | +| PR24 | N | Managed workload and outcome reporting | 112-116 | `e22065df1..9537478d1` | 5 | PR23 | +| PR25 | P | Management plane | 117-118 | `669e4aecd..9ef38e9ec` | 2 | PR24 | +| PR26 | U | Profiling benchmark | 119 | `9fbf62d3b` | 1 | PR25 in the current stack | +| PR27 | U/P | Safe symlinks for writable microVM shares | 123-124 | `cb2506c6d..7f31de535` | 2 | PR22; position 123 can land independently | +| Fork tail | F | CI guards and NVX wire compatibility | 120-122 | `4527dbc00..6ef4e8ca6` | 3 | PR26; do not submit upstream | ## Exact commit-to-PR mapping -Each entry, at the position that the commit had in v5.0 and v5.1 too, names the v4.0 position of the -commit, the v3.0 and v2.4 positions that v4.0 recorded, and the v2.4 and v5.1 fixups that it folds; -"(part)" marks a fixup that split across commits. Positions 241-243 and 247-250, which followed -the v6.0 reorganization, name their OpenVMM pull request instead. A -v4.0 position counts in `feature/microvm/dev` at `e1ca353eb`, whose first 210 commits are those of -`feature/microvm/release/v4.0`. Landed entries name the commits and positions of the branch that -the rebase started from, `microvm/v2.1`, `feature/microvm/release/v2.2`, -`feature/microvm/release/v2.3`, `feature/microvm/release/v2.4`, `feature/microvm/release/v3.0`, -or `feature/microvm/dev` at `e1ca353eb`, and the counts exclude them. Partial upstream overlap is -called out without striking the remaining fork work, and **open upstream** names the upstream pull -request that carries a commit. +Each entry names the v6.0 position of the commit, which it had in v5.0 and v5.1 too, the v4.0 +position, the v3.0 and v2.4 positions that v4.0 recorded, and the v2.4 and v5.1 fixups that it +folds; "(part)" marks a fixup that split across commits. Positions 234-236 and 240-243, which +followed the v6.0 reorganization, name their OpenVMM pull request instead of earlier positions. A +v6.0 position counts in `feature/microvm/dev` at `5ca20ee08`, whose first 220 commits are those of +`feature/microvm/release/v6.0`, and a v4.0 position in `feature/microvm/dev` at `e1ca353eb`, whose +first 210 commits are those of `feature/microvm/release/v4.0`. Landed entries name the commits and +positions of the branch that the rebase started from, `microvm/v2.1`, +`feature/microvm/release/v2.2`, `feature/microvm/release/v2.3`, `feature/microvm/release/v2.4`, +`feature/microvm/release/v3.0`, `feature/microvm/dev` at `e1ca353eb`, or `feature/microvm/dev` at +`5ca20ee08`, and the counts exclude them. Partial upstream overlap is called out without striking +the remaining fork work, and **open upstream** names the upstream pull request that carries a +commit.
-PR01 - Build and test infrastructure (U) - 4 commits + 4 landed upstream +PR01 - Build and test infrastructure (U) - 3 commits + 5 landed upstream -- 001 `82b29f30e` - build: keep Winsock eagerly imported on Windows (v4.0 001, v3.0 001, v2.4 001; **not upstream**: microsoft/openvmm#4451 was closed without merging) -- 002 `707747c16` - flowey: distinguish native Windows and WSL nextest paths (v4.0 002, v3.0 002, v2.4 002; **open upstream**: microsoft/openvmm#4595) -- 003 `057063661` - flowey: keep caller temp directories for native local VMM-test runs (v4.0 003, v3.0 003, v2.4 003; **open upstream**: microsoft/openvmm#4618) -- 004 `bec5bb375` - virt_whp, petri: enable native PCIe NVMe boot on WHP (v4.0 005, v3.0 005, v2.4 005; **open upstream**: microsoft/openvmm#4615) +- 001 `d96bb662a` - build: keep Winsock eagerly imported on Windows (v6.0 001, v4.0 001, v3.0 001, v2.4 001; **not upstream**: microsoft/openvmm#4451 was closed without merging) +- 002 `ec5565cfd` - flowey: keep caller temp directories for native local VMM-test runs (v6.0 003, v4.0 003, v3.0 003, v2.4 003; **open upstream**: microsoft/openvmm#4618) +- 003 `912d8a680` - virt_whp, petri: enable native PCIe NVMe boot on WHP (v6.0 004, v4.0 005, v3.0 005, v2.4 005; **not upstream**: microsoft/openvmm#4615 was closed, since a Windows servicing release fixes the WHP behavior that it works around) Landed upstream and dropped from the chain: +- ~~`707747c16` - flowey: distinguish native Windows and WSL nextest paths~~ + (**landed upstream**: microsoft/openvmm#4595, merged as `5d3ab02f0`; v6.0 position 002) - ~~`6476a457f` - consomme: make TCP window-reopen validation deterministic~~ (**landed upstream**: microsoft/openvmm#4598, merged as `19485f88e`; v4.0 position 004) - ~~`607e6c6a2` - nextest: scope a longer budget to the exhaustive ring-buffer loom test~~ @@ -2017,8 +2148,8 @@ Landed upstream and dropped from the chain:
PR02 - Host primitives: mesh and sparse_mmap (U) - 2 commits + 1 landed upstream -- 005 `27eb3b1b5` - mesh_protobuf: clone type-erased messages and expose encoded length (v4.0 006, v3.0 006, v2.4 006; **partly landed upstream**: microsoft/openvmm#4556, merged as `96647c331`, derives `Clone`; this commit now adds only `ProtobufAny::value_len` and a clone check) -- 006 `020089bd3` - sparse_mmap: flush file-backed ranges with bounded concurrency (v4.0 007, v3.0 007, v2.4 007; **open upstream**: microsoft/openvmm#4558; folds v2.4 328 (part)) +- 004 `0e94f0e6a` - mesh_protobuf: clone type-erased messages and expose encoded length (v6.0 005, v4.0 006, v3.0 006, v2.4 006; **partly landed upstream**: microsoft/openvmm#4556, merged as `96647c331`, derives `Clone`; this commit now adds only `ProtobufAny::value_len` and a clone check) +- 005 `79adbc493` - sparse_mmap: flush file-backed ranges with bounded concurrency (v6.0 006, v4.0 007, v3.0 007, v2.4 007; **open upstream**: microsoft/openvmm#4558; folds v2.4 328 (part)) Landed upstream and dropped from the chain: @@ -2028,25 +2159,28 @@ Landed upstream and dropped from the chain:
-PR03 - Host primitives: PAL on Unix (U) - 2 commits + 1 landed upstream +PR03 - Host primitives: PAL on Unix (U) - 1 commit + 2 landed upstream -- 007 `432f59f81` - pal: bound Linux descriptor-table pre-expansion (v4.0 008, v3.0 008, v2.4 008; **open upstream**: microsoft/openvmm#4589) -- 008 `299a04d4f` - pal: query Unix socket peer credentials (v4.0 009, v3.0 009, v2.4 009; **open upstream**: microsoft/openvmm#4591) +- 006 `50018e52e` - pal: bound Linux descriptor-table pre-expansion (v6.0 007, v4.0 008, v3.0 008, v2.4 008; **open upstream**: microsoft/openvmm#4589) Landed upstream and dropped from the chain: +- ~~`299a04d4f` - pal: query Unix socket peer credentials~~ + (**landed upstream**: microsoft/openvmm#4591, merged as `42d4fe619` with tests; v6.0 position 008) - ~~`4a7ab405c` - pal: add Unix extent cloning and sparse-extent seeking~~ (**landed upstream**: microsoft/openvmm#4590, merged as `c62489737`; v2.3 position 012)
-PR04 - Host primitives: PAL and PAL async on Windows (U) - 1 commit + 5 landed upstream +PR04 - Host primitives: PAL and PAL async on Windows (U) - 0 commits + 6 landed upstream -- 009 `a0e70d99e` - pal: resolve the process token user SID (v4.0 010, v3.0 011, v2.4 011; **open upstream**: microsoft/openvmm#4604) +No commit of PR04 remains in the chain. Landed upstream and dropped from the chain: +- ~~`a0e70d99e` - pal: resolve the process token user SID~~ + (**landed upstream**: microsoft/openvmm#4604, merged as `6937acefb` in `pal::windows::security` itself rather than in a `user_sid` module of it; v6.0 position 009) - ~~`1a8bc4363` - pal: add handle-relative file access that does not follow reparse points~~ (**landed upstream**: microsoft/openvmm#4593, merged as `789d51653`; v3.0 position 010) - ~~`d25e0e13f` - pal_async: fix named-pipe reconnect and already-connected listen~~ @@ -2063,9 +2197,9 @@ Landed upstream and dropped from the chain:
PR05 - Hypervisor backend fixes (U) - 3 commits + 2 landed upstream -- 010 `0b8ecf772` - virt_mshv: make RUN_VP cancellation race-free (v4.0 011, v3.0 013, v2.4 013; **open upstream**: microsoft/openvmm#4536) -- 011 `378906bb7` - virt: add Partition::finalize_memory; create the MSHV BSP after finalization (v4.0 012, v3.0 014, v2.4 014; **open upstream**: microsoft/openvmm#4607; folds v2.4 325 (part), 373 (part), and 386) -- 012 `f59c09a4e` - virt_mshv: persist and redeliver pending external interrupts (v4.0 013, v3.0 015, v2.4 015; **open upstream**: microsoft/openvmm#4613, stacked on microsoft/openvmm#4536; folds v2.4 325 (part) and 311) +- 007 `63edd3df6` - virt_mshv: make RUN_VP cancellation race-free (v6.0 010, v4.0 011, v3.0 013, v2.4 013; **open upstream**: microsoft/openvmm#4536) +- 008 `33e9f2082` - virt: add Partition::finalize_memory; create the MSHV BSP after finalization (v6.0 011, v4.0 012, v3.0 014, v2.4 014; **open upstream**: microsoft/openvmm#4607; folds v2.4 325 (part), 373 (part), and 386) +- 009 `47d953aa0` - virt_mshv: persist and redeliver pending external interrupts (v6.0 012, v4.0 013, v3.0 015, v2.4 015; **open upstream**: microsoft/openvmm#4613, stacked on microsoft/openvmm#4536; folds v2.4 325 (part) and 311) Landed upstream and dropped from the chain: @@ -2077,15 +2211,16 @@ Landed upstream and dropped from the chain:
-PR06 - Device fixes and hardening (U) - 2 commits + 8 landed upstream +PR06 - Device fixes and hardening (U) - 1 commit + 9 landed upstream -- 013 `6ee09d624` - virtiofs: bound guest payload allocations and rate-limit diagnostics (v4.0 014, v3.0 018, v2.4 019; **open upstream**: microsoft/openvmm#4597) -- 014 `5ed5f7a22` - serial_socket: keep Windows named-pipe listeners reconnectable (v4.0 016, v3.0 020, v2.4 021; **open upstream**: microsoft/openvmm#4609, stacked on microsoft/openvmm#4582 and microsoft/openvmm#4585; a `Retain` console on a named pipe needs its write handling, which joins position 041 in PR13 if review narrows microsoft/openvmm#4609 as it narrowed microsoft/openvmm#4605) +- 010 `bb16d715b` - virtiofs: bound guest payload allocations and rate-limit diagnostics (v6.0 013, v4.0 014, v3.0 018, v2.4 019; **open upstream**: microsoft/openvmm#4597) -Position 041, which carried the first revision of microsoft/openvmm#4605, moved to PR13. +Position 037, which carried the first revision of microsoft/openvmm#4605, moved to PR13. Landed upstream and dropped from the chain: +- ~~`5ed5f7a22` - serial_socket: keep Windows named-pipe listeners reconnectable~~ + (**landed upstream**: microsoft/openvmm#4609, merged as `f5ef11b8a` with the write handling that a `Retain` console on a named pipe needs; v6.0 position 014) - ~~`62b427a38` - serial_socket: report read errors as EOF and drop the connection~~ (**landed upstream**: microsoft/openvmm#4605, merged as `48e0681e9`, narrowed in review to the read path; v4.0 position 217, which cherry-picked it) - ~~`47102941e` - virtio_blk: let stop cancellation win over a ready queue and drain accepted I/O~~ @@ -2146,13 +2281,13 @@ Landed upstream and dropped from the chain:
PR09 - Fallible VM lifecycle (U) - 7 commits + 1 landed upstream + 2 retired -- 015 `179106cd9` - state_unit: roll back a partial start instead of panicking (v4.0 018, v3.0 026, v2.4 027; **open upstream**: microsoft/openvmm#4872, with review changes that the chain lacks, apart from those of positions 241-243; microsoft/openvmm#4619 proposed the fallible unit start that the v4.0 reorganization retired, in favor of microsoft/nvx#1232; see [The v4.0 reorganization](#the-v40-reorganization)) -- 016 `1ab89b3fe` - openvmm: make VM resume fallible (v4.0 019, v3.0 028, v2.4 029; **closed upstream**: microsoft/openvmm#4623 was closed in favor of microsoft/nvx#1232, but the resume stays fallible: the post-restore input gate, the restore readiness event, and the time ABI's TSC offset measurement fail it) -- 017 `d51a1e8ef` - state_unit: record the exact unit inventory in saved state (v4.0 020, v3.0 029, v2.4 030; **open upstream**: microsoft/openvmm#4624) -- 018 `07a98b977` - vmcore: add device input quiesce and resume (v4.0 022, v3.0 031, v2.4 032; **open upstream**: microsoft/openvmm#4626, stacked on microsoft/openvmm#4872, without the input gate's deadline, which the v5.0 reorganization removed here too, by folding v4.0 position 216) -- 241 `78e752de1` - state_unit: handle a unit in a terminal state instead of panicking (microsoft/openvmm#5012; **fold into 015**, its check and test of a time advance into PR10's 019; microsoft/openvmm#4872's head makes the same change) -- 242 `6ddd6ca50` - openvmm_core: tear the VM down when a restart cannot resume it (microsoft/openvmm#5012; **fold into 015**; microsoft/openvmm#4872's head makes the same change) -- 243 `2fcd1573d` - state_unit: roll back a partial start without panicking on a lost unit (microsoft/openvmm#5013; **fold into 015**, its description of the snapshot rollback into PR17's 072; microsoft/openvmm#4872's head orders its rollback's stop the same way) +- 011 `f2a3c2c20` - state_unit: roll back a partial start instead of panicking (v6.0 015, v4.0 018, v3.0 026, v2.4 027; **open upstream**: microsoft/openvmm#4872, with review changes that the chain lacks, apart from those of positions 234-236; microsoft/openvmm#4619 proposed the fallible unit start that the v4.0 reorganization retired, in favor of microsoft/nvx#1232; see [The v4.0 reorganization](#the-v40-reorganization)) +- 012 `0299bc250` - openvmm: make VM resume fallible (v6.0 016, v4.0 019, v3.0 028, v2.4 029; **closed upstream**: microsoft/openvmm#4623 was closed in favor of microsoft/nvx#1232, but the resume stays fallible: the post-restore input gate, the restore readiness event, and the time ABI's TSC offset measurement fail it) +- 013 `da49c41e3` - state_unit: record the exact unit inventory in saved state (v6.0 017, v4.0 020, v3.0 029, v2.4 030; **open upstream**: microsoft/openvmm#4624) +- 014 `c9777119a` - vmcore: add device input quiesce and resume (v6.0 018, v4.0 022, v3.0 031, v2.4 032; **open upstream**: microsoft/openvmm#4626, stacked on microsoft/openvmm#4872, without the input gate's deadline, which the v5.0 reorganization removed here too, by folding v4.0 position 216) +- 234 `dcc3065ad` - state_unit: handle a unit in a terminal state instead of panicking (v6.0 241, microsoft/openvmm#5012; **fold into 011**, its check and test of a time advance into PR10's 015; microsoft/openvmm#4872's head makes the same change) +- 235 `b62b21163` - openvmm_core: tear the VM down when a restart cannot resume it (v6.0 242, microsoft/openvmm#5012; **fold into 011**; microsoft/openvmm#4872's head makes the same change) +- 236 `e1433b346` - state_unit: roll back a partial start without panicking on a lost unit (v6.0 243, microsoft/openvmm#5013; **fold into 011**, its description of the snapshot rollback into PR17's 065; microsoft/openvmm#4872's head orders its rollback's stop the same way) Landed upstream and dropped from the chain: @@ -2164,77 +2299,80 @@ Retired by the v4.0 and v5.0 reorganizations: - ~~`03291e1ea` - state_unit: add bounded quiesce transactions with rollback classification~~ (**retired** by the v5.0 reorganization: microsoft/openvmm#4625 was closed in favor of microsoft/nvx#1260, and a snapshot quiesce stops the state units and a failed capture starts them again instead, with no deadline; v4.0 position 021) - ~~`d94e7b9b3` - vmcore: add fallible device start through chipset device workers~~ - (**retired** by the v4.0 reorganization: microsoft/openvmm#4622 was closed in favor of microsoft/nvx#1232, and chipset device workers start their devices without an acknowledgement, as upstream's do; position 219 has them carry a separate confirmation of the start instead; v3.0 position 027) + (**retired** by the v4.0 reorganization: microsoft/openvmm#4622 was closed in favor of microsoft/nvx#1232, and chipset device workers start their devices without an acknowledgement, as upstream's do; position 211 has them carry a separate confirmation of the start instead; v3.0 position 027)
PR10 - Portable CPU and clock state (U) - 11 commits -- 019 `a1e113d12` - vmcore, state_unit: advance guest time across stopped downtime (v4.0 024, v3.0 033, v2.4 033; folds v2.4 213 (part) and 371 (part)) -- 020 `206e5a5ce` - chipset: persist and advance the RTC clock (v4.0 025, v3.0 034, v2.4 034; folds v2.4 213 (part)) -- 021 `0a28c6f8d` - chipset: reject inconsistent RTC interrupt state on restore (v4.0 026, v3.0 035, v2.4 035) -- 022 `8f5d82cf9` - chipset: catch up the PIT after downtime (v4.0 027, v3.0 036, v2.4 036) -- 023 `9038c6205` - virt: define a canonical x86 CPU compatibility contract (v4.0 028, v3.0 037, v2.4 037) -- 024 `5a4365c75` - virt: record TSC-deadline support and advance APIC timers (v4.0 029, v3.0 038, v2.4 038; **partly superseded upstream**: microsoft/openvmm#4704, merged as `1c093df84` before the fork base, adds the same `TscDeadline` state element and backend accessors, whose chain copies this commit no longer adds; folds v2.4 324 (part)) -- 025 `bf56c552c` - virt: add exact TSC-frequency helpers and snapshot clock hooks (v4.0 030, v3.0 039, v2.4 039) -- 026 `f7ed35976` - virt_kvm: save and restore exact TSC and kvm-clock state (v4.0 031, v3.0 040, v2.4 040) -- 027 `9c9e8738f` - virt_mshv: synchronize restored vCPU clocks and expose the exact TSC frequency (v4.0 032, v3.0 041, v2.4 041; folds v2.4 373 (part)) -- 028 `a87d48ecd` - virt_whp: synchronize restored vCPU clocks and keep SMP TSC reads coherent (v4.0 033, v3.0 042, v2.4 042; folds v2.4 312 and 324 (part)) -- 029 `ab67f39e2` - vmm_core: advance VP TSC and APIC timers across downtime (v4.0 034, v3.0 043, v2.4 043) +- 015 `dbeb3a372` - vmcore, state_unit: advance guest time across stopped downtime (v6.0 019, v4.0 024, v3.0 033, v2.4 033; folds v2.4 213 (part) and 371 (part)) +- 016 `d90e9402e` - chipset: persist and advance the RTC clock (v6.0 020, v4.0 025, v3.0 034, v2.4 034; folds v2.4 213 (part)) +- 017 `1222364a3` - chipset: reject inconsistent RTC interrupt state on restore (v6.0 021, v4.0 026, v3.0 035, v2.4 035) +- 018 `76fc13889` - chipset: catch up the PIT after downtime (v6.0 022, v4.0 027, v3.0 036, v2.4 036) +- 019 `6c168baa0` - virt: define a canonical x86 CPU compatibility contract (v6.0 023, v4.0 028, v3.0 037, v2.4 037) +- 020 `cd5683cb7` - virt: record TSC-deadline support and advance APIC timers (v6.0 024, v4.0 029, v3.0 038, v2.4 038; **partly superseded upstream**: microsoft/openvmm#4704, merged as `1c093df84` before the fork base, adds the same `TscDeadline` state element and backend accessors, whose chain copies this commit no longer adds; folds v2.4 324 (part)) +- 021 `78857469d` - virt: add exact TSC-frequency helpers and snapshot clock hooks (v6.0 025, v4.0 030, v3.0 039, v2.4 039) +- 022 `41affcec2` - virt_kvm: save and restore exact TSC and kvm-clock state (v6.0 026, v4.0 031, v3.0 040, v2.4 040) +- 023 `347df32a9` - virt_mshv: synchronize restored vCPU clocks and expose the exact TSC frequency (v6.0 027, v4.0 032, v3.0 041, v2.4 041; folds v2.4 373 (part)) +- 024 `5857bd0be` - virt_whp: synchronize restored vCPU clocks and keep SMP TSC reads coherent (v6.0 028, v4.0 033, v3.0 042, v2.4 042; folds v2.4 312 and 324 (part)) +- 025 `f435f0d20` - vmm_core: advance VP TSC and APIC timers across downtime (v6.0 029, v4.0 034, v3.0 043, v2.4 043)
PR11 - Snapshot publication protocol (U) - 4 commits -- 030 `23e759e74` - openvmm_defs: add opt-in snapshot lifecycle profiling (v4.0 035, v3.0 044, v2.4 044) -- 031 `f1d03f428` - openvmm_helpers: version the snapshot manifest format and bound its decoding (v4.0 036, v3.0 045, v2.4 045) -- 032 `f6cdb703a` - openvmm_helpers: publish snapshots atomically through durable staging (v4.0 037, v3.0 046, v2.4 046) -- 033 `112512c35` - openvmm: publish the exact file-backed RAM handle (v4.0 038, v3.0 047, v2.4 047; folds v2.4 317 (part)) +- 026 `33d3c96db` - openvmm_defs: add opt-in snapshot lifecycle profiling (v6.0 030, v4.0 035, v3.0 044, v2.4 044) +- 027 `9a8d99b0b` - openvmm_helpers: version the snapshot manifest format and bound its decoding (v6.0 031, v4.0 036, v3.0 045, v2.4 045) +- 028 `119345ead` - openvmm_helpers: publish snapshots atomically through durable staging (v6.0 032, v4.0 037, v3.0 046, v2.4 046) +- 029 `6f57af410` - openvmm: publish the exact file-backed RAM handle (v6.0 033, v4.0 038, v3.0 047, v2.4 047; folds v2.4 317 (part))
PR12 - Immutable private-CoW restore (U) - 5 commits -- 034 `6c89f4c94` - membacking: map guest RAM privately copy-on-write with fault accounting (v4.0 039, v3.0 048, v2.4 048; folds v2.4 375 (part)) -- 035 `cd4ee97fc` - openvmm_helpers: open snapshots once and read artifacts relative to the directory (v4.0 040, v3.0 049, v2.4 049; folds v5.1 221 (part)) -- 036 `49a1a98b9` - openvmm: restore RAM through a private CoW mapping and retain generation handles (v4.0 041, v3.0 050, v2.4 050; folds v2.4 375 (part) and v5.1 221 (part)) -- 037 `0db74e79a` - openvmm: signal restore readiness to a local socket or pipe (v4.0 042, v3.0 051, v2.4 051) -- 038 `3da713626` - virt_whp: resolve unmapped-GPA faults and register restored RAM lazily (v4.0 043, v3.0 052, v2.4 052; folds v2.4 313 and 382 (part)) +- 030 `46beb573c` - membacking: map guest RAM privately copy-on-write with fault accounting (v6.0 034, v4.0 039, v3.0 048, v2.4 048; folds v2.4 375 (part)) +- 031 `61ecff3d5` - openvmm_helpers: open snapshots once and read artifacts relative to the directory (v6.0 035, v4.0 040, v3.0 049, v2.4 049; folds v5.1 221 (part)) +- 032 `fff152a23` - openvmm: restore RAM through a private CoW mapping and retain generation handles (v6.0 036, v4.0 041, v3.0 050, v2.4 050; folds v2.4 375 (part) and v5.1 221 (part)) +- 033 `9d0c68420` - openvmm: signal restore readiness to a local socket or pipe (v6.0 037, v4.0 042, v3.0 051, v2.4 051) +- 034 `42371653d` - virt_whp: resolve unmapped-GPA faults and register restored RAM lazily (v6.0 038, v4.0 043, v3.0 052, v2.4 052; folds v2.4 313 and 382 (part))
PR13 - Generic virtio persistence (U) - 13 commits -- 039 `1f94f48f1` - virtio: add device-private saved state and restore it while the device is stopped (v4.0 044, v3.0 053, v2.4 053; folds v2.4 372; rewritten by the v4.0 reorganization to restore device-private state into the stopped device, for microsoft/nvx#1232) -- 040 `c09560974` - virtio: forward input quiesce and resume through transports (v4.0 045, v3.0 054, v2.4 054) -- 041 `cbc8ee55c` - serial_socket: drop the connection on any write failure (v4.0 015, v3.0 019, v2.4 020; folds v4.0 218, which explains and tests the write handling; moved from PR06 by the v5.0 reorganization: it carried the first revision of microsoft/openvmm#4605, which merged narrowed to the read path as `48e0681e9`, and stays for the guest output that position 042's `Retain` policy and PR15's portb console keep for the next peer, so it goes upstream with this PR) -- 042 `23fc86833` - virtio_console: add attachment identities and reconnect and disconnect policies (v4.0 046, v3.0 055, v2.4 055; folds v2.4 380 (part)) -- 043 `32d7fad75` - virtio_console: persist buffered direct-console I/O (v4.0 047, v3.0 056, v2.4 056; folds v4.0 219, which tests that a `Retain` console keeps output for the next peer, re-expressed for this commit's harness) -- 044 `6d3f5ab19` - net_backend: add an endpoint queue quiesce contract (v4.0 048, v3.0 057, v2.4 057) -- 045 `619a05557` - net_tap: quiesce queues and retain pending transmit ownership (v4.0 049, v3.0 058, v2.4 058; folds v2.4 309 (part) and 379 (part)) -- 046 `119ed5c6d` - net_consomme: quiesce endpoint queues (v4.0 050, v3.0 059, v2.4 059) -- 047 `f9f5232cf` - consomme: add an exact static IPv4 and gateway identity (v4.0 051, v3.0 060, v2.4 060) -- 048 `8f3d55b15` - virtio_net: persist drained queue state for static-identity NICs (v4.0 052, v3.0 061, v2.4 061) -- 049 `9a21e594f` - fuse: save and restore negotiated session state (v4.0 053, v3.0 062, v2.4 062) -- 050 `35a362441` - virtiofs: track inode aliases through link, rename, and unlink (v4.0 054, v3.0 063, v2.4 063) -- 247 `61cdd6397` - virtio: keep a held input gate across a device reset (microsoft/openvmm#5022; **fold into 043 and 048**, its documentation of `VirtioDevice`'s gate into 040, its virtio-fs change and tests into PR18's 088, its broker test into PR23's 113, its virtio-fs queue test into 172, its documentation of `ChangeDeviceState`'s gate into PR09's 018, and its sentence of the snapshot guide into PR20's 095) +- 035 `7294e5c6c` - virtio: add device-private saved state and restore it while the device is stopped (v6.0 039, v4.0 044, v3.0 053, v2.4 053; folds v2.4 372; rewritten by the v4.0 reorganization to restore device-private state into the stopped device, for microsoft/nvx#1232) +- 036 `4df21211e` - virtio: forward input quiesce and resume through transports (v6.0 040, v4.0 045, v3.0 054, v2.4 054) +- 037 `85f69452f` - serial_socket: drop the connection on any write failure (v6.0 041, v4.0 015, v3.0 019, v2.4 020; folds v4.0 218, which explains and tests the write handling; moved from PR06 by the v5.0 reorganization: it carried the first revision of microsoft/openvmm#4605, which merged narrowed to the read path as `48e0681e9`, and stays for the guest output that position 038's `Retain` policy and PR15's portb console keep for the next peer, so it goes upstream with this PR) +- 038 `ffd7bc684` - virtio_console: add attachment identities and reconnect and disconnect policies (v6.0 042, v4.0 046, v3.0 055, v2.4 055; folds v2.4 380 (part)) +- 039 `dbb46ed0b` - virtio_console: persist buffered direct-console I/O (v6.0 043, v4.0 047, v3.0 056, v2.4 056; folds v4.0 219, which tests that a `Retain` console keeps output for the next peer, re-expressed for this commit's harness) +- 040 `3da65f73b` - net_backend: add an endpoint queue quiesce contract (v6.0 044, v4.0 048, v3.0 057, v2.4 057) +- 041 `c87b1f3d1` - net_tap: quiesce queues and retain pending transmit ownership (v6.0 045, v4.0 049, v3.0 058, v2.4 058; folds v2.4 309 (part) and 379 (part)) +- 042 `a984a3300` - net_consomme: quiesce endpoint queues (v6.0 046, v4.0 050, v3.0 059, v2.4 059) +- 043 `e5f3caf2e` - consomme: add an exact static IPv4 and gateway identity (v6.0 047, v4.0 051, v3.0 060, v2.4 060) +- 044 `309dd7989` - virtio_net: persist drained queue state for static-identity NICs (v6.0 048, v4.0 052, v3.0 061, v2.4 061) +- 045 `41d02146f` - fuse: save and restore negotiated session state (v6.0 049, v4.0 053, v3.0 062, v2.4 062) +- 046 `fcb36de78` - virtiofs: track inode aliases through link, rename, and unlink (v6.0 050, v4.0 054, v3.0 063, v2.4 063) +- 240 `459c28110` - virtio: keep a held input gate across a device reset (v6.0 247, microsoft/openvmm#5022; **fold into 039 and 044**, its documentation of `VirtioDevice`'s gate into 036, its virtio-fs change and tests into PR18's 081, its broker test into PR23's 106, its virtio-fs queue test into 165, its documentation of `ChangeDeviceState`'s gate into PR09's 014, and its sentence of the snapshot guide into PR20's 088)
-PR14 - Firmware-less direct boot, loader half (U) - 4 commits + 1 landed upstream +PR14 - Firmware-less direct boot, loader half (U) - 1 commit + 4 landed upstream -- 051 `6cea1ae18` - loader: let static ELF loading reuse a caller buffer (v4.0 055, v3.0 064, v2.4 064; **open upstream**: microsoft/openvmm#4554) -- 052 `4ccef3c27` - loader: add an Intel MP 1.4 table builder (v4.0 056, v3.0 065, v2.4 065; **open upstream**: microsoft/openvmm#4554) -- 053 `b585c7300` - loader: add firmware-less Linux direct boot with MP tables (v4.0 057, v3.0 066, v2.4 066; **open upstream**: microsoft/openvmm#4554) -- 054 `235bf44a0` - vmm_core: make level-triggered legacy IRQs explicit (v4.0 058, v3.0 067, v2.4 067; **open upstream**: microsoft/openvmm#4611; folds v2.4 326) +- 047 `5be7ccf5f` - vmm_core: make level-triggered legacy IRQs explicit (v6.0 054, v4.0 058, v3.0 067, v2.4 067; **not upstream**: microsoft/openvmm#4611 was closed after review suggested combining it with the commit that needs it; folds v2.4 326) Landed upstream and dropped from the chain: +- ~~`6cea1ae18` - loader: let static ELF loading reuse a caller buffer~~ + (**superseded upstream**: microsoft/openvmm#4554, merged as `e4728b7f4`, loads the kernel and initrd through `load_kernel_and_initrd_x64`, which needs no shared buffer; v6.0 position 051) +- ~~`4ccef3c27` - loader: add an Intel MP 1.4 table builder~~ + (**landed upstream**: microsoft/openvmm#4554, merged as `e4728b7f4` with a table that `zerocopy` builds from the specification's structures; v6.0 position 052) +- ~~`b585c7300` - loader: add firmware-less Linux direct boot with MP tables~~ + (**landed upstream**: microsoft/openvmm#4554, merged as `e4728b7f4` as `loader::linux::mptable_boot`; v6.0 position 053) - ~~`f6e6ff738` - loader_defs: name the boot_params ACPI RSDP field~~ (**landed upstream**: microsoft/openvmm#4661, merged as `8beae2961`; v2.2 position 074) @@ -2243,163 +2381,163 @@ Landed upstream and dropped from the chain:
PR15 - microVM machine profile and minimal chipset (P) - 11 commits -- 055 `d814dc8b1` - openvmm_defs: add machine-profile selection (v4.0 059, v3.0 068, v2.4 068) -- 056 `23d930e70` - virt: describe the deterministic microVM topology (v4.0 060, v3.0 069, v2.4 069) -- 057 `0d5c716be` - chipset: add an RTC mode seam (v4.0 061, v3.0 070, v2.4 070) -- 058 `a3ea99415` - vm_manifest_builder: add the minimal microVM base chipset without ACPI (v4.0 062, v3.0 071, v2.4 071) -- 059 `c0a3c098d` - vmm_core: add status-bearing guest power-off (v4.0 063, v3.0 072, v2.4 072) -- 060 `470178800` - chipset: add the microVM portb console (v4.0 064, v3.0 073, v2.4 073) -- 061 `3d07dd869` - chipset: add the microVM shutdown and exit-status port (v4.0 065, v3.0 074, v2.4 074) -- 062 `62cd72aa8` - openvmm_core: boot microVMs through MP-table direct load (v4.0 066, v3.0 075, v2.4 075; folds v2.4 315 and 314 (part)) -- 063 `f37d15648` - openvmm_core: reject host save, pulse save/restore, and worker restart for microVMs (v4.0 067, v3.0 076, v2.4 076; folds v2.4 314 (part)) -- 064 `87811096f` - openvmm_entry: expose `--machine microvm` (v4.0 068, v3.0 077, v2.4 077; folds v2.4 316 (part), 317 (part), and 320 (part)) -- 065 `ada37b9d4` - petri, vmm_tests: add a microVM builder, portb harness, and cold-boot test (v4.0 069, v3.0 078, v2.4 078; folds v2.4 380 (part)) +- 048 `3993956e2` - openvmm_defs: add machine-profile selection (v6.0 055, v4.0 059, v3.0 068, v2.4 068) +- 049 `adcab667b` - virt: describe the deterministic microVM topology (v6.0 056, v4.0 060, v3.0 069, v2.4 069) +- 050 `d5262f051` - chipset: add an RTC mode seam (v6.0 057, v4.0 061, v3.0 070, v2.4 070) +- 051 `21830ee3e` - vm_manifest_builder: add the minimal microVM base chipset without ACPI (v6.0 058, v4.0 062, v3.0 071, v2.4 071) +- 052 `6ff550b29` - vmm_core: add status-bearing guest power-off (v6.0 059, v4.0 063, v3.0 072, v2.4 072) +- 053 `bf5b0b928` - chipset: add the microVM portb console (v6.0 060, v4.0 064, v3.0 073, v2.4 073) +- 054 `1ee622ab9` - chipset: add the microVM shutdown and exit-status port (v6.0 061, v4.0 065, v3.0 074, v2.4 074) +- 055 `b6ba6c937` - openvmm_core: boot microVMs through MP-table direct load (v6.0 062, v4.0 066, v3.0 075, v2.4 075; folds v2.4 315 and 314 (part)) +- 056 `3158dd4cb` - openvmm_core: reject host save, pulse save/restore, and worker restart for microVMs (v6.0 063, v4.0 067, v3.0 076, v2.4 076; folds v2.4 314 (part)) +- 057 `cd065f0c0` - openvmm_entry: expose `--machine microvm` (v6.0 064, v4.0 068, v3.0 077, v2.4 077; folds v2.4 316 (part), 317 (part), and 320 (part)) +- 058 `aaf5bbfb8` - petri, vmm_tests: add a microVM builder, portb harness, and cold-boot test (v6.0 065, v4.0 069, v3.0 078, v2.4 078; folds v2.4 380 (part))
PR16 - Fixed virtio-MMIO ABI and shared interrupt status (P) - 4 commits -- 066 `1d0ded1ec` - virtio: allow feature masking for virtio-MMIO devices (v4.0 070, v3.0 079, v2.4 079) -- 067 `bf8928998` - openvmm: place virtio devices at fixed microVM MMIO slots (v4.0 071, v3.0 080, v2.4 080; folds v2.4 314 (part)) -- 068 `6482898da` - virtio: add shared MMIO interrupt status and ACK doorbells (v4.0 072, v3.0 081, v2.4 081) -- 069 `62a1fdcba` - openvmm: use shared interrupt status for fixed microVM slots (v4.0 073, v3.0 082, v2.4 082) +- 059 `8c329db34` - virtio: allow feature masking for virtio-MMIO devices (v6.0 066, v4.0 070, v3.0 079, v2.4 079) +- 060 `8b6f04c50` - openvmm: place virtio devices at fixed microVM MMIO slots (v6.0 067, v4.0 071, v3.0 080, v2.4 080; folds v2.4 314 (part)) +- 061 `46e94523f` - virtio: add shared MMIO interrupt status and ACK doorbells (v6.0 068, v4.0 072, v3.0 081, v2.4 081) +- 062 `62327fb46` - openvmm: use shared interrupt status for fixed microVM slots (v6.0 069, v4.0 073, v3.0 082, v2.4 082)
PR17 - microVM snapshot capture and authoritative restore (P) - 11 commits -- 070 `fc16b2991` - vmm_core: stop VPs at a deferred-I/O boundary (v4.0 074, v3.0 083, v2.4 083) -- 071 `f70308f1d` - chipset: add the microVM snapshot-request port (v4.0 075, v3.0 084, v2.4 084) -- 072 `31ea2adca` - openvmm_core: establish the post-OUT snapshot boundary in the worker (v4.0 076, v3.0 085, v2.4 085) -- 073 `9dbf2ba95` - openvmm_core: fence management mutations during snapshot boundaries (v4.0 077, v3.0 086, v2.4 086) -- 074 `f38fe830b` - openvmm_helpers: define the authoritative microVM machine contract (v4.0 078, v3.0 087, v2.4 087) -- 075 `555a3f406` - openvmm_core: propagate the guest TSC frequency for snapshot-capable cold boots (v4.0 079, v3.0 088, v2.4 088) -- 076 `652724750` - openvmm_entry: capture guest-requested microVM snapshots (v4.0 080, v3.0 089, v2.4 089; folds v2.4 328 (part)) -- 077 `94fc3fcae` - virt: build a reproducible CPU and clock contract for microVM partitions (v4.0 081, v3.0 090, v2.4 090) -- 078 `033fc4404` - openvmm_core: validate restored CPU and clock contracts and apply host downtime (v4.0 082, v3.0 091, v2.4 091) -- 079 `94e3ab4ae` - openvmm_entry: restore microVMs authoritatively (v4.0 083, v3.0 092, v2.4 092) -- 080 `8fa1c8ccf` - vmm_tests: check that an unconfigured microVM snapshot request continues (v4.0 084, v3.0 093, v2.4 093) +- 063 `9e4aee688` - vmm_core: stop VPs at a deferred-I/O boundary (v6.0 070, v4.0 074, v3.0 083, v2.4 083) +- 064 `c447fa27b` - chipset: add the microVM snapshot-request port (v6.0 071, v4.0 075, v3.0 084, v2.4 084) +- 065 `791716ff2` - openvmm_core: establish the post-OUT snapshot boundary in the worker (v6.0 072, v4.0 076, v3.0 085, v2.4 085) +- 066 `ed97ce194` - openvmm_core: fence management mutations during snapshot boundaries (v6.0 073, v4.0 077, v3.0 086, v2.4 086) +- 067 `11cdcd8d0` - openvmm_helpers: define the authoritative microVM machine contract (v6.0 074, v4.0 078, v3.0 087, v2.4 087) +- 068 `420b13d9b` - openvmm_core: propagate the guest TSC frequency for snapshot-capable cold boots (v6.0 075, v4.0 079, v3.0 088, v2.4 088) +- 069 `f8a051525` - openvmm_entry: capture guest-requested microVM snapshots (v6.0 076, v4.0 080, v3.0 089, v2.4 089; folds v2.4 328 (part)) +- 070 `0f4f022ab` - virt: build a reproducible CPU and clock contract for microVM partitions (v6.0 077, v4.0 081, v3.0 090, v2.4 090) +- 071 `429202395` - openvmm_core: validate restored CPU and clock contracts and apply host downtime (v6.0 078, v4.0 082, v3.0 091, v2.4 091) +- 072 `0a3a4f868` - openvmm_entry: restore microVMs authoritatively (v6.0 079, v4.0 083, v3.0 092, v2.4 092) +- 073 `98e18ef7e` - vmm_tests: check that an unconfigured microVM snapshot request continues (v6.0 080, v4.0 084, v3.0 093, v2.4 093)
PR18 - microVM host attachments and device persistence (P) - 11 commits -- 081 `0150d6240` - openvmm_entry: add connect= serial backends with bounded timeouts (v4.0 085, v3.0 094, v2.4 094; folds v2.4 144) -- 082 `86f8f67e8` - openvmm: persist the microVM boot console and rebuild its attachment on restore (v4.0 086, v3.0 095, v2.4 095) -- 083 `df45133b7` - openvmm: attach a portable Consomme NIC to microVMs (v4.0 087, v3.0 096, v2.4 096; folds v2.4 376 and 316 (part)) -- 084 `012a472ef` - openvmm: persist the microVM NIC and restore a fresh endpoint generation (v4.0 088, v3.0 097, v2.4 097) -- 085 `50ccf730b` - net_tap: support persistent TAP attachments (v4.0 089, v3.0 098, v2.4 098) -- 086 `d64e4583e` - virtiofs: add the fixed microVM filesystem profile (v4.0 090, v3.0 099, v2.4 099) -- 087 `385938ea0` - openvmm_entry: expose `--mount` for the microVM HostFs slot (v4.0 091, v3.0 100, v2.4 100) -- 088 `4cab2fbe9` - virtiofs: persist microVM FUSE namespaces, handles, and directory cookies (v4.0 092, v3.0 101, v2.4 101; folds v2.4 335 (part)) -- 089 `fe3f54708` - openvmm: snapshot the microVM filesystem and revalidate it on restore (v4.0 093, v3.0 102, v2.4 102) -- 090 `9e845e726` - openvmm: reserve a dormant microVM filesystem slot (v4.0 094, v3.0 103, v2.4 103; folds v2.4 335 (part)) -- 248 `58d3c3b1d` - microVM: refuse a decoded network prefix outside /1 to /30 (microsoft/openvmm#5026; **fold into 083**, its test's virtio-fs device into 202) +- 074 `4dd4f3709` - openvmm_entry: add connect= serial backends with bounded timeouts (v6.0 081, v4.0 085, v3.0 094, v2.4 094; folds v2.4 144) +- 075 `6db15ba06` - openvmm: persist the microVM boot console and rebuild its attachment on restore (v6.0 082, v4.0 086, v3.0 095, v2.4 095) +- 076 `84ff687c0` - openvmm: attach a portable Consomme NIC to microVMs (v6.0 083, v4.0 087, v3.0 096, v2.4 096; folds v2.4 376 and 316 (part)) +- 077 `e1a1b7f5a` - openvmm: persist the microVM NIC and restore a fresh endpoint generation (v6.0 084, v4.0 088, v3.0 097, v2.4 097) +- 078 `23fcd786f` - net_tap: support persistent TAP attachments (v6.0 085, v4.0 089, v3.0 098, v2.4 098) +- 079 `5cb0a237f` - virtiofs: add the fixed microVM filesystem profile (v6.0 086, v4.0 090, v3.0 099, v2.4 099) +- 080 `dfccc0ed7` - openvmm_entry: expose `--mount` for the microVM HostFs slot (v6.0 087, v4.0 091, v3.0 100, v2.4 100) +- 081 `9ccbec94e` - virtiofs: persist microVM FUSE namespaces, handles, and directory cookies (v6.0 088, v4.0 092, v3.0 101, v2.4 101; folds v2.4 335 (part)) +- 082 `5b80d6210` - openvmm: snapshot the microVM filesystem and revalidate it on restore (v6.0 089, v4.0 093, v3.0 102, v2.4 102) +- 083 `90a1188b4` - openvmm: reserve a dormant microVM filesystem slot (v6.0 090, v4.0 094, v3.0 103, v2.4 103; folds v2.4 335 (part)) +- 241 `066b40f14` - microVM: refuse a decoded network prefix outside /1 to /30 (v6.0 248, microsoft/openvmm#5026; **fold into 076**, its test's virtio-fs device into 195)
PR19 - Sandbox block roles and snapshot tiers (N/P) - 4 commits -- 091 `ec3f530b8` - openvmm: add fixed-role microVM sandbox block slots (v4.0 095, v3.0 104, v2.4 104; folds v2.4 320 (part)) -- 092 `a098f4a43` - openvmm: snapshot sandbox blocks with paired or fresh scratch (v4.0 096, v3.0 105, v2.4 105; folds v2.4 317 (part)) -- 093 `65f8b0d31` - openvmm: add clone and resume tiers with single-use resume claims (v4.0 097, v3.0 106, v2.4 106; folds v2.4 320 (part)) -- 250 `23136b647` - openvmm_helpers: check paired scratch when opening a snapshot (microsoft/openvmm#5041; **fold into 093**, its test's FIFO case into 237) +- 084 `cdc202d24` - openvmm: add fixed-role microVM sandbox block slots (v6.0 091, v4.0 095, v3.0 104, v2.4 104; folds v2.4 320 (part)) +- 085 `1f74fddec` - openvmm: snapshot sandbox blocks with paired or fresh scratch (v6.0 092, v4.0 096, v3.0 105, v2.4 105; folds v2.4 317 (part)) +- 086 `7868666b8` - openvmm: add clone and resume tiers with single-use resume claims (v6.0 093, v4.0 097, v3.0 106, v2.4 106; folds v2.4 320 (part)) +- 243 `67000c096` - openvmm_helpers: check paired scratch when opening a snapshot (v6.0 250, microsoft/openvmm#5041; **fold into 086**, its test's FIFO case into 230)
PR20 - Restore-time processor and memory activation (P) - 8 commits -- 094 `7ea7ff8e6` - chipset: expose a stable generation ID and restore entropy on portb (v4.0 098, v3.0 107, v2.4 107) -- 095 `b15e7593c` - openvmm: gate external input until post-restore repair completes (v4.0 099, v3.0 108, v2.4 108; folds v2.4 335 (part)) -- 096 `522438601` - vmm_core: instantiate an active VP prefix (v4.0 100, v3.0 109, v2.4 109) -- 097 `51e26384a` - openvmm: bring a restore-time processor prefix online (v4.0 101, v3.0 110, v2.4 110; folds v2.4 141, 142 (part), and 325 (part), and v5.1 148) -- 098 `c8b18180a` - openvmm_core: back expandable restore RAM with fresh private memory (v4.0 102, v3.0 111, v2.4 111) -- 099 `1564f0c13` - openvmm: add bounded restore-time memory expansion (v4.0 103, v3.0 112, v2.4 112; folds v2.4 320 (part)) -- 100 `e9e56474b` - openvmm_entry: pre-expand the Linux descriptor table at startup (v4.0 104, v3.0 113, v2.4 113) -- 249 `fb4f34126` - microVM: refuse an unaligned or reversed decoded snapshot RAM range (microsoft/openvmm#5038; **fold into 098**, its test's time ABI parameters into 147) +- 087 `8dcea6902` - chipset: expose a stable generation ID and restore entropy on portb (v6.0 094, v4.0 098, v3.0 107, v2.4 107) +- 088 `245700b29` - openvmm: gate external input until post-restore repair completes (v6.0 095, v4.0 099, v3.0 108, v2.4 108; folds v2.4 335 (part)) +- 089 `eaeca5f78` - vmm_core: instantiate an active VP prefix (v6.0 096, v4.0 100, v3.0 109, v2.4 109) +- 090 `edea159b3` - openvmm: bring a restore-time processor prefix online (v6.0 097, v4.0 101, v3.0 110, v2.4 110; folds v2.4 141, 142 (part), and 325 (part), and v5.1 148) +- 091 `d91c8b860` - openvmm_core: back expandable restore RAM with fresh private memory (v6.0 098, v4.0 102, v3.0 111, v2.4 111) +- 092 `f48db5205` - openvmm: add bounded restore-time memory expansion (v6.0 099, v4.0 103, v3.0 112, v2.4 112; folds v2.4 320 (part)) +- 093 `fe67d7a96` - openvmm_entry: pre-expand the Linux descriptor table at startup (v6.0 100, v4.0 104, v3.0 113, v2.4 113) +- 242 `1ec79d60f` - microVM: refuse an unaligned or reversed decoded snapshot RAM range (v6.0 249, microsoft/openvmm#5038; **fold into 091**, its test's time ABI parameters into 140)
PR21 - Network egress policy (P/N) - 6 commits -- 101 `3ca445754` - net_backend_resources: define a canonical bound IPv4 egress policy (v4.0 105, v3.0 114, v2.4 114) -- 102 `34005ef08` - net_backend: let endpoints accept a run-scoped egress policy (v4.0 106, v3.0 115, v2.4 115) -- 103 `8ee67c7b8` - net_consomme: enforce the egress policy on final transmitted bytes (v4.0 107, v3.0 116, v2.4 116; folds v2.4 379 (part)) -- 104 `38585c1bf` - net_tap: enforce the egress policy on TAP transmit (v4.0 108, v3.0 117, v2.4 117; folds v2.4 309 (part) and 379 (part)) -- 105 `3350bf076` - virtio_net: install and prefilter the egress policy (v4.0 109, v3.0 118, v2.4 118) -- 106 `4eb910e1b` - openvmm: add microVM network egress policy and bind it into snapshots (v4.0 110, v3.0 119, v2.4 119; folds v2.4 320 (part)) +- 094 `5f80ea328` - net_backend_resources: define a canonical bound IPv4 egress policy (v6.0 101, v4.0 105, v3.0 114, v2.4 114) +- 095 `6898198f7` - net_backend: let endpoints accept a run-scoped egress policy (v6.0 102, v4.0 106, v3.0 115, v2.4 115) +- 096 `5fdd60015` - net_consomme: enforce the egress policy on final transmitted bytes (v6.0 103, v4.0 107, v3.0 116, v2.4 116; folds v2.4 379 (part)) +- 097 `be7825efd` - net_tap: enforce the egress policy on TAP transmit (v6.0 104, v4.0 108, v3.0 117, v2.4 117; folds v2.4 309 (part) and 379 (part)) +- 098 `eec3aa4fe` - virtio_net: install and prefilter the egress policy (v6.0 105, v4.0 109, v3.0 118, v2.4 118) +- 099 `eb1c0ac06` - openvmm: add microVM network egress policy and bind it into snapshots (v6.0 106, v4.0 110, v3.0 119, v2.4 119; folds v2.4 320 (part))
PR22 - Filesystem deny policy (P) - 2 commits -- 107 `df424a368` - virtiofs: enforce denied subtrees by object identity (v4.0 111, v3.0 120, v2.4 120) -- 108 `c43e201c1` - openvmm: add --mount-deny and record denied paths in snapshots (v4.0 112, v3.0 121, v2.4 121; folds v2.4 320 (part)) +- 100 `1ddbcd729` - virtiofs: enforce denied subtrees by object identity (v6.0 107, v4.0 111, v3.0 120, v2.4 120) +- 101 `3a22e3fda` - openvmm: add --mount-deny and record denied paths in snapshots (v6.0 108, v4.0 112, v3.0 121, v2.4 121; folds v2.4 320 (part))
PR23 - Authenticated control console (N) - 10 commits -- 109 `88b9f18f5` - serial_core: expose local peer identity and active-peer eviction (v4.0 113, v3.0 122, v2.4 122) -- 110 `1414c1a56` - serial_socket: report Unix and named-pipe peer identities (v4.0 114, v3.0 123, v2.4 123; folds v2.4 374 (part)) -- 111 `7baaa6edf` - virtio_console: define the control-session record protocol (v4.0 115, v3.0 124, v2.4 124) -- 112 `b11436091` - virtio_console: add the control-session broker state machine (v4.0 116, v3.0 125, v2.4 125) -- 113 `5afa40bae` - virtio_console: attach the broker to serial I/O with receive credits (v4.0 117, v3.0 126, v2.4 126; folds v2.4 330 (part) and 384) -- 114 `7f9c28ab2` - virtio_console: save and restore broker state (v4.0 118, v3.0 127, v2.4 127) -- 115 `d08457789` - openvmm: reserve the dedicated microVM control-console slot (v4.0 119, v3.0 128, v2.4 128) -- 116 `0a430faac` - openvmm_helpers: record the control console in the microVM machine contract (v4.0 120, v3.0 129, v2.4 129) -- 117 `d7850e2d0` - openvmm_entry: add authenticated microVM control-console endpoints (v4.0 121, v3.0 130, v2.4 130; folds v2.4 330 (part), 374 (part), 385, 317 (part), and 320 (part)) -- 118 `c3e6e68cc` - openvmm_entry: restore listener endpoint rebinding (v4.0 122, v3.0 131, v2.4 143) +- 102 `ffac0eafa` - serial_core: expose local peer identity and active-peer eviction (v6.0 109, v4.0 113, v3.0 122, v2.4 122) +- 103 `56b65cb4f` - serial_socket: report Unix and named-pipe peer identities (v6.0 110, v4.0 114, v3.0 123, v2.4 123; folds v2.4 374 (part)) +- 104 `dc07f16b1` - virtio_console: define the control-session record protocol (v6.0 111, v4.0 115, v3.0 124, v2.4 124) +- 105 `fe9ae6a8b` - virtio_console: add the control-session broker state machine (v6.0 112, v4.0 116, v3.0 125, v2.4 125) +- 106 `974beaaa1` - virtio_console: attach the broker to serial I/O with receive credits (v6.0 113, v4.0 117, v3.0 126, v2.4 126; folds v2.4 330 (part) and 384) +- 107 `3de867726` - virtio_console: save and restore broker state (v6.0 114, v4.0 118, v3.0 127, v2.4 127) +- 108 `90bc37537` - openvmm: reserve the dedicated microVM control-console slot (v6.0 115, v4.0 119, v3.0 128, v2.4 128) +- 109 `dad4030ba` - openvmm_helpers: record the control console in the microVM machine contract (v6.0 116, v4.0 120, v3.0 129, v2.4 129) +- 110 `e45a93036` - openvmm_entry: add authenticated microVM control-console endpoints (v6.0 117, v4.0 121, v3.0 130, v2.4 130; folds v2.4 330 (part), 374 (part), 385, 317 (part), and 320 (part)) +- 111 `1afb9a678` - openvmm_entry: restore listener endpoint rebinding (v6.0 118, v4.0 122, v3.0 131, v2.4 143)
PR24 - Managed workload and outcome reporting (N) - 5 commits -- 119 `95c94240e` - openvmm_entry: drain portb output before guest-requested exit (v4.0 123, v3.0 132, v2.4 131; folds v2.4 148 (part)) -- 120 `fe8cd6829` - openvmm: add a fixed non-root workload identity (v4.0 124, v3.0 133, v2.4 132; folds v2.4 320 (part)) -- 121 `155422037` - openvmm: support a managed workload lifecycle (v4.0 125, v3.0 134, v2.4 133) -- 122 `64d00cb25` - openvmm_entry: write bounded microVM outcome reports (v4.0 126, v3.0 135, v2.4 134) -- 123 `724a94bfc` - Guide: describe teardown after a failed snapshot boundary (v4.0 127, v3.0 136, v2.4 135) +- 112 `e22065df1` - openvmm_entry: drain portb output before guest-requested exit (v6.0 119, v4.0 123, v3.0 132, v2.4 131; folds v2.4 148 (part)) +- 113 `d738550e5` - openvmm: add a fixed non-root workload identity (v6.0 120, v4.0 124, v3.0 133, v2.4 132; folds v2.4 320 (part)) +- 114 `8939969a0` - openvmm: support a managed workload lifecycle (v6.0 121, v4.0 125, v3.0 134, v2.4 133) +- 115 `06a9f3804` - openvmm_entry: write bounded microVM outcome reports (v6.0 122, v4.0 126, v3.0 135, v2.4 134) +- 116 `9537478d1` - Guide: describe teardown after a failed snapshot boundary (v6.0 123, v4.0 127, v3.0 136, v2.4 135)
PR25 - Management plane (P) - 2 commits -- 124 `5fde97978` - vmservice: create, capture, and restore microVMs over the management RPC (v4.0 128, v3.0 137, v2.4 136; folds v2.4 137 (part), 142 (part), 145, 148 (part), 310, 321, 377 (part), and 381) -- 125 `502f72235` - ttrpc: propagate nonzero guest exit status (v4.0 129, v3.0 138, v2.4 137; folds v2.4 148 (part)) +- 117 `669e4aecd` - vmservice: create, capture, and restore microVMs over the management RPC (v6.0 124, v4.0 128, v3.0 137, v2.4 136; folds v2.4 137 (part), 142 (part), 145, 148 (part), 310, 321, 377 (part), and 381) +- 118 `9ef38e9ec` - ttrpc: propagate nonzero guest exit status (v6.0 125, v4.0 129, v3.0 138, v2.4 137; folds v2.4 148 (part))
PR26 - Profiling benchmark (U) - 1 commit -- 126 `a202c8bf1` - openvmm_helpers: add a publication and private-restore benchmark (v4.0 130, v3.0 139, v2.4 138; folds v2.4 375 (part)) +- 119 `9fbf62d3b` - openvmm_helpers: add a publication and private-restore benchmark (v6.0 126, v4.0 130, v3.0 139, v2.4 138; folds v2.4 375 (part))
PR27 - Safe symlinks for writable microVM shares (U/P) - 2 commits -- 130 `e4c23d26b` - lxutil: add path confinement that never follows symbolic links (v4.0 134, v3.0 143, v2.4 146) -- 131 `7677ad8d5` - virtiofs: allow symlink creation on read-write microVM shares (v4.0 135, v3.0 144, v2.4 147) +- 123 `cb2506c6d` - lxutil: add path confinement that never follows symbolic links (v6.0 130, v4.0 134, v3.0 143, v2.4 146) +- 124 `7f31de535` - virtiofs: allow symlink creation on read-write microVM shares (v6.0 131, v4.0 135, v3.0 144, v2.4 147)
Fork-only tail (F) - 3 commits -- 127 `75d359f4c` - ci: restrict privileged, self-hosted, and publishing jobs to microsoft/openvmm (v4.0 131, v3.0 140, v2.4 139; folds v2.4 383) -- 128 `88c55fa8f` - ci: run the checkin gates on the feature/microvm branches (v4.0 132, v3.0 141, v2.4 308) -- 129 `1ab485e7c` - vmservice: keep NVX wire-tag compatibility (v4.0 133, v3.0 142, v2.4 140) +- 120 `4527dbc00` - ci: restrict privileged, self-hosted, and publishing jobs to microsoft/openvmm (v6.0 127, v4.0 131, v3.0 140, v2.4 139; folds v2.4 383) +- 121 `d9c7e801a` - ci: run the checkin gates on the feature/microvm branches (v6.0 128, v4.0 132, v3.0 141, v2.4 308) +- 122 `6ef4e8ca6` - vmservice: keep NVX wire-tag compatibility (v6.0 129, v4.0 133, v3.0 142, v2.4 140)