Message ID | 158379378586.1643521.16002013085934751137.stgit@bahia.lan |
---|---|
State | Accepted |
Headers | show
Return-Path: <slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48btYD1Gn3z9sPJ for <incoming@patchwork.ozlabs.org>; Tue, 10 Mar 2020 09:43:28 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=kaod.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 48btYC2rRWzDqLL for <incoming@patchwork.ozlabs.org>; Tue, 10 Mar 2020 09:43:27 +1100 (AEDT) X-Original-To: slof@lists.ozlabs.org Delivered-To: slof@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=softfail (domain owner discourages use of this host) smtp.mailfrom=kaod.org (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=groug@kaod.org; receiver=<UNKNOWN>) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=kaod.org Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 48btY10jHbzDqLG for <slof@lists.ozlabs.org>; Tue, 10 Mar 2020 09:43:16 +1100 (AEDT) Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 029MUVe1020734 for <slof@lists.ozlabs.org>; Mon, 9 Mar 2020 18:43:11 -0400 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0b-001b2d01.pphosted.com with ESMTP id 2ynww8hk6t-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for <slof@lists.ozlabs.org>; Mon, 09 Mar 2020 18:43:11 -0400 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for <slof@lists.ozlabs.org> from <groug@kaod.org>; Mon, 9 Mar 2020 22:43:09 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 9 Mar 2020 22:43:07 -0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 029Mh6op27590856 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 9 Mar 2020 22:43:06 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BC5D711C05B; Mon, 9 Mar 2020 22:43:06 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9B51111C052; Mon, 9 Mar 2020 22:43:06 +0000 (GMT) Received: from bahia.lan (unknown [9.145.41.106]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 9 Mar 2020 22:43:06 +0000 (GMT) From: Greg Kurz <groug@kaod.org> To: slof@lists.ozlabs.org Date: Mon, 09 Mar 2020 23:43:06 +0100 In-Reply-To: <158379377926.1643521.5206856271270861535.stgit@bahia.lan> References: <158379377926.1643521.5206856271270861535.stgit@bahia.lan> User-Agent: StGit/unknown-version MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 20030922-0008-0000-0000-0000035AED00 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20030922-0009-0000-0000-00004A7C2E4A Message-Id: <158379378586.1643521.16002013085934751137.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-03-09_11:2020-03-09, 2020-03-09 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 malwarescore=0 spamscore=0 priorityscore=1501 suspectscore=1 bulkscore=0 impostorscore=0 adultscore=0 mlxscore=0 clxscore=1034 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2003090136 Subject: [SLOF] [PATCH 1/3] virtio-serial: Don't override some words X-BeenThere: slof@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Patches for https://github.com/aik/SLOF" <slof.lists.ozlabs.org> List-Unsubscribe: <https://lists.ozlabs.org/options/slof>, <mailto:slof-request@lists.ozlabs.org?subject=unsubscribe> List-Archive: <http://lists.ozlabs.org/pipermail/slof/> List-Post: <mailto:slof@lists.ozlabs.org> List-Help: <mailto:slof-request@lists.ozlabs.org?subject=help> List-Subscribe: <https://lists.ozlabs.org/listinfo/slof>, <mailto:slof-request@lists.ozlabs.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "SLOF" <slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org> |
Series |
Fix virtio-serial
|
expand
|
diff --git a/board-qemu/slof/virtio-serial.fs b/board-qemu/slof/virtio-serial.fs index 42ab3e2ccc9c..a99293f6ef77 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 ;
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> --- board-qemu/slof/virtio-serial.fs | 3 --- 1 file changed, 3 deletions(-)