From: Tetsuya Mukawa <mukawa@igel.co.jp>
To: qemu-devel@nongnu.org, eblake@redhat.com
Cc: Tetsuya Mukawa <mukawa@igel.co.jp>,
jasowang@redhat.com, n.nikolaev@virtualopensystems.com,
stefanha@redhat.com
Subject: [Qemu-devel] [PATCH v1 1/4] vhost-user: Add ability to know vhost-user backend disconnection
Date: Fri, 29 May 2015 13:42:27 +0900 [thread overview]
Message-ID: <1432874550-10921-2-git-send-email-mukawa@igel.co.jp> (raw)
In-Reply-To: <1432874550-10921-1-git-send-email-mukawa@igel.co.jp>
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>
---
net/vhost-user.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/net/vhost-user.c b/net/vhost-user.c
index 11899c5..1967ff4 100644
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -19,6 +19,7 @@ typedef struct VhostUserState {
NetClientState nc;
CharDriverState *chr;
VHostNetState *vhost_net;
+ int watch;
} VhostUserState;
typedef struct VhostUserChardevProps {
@@ -113,12 +114,23 @@ 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];
+
+ 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;
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);
error_report("chardev \"%s\" went up", s->chr->label);
@@ -126,6 +138,8 @@ static void net_vhost_user_event(void *opaque, int event)
case CHR_EVENT_CLOSED:
net_vhost_link_down(s, true);
vhost_user_stop(s);
+ g_source_remove(s->watch);
+ s->watch = 0;
error_report("chardev \"%s\" went down", s->chr->label);
break;
}
--
2.1.4
next prev parent reply other threads:[~2015-05-29 4:42 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-25 7:28 [Qemu-devel] [RFC PATCH 0/4] Add feature to start QEMU without vhost-user backend Tetsuya Mukawa
2015-05-25 7:28 ` [Qemu-devel] [RFC PATCH 1/4] vhost-user: Add ability to know vhost-user backend disconnection Tetsuya Mukawa
2015-05-25 7:28 ` [Qemu-devel] [RFC PATCH 2/4] vhost-user: Shutdown vhost-user connection when wrong messages are passed Tetsuya Mukawa
2015-05-25 7:28 ` [Qemu-devel] [RFC PATCH 3/4] vhost-user: Enable 'nowait' and 'reconnect' option Tetsuya Mukawa
2015-05-25 7:28 ` [Qemu-devel] [RFC PATCH 4/4] vhost-user: Add new option to specify vhost-user backend supports Tetsuya Mukawa
2015-05-25 22:11 ` Eric Blake
2015-05-26 2:46 ` Tetsuya Mukawa
2015-05-26 4:29 ` Tetsuya Mukawa
2015-05-26 12:52 ` Eric Blake
2015-05-28 1:25 ` Tetsuya Mukawa
2015-05-29 4:42 ` Tetsuya Mukawa
2015-05-29 4:42 ` [Qemu-devel] [PATCH v1 0/4] Add feature to start QEMU without vhost-user backend Tetsuya Mukawa
2015-05-29 4:42 ` Tetsuya Mukawa [this message]
2015-06-15 13:32 ` [Qemu-devel] [PATCH v1 1/4] vhost-user: Add ability to know vhost-user backend disconnection Stefan Hajnoczi
2015-06-16 5:07 ` Tetsuya Mukawa
2015-05-29 4:42 ` [Qemu-devel] [PATCH v1 2/4] vhost-user: Shutdown vhost-user connection when wrong messages are passed Tetsuya Mukawa
2015-06-15 13:40 ` Stefan Hajnoczi
2015-06-16 5:08 ` Tetsuya Mukawa
2015-05-29 4:42 ` [Qemu-devel] [PATCH v1 3/4] vhost-user: Enable 'nowait' and 'reconnect' option Tetsuya Mukawa
2015-06-15 13:41 ` Stefan Hajnoczi
2015-06-15 13:58 ` Stefan Hajnoczi
2015-06-16 5:08 ` Tetsuya Mukawa
2015-05-29 4:42 ` [Qemu-devel] [PATCH v1 4/4] vhost-user: Add new option to specify vhost-user backend features Tetsuya Mukawa
2015-06-15 13:58 ` Stefan Hajnoczi
2015-06-16 5:08 ` Tetsuya Mukawa
2015-06-16 12:27 ` Eric Blake
2015-06-17 9:29 ` Tetsuya Mukawa
2015-06-11 1:56 ` [Qemu-devel] [PATCH v1 0/4] Add feature to start QEMU without vhost-user backend Tetsuya Mukawa
2015-06-15 14:12 ` Stefan Hajnoczi
2015-06-15 14:21 ` Michael S. Tsirkin
2015-06-15 14:08 ` Stefan Hajnoczi
2015-06-16 5:09 ` Tetsuya Mukawa
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=1432874550-10921-2-git-send-email-mukawa@igel.co.jp \
--to=mukawa@igel.co.jp \
--cc=eblake@redhat.com \
--cc=jasowang@redhat.com \
--cc=n.nikolaev@virtualopensystems.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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).