diff options
| -rw-r--r-- | kvm/src/lib.rs | 17 | ||||
| -rw-r--r-- | src/linux.rs | 6 |
2 files changed, 21 insertions, 2 deletions
diff --git a/kvm/src/lib.rs b/kvm/src/lib.rs index bc1abad..c5da845 100644 --- a/kvm/src/lib.rs +++ b/kvm/src/lib.rs @@ -1128,7 +1128,9 @@ pub enum VcpuExit { Hlt, IrqWindowOpen, Shutdown, - FailEntry, + FailEntry { + hardware_entry_failure_reason: u64, + }, Intr, SetTpr, TprAccess, @@ -1786,7 +1788,18 @@ impl RunnableVcpu { KVM_EXIT_HLT => Ok(VcpuExit::Hlt), KVM_EXIT_IRQ_WINDOW_OPEN => Ok(VcpuExit::IrqWindowOpen), KVM_EXIT_SHUTDOWN => Ok(VcpuExit::Shutdown), - KVM_EXIT_FAIL_ENTRY => Ok(VcpuExit::FailEntry), + KVM_EXIT_FAIL_ENTRY => { + // Safe because the exit_reason (which comes from the kernel) told us which + // union field to use. + let hardware_entry_failure_reason = unsafe { + run.__bindgen_anon_1 + .fail_entry + .hardware_entry_failure_reason + }; + Ok(VcpuExit::FailEntry { + hardware_entry_failure_reason, + }) + } KVM_EXIT_INTR => Ok(VcpuExit::Intr), KVM_EXIT_SET_TPR => Ok(VcpuExit::SetTpr), KVM_EXIT_TPR_ACCESS => Ok(VcpuExit::TprAccess), diff --git a/src/linux.rs b/src/linux.rs index 57b3ef5..62bfd68 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -1346,6 +1346,12 @@ fn run_vcpu( } Ok(VcpuExit::Hlt) => break, Ok(VcpuExit::Shutdown) => break, + Ok(VcpuExit::FailEntry { + hardware_entry_failure_reason, + }) => { + error!("vcpu hw run failure: {:#x}", hardware_entry_failure_reason); + break; + }, Ok(VcpuExit::SystemEvent(_, _)) => break, Ok(r) => warn!("unexpected vcpu exit: {:?}", r), Err(e) => match e.errno() { |