Skip to content

chore: remove vmclock patches#5826

Merged
JamesC1305 merged 6 commits intofirecracker-microvm:mainfrom
JamesC1305:remove-vmclock-patches
Apr 16, 2026
Merged

chore: remove vmclock patches#5826
JamesC1305 merged 6 commits intofirecracker-microvm:mainfrom
JamesC1305:remove-vmclock-patches

Conversation

@JamesC1305
Copy link
Copy Markdown
Contributor

@JamesC1305 JamesC1305 commented Apr 9, 2026

Changes

  • Remove patches
  • Update rebuild.sh script slightly to prevent errors on non-existent patches
  • Update VMclock documentation to reflect new sources

Reason

Patches no longer needed due to AL kernel backports

License Acceptance

By submitting this pull request, I confirm that my contribution is made under
the terms of the Apache 2.0 license. For more information on following Developer
Certificate of Origin and signing off your commits, please check
CONTRIBUTING.md.

PR Checklist

  • I have read and understand CONTRIBUTING.md.
  • I have run tools/devtool checkbuild --all to verify that the PR passes
    build checks on all supported architectures.
  • I have run tools/devtool checkstyle to verify that the PR passes the
    automated style checks.
  • I have described what is done in these changes, why they are needed, and
    how they are solving the problem in a clear and encompassing way.
  • I have updated any relevant documentation (both in code and in the docs)
    in the PR.
  • I have mentioned all user-facing changes in CHANGELOG.md.
  • If a specific issue led to this PR, this PR closes the issue.
  • When making API changes, I have followed the
    Runbook for Firecracker API changes.
  • I have tested all new and changed functionalities in unit tests and/or
    integration tests.
  • I have linked an issue to every new TODO.

  • This functionality cannot be added in rust-vmm.

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 9, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 83.07%. Comparing base (1608f22) to head (5c6e5ce).
⚠️ Report is 3 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5826   +/-   ##
=======================================
  Coverage   83.07%   83.07%           
=======================================
  Files         276      276           
  Lines       29546    29546           
=======================================
  Hits        24546    24546           
  Misses       5000     5000           
Flag Coverage Δ
5.10-m5n.metal 83.40% <ø> (+<0.01%) ⬆️
5.10-m6a.metal 82.73% <ø> (-0.01%) ⬇️
5.10-m6g.metal 79.99% <ø> (+<0.01%) ⬆️
5.10-m6i.metal 83.40% <ø> (ø)
5.10-m7a.metal-48xl 82.72% <ø> (ø)
5.10-m7g.metal 79.99% <ø> (ø)
5.10-m7i.metal-24xl 83.37% <ø> (-0.01%) ⬇️
5.10-m7i.metal-48xl 83.37% <ø> (-0.01%) ⬇️
5.10-m8g.metal-24xl 79.99% <ø> (ø)
5.10-m8g.metal-48xl 79.99% <ø> (ø)
5.10-m8i.metal-48xl 83.37% <ø> (-0.01%) ⬇️
5.10-m8i.metal-96xl 83.37% <ø> (+<0.01%) ⬆️
6.1-m5n.metal 83.43% <ø> (+<0.01%) ⬆️
6.1-m6a.metal 82.76% <ø> (+<0.01%) ⬆️
6.1-m6g.metal 79.99% <ø> (+<0.01%) ⬆️
6.1-m6i.metal 83.42% <ø> (-0.01%) ⬇️
6.1-m7a.metal-48xl 82.75% <ø> (ø)
6.1-m7g.metal 79.99% <ø> (ø)
6.1-m7i.metal-24xl 83.43% <ø> (ø)
6.1-m7i.metal-48xl 83.43% <ø> (-0.01%) ⬇️
6.1-m8g.metal-24xl 79.99% <ø> (ø)
6.1-m8g.metal-48xl 79.99% <ø> (-0.01%) ⬇️
6.1-m8i.metal-48xl 83.44% <ø> (ø)
6.1-m8i.metal-96xl 83.44% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@JamesC1305 JamesC1305 added the Status: Awaiting review Indicates that a pull request is ready to be reviewed label Apr 9, 2026
JackThomson2
JackThomson2 previously approved these changes Apr 9, 2026
@JamesC1305 JamesC1305 force-pushed the remove-vmclock-patches branch 2 times, most recently from 679f332 to 85b7d63 Compare April 10, 2026 11:45
With the release of microvm-kernel-5.10.252-285.992.amzn2 and
microvm-kernel-6.1.167-27.319.amzn2023, the vmclock patches are now
present in the kernel, meaning the copies we apply on kernel build can
be safely removed.

Signed-off-by: James Curtis <jxcurtis@amazon.co.uk>
Update the Kconfig files to be those of the 6.1.167
and 5.10.252 microvm kernel releases. As part of this, Drop Kconfig
patches for PCI, vmclock, virtio-mem and virtio-pmem, since the latest
microvm kernel config already enables the required options.

Signed-off-by: James Curtis <jxcurtis@amazon.co.uk>
Update snapshot docs to reflect the fact that vmclock is now available
in newly built microvm kernels.

Signed-off-by: James Curtis <jxcurtis@amazon.co.uk>
@JamesC1305 JamesC1305 force-pushed the remove-vmclock-patches branch from ec6aeff to 2e8b529 Compare April 13, 2026 08:03
@JamesC1305 JamesC1305 enabled auto-merge (rebase) April 16, 2026 14:42
@JamesC1305 JamesC1305 merged commit 53b382a into firecracker-microvm:main Apr 16, 2026
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Status: Awaiting review Indicates that a pull request is ready to be reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants