From patchwork Sun Sep 30 08:12:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 976848 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aYPGR5h3"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42NK8j33R8z9s1x for ; Sun, 30 Sep 2018 18:59:01 +1000 (AEST) Received: from localhost ([::1]:54462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6XZ5-0003Su-2G for incoming@patchwork.ozlabs.org; Sun, 30 Sep 2018 04:58:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6Ws7-0002wr-2Y for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6Ws2-0001Aj-NI for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:33 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:33566) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g6Wrx-00010C-Gi for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:27 -0400 Received: by mail-wr1-x42d.google.com with SMTP id f10-v6so10511867wrs.0 for ; Sun, 30 Sep 2018 01:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bsDx04YYQH0slZcfRfjCXorkJ6b5b1fkG3WAjyXPfC4=; b=aYPGR5h3NbH0ZI9QjuRjJqOXKm4rYdtnDOiPqdj7sXvB3melV5QTqk+CESHyR24cX/ cbeS7d5bSLAnx9uOb23pw0XbeDrCHWgvadzT2KIQ9LbZor6jcPNwBDak94EtaRNaANH2 V01A1MGK+lXnbI4tNtq+oxKhe3/1Kq804untqdDZLKCZq6nKjq4xMMHoxCq/lMdiUmzE UyXAlIIWWFCg5Lpirn0fBVM/hg3dlEWafpOMSLTH1uQSMdXkT9xYCexl99l3BDKihRJ0 yEaBsiCNT+k4lNxjOGLnER9v8988e6GOiyuo7VoaPo6OFNCQcHWdSYuMOVvynLZxUXRW t/Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=bsDx04YYQH0slZcfRfjCXorkJ6b5b1fkG3WAjyXPfC4=; b=kW3ygH1yBWtpjedJycrOl9KkT/RFSVZF9pMsfo3ptRyBENwsJL0TlfMAQlb3qEOrlo ZKvdBG+j4mzsci3hgvWExxczITGaGcY2xI53r6++b+WFL01Ih1q9+5IiR8LOrQA9cHG8 q7sMnKdAikSClK80PxHwp7Xy92jyqT/qj5AOsmelX+p38T/wJyTPqJPD7I7j1xCsc4+a JI2q3nLT/uvMT/lcxR/O5R7IXKniTcmwERp45toGWLscmPf+jJUz91llQ/oZK41bFGb/ VeIBBu7Leg5Wtm0Oci54jtR6MuRvUop5T2PpoREcwpftDD9d1eYutAg4qQl+pWHIJcXQ 2ynA== X-Gm-Message-State: ABuFfohqsYT7qfhql1rz+kyR/egwH3sFCAenT++Qw2jVBnn1+fQmwVhJ nQwJDOuDG0V1jCfk3HfjCp39G+lY X-Google-Smtp-Source: ACcGV61MSH/I1cX3LvaXRL+ei12tleVFsZMPcHb/wMtbVYu9z5qSGSdIwpSw5+xRvo5lZbT/+ncehw== X-Received: by 2002:a5d:4a12:: with SMTP id m18-v6mr3719156wrq.278.1538295253997; Sun, 30 Sep 2018 01:14:13 -0700 (PDT) Received: from 640k.lan (94-36-187-248.adsl-ull.clienti.tiscali.it. [94.36.187.248]) by smtp.gmail.com with ESMTPSA id u76-v6sm11369194wmd.10.2018.09.30.01.14.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 01:14:13 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sun, 30 Sep 2018 10:12:50 +0200 Message-Id: <1538295197-23704-53-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> References: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PULL 52/79] char-socket: update all ioc handlers when changing context X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau So far, tcp_chr_update_read_handler() only updated the read handler. Let's also update the hup handler. Factorize the code while at it. (note that s->ioc != NULL when s->connected) Signed-off-by: Marc-André Lureau Message-Id: <20180817135224.22971-4-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini Signed-off-by: Marc-André Lureau --- chardev/char-socket.c | 59 ++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 14f6567..7cd0ae2 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -353,6 +353,15 @@ static GSource *tcp_chr_add_watch(Chardev *chr, GIOCondition cond) return qio_channel_create_watch(s->ioc, cond); } +static void remove_hup_source(SocketChardev *s) +{ + if (s->hup_source != NULL) { + g_source_destroy(s->hup_source); + g_source_unref(s->hup_source); + s->hup_source = NULL; + } +} + static void tcp_chr_free_connection(Chardev *chr) { SocketChardev *s = SOCKET_CHARDEV(chr); @@ -367,11 +376,7 @@ static void tcp_chr_free_connection(Chardev *chr) s->read_msgfds_num = 0; } - if (s->hup_source != NULL) { - g_source_destroy(s->hup_source); - g_source_unref(s->hup_source); - s->hup_source = NULL; - } + remove_hup_source(s); tcp_set_msgfds(chr, NULL, 0); remove_fd_in_watch(chr); @@ -540,6 +545,27 @@ static char *sockaddr_to_str(struct sockaddr_storage *ss, socklen_t ss_len, } } +static void update_ioc_handlers(SocketChardev *s) +{ + Chardev *chr = CHARDEV(s); + + if (!s->connected) { + return; + } + + remove_fd_in_watch(chr); + chr->gsource = io_add_watch_poll(chr, s->ioc, + tcp_chr_read_poll, + tcp_chr_read, chr, + chr->gcontext); + + remove_hup_source(s); + s->hup_source = qio_channel_create_watch(s->ioc, G_IO_HUP); + g_source_set_callback(s->hup_source, (GSourceFunc)tcp_chr_hup, + chr, NULL); + g_source_attach(s->hup_source, chr->gcontext); +} + static void tcp_chr_connect(void *opaque) { Chardev *chr = CHARDEV(opaque); @@ -552,16 +578,7 @@ static void tcp_chr_connect(void *opaque) s->is_listen, s->is_telnet); s->connected = 1; - chr->gsource = io_add_watch_poll(chr, s->ioc, - tcp_chr_read_poll, - tcp_chr_read, - chr, chr->gcontext); - - s->hup_source = qio_channel_create_watch(s->ioc, G_IO_HUP); - g_source_set_callback(s->hup_source, (GSourceFunc)tcp_chr_hup, - chr, NULL); - g_source_attach(s->hup_source, chr->gcontext); - + update_ioc_handlers(s); qemu_chr_be_event(chr, CHR_EVENT_OPENED); } @@ -592,17 +609,7 @@ static void tcp_chr_update_read_handler(Chardev *chr) tcp_chr_telnet_init(CHARDEV(s)); } - if (!s->connected) { - return; - } - - remove_fd_in_watch(chr); - if (s->ioc) { - chr->gsource = io_add_watch_poll(chr, s->ioc, - tcp_chr_read_poll, - tcp_chr_read, chr, - chr->gcontext); - } + update_ioc_handlers(s); } static gboolean tcp_chr_telnet_init_io(QIOChannel *ioc,