From nobody Tue Feb 10 02:42:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1635870493; cv=none; d=zohomail.com; s=zohoarc; b=LJOtp+ekYpxVJVrRYSiirEk+USX7FnT37lyowObpiQjWn2xLAFNtOwo2ImrF9uurb9IJUcd0t0y95pppmQEXJURFu5pUyFPUR8JTZtqSHK8a1kj4GQshESuw0um8DdWTJMv9TbBamh8y2/VJevYejiMOWWLCsFfIrDJASB60Lxc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635870493; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=g6Ov4Y0MJFmq1qaH7RsUjq1nr4TjTqLuO/wHnfMydGA=; b=PnijwuFI8X/5pDEWPtXuSTeWB1qqd7Gd5U8iE+prLzKiv16frOtzNtErDvxd/y94SC5LQ4tVAa+ZrBbqm/Hvu62M7xAl94rqbg3ihM7bSwvOGi++X1EiV55twYjDy2KdnA7pg0BUXCydiTtl2cGYeCe+XfzbYY+PjE3a9djjYVg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1635870493421754.3251102102375; Tue, 2 Nov 2021 09:28:13 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-421-xGdtMTUaMMmZKWkkjsoaDw-1; Tue, 02 Nov 2021 12:26:58 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0EFC618125E0; Tue, 2 Nov 2021 16:26:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C334C10016F5; Tue, 2 Nov 2021 16:26:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 798621806D04; Tue, 2 Nov 2021 16:26:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1A2GQYjW005433 for ; Tue, 2 Nov 2021 12:26:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6E21B60C17; Tue, 2 Nov 2021 16:26:34 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.194.99]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C75BE60C05; Tue, 2 Nov 2021 16:26:33 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E6E811801ABD; Tue, 2 Nov 2021 17:26:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635870492; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=g6Ov4Y0MJFmq1qaH7RsUjq1nr4TjTqLuO/wHnfMydGA=; b=QY/MrC+Qu8uGXr5X1JuK8VwPQ6RQB2ZAO5i/bO1haqz0iPh1rLJ+xo5HdxvfabHEnVVN/+ BX2sVjroMV7XblWZYfmzB3hDDkXeJA4lJ8eC5Si6Be9A3lwFK6PbwSN6eRe1iDjTroYvWL ZlS4CbRsXqbk7LA8PCeTYg7+wxlvSJE= X-MC-Unique: xGdtMTUaMMmZKWkkjsoaDw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 07/10] ui/console: replace kbd_timer with chr_accept_input callback Date: Tue, 2 Nov 2021 17:26:16 +0100 Message-Id: <20211102162619.2760593-8-kraxel@redhat.com> In-Reply-To: <20211102162619.2760593-1-kraxel@redhat.com> References: <20211102162619.2760593-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Thomas Huth , Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Volker=20R=C3=BCmelin?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , Gerd Hoffmann , Marcel Apfelbaum , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635870494304100001 From: Volker R=C3=BCmelin There's a ChardevClass chr_accept_input() callback function that can replace the write retry timer. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Volker R=C3=BCmelin Message-Id: <20210916192239.18742-2-vr_qemu@t-online.de> Signed-off-by: Gerd Hoffmann --- ui/console.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/ui/console.c b/ui/console.c index d2433c0636d0..dda1e6861d6a 100644 --- a/ui/console.c +++ b/ui/console.c @@ -116,7 +116,6 @@ struct QemuConsole { Chardev *chr; /* fifo for key pressed */ Fifo8 out_fifo; - QEMUTimer *kbd_timer; CoQueue dump_queue; =20 QTAILQ_ENTRY(QemuConsole) next; @@ -1106,30 +1105,21 @@ static int vc_chr_write(Chardev *chr, const uint8_t= *buf, int len) return len; } =20 -static void kbd_send_chars(void *opaque) +static void kbd_send_chars(QemuConsole *s) { - QemuConsole *s =3D opaque; uint32_t len, avail; =20 len =3D qemu_chr_be_can_write(s->chr); avail =3D fifo8_num_used(&s->out_fifo); - if (len > avail) { - len =3D avail; - } - while (len > 0) { + while (len > 0 && avail > 0) { const uint8_t *buf; uint32_t size; =20 - buf =3D fifo8_pop_buf(&s->out_fifo, len, &size); + buf =3D fifo8_pop_buf(&s->out_fifo, MIN(len, avail), &size); qemu_chr_be_write(s->chr, (uint8_t *)buf, size); - len -=3D size; + len =3D qemu_chr_be_can_write(s->chr); avail -=3D size; } - /* characters are pending: we send them a bit later (XXX: - horrible, should change char device API) */ - if (avail > 0) { - timer_mod(s->kbd_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + 1= ); - } } =20 /* called when an ascii key is pressed */ @@ -2141,6 +2131,14 @@ int qemu_console_get_height(QemuConsole *con, int fa= llback) return con ? surface_height(con->surface) : fallback; } =20 +static void vc_chr_accept_input(Chardev *chr) +{ + VCChardev *drv =3D VC_CHARDEV(chr); + QemuConsole *s =3D drv->console; + + kbd_send_chars(s); +} + static void vc_chr_set_echo(Chardev *chr, bool echo) { VCChardev *drv =3D VC_CHARDEV(chr); @@ -2189,7 +2187,6 @@ static void text_console_do_init(Chardev *chr, Displa= yState *ds) int g_height =3D 24 * FONT_HEIGHT; =20 fifo8_create(&s->out_fifo, 16); - s->kbd_timer =3D timer_new_ms(QEMU_CLOCK_REALTIME, kbd_send_chars, s); s->ds =3D ds; =20 s->y_displayed =3D 0; @@ -2439,6 +2436,7 @@ static void char_vc_class_init(ObjectClass *oc, void = *data) cc->parse =3D qemu_chr_parse_vc; cc->open =3D vc_chr_open; cc->chr_write =3D vc_chr_write; + cc->chr_accept_input =3D vc_chr_accept_input; cc->chr_set_echo =3D vc_chr_set_echo; } =20 --=20 2.31.1