Skip to content

pci: Return error from add_device() instead of asserting#5864

Merged
ilstam merged 1 commit into
firecracker-microvm:mainfrom
ilstam:device-no-assert
May 5, 2026
Merged

pci: Return error from add_device() instead of asserting#5864
ilstam merged 1 commit into
firecracker-microvm:mainfrom
ilstam:device-no-assert

Conversation

@ilstam
Copy link
Copy Markdown
Contributor

@ilstam ilstam commented May 5, 2026

Replace the assert in PciBus::add_device() with a proper error return, allowing callers to handle duplicate device IDs gracefully. This is important for the snapshot restore path where a corrupted snapshot should not crash the VMM.

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.

Replace the assert in PciBus::add_device() with a proper error return,
allowing callers to handle duplicate device IDs gracefully. This is
important for the snapshot restore path where a corrupted snapshot
should not crash the VMM.

Signed-off-by: Ilias Stamatis <ilstam@amazon.com>
@codecov
Copy link
Copy Markdown

codecov Bot commented May 5, 2026

Codecov Report

❌ Patch coverage is 90.00000% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 82.80%. Comparing base (3cf3a58) to head (eb81924).

Files with missing lines Patch % Lines
src/vmm/src/pci/bus.rs 88.88% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5864   +/-   ##
=======================================
  Coverage   82.80%   82.80%           
=======================================
  Files         277      277           
  Lines       29889    29895    +6     
=======================================
+ Hits        24751    24756    +5     
- Misses       5138     5139    +1     
Flag Coverage Δ
5.10-m5n.metal 83.09% <90.00%> (-0.01%) ⬇️
5.10-m6a.metal 82.43% <90.00%> (-0.01%) ⬇️
5.10-m6g.metal 79.73% <90.00%> (-0.01%) ⬇️
5.10-m6i.metal 83.09% <90.00%> (-0.01%) ⬇️
5.10-m7a.metal-48xl 82.42% <90.00%> (+<0.01%) ⬆️
5.10-m7g.metal 79.73% <90.00%> (-0.01%) ⬇️
5.10-m7i.metal-24xl 83.06% <90.00%> (-0.01%) ⬇️
5.10-m7i.metal-48xl 83.08% <90.00%> (+<0.01%) ⬆️
5.10-m8g.metal-24xl 79.73% <90.00%> (-0.01%) ⬇️
5.10-m8g.metal-48xl 79.73% <90.00%> (-0.01%) ⬇️
5.10-m8i.metal-48xl 83.07% <90.00%> (-0.01%) ⬇️
5.10-m8i.metal-96xl 83.07% <90.00%> (+<0.01%) ⬆️
6.1-m5n.metal 83.12% <90.00%> (+<0.01%) ⬆️
6.1-m6a.metal 82.46% <90.00%> (-0.01%) ⬇️
6.1-m6g.metal 79.73% <90.00%> (-0.01%) ⬇️
6.1-m6i.metal 83.12% <90.00%> (-0.01%) ⬇️
6.1-m7a.metal-48xl 82.45% <90.00%> (+<0.01%) ⬆️
6.1-m7g.metal 79.73% <90.00%> (-0.01%) ⬇️
6.1-m7i.metal-24xl 83.13% <90.00%> (-0.02%) ⬇️
6.1-m7i.metal-48xl 83.14% <90.00%> (-0.01%) ⬇️
6.1-m8g.metal-24xl 79.73% <90.00%> (-0.01%) ⬇️
6.1-m8g.metal-48xl 79.73% <90.00%> (+<0.01%) ⬆️
6.1-m8i.metal-48xl 83.14% <90.00%> (+<0.01%) ⬆️
6.1-m8i.metal-96xl 83.14% <90.00%> (+<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.

@ilstam ilstam added the Status: Awaiting review Indicates that a pull request is ready to be reviewed label May 5, 2026
@ilstam ilstam enabled auto-merge (rebase) May 5, 2026 10:19
@ilstam ilstam merged commit e7e0efe into firecracker-microvm:main May 5, 2026
8 checks passed
@ilstam ilstam deleted the device-no-assert branch May 5, 2026 10:26
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.

3 participants