aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kurz <groug@kaod.org>2020-03-09 23:43:06 +0100
committerAlexey Kardashevskiy <aik@ozlabs.ru>2020-03-11 15:43:22 +1100
commit1641d2d5ebdf67d515d7679f96d0623b5886b630 (patch)
treeb22022ab563340ac3f82751c6af45677ac5f892e
parent4b73a933c49a9735bc964f5c1e5a5b2ce62801e9 (diff)
downloadSLOF-1641d2d5ebdf67d515d7679f96d0623b5886b630.zip
SLOF-1641d2d5ebdf67d515d7679f96d0623b5886b630.tar.gz
SLOF-1641d2d5ebdf67d515d7679f96d0623b5886b630.tar.bz2
virtio-serial: Don't override some words
term-io.fs already overrides "emit", "key" and "key?" with its own version: - "term-io-emit" calls the "write" method of the "stdout" instance, which then calls "virtio-serial-putchar" - "term-io-key" calls the "read" method of the "stdout" instance, which then calls "virtio-serial-getchar" - "term-io-key?" calls "serial-key?" if the device is a serial device, which is the case here and we already override "serial-key?" with "virtio-serial-term-key?". It thus looks weird to rely on these shortcuts. Especially, when IOMMU is enabled, we need a valid instance in "dmap-map-in" and going through "term-io-emit" buys us that. Signed-off-by: Greg Kurz <groug@kaod.org> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
-rw-r--r--board-qemu/slof/virtio-serial.fs3
1 files changed, 0 insertions, 3 deletions
diff --git a/board-qemu/slof/virtio-serial.fs b/board-qemu/slof/virtio-serial.fs
index 42ab3e2..a99293f 100644
--- a/board-qemu/slof/virtio-serial.fs
+++ b/board-qemu/slof/virtio-serial.fs
@@ -39,9 +39,6 @@ virtio-setup-vd VALUE virtiodev
: init ( -- )
virtiodev virtio-serial-init drop
TRUE to initialized?
- ['] virtio-serial-term-emit to emit
- ['] virtio-serial-term-key to key
- ['] virtio-serial-term-key? to key?
['] shutdown add-quiesce-xt
;