diff options
| author |   reyk <reyk@openbsd.org> | 2017-03-24 11:08:43 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2017-03-24 11:08:43 +0000 |
| commit | b8e4a3e38aebf5bb2160958dc13d12d16bd4bc18 (patch) | |
| tree | a6e69c1dc46d47357292546f623ebf55b8fb9127 | |
| parent | Use C99 types (uint32_t) instead of BSD (u_int32_t) - the former are (diff) | |
| download | wireguard-openbsd-b8e4a3e38aebf5bb2160958dc13d12d16bd4bc18.tar.xz wireguard-openbsd-b8e4a3e38aebf5bb2160958dc13d12d16bd4bc18.zip | |
Backout mlarkin's previous commit while he is away:
The newly-used function get_input_data() is missing and broke the tree.
| -rw-r--r-- | usr.sbin/vmd/i8253.c | 4 | ||||
| -rw-r--r-- | usr.sbin/vmd/i8259.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/vmd/i8253.c b/usr.sbin/vmd/i8253.c index 332bce59ffe..3f9b7383d7b 100644 --- a/usr.sbin/vmd/i8253.c +++ b/usr.sbin/vmd/i8253.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i8253.c,v 1.8 2017/03/24 09:11:49 mlarkin Exp $ */ +/* $OpenBSD: i8253.c,v 1.9 2017/03/24 11:08:43 reyk Exp $ */ /* * Copyright (c) 2016 Mike Larkin <mlarkin@openbsd.org> * @@ -133,7 +133,7 @@ vcpu_exit_i8253(struct vm_run_params *vrp) struct timeval now, delta; union vm_exit *vei = vrp->vrp_exit; - out_data = get_input_data(vei); + out_data = vei->vei.vei_data & 0xFF; if (vei->vei.vei_port == TIMER_CTRL) { if (vei->vei.vei_dir == VEI_DIR_OUT) { /* OUT instruction */ diff --git a/usr.sbin/vmd/i8259.c b/usr.sbin/vmd/i8259.c index 4e1ca78fa47..1be0daf0251 100644 --- a/usr.sbin/vmd/i8259.c +++ b/usr.sbin/vmd/i8259.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i8259.c,v 1.9 2017/03/24 09:11:49 mlarkin Exp $ */ +/* $OpenBSD: i8259.c,v 1.10 2017/03/24 11:08:43 reyk Exp $ */ /* * Copyright (c) 2016 Mike Larkin <mlarkin@openbsd.org> * @@ -556,7 +556,7 @@ static void i8259_io_write(union vm_exit *vei) { uint16_t port = vei->vei.vei_port; - uint8_t data = get_input_data(vei); + uint8_t data = vei->vei.vei_data; uint8_t n = 0; switch (port) { |