Skip to content

Commit

Permalink
updates kvm bindings and ioctls
Browse files Browse the repository at this point in the history
Signed-off-by: Simon Davies <[email protected]>
  • Loading branch information
simongdavies committed Nov 6, 2024
1 parent 51dfdcc commit 5b3b500
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 13 deletions.
4 changes: 2 additions & 2 deletions src/hyperlight_host/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ windows-result = "0.2"
seccompiler = { version = "0.4.0", optional = true }
mshv-bindings = { workspace = true, optional = true }
mshv-ioctls = { workspace = true, optional = true }
kvm-bindings = { version = "0.9.0", features = ["fam-wrappers"], optional = true }
kvm-ioctls = { version = "0.18.0", optional = true }
kvm-bindings = { version = "0.10.0", features = ["fam-wrappers"], optional = true }
kvm-ioctls = { version = "0.19.0", optional = true }

[dev-dependencies]
signal-hook-registry = "1.4.1"
Expand Down
11 changes: 4 additions & 7 deletions src/hyperlight_host/src/hypervisor/kvm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,16 +145,13 @@ impl Debug for KVMDriver {
f.field("Registers", &regs);
}

// TODO: the call to get sregs is removed because it hangs after updating to kvm-ioctls 0.18
// this needs to be investigated or to be replaced with sync_regs() to see if that gets around the issue

//let sregs = self.vcpu_fd.get_sregs();
let sregs = self.vcpu_fd.get_sregs();

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

// if let Ok(sregs) = sregs {
// f.field("Special Registers", &sregs);
// }
if let Ok(sregs) = sregs {
f.field("Special Registers", &sregs);
}

f.finish()
}
Expand Down
4 changes: 2 additions & 2 deletions src/tests/rust_guests/callbackguest/Cargo.lock

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

4 changes: 2 additions & 2 deletions src/tests/rust_guests/simpleguest/Cargo.lock

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

0 comments on commit 5b3b500

Please sign in to comment.