From 8914ce9da8f289d5187a57a388000e236f80cfb0 Mon Sep 17 00:00:00 2001 From: Jinank Jain Date: Sat, 17 Dec 2022 17:53:21 +0000 Subject: [PATCH] build: Bump mshv-ioctls from `10d0c52` to `ef01a5a` With this bump there was a change in one of the externally exposed variable. Thus, the use of that variable in CLH must be adjusted accordingly. Signed-off-by: Jinank Jain --- Cargo.lock | 4 ++-- hypervisor/src/mshv/mod.rs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a8435ea65..dedcf8baf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -595,7 +595,7 @@ dependencies = [ [[package]] name = "mshv-bindings" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#10d0c5208cc41a3958e0fd31fabf2c88b18a97b5" +source = "git+https://github.com/rust-vmm/mshv?branch=main#ef01a5abd0377701b3cee7ed6c69d7353db78a9f" dependencies = [ "libc", "serde", @@ -607,7 +607,7 @@ dependencies = [ [[package]] name = "mshv-ioctls" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#10d0c5208cc41a3958e0fd31fabf2c88b18a97b5" +source = "git+https://github.com/rust-vmm/mshv?branch=main#ef01a5abd0377701b3cee7ed6c69d7353db78a9f" dependencies = [ "libc", "mshv-bindings", diff --git a/hypervisor/src/mshv/mod.rs b/hypervisor/src/mshv/mod.rs index c5d96b2cd..b2d046edc 100644 --- a/hypervisor/src/mshv/mod.rs +++ b/hypervisor/src/mshv/mod.rs @@ -446,10 +446,10 @@ impl cpu::Vcpu for MshvVcpu { /* Advance RIP and update RAX */ let arr_reg_name_value = [ ( - hv_register_name::HV_X64_REGISTER_RIP, + hv_x64_register_name_HV_X64_REGISTER_RIP, info.header.rip + insn_len, ), - (hv_register_name::HV_X64_REGISTER_RAX, ret_rax), + (hv_x64_register_name_HV_X64_REGISTER_RAX, ret_rax), ]; set_registers_64!(self.fd, arr_reg_name_value) .map_err(|e| cpu::HypervisorCpuError::SetRegister(e.into()))?; @@ -495,10 +495,10 @@ impl cpu::Vcpu for MshvVcpu { /* Advance RIP and update RAX */ let arr_reg_name_value = [ ( - hv_register_name::HV_X64_REGISTER_RIP, + hv_x64_register_name_HV_X64_REGISTER_RIP, info.header.rip + insn_len, ), - (hv_register_name::HV_X64_REGISTER_RAX, ret_rax), + (hv_x64_register_name_HV_X64_REGISTER_RAX, ret_rax), ]; set_registers_64!(self.fd, arr_reg_name_value) .map_err(|e| cpu::HypervisorCpuError::SetRegister(e.into()))?;