diff options
| author |   mlarkin <mlarkin@openbsd.org> | 2017-03-24 09:11:49 +0000 |
|---|---|---|
| committer | mlarkin <mlarkin@openbsd.org> | 2017-03-24 09:11:49 +0000 |
| commit | fd0f638230176f73276160dc474f099f60fc2b81 (patch) | |
| tree | a1e505c78572bd61a67511e120b6084e3c18c4b7 | |
| parent | Handle guest interruptibility state - Reset the interruptibility state (diff) | |
| download | wireguard-openbsd-fd0f638230176f73276160dc474f099f60fc2b81.tar.xz wireguard-openbsd-fd0f638230176f73276160dc474f099f60fc2b81.zip | |
Last bits of cleanup for linux/seabios support in i8253/i8259 emulation
code.
| -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 39b21c49cc1..332bce59ffe 100644 --- a/usr.sbin/vmd/i8253.c +++ b/usr.sbin/vmd/i8253.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i8253.c,v 1.7 2017/03/23 07:02:47 mlarkin Exp $ */ +/* $OpenBSD: i8253.c,v 1.8 2017/03/24 09:11:49 mlarkin 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 = vei->vei.vei_data & 0xFF; + out_data = get_input_data(vei); 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 3aa906051f8..4e1ca78fa47 100644 --- a/usr.sbin/vmd/i8259.c +++ b/usr.sbin/vmd/i8259.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i8259.c,v 1.8 2017/03/23 06:56:33 mlarkin Exp $ */ +/* $OpenBSD: i8259.c,v 1.9 2017/03/24 09:11:49 mlarkin 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 = vei->vei.vei_data; + uint8_t data = get_input_data(vei); uint8_t n = 0; switch (port) { |