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

This allows a system manager like libvirt to detect when the server
fails.

For instance with passt:

{ 'execute': 'qmp_capabilities' }
{ "return": { } }
{ "timestamp": { "seconds": 1666341395, "microseconds": 505347 },
    "event": "NETDEV_STREAM_CONNECTED",
    "data": { "netdev-id": "netdev0",
        "addr": { "path": "/tmp/passt_1.socket", "type": "unix" } } }

[killing passt here]

{ "timestamp": { "seconds": 1666341430, "microseconds": 968694 },
    "event": "NETDEV_STREAM_DISCONNECTED",
    "data": { "netdev-id": "netdev0" } }

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

diff --git a/net/stream.c b/net/stream.c
index 54c67e14d240..53b7040cc417 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,6 +247,7 @@ 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);
 }
 
@@ -335,6 +339,7 @@ static void net_stream_client_connected(QIOTask *task, gpointer opaque)
     s->ioc_read_tag = qio_channel_add_watch(s->ioc, G_IO_IN, net_stream_send,
                                             s, NULL);
     s->nc.link_down = false;
+    qapi_event_send_netdev_stream_connected(s->nc.name, addr);
     qapi_free_SocketAddress(addr);
 
     return;
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-21  9:43 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-21  9:09 [PATCH v14 00/17] qapi: net: add unix socket type support to netdev backend Laurent Vivier
2022-10-21  9:09 ` [PATCH v14 01/17] net: introduce convert_host_port() Laurent Vivier
2022-10-21  9:09 ` [PATCH v14 02/17] net: remove the @errp argument of net_client_inits() Laurent Vivier
2022-10-21  9:09 ` [PATCH v14 03/17] net: simplify net_client_parse() error management Laurent Vivier
2022-10-21  9:09 ` [PATCH v14 04/17] qapi: net: introduce a way to bypass qemu_opts_parse_noisily() Laurent Vivier
2022-10-21  9:09 ` [PATCH v14 05/17] net: introduce qemu_set_info_str() function Laurent Vivier
2022-10-21  9:09 ` [PATCH v14 06/17] qapi: net: add stream and dgram netdevs Laurent Vivier
2022-10-21 11:43   ` Alex Bennée
2022-10-21  9:09 ` [PATCH v14 07/17] net: socket: Don't ignore EINVAL on netdev socket connection Laurent Vivier
2022-10-21  9:09 ` [PATCH v14 08/17] net: stream: " Laurent Vivier
2022-10-21  9:09 ` [PATCH v14 09/17] net: stream: add unix socket Laurent Vivier
2022-10-21  9:09 ` [PATCH v14 10/17] net: dgram: make dgram_dst generic Laurent Vivier
2022-10-21  9:09 ` [PATCH v14 11/17] net: dgram: move mcast specific code from net_socket_fd_init_dgram() Laurent Vivier
2022-10-21  9:09 ` [PATCH v14 12/17] net: dgram: add unix socket Laurent Vivier
2022-10-21 11:14   ` Philippe Mathieu-Daudé
2022-10-21  9:09 ` [PATCH v14 13/17] qemu-sockets: move and rename SocketAddress_to_str() Laurent Vivier
2022-10-21 10:18   ` Philippe Mathieu-Daudé
2022-10-21 10:30   ` Marc-André Lureau
2022-10-21  9:09 ` [PATCH v14 14/17] qemu-sockets: update socket_uri() and socket_parse() to be consistent Laurent Vivier
2022-10-21  9:09 ` [PATCH v14 15/17] net: stream: move to QIO to enable additional parameters Laurent Vivier
2022-10-21 10:05   ` Philippe Mathieu-Daudé
2022-10-21 10:35     ` Markus Armbruster
2022-10-21 10:43       ` Laurent Vivier
2022-10-21 11:31         ` Markus Armbruster
2022-10-21 13:20           ` Philippe Mathieu-Daudé
2022-10-21  9:09 ` [PATCH v14 16/17] tests/qtest: netdev: test stream and dgram backends Laurent Vivier
2022-10-28  5:04   ` Jason Wang
2022-11-03  9:33     ` Laurent Vivier
2022-11-03 11:07       ` Philippe Mathieu-Daudé
2022-11-03 11:21         ` Laurent Vivier
2022-11-04  6:54       ` Jason Wang
2022-10-21  9:09 ` Laurent Vivier [this message]
2022-10-24 11:00   ` [PATCH v14 17/17] net: stream: add QAPI events to report connection state Markus Armbruster

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=20221021090922.170074-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).