From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:33709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grRFB-00062X-E4 for qemu-devel@nongnu.org; Wed, 06 Feb 2019 12:44:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grRFA-0004dP-9s for qemu-devel@nongnu.org; Wed, 06 Feb 2019 12:44:17 -0500 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 6 Feb 2019 18:43:25 +0100 Message-Id: <20190206174328.9736-4-marcandre.lureau@redhat.com> In-Reply-To: <20190206174328.9736-1-marcandre.lureau@redhat.com> References: <20190206174328.9736-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 3/6] terminal3270: do not use backend timer sources List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Xu , Cornelia Huck , Halil Pasic , Christian Borntraeger , "open list:S390" terminal3270 uses the front-end side of the chardev. It shouldn't create sources from backend side context (with backend functions). send_timing_mark_cb calls qemu_chr_fe_write_all() which should be thread safe. This partially reverts changes from commit 2c716ba1506769c9be2caa02f0f6d6e7c00f4304. CC: Peter Xu Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/char/terminal3270.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c index e9c45e55b1..35b079d5c4 100644 --- a/hw/char/terminal3270.c +++ b/hw/char/terminal3270.c @@ -31,7 +31,7 @@ typedef struct Terminal3270 { uint8_t outv[OUTPUT_BUFFER_SIZE]; int in_len; bool handshake_done; - GSource *timer_src; + guint timer_tag; } Terminal3270; =20 #define TYPE_TERMINAL_3270 "x-terminal3270" @@ -47,10 +47,9 @@ static int terminal_can_read(void *opaque) =20 static void terminal_timer_cancel(Terminal3270 *t) { - if (t->timer_src) { - g_source_destroy(t->timer_src); - g_source_unref(t->timer_src); - t->timer_src =3D NULL; + if (t->timer_tag) { + g_source_remove(t->timer_tag); + t->timer_tag =3D 0; } } =20 @@ -100,8 +99,7 @@ static void terminal_read(void *opaque, const uint8_t = *buf, int size) assert(size <=3D (INPUT_BUFFER_SIZE - t->in_len)); =20 terminal_timer_cancel(t); - t->timer_src =3D qemu_chr_timeout_add_ms(t->chr.chr, 600 * 1000, - send_timing_mark_cb, t); + t->timer_tag =3D g_timeout_add_seconds(600, send_timing_mark_cb, t); memcpy(&t->inv[t->in_len], buf, size); t->in_len +=3D size; if (t->in_len < 2) { @@ -160,8 +158,7 @@ static void chr_event(void *opaque, int event) * char-socket.c. Once qemu receives the terminal-type of the * client, mark handshake done and trigger everything rolling ag= ain. */ - t->timer_src =3D qemu_chr_timeout_add_ms(t->chr.chr, 600 * 1000, - send_timing_mark_cb, t); + t->timer_tag =3D g_timeout_add_seconds(600, send_timing_mark_cb,= t); break; case CHR_EVENT_CLOSED: sch->curr_status.scsw.dstat =3D SCSW_DSTAT_DEVICE_END; --=20 2.20.1.519.g8feddda32c