mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vhost-user: add ability to know vhost-user backend disconnection

Browse Source 
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 <mukawa@igel.co.jp>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Victor Kaplansky <victork@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Tetsuya Mukawa 2016-06-06 18:44:59 +02:00 committed by Michael S. Tsirkin
parent 4a94b3aa6d
commit a6553598be
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/vhost-user.c
View File

@ -22,6 +22,7 @@ typedef struct VhostUserState {
NetClientState nc; NetClientState nc;
CharDriverState *chr; CharDriverState *chr;
VHostNetState *vhost_net; VHostNetState *vhost_net;
int watch;
} VhostUserState; } VhostUserState;
typedef struct VhostUserChardevProps { typedef struct VhostUserChardevProps {
@ -167,6 +168,20 @@ static NetClientInfo net_vhost_user_info = {
.has_ufo = vhost_user_has_ufo, .has_ufo = vhost_user_has_ufo,
}; };
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) static void net_vhost_user_event(void *opaque, int event)
{ {
const char *name = opaque; const char *name = opaque;
@ -184,6 +199,8 @@ static void net_vhost_user_event(void *opaque, int event)
trace_vhost_user_event(s->chr->label, event); trace_vhost_user_event(s->chr->label, event);
switch (event) { switch (event) {
case CHR_EVENT_OPENED: case CHR_EVENT_OPENED:
s->watch = qemu_chr_fe_add_watch(s->chr, G_IO_HUP,
net_vhost_user_watch, s);
if (vhost_user_start(queues, ncs) < 0) { if (vhost_user_start(queues, ncs) < 0) {
exit(1); exit(1);
} }
@ -192,6 +209,8 @@ static void net_vhost_user_event(void *opaque, int event)
case CHR_EVENT_CLOSED: case CHR_EVENT_CLOSED:
qmp_set_link(name, false, &err); qmp_set_link(name, false, &err);
vhost_user_stop(queues, ncs); vhost_user_stop(queues, ncs);
g_source_remove(s->watch);
s->watch = 0;
break; break;
} }