Skip to content

Commit 2b6de37

Browse files
slptylerfanelli
authored andcommitted
vmm: update sev crates to latest version
This required minor changes in amdsev. Signed-off-by: Sergio Lopez <[email protected]>
1 parent 5f7ff6d commit 2b6de37

File tree

3 files changed

+21
-9
lines changed

3 files changed

+21
-9
lines changed

Cargo.lock

Lines changed: 15 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/vmm/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2021"
66

77
[features]
88
tee = []
9-
amd-sev = [ "blk", "tee", "codicon", "kbs-types", "procfs", "serde", "serde_json", "sev", "curl" ]
9+
amd-sev = [ "blk", "tee", "codicon", "kbs-types", "procfs", "rdrand", "serde", "serde_json", "sev", "curl" ]
1010
net = []
1111
blk = []
1212
efi = [ "blk", "net" ]
@@ -28,11 +28,12 @@ polly = { path = "../polly" }
2828

2929
# Dependencies for amd-sev
3030
codicon = { version = "3.0.0", optional = true }
31-
kbs-types = { version = "0.7.0", features = ["tee-sev", "tee-snp"], optional = true }
31+
kbs-types = { version = "0.8.0", features = ["tee-sev", "tee-snp"], optional = true }
3232
procfs = { version = "0.12", optional = true }
33+
rdrand = { version = "^0.8", optional = true }
3334
serde = { version = "1.0.125", optional = true }
3435
serde_json = { version = "1.0.64", optional = true }
35-
sev = { version = "3.2.0", features = ["openssl"], optional = true }
36+
sev = { version = "4.0.0", features = ["openssl"], optional = true }
3637
curl = { version = "0.4", optional = true }
3738
nix = "0.24.1"
3839

src/vmm/src/linux/tee/amdsev.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pub enum Error {
4242
MemoryEncryptRegion,
4343
ReadingCpuData(procfs::ProcError),
4444
ReadingCoreData,
45-
SessionFromPolicy(std::io::Error),
45+
SessionFromPolicy(rdrand::ErrorCode),
4646
SessionRequest(curl::Error),
4747
SevInit(kvm_ioctls::Error),
4848
SevInjectSecret(kvm_ioctls::Error),
@@ -51,7 +51,7 @@ pub enum Error {
5151
SevLaunchStart(kvm_ioctls::Error),
5252
SevLaunchUpdateData(kvm_ioctls::Error),
5353
SevLaunchUpdateVmsa(kvm_ioctls::Error),
54-
StartFromSession(std::io::Error),
54+
StartFromSession(sev::error::SessionError),
5555
UnknownCpuModel,
5656
}
5757

0 commit comments

Comments
 (0)