diff options
| author |   mlarkin <mlarkin@openbsd.org> | 2017-03-24 08:04:02 +0000 |
|---|---|---|
| committer | mlarkin <mlarkin@openbsd.org> | 2017-03-24 08:04:02 +0000 |
| commit | eab12b1c3e4a22bb85b76a4c3596397b986ec309 (patch) | |
| tree | 6b9547b54a6228a68a4d66c3d7ad458b655a047a | |
| parent | Allow returns from vmd after handling cpuid exits (handles the case where (diff) | |
| download | wireguard-openbsd-eab12b1c3e4a22bb85b76a4c3596397b986ec309.tar.xz wireguard-openbsd-eab12b1c3e4a22bb85b76a4c3596397b986ec309.zip | |
Allow vmd to proceed after an interrupt occurred after retiring a cpuid
instruction. Matches previous commit to kernel vmm.c
| -rw-r--r-- | usr.sbin/vmd/vm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/vmd/vm.c b/usr.sbin/vmd/vm.c index 72e369f2201..896364b7c07 100644 --- a/usr.sbin/vmd/vm.c +++ b/usr.sbin/vmd/vm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm.c,v 1.5 2017/03/23 07:59:41 mlarkin Exp $ */ +/* $OpenBSD: vm.c,v 1.6 2017/03/24 08:04:02 mlarkin Exp $ */ /* * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org> @@ -1002,6 +1002,7 @@ vcpu_exit(struct vm_run_params *vrp) switch (vrp->vrp_exit_reason) { case VMX_EXIT_INT_WINDOW: + case VMX_EXIT_CPUID: case VMX_EXIT_EXTINT: case VMX_EXIT_EPT_VIOLATION: case SVM_VMEXIT_NPF: |