Skip to content

Commit 5d03294

Browse files
authored
updates kvm bindings and ioctls (#18)
Signed-off-by: Simon Davies <[email protected]>
1 parent 9552291 commit 5d03294

File tree

4 files changed

+10
-13
lines changed

4 files changed

+10
-13
lines changed

src/hyperlight_host/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ windows-result = "0.2"
6565
seccompiler = { version = "0.4.0", optional = true }
6666
mshv-bindings = { workspace = true, optional = true }
6767
mshv-ioctls = { workspace = true, optional = true }
68-
kvm-bindings = { version = "0.9.0", features = ["fam-wrappers"], optional = true }
69-
kvm-ioctls = { version = "0.18.0", optional = true }
68+
kvm-bindings = { version = "0.10.0", features = ["fam-wrappers"], optional = true }
69+
kvm-ioctls = { version = "0.19.0", optional = true }
7070

7171
[dev-dependencies]
7272
signal-hook-registry = "1.4.1"

src/hyperlight_host/src/hypervisor/kvm.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,16 +145,13 @@ impl Debug for KVMDriver {
145145
f.field("Registers", &regs);
146146
}
147147

148-
// TODO: the call to get sregs is removed because it hangs after updating to kvm-ioctls 0.18
149-
// this needs to be investigated or to be replaced with sync_regs() to see if that gets around the issue
150-
151-
//let sregs = self.vcpu_fd.get_sregs();
148+
let sregs = self.vcpu_fd.get_sregs();
152149

153150
// check that sregs is OK and then set field in debug struct
154151

155-
// if let Ok(sregs) = sregs {
156-
// f.field("Special Registers", &sregs);
157-
// }
152+
if let Ok(sregs) = sregs {
153+
f.field("Special Registers", &sregs);
154+
}
158155

159156
f.finish()
160157
}

src/tests/rust_guests/callbackguest/Cargo.lock

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

src/tests/rust_guests/simpleguest/Cargo.lock

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

0 commit comments

Comments
 (0)