From patchwork Tue Mar 13 22:46:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 10281113 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D99B1601A0 for ; Tue, 13 Mar 2018 22:55:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C80BC28592 for ; Tue, 13 Mar 2018 22:55:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BCC952859F; Tue, 13 Mar 2018 22:55:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 66FF528592 for ; Tue, 13 Mar 2018 22:55:05 +0000 (UTC) Received: from localhost ([::1]:43308 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evsoy-0002EH-Le for patchwork-qemu-devel@patchwork.kernel.org; Tue, 13 Mar 2018 18:55:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evshq-0005W4-22 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:47:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evshp-00031G-BR for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:47:42 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:45851) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evshp-000301-4A for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:47:41 -0400 Received: by mail-wr0-x241.google.com with SMTP id h2so2479341wre.12 for ; Tue, 13 Mar 2018 15:47:40 -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=9PpId5oIMzlM/o07QJm2W2GX7Ab99JcLs9bF5+DYFAQ=; b=L6CNG4BD7xvr9qlR1DTR4/YbHk93oqYMstGe1OpeFAXqQevNY5wIYl0YvhTPgZw8/9 r4q+Yk5m5Vxg9u37eNprduG9QE+3ntsW0U/JA8iThzEKHomnAltsXmKjHEXOqSmyilu9 wpWQBol23Z+fLRJMtEF4wi+T2yLGhK7a5Q2itfoduFggUgtpIpm746a50BwBWVJ4NLqH vm52zcZ0nFQMjuOXo0KDOFLmqldl4LaPfYkU+u7najkuYIz98hUETaXB1c/Z8YaX2Q+1 cc7Fvs4B4/tXa3zq/TrgT/T5ZDNbGM7vziAi/oj5gd0gA9zslvmuES4LIEMhtFgvWsbn TvnQ== 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=9PpId5oIMzlM/o07QJm2W2GX7Ab99JcLs9bF5+DYFAQ=; b=uR//AmChtFqR6Z8QafAh5dXt2rXQ7mv7v/ZVXd1PLZtLOLEPPkmclBa7F6woXdG30a x33IJod7avJrc2Jb/wCmRRdpRJWrcGJZhJr90AofisKQOc11n0e+gclCXHXvJc+fpQyR bDuh5pKQggb02Qc4tehQ3qLg+FF8Ai76jRNuRuV8d1Lrz6bzX615Yya9O+2GSEFZDc0e rY1IzAn8wqMobo2nGHDTO42XDcaBCC7JC9dAZ2GJ3cS2dCHGdjSBL7LzcDrw8G/1UaQQ qIGePJBanSqy6KAZNoA/awoJqobG5VgVok5Sk+yKTdLpktyGGYbkBJVfFs+CD0MPhu+l NIpA== X-Gm-Message-State: AElRT7F6YSmHL7hfnkMWjPKIT3xK9/oC7CAHsmQvJK7UoypVS2DvymW8 q/okxnQZsQbR4Nqh/w3QL9sdMWFx X-Google-Smtp-Source: AG47ELtBaBy8mBa1Q0KJ7mBDM/NAINx0QwhQEE3GTD3bVcyRlGiojG5hGR6hJHzI/zU/pTaPl2N7dQ== X-Received: by 10.223.142.164 with SMTP id q33mr1950176wrb.72.1520981259722; Tue, 13 Mar 2018 15:47:39 -0700 (PDT) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id x107sm1557951wrb.97.2018.03.13.15.47.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:47:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:46:25 +0100 Message-Id: <20180313224719.4954-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313224719.4954-1-pbonzini@redhat.com> References: <20180313224719.4954-1-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:400c:c0c::241 Subject: [Qemu-devel] [PULL 15/69] chardev: use chardev's gcontext for async connect 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: Peter Xu Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Peter Xu Generalize the function to create the async QIO task connection. Also, fix the context pointer to use the chardev's gcontext. Reviewed-by: Paolo Bonzini Signed-off-by: Peter Xu Message-Id: <20180306053320.15401-7-peterx@redhat.com> Acked-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrangé Signed-off-by: Paolo Bonzini --- chardev/char-socket.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 82c7d7a323..09aa345869 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -902,11 +902,22 @@ cleanup: object_unref(OBJECT(sioc)); } +static void tcp_chr_connect_async(Chardev *chr) +{ + SocketChardev *s = SOCKET_CHARDEV(chr); + QIOChannelSocket *sioc; + + sioc = qio_channel_socket_new(); + tcp_chr_set_client_ioc_name(chr, sioc); + qio_channel_socket_connect_async(sioc, s->addr, + qemu_chr_socket_connected, + chr, NULL, chr->gcontext); +} + static gboolean socket_reconnect_timeout(gpointer opaque) { Chardev *chr = CHARDEV(opaque); SocketChardev *s = SOCKET_CHARDEV(opaque); - QIOChannelSocket *sioc; g_source_unref(s->reconnect_timer); s->reconnect_timer = NULL; @@ -915,11 +926,7 @@ static gboolean socket_reconnect_timeout(gpointer opaque) return false; } - sioc = qio_channel_socket_new(); - tcp_chr_set_client_ioc_name(chr, sioc); - qio_channel_socket_connect_async(sioc, s->addr, - qemu_chr_socket_connected, - chr, NULL, NULL); + tcp_chr_connect_async(chr); return false; } @@ -999,11 +1006,7 @@ static void qmp_chardev_open_socket(Chardev *chr, } if (s->reconnect_time) { - sioc = qio_channel_socket_new(); - tcp_chr_set_client_ioc_name(chr, sioc); - qio_channel_socket_connect_async(sioc, s->addr, - qemu_chr_socket_connected, - chr, NULL, NULL); + tcp_chr_connect_async(chr); } else { if (s->is_listen) { char *name;