qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Vivier <lvivier@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paul Durrant" <paul@xen.org>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Greg Kurz" <groug@kaod.org>,
	"Stefano Stabellini" <sstabellini@kernel.org>,
	"David Gibson" <david@gibson.dropbear.id.au>,
	"Eric Blake" <eblake@redhat.com>,
	xen-devel@lists.xenproject.org,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Stefan Weil" <sw@weilnetz.de>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Jason Wang" <jasowang@redhat.com>,
	"Laurent Vivier" <lvivier@redhat.com>,
	"Samuel Thibault" <samuel.thibault@ens-lyon.org>,
	"Anthony Perard" <anthony.perard@citrix.com>
Subject: [PATCH v13 17/17] net: stream: add QAPI events to report connection state
Date: Thu, 20 Oct 2022 18:25:58 +0200	[thread overview]
Message-ID: <20221020162558.123284-18-lvivier@redhat.com> (raw)
In-Reply-To: <20221020162558.123284-1-lvivier@redhat.com>

The netdev reports NETDEV_STREAM_CONNECTED event when the backend
is connected, and NETDEV_STREAM_DISCONNECTED when it is disconnected.

The NETDEV_STREAM_CONNECTED event includes the URI of the destination
address.

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
---
 net/stream.c  |  9 +++++++--
 qapi/net.json | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/net/stream.c b/net/stream.c
index 95d6b910407d..cac01d4d792a 100644
--- a/net/stream.c
+++ b/net/stream.c
@@ -38,6 +38,7 @@
 #include "io/channel.h"
 #include "io/channel-socket.h"
 #include "io/net-listener.h"
+#include "qapi/qapi-events-net.h"
 
 typedef struct NetStreamState {
     NetClientState nc;
@@ -168,6 +169,8 @@ static gboolean net_stream_send(QIOChannel *ioc,
         s->nc.link_down = true;
         qemu_set_info_str(&s->nc, "");
 
+        qapi_event_send_netdev_stream_disconnected(s->nc.name);
+
         return G_SOURCE_REMOVE;
     }
     buf = buf1;
@@ -244,8 +247,8 @@ static void net_stream_listen(QIONetListener *listener,
     uri = socket_uri(addr);
     qemu_set_info_str(&s->nc, uri);
     g_free(uri);
+    qapi_event_send_netdev_stream_connected(s->nc.name, addr);
     qapi_free_SocketAddress(addr);
-
 }
 
 static void net_stream_server_listening(QIOTask *task, gpointer opaque)
@@ -327,7 +330,6 @@ static void net_stream_client_connected(QIOTask *task, gpointer opaque)
         goto error;
     }
     g_assert(ret == 0);
-    qapi_free_SocketAddress(addr);
 
     net_socket_rs_init(&s->rs, net_stream_rs_finalize, false);
 
@@ -338,6 +340,9 @@ static void net_stream_client_connected(QIOTask *task, gpointer opaque)
                                             s, NULL);
     s->nc.link_down = false;
 
+    qapi_event_send_netdev_stream_connected(s->nc.name, addr);
+    qapi_free_SocketAddress(addr);
+
     return;
 error:
     object_unref(OBJECT(s->ioc));
diff --git a/qapi/net.json b/qapi/net.json
index 39388b1b6c41..c37b24717382 100644
--- a/qapi/net.json
+++ b/qapi/net.json
@@ -895,3 +895,52 @@
 ##
 { 'event': 'FAILOVER_NEGOTIATED',
   'data': {'device-id': 'str'} }
+
+##
+# @NETDEV_STREAM_CONNECTED:
+#
+# Emitted when the netdev stream backend is connected
+#
+# @netdev-id: QEMU netdev id that is connected
+# @addr: The destination address
+#
+# Since: 7.2
+#
+# Example:
+#
+# <- { "event": "NETDEV_STREAM_CONNECTED",
+#      "data": { "netdev-id": "netdev0",
+#                "addr": { "port": "47666", "ipv6": true,
+#                          "host": "::1", "type": "inet" } },
+#      "timestamp": { "seconds": 1666269863, "microseconds": 311222 } }
+#
+# or
+#
+# <- { "event": "NETDEV_STREAM_CONNECTED",
+#      "data": { "netdev-id": "netdev0",
+#                "addr": { "path": "/tmp/qemu0", "type": "unix" } },
+#      "timestamp": { "seconds": 1666269706, "microseconds": 413651 } }
+#
+##
+{ 'event': 'NETDEV_STREAM_CONNECTED',
+  'data': { 'netdev-id': 'str',
+            'addr': 'SocketAddress' } }
+
+##
+# @NETDEV_STREAM_DISCONNECTED:
+#
+# Emitted when the netdev stream backend is disconnected
+#
+# @netdev-id: QEMU netdev id that is disconnected
+#
+# Since: 7.2
+#
+# Example:
+#
+# <- { 'event': 'NETDEV_STREAM_DISCONNECTED',
+#      'data': {'netdev-id': 'netdev0'},
+#      'timestamp': {'seconds': 1663330937, 'microseconds': 526695} }
+#
+##
+{ 'event': 'NETDEV_STREAM_DISCONNECTED',
+  'data': { 'netdev-id': 'str' } }
-- 
2.37.3



  parent reply	other threads:[~2022-10-20 17:13 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-20 16:25 [PATCH v13 00/17] qapi: net: add unix socket type support to netdev backend Laurent Vivier
2022-10-20 16:25 ` [PATCH v13 04/17] qapi: net: introduce a way to bypass qemu_opts_parse_noisily() Laurent Vivier
2022-10-20 16:25 ` [PATCH v13 05/17] net: introduce qemu_set_info_str() function Laurent Vivier
2022-10-20 16:25 ` [PATCH v13 07/17] net: socket: Don't ignore EINVAL on netdev socket connection Laurent Vivier
2022-10-20 16:25 ` [PATCH v13 09/17] net: stream: add unix socket Laurent Vivier
2022-10-20 16:25 ` [PATCH v13 10/17] net: dgram: make dgram_dst generic Laurent Vivier
2022-10-20 16:25 ` [PATCH v13 12/17] net: dgram: add unix socket Laurent Vivier
2022-10-20 16:25 ` [PATCH v13 14/17] qemu-sockets: update socket_uri() and socket_parse() to be consistent Laurent Vivier
2022-10-20 16:25 ` [PATCH v13 15/17] net: stream: move to QIO to enable additional parameters Laurent Vivier
2022-10-20 16:25 ` Laurent Vivier [this message]
2022-10-21  5:48   ` [PATCH v13 17/17] net: stream: add QAPI events to report connection state Markus Armbruster
2022-10-21  8:13     ` Laurent Vivier
2022-10-21  9:12       ` Markus Armbruster
2022-10-21  9:36         ` Laurent Vivier
2022-10-21  9:41           ` Markus Armbruster
2022-10-21  9:40         ` Stefano Brivio
2022-10-21 10:55           ` Markus Armbruster
2022-10-24 11:00         ` Markus Armbruster
2022-10-24 12:04           ` Stefano Brivio
2022-10-24 12:29             ` Markus Armbruster
2022-10-21  5:49 ` [PATCH v13 00/17] qapi: net: add unix socket type support to netdev backend Jason Wang
2022-10-21  6:46   ` Markus Armbruster
2022-10-21  6:50     ` Jason Wang
2022-10-21  8:43       ` Laurent Vivier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221020162558.123284-18-lvivier@redhat.com \
    --to=lvivier@redhat.com \
    --cc=anthony.perard@citrix.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=dgilbert@redhat.com \
    --cc=eblake@redhat.com \
    --cc=groug@kaod.org \
    --cc=jasowang@redhat.com \
    --cc=mst@redhat.com \
    --cc=paul@xen.org \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=samuel.thibault@ens-lyon.org \
    --cc=sstabellini@kernel.org \
    --cc=sw@weilnetz.de \
    --cc=thuth@redhat.com \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).