[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 01/14] vhost-user: Add ability to know vhost-use
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH RFC 01/14] vhost-user: Add ability to know vhost-user backend disconnection |
Date: |
Wed, 9 Sep 2015 01:09:53 +0200 |
From: Tetsuya Mukawa <address@hidden>
Current QEMU cannot detect vhost-user backend disconnection. The
patch adds ability to know it.
To know disconnection, add watcher to detect G_IO_HUP event. When
G_IO_HUP event is detected, the disconnected socket will be read
to cause a CHR_EVENT_CLOSED.
Signed-off-by: Tetsuya Mukawa <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
---
net/vhost-user.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/net/vhost-user.c b/net/vhost-user.c
index 5657992..266b54d 100644
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -20,6 +20,7 @@ typedef struct VhostUserState {
NetClientState nc;
CharDriverState *chr;
VHostNetState *vhost_net;
+ int watch;
} VhostUserState;
typedef struct VhostUserChardevProps {
@@ -120,6 +121,20 @@ static void net_vhost_link_down(VhostUserState *s, bool
link_down)
}
}
+static gboolean net_vhost_user_watch(GIOChannel *chan, GIOCondition cond,
+ void *opaque)
+{
+ VhostUserState *s = opaque;
+ uint8_t buf[1];
+
+ /* We don't actually want to read anything, but CHR_EVENT_CLOSED will be
+ * raised as a side-effect of the read.
+ */
+ qemu_chr_fe_read_all(s->chr, buf, sizeof(buf));
+
+ return FALSE;
+}
+
static void net_vhost_user_event(void *opaque, int event)
{
VhostUserState *s = opaque;
@@ -128,12 +143,15 @@ static void net_vhost_user_event(void *opaque, int event)
switch (event) {
case CHR_EVENT_OPENED:
+ s->watch = qemu_chr_fe_add_watch(s->chr, G_IO_HUP,
net_vhost_user_watch, s);
vhost_user_start(s);
net_vhost_link_down(s, false);
break;
case CHR_EVENT_CLOSED:
net_vhost_link_down(s, true);
vhost_user_stop(s);
+ g_source_remove(s->watch);
+ s->watch = 0;
break;
}
}
--
2.4.3
- [Qemu-devel] [PATCH RFC 00/14] vhost-user: shutdown and reconnection, marcandre . lureau, 2015/09/08
- [Qemu-devel] [PATCH RFC 02/14] vhost-user: remove useless is_server field, marcandre . lureau, 2015/09/08
- [Qemu-devel] [PATCH RFC 01/14] vhost-user: Add ability to know vhost-user backend disconnection,
marcandre . lureau <=
- [Qemu-devel] [PATCH RFC 03/14] qemu-char: avoid potential double-free, marcandre . lureau, 2015/09/08
- [Qemu-devel] [PATCH RFC 04/14] qemu-char: remove all msgfds on disconnect, marcandre . lureau, 2015/09/08
- [Qemu-devel] [PATCH RFC 05/14] qemu-char: make tcp_chr_disconnect() reentrant-safe, marcandre . lureau, 2015/09/08
- [Qemu-devel] [PATCH RFC 07/14] virtio-net: enable tx notification if up and vhost started, marcandre . lureau, 2015/09/08
- [Qemu-devel] [PATCH RFC 06/14] vhost-net: keep VIRTIO_NET_F_STATUS for vhost-user, marcandre . lureau, 2015/09/08
- [Qemu-devel] [PATCH RFC 08/14] vhost: add vhost_dev stop callback, marcandre . lureau, 2015/09/08
- [Qemu-devel] [PATCH RFC 09/14] vhost-user: add vhost_user to hold the chr, marcandre . lureau, 2015/09/08
- [Qemu-devel] [PATCH RFC 10/14] qemu-char: add qemu_chr_free(), marcandre . lureau, 2015/09/08
- [Qemu-devel] [PATCH RFC 12/14] vhost-user: add shutdown support, marcandre . lureau, 2015/09/08
- [Qemu-devel] [PATCH RFC 11/14] vhost-user: add slave-fd support, marcandre . lureau, 2015/09/08