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

vhost-user: wait until backend init is completed

Browse Source 
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 <marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Marc-André Lureau 2016-07-27 01:15:19 +04:00 committed by Michael S. Tsirkin
parent d7a04fd7d5
commit c89804d674
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/vhost-user.c
View File

@ -24,6 +24,7 @@ typedef struct VhostUserState {
VHostNetState *vhost_net; VHostNetState *vhost_net;
guint watch; guint watch;
uint64_t acked_features; uint64_t acked_features;
bool started;
} VhostUserState; } VhostUserState;
typedef struct VhostUserChardevProps { typedef struct VhostUserChardevProps {
@ -220,6 +221,7 @@ static void net_vhost_user_event(void *opaque, int event)
return; return;
} }
qmp_set_link(name, true, &err); qmp_set_link(name, true, &err);
s->started = true;
break; break;
case CHR_EVENT_CLOSED: case CHR_EVENT_CLOSED:
qmp_set_link(name, false, &err); 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, const char *name, CharDriverState *chr,
int queues) int queues)
{ {
NetClientState *nc; NetClientState *nc, *nc0 = NULL;
VhostUserState *s; VhostUserState *s;
int i; int i;
@ -247,6 +249,9 @@ static int net_vhost_user_init(NetClientState *peer, const char *device,
for (i = 0; i < queues; i++) { for (i = 0; i < queues; i++) {
nc = qemu_new_net_client(&net_vhost_user_info, peer, device, name); 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", snprintf(nc->info_str, sizeof(nc->info_str), "vhost-user%d to %s",
i, chr->label); i, chr->label);
@ -257,7 +262,16 @@ static int net_vhost_user_init(NetClientState *peer, const char *device,
s->chr = chr; 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); assert(s->vhost_net);