diff options
| author |   mlarkin <mlarkin@openbsd.org> | 2018-04-26 17:15:39 +0000 |
|---|---|---|
| committer | mlarkin <mlarkin@openbsd.org> | 2018-04-26 17:15:39 +0000 |
| commit | c53dd2e4302924c23340be8af8d3e22b9aa9a3bd (patch) | |
| tree | 20367cc4d2d520349ae507d98c4d3b89b41f7846 | |
| parent | vmd(8): handle PIT channel 2 status readback via port 0x61 (diff) | |
| download | wireguard-openbsd-c53dd2e4302924c23340be8af8d3e22b9aa9a3bd.tar.xz wireguard-openbsd-c53dd2e4302924c23340be8af8d3e22b9aa9a3bd.zip | |
vmm(4): passthrough port 0x61 to vmd(8)
ok guenther
| -rw-r--r-- | sys/arch/amd64/amd64/vmm.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/include/vmmvar.h | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/vmm.c b/sys/arch/amd64/amd64/vmm.c index cacf5df42c6..b026ab48df6 100644 --- a/sys/arch/amd64/amd64/vmm.c +++ b/sys/arch/amd64/amd64/vmm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm.c,v 1.194 2018/04/26 14:34:42 mlarkin Exp $ */ +/* $OpenBSD: vmm.c,v 1.195 2018/04/26 17:15:39 mlarkin Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> * @@ -4983,6 +4983,7 @@ svm_handle_inout(struct vcpu *vcpu) switch (vcpu->vc_exit.vei.vei_port) { case IO_ICU1 ... IO_ICU1 + 1: case 0x40 ... 0x43: + case PCKBC_AUX: case IO_RTC ... IO_RTC + 1: case IO_ICU2 ... IO_ICU2 + 1: case 0x3f8 ... 0x3ff: @@ -5064,6 +5065,7 @@ vmx_handle_inout(struct vcpu *vcpu) switch (vcpu->vc_exit.vei.vei_port) { case IO_ICU1 ... IO_ICU1 + 1: case 0x40 ... 0x43: + case PCKBC_AUX: case IO_RTC ... IO_RTC + 1: case IO_ICU2 ... IO_ICU2 + 1: case 0x3f8 ... 0x3ff: diff --git a/sys/arch/amd64/include/vmmvar.h b/sys/arch/amd64/include/vmmvar.h index 920a2e296a0..5513863b321 100644 --- a/sys/arch/amd64/include/vmmvar.h +++ b/sys/arch/amd64/include/vmmvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmmvar.h,v 1.51 2018/03/29 02:25:10 mlarkin Exp $ */ +/* $OpenBSD: vmmvar.h,v 1.52 2018/04/26 17:15:39 mlarkin Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> * @@ -322,6 +322,11 @@ enum { }; /* + * Port definitions not found elsewhere + */ +#define PCKBC_AUX 0x61 + +/* * vm exit data * vm_exit_inout : describes an IN/OUT exit */ |