diff options
| author |   mlarkin <mlarkin@openbsd.org> | 2017-03-24 08:02:02 +0000 |
|---|---|---|
| committer | mlarkin <mlarkin@openbsd.org> | 2017-03-24 08:02:02 +0000 |
| commit | cfb7fcffeec706e4751b5eacf45d241139af5f1a (patch) | |
| tree | 261197693c354a47b5b5a237759439ca18deb57b | |
| parent | add viocon and a missing full stop in previous; (diff) | |
| download | wireguard-openbsd-cfb7fcffeec706e4751b5eacf45d241139af5f1a.tar.xz wireguard-openbsd-cfb7fcffeec706e4751b5eacf45d241139af5f1a.zip | |
Allow returns from vmd after handling cpuid exits (handles the case where
a cpuid instruction was emulated at the same time there was an interrupt
pending)
| -rw-r--r-- | sys/arch/amd64/amd64/vmm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/amd64/amd64/vmm.c b/sys/arch/amd64/amd64/vmm.c index 98d07473e9e..3f00f3a5652 100644 --- a/sys/arch/amd64/amd64/vmm.c +++ b/sys/arch/amd64/amd64/vmm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm.c,v 1.122 2017/03/21 02:57:38 mlarkin Exp $ */ +/* $OpenBSD: vmm.c,v 1.123 2017/03/24 08:02:02 mlarkin Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> * @@ -3403,6 +3403,8 @@ vcpu_run_vmx(struct vcpu *vcpu, struct vm_run_params *vrp) break; case VMX_EXIT_EPT_VIOLATION: break; + case VMX_EXIT_CPUID: + break; #ifdef VMM_DEBUG case VMX_EXIT_TRIPLE_FAULT: DPRINTF("%s: vm %d vcpu %d triple fault\n", |