diff options
| author |   mlarkin <mlarkin@openbsd.org> | 2017-03-25 07:46:24 +0000 |
|---|---|---|
| committer | mlarkin <mlarkin@openbsd.org> | 2017-03-25 07:46:24 +0000 |
| commit | 46635426ba6e01201f3d8e14a59ae7bfe1afe7ee (patch) | |
| tree | e8d11ec434ae50a46f84ea9d208a1e7434abf037 /usr.sbin/vmd/mc146818.c | |
| parent | More PCI extended capabilities handling in pcidump. (diff) | |
| download | wireguard-openbsd-46635426ba6e01201f3d8e14a59ae7bfe1afe7ee.tar.xz wireguard-openbsd-46635426ba6e01201f3d8e14a59ae7bfe1afe7ee.zip | |
Introduce a new function to obtain properly sized input data, and convert
i8253/i8259/mc146818 emulation to use this.
Diffstat (limited to 'usr.sbin/vmd/mc146818.c')
| -rw-r--r-- | usr.sbin/vmd/mc146818.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/usr.sbin/vmd/mc146818.c b/usr.sbin/vmd/mc146818.c index 59b5c57a2c9..5c265457dde 100644 --- a/usr.sbin/vmd/mc146818.c +++ b/usr.sbin/vmd/mc146818.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mc146818.c,v 1.8 2017/03/23 07:59:41 mlarkin Exp $ */ +/* $OpenBSD: mc146818.c,v 1.9 2017/03/25 07:46:24 mlarkin Exp $ */ /* * Copyright (c) 2016 Mike Larkin <mlarkin@openbsd.org> * @@ -249,7 +249,9 @@ vcpu_exit_mc146818(struct vm_run_params *vrp) union vm_exit *vei = vrp->vrp_exit; uint16_t port = vei->vei.vei_port; uint8_t dir = vei->vei.vei_dir; - uint32_t data = vei->vei.vei_data & 0xFF; + uint32_t data; + + data = get_input_data(vei); if (port == IO_RTC) { /* Discard NMI bit */ @@ -259,16 +261,10 @@ vcpu_exit_mc146818(struct vm_run_params *vrp) if (dir == 0) { if (data < (NVRAM_SIZE)) rtc.idx = data; - else { - log_warnx("%s: mc146818 bogus register 0x%x", - __func__, data); + else rtc.idx = MC_REGD; - } - } else { - log_warnx("%s: mc146818 illegal read from port 0x%x", - __func__, port); - set_return_data(vei, 0xFF); - } + } else + set_return_data(vei, rtc.idx); } else if (port == IO_RTC + 1) { if (dir == 0) { switch (rtc.idx) { @@ -291,7 +287,6 @@ vcpu_exit_mc146818(struct vm_run_params *vrp) log_warnx("%s: mc146818 illegal reg %x\n", __func__, rtc.idx); } - rtc.idx = MC_REGD; } else { data = rtc.regs[rtc.idx]; set_return_data(vei, data); @@ -300,7 +295,6 @@ vcpu_exit_mc146818(struct vm_run_params *vrp) /* Reset IRQ state */ rtc.regs[MC_REGC] &= ~MC_REGC_PF; } - rtc.idx = MC_REGD; } } else { log_warnx("%s: mc146818 unknown port 0x%x", |