Message ID | 1538295197-23704-52-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> 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=<UNKNOWN>) 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="hhSHaZGg"; 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 42NK226Z2dz9s1x for <incoming@patchwork.ozlabs.org>; Sun, 30 Sep 2018 18:53:14 +1000 (AEST) Received: from localhost ([::1]:54431 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1g6XTU-0006sc-EX for incoming@patchwork.ozlabs.org; Sun, 30 Sep 2018 04:53:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Ws7-0002wq-2W 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 <paolo.bonzini@gmail.com>) id 1g6Ws1-0001A0-AE for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:31 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:38657) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Wru-0000zv-AW for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:25 -0400 Received: by mail-wr1-x442.google.com with SMTP id j8-v6so10489552wrw.5 for <qemu-devel@nongnu.org>; Sun, 30 Sep 2018 01:14:14 -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=lU2cRxf5K+Pv2BJrGTRLoxHU06WE1M7LmH/7RT3PKX4=; b=hhSHaZGg3w/3QLjiURy9p7P9IwrTZ/fXaZYjOe3YARDKGlw8DkVqyDTYjh9kYgS/Ka RijHHm9IsUWK65bZk0tlyfGvKJ+uYDnUFgWyZkHJa3i1ra4HUeLVOJIZtfRGU0pccMF4 N57tfROw9eu5pKm/6k62WKowQSloC46VW7LvsQ5/rGCX83lJ1xw+ZCzdsi/vQk9GbymS hMXl3lMPWHZ7+PbDD9Quw0xHFJE+m1lMfFtyb2/EJcXMDkbPYNrZjUV5vHXpwZxiQq9E q/KTpuqflFuMnHyWQI7BUF7t7S6RFnt9YrDVmQDxpSvBQVF2DJU0AQPHoWgb5MjRbv7V Raog== 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=lU2cRxf5K+Pv2BJrGTRLoxHU06WE1M7LmH/7RT3PKX4=; b=SmovFct3auj+TS0Aq9vnk8Np6Itg528R6kE5O0+v5Yh0YRtH1YnIv2ELF3hHyE8PBJ YL9YM4Rddnxx9gk3RN5ME/C3R1qlYe+2lSd/rN1Nn0VN39yBdzSylw2jm2XBVMRRUnNn GOyWy/+VyheCLCMT/Tt+ljT8X4cG6LUbQC9DYcazPySHWp2sizsccnDKBXZ/MKkr9Yig jWgz6EheUkpmCvBqZvzk9/PJaLrE2Rx54iXeWFySES740d7YBwikwd8GN5aVIP6rFqsu fG4emdrVssFeCrZDGnvnH08eDZHQfcuSwxRbwuDZEtn3+UetCCj9oZTdN39uK9KzrB6q TLMQ== X-Gm-Message-State: ABuFfogJwebvVZyyGrg64dwIk8IhowE8qDDMqzcb8BtAcbqRPeoYMQxG xUY5fVR6IVwUJIP/+K9GXAUAZHsF X-Google-Smtp-Source: ACcGV61HR3leD07Wxux9kyJsIyLwDaWC07xOCc5MnRba65FTadivxibHHNGlRo1ttdu1sFY18rr7QA== X-Received: by 2002:adf:db8e:: with SMTP id u14-v6mr3884942wri.217.1538295253076; 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.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 01:14:12 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Sun, 30 Sep 2018 10:12:49 +0200 Message-Id: <1538295197-23704-52-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PULL 51/79] Revert "chardev: tcp: postpone async connection setup" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/79] virtio: Return true from virtio_queue_empty if broken
|
expand
|
diff --git a/chardev/char-socket.c b/chardev/char-socket.c index e28d2cc..14f6567 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1005,8 +1005,9 @@ static void qmp_chardev_open_socket(Chardev *chr, s->reconnect_time = reconnect; } - /* If reconnect_time is set, will do that in chr_machine_done. */ - if (!s->reconnect_time) { + if (s->reconnect_time) { + tcp_chr_connect_async(chr); + } else { if (s->is_listen) { char *name; s->listener = qio_net_listener_new(); @@ -1155,17 +1156,6 @@ char_socket_get_connected(Object *obj, Error **errp) return s->connected; } -static int tcp_chr_machine_done_hook(Chardev *chr) -{ - SocketChardev *s = SOCKET_CHARDEV(chr); - - if (s->reconnect_time) { - tcp_chr_connect_async(chr); - } - - return 0; -} - static void char_socket_class_init(ObjectClass *oc, void *data) { ChardevClass *cc = CHARDEV_CLASS(oc); @@ -1181,7 +1171,6 @@ static void char_socket_class_init(ObjectClass *oc, void *data) cc->chr_add_client = tcp_chr_add_client; cc->chr_add_watch = tcp_chr_add_watch; cc->chr_update_read_handler = tcp_chr_update_read_handler; - cc->chr_machine_done = tcp_chr_machine_done_hook; object_class_property_add(oc, "addr", "SocketAddress", char_socket_get_addr, NULL,