[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 35/41] vhost-user: wait until backend init is complet
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 35/41] vhost-user: wait until backend init is completed |
Date: |
Fri, 29 Jul 2016 06:17:06 +0300 |
From: Marc-André Lureau <address@hidden>
The chardev waits for an initial connection before starting qemu, and
vhost-user should wait for the backend negotiation to be completed
before starting qemu too.
vhost-user is started in the net_vhost_user_event callback, which is
synchronously called after the socket is connected. Use a
VhostUserState.started flag to indicate vhost-user init completed
successfully and qemu can be started.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
net/vhost-user.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/net/vhost-user.c b/net/vhost-user.c
index 39987a3..b0595f8 100644
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -24,6 +24,7 @@ typedef struct VhostUserState {
VHostNetState *vhost_net;
guint watch;
uint64_t acked_features;
+ bool started;
} VhostUserState;
typedef struct VhostUserChardevProps {
@@ -220,6 +221,7 @@ static void net_vhost_user_event(void *opaque, int event)
return;
}
qmp_set_link(name, true, &err);
+ s->started = true;
break;
case CHR_EVENT_CLOSED:
qmp_set_link(name, false, &err);
@@ -238,7 +240,7 @@ static int net_vhost_user_init(NetClientState *peer, const
char *device,
const char *name, CharDriverState *chr,
int queues)
{
- NetClientState *nc;
+ NetClientState *nc, *nc0 = NULL;
VhostUserState *s;
int i;
@@ -247,6 +249,9 @@ static int net_vhost_user_init(NetClientState *peer, const
char *device,
for (i = 0; i < queues; i++) {
nc = qemu_new_net_client(&net_vhost_user_info, peer, device, name);
+ if (!nc0) {
+ nc0 = nc;
+ }
snprintf(nc->info_str, sizeof(nc->info_str), "vhost-user%d to %s",
i, chr->label);
@@ -257,7 +262,16 @@ static int net_vhost_user_init(NetClientState *peer, const
char *device,
s->chr = chr;
}
- qemu_chr_add_handlers(chr, NULL, NULL, net_vhost_user_event, nc[0].name);
+ s = DO_UPCAST(VhostUserState, nc, nc0);
+ do {
+ Error *err = NULL;
+ if (qemu_chr_wait_connected(chr, &err) < 0) {
+ error_report_err(err);
+ return -1;
+ }
+ qemu_chr_add_handlers(chr, NULL, NULL,
+ net_vhost_user_event, nc0->name);
+ } while (!s->started);
assert(s->vhost_net);
--
MST
- [Qemu-devel] [PULL 24/41] qemu-char: fix qemu_chr_fe_set_msgfds() crash when disconnected, (continued)
- [Qemu-devel] [PULL 24/41] qemu-char: fix qemu_chr_fe_set_msgfds() crash when disconnected, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 25/41] vhost-user: call set_msgfds unconditionally, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 26/41] vhost-user: check qemu_chr_fe_set_msgfds() return value, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 27/41] vhost-user: check vhost_user_{read, write}() return value, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 28/41] vhost-user: keep vhost_net after a disconnection, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 29/41] vhost-user: add get_vhost_net() assertions, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 30/41] Revert "vhost-net: do not crash if backend is not present", Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 31/41] vhost-net: vhost_migration_done is vhost-user specific, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 32/41] vhost: add assert() to check runtime behaviour, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 33/41] char: add chr_wait_connected callback, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 35/41] vhost-user: wait until backend init is completed,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 34/41] char: add and use tcp_chr_wait_connected, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 36/41] tests: plug some leaks in virtio-net-test, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 37/41] tests: fix vhost-user-test leak, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 38/41] vhost-user: add error report in vhost_user_write(), Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 39/41] vhost: add vhost_net_set_backend(), Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 41/41] mptsas: Fix a migration compatible issue, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 40/41] vhost: do not update last avail idx on get_vring_base() failure, Michael S. Tsirkin, 2016/07/28
- Re: [Qemu-devel] [PULL 00/41] pc, pci, virtio: cleanups, fixes, Peter Maydell, 2016/07/29