Skip to content

cargo: fix up feature and remove unused dependency #1236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stefano-garzarella merged 2 commits into from
Oct 9, 2026
+7 −15
Merged

cargo: fix up feature and remove unused dependency #1236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfb861f
kernel: make block and vsock imply virtio-drivers
luigix25 Sep 29, 2026
406fb02
verification/verus_macro_stub: remove unused proc-macro2 dependency
luigix25 Sep 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Documentation/docs/developer/ATTESTATION.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,8 @@ SEV-SNP machine with an SVSM-enabled kernel.
```shell
git clone https://github.com/coconut-svsm/svsm.git
# ... build OVMF, qemu, SVSM IGVM, etc...
FW_FILE=... make FEATURES=attest,vsock,virtio-drivers # vsock transport (default)
Comment thread
luigix25 marked this conversation as resolved.
FW_FILE=... make FEATURES=attest,vsock,attest-serial,virtio-drivers # vsock with serial fallback (testing)
FW_FILE=... make FEATURES=attest # vsock transport (default)
FW_FILE=... make FEATURES=attest-serial # vsock with serial fallback (testing)
```

2. Clone and run the `kbs-test` server used for testing. Supply the following
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SVSM_ARGS += --features ${FEATURES}
XBUILD_ARGS += -f ${FEATURES}
endif

FEATURES_TEST ?= vtpm,virtio-drivers,block,vsock,uefivars,secureboot,enable-console-log,attest
FEATURES_TEST ?= vtpm,block,uefivars,secureboot,enable-console-log,attest
SVSM_ARGS_TEST += --no-default-features
ifneq ($(FEATURES_TEST),)
SVSM_ARGS_TEST += --features ${FEATURES_TEST}
Expand Down
6 changes: 3 additions & 3 deletions kernel/Cargo.toml
View file
Open in desktop
Comment thread
luigix25 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ attest = [
attest-serial = ["attest"]

default = []
persistence = ["dep:cocoon-tpm-storage", "block", "virtio-drivers", "attest"]
persistence = ["dep:cocoon-tpm-storage", "block", "attest"]
enable-gdb = ["dep:gdbstub", "dep:gdbstub_arch"]
vtpm = ["dep:libtcgtpm"]
nosmep = []
Expand All @@ -112,8 +112,8 @@ verus_all = [
verus = ["verus_all", "verify_proof/noverify", "verify_external/noverify"]
noverify = []
virtio-drivers = ["dep:virtio-drivers", "dep:safe-mmio"]
block = []
vsock = []
block = ["virtio-drivers"]
vsock = ["virtio-drivers"]
Comment thread
luigix25 marked this conversation as resolved.
uefivars = ["dep:virtfw-varstore", "dep:virtfw-libefi"]
secureboot = ["uefivars"]
enable-console-log = []
Expand Down
1 change: 0 additions & 1 deletion kernel/src/block/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

pub mod api;
pub mod error;
#[cfg(feature = "virtio-drivers")]
pub mod virtio_blk;

pub use error::BlockDeviceError;
Expand Down
2 changes: 1 addition & 1 deletion kernel/src/svsm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ use svsm::types::PAGE_SIZE;
use svsm::utils::MemoryRegion;
use svsm::utils::ScopedMut;
use svsm::utils::round_to_pages;
#[cfg(all(feature = "virtio-drivers", any(feature = "block", feature = "vsock")))]
#[cfg(any(feature = "block", feature = "vsock"))]
use svsm::virtio::probe_mmio_slots;
#[cfg(feature = "vtpm")]
use svsm::vtpm::vtpm_init;
Expand Down
1 change: 0 additions & 1 deletion kernel/src/vsock/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
pub mod api;
pub mod error;
pub mod stream;
#[cfg(feature = "virtio-drivers")]
pub mod virtio_vsock;

pub use error::VsockError;
Expand Down
3 changes: 0 additions & 3 deletions verification/verus_macro_stub/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@ workspace = true

[lib]
proc-macro = true

[dependencies]
proc-macro2 = "1.0.94"
Loading