diff options
Diffstat (limited to 'net/vhost-user.c')
| -rw-r--r-- | net/vhost-user.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/net/vhost-user.c b/net/vhost-user.c index e443c4b2b5..ffbd94d944 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -311,15 +311,14 @@ static void net_vhost_user_event(void *opaque, QEMUChrEvent event) } static int net_vhost_user_init(NetClientState *peer, const char *device, - const char *name, const char *chardev, - Chardev *chr, int queues) + const char *name, Chardev *chr, + int queues) { Error *err = NULL; NetClientState *nc, *nc0 = NULL; NetVhostUserState *s = NULL; VhostUserState *user; int i; - NetdevVhostUserOptions *stored; assert(name); assert(queues > 0); @@ -327,6 +326,8 @@ static int net_vhost_user_init(NetClientState *peer, const char *device, user = g_new0(struct VhostUserState, 1); for (i = 0; i < queues; i++) { nc = qemu_new_net_client(&net_vhost_user_info, peer, device, name); + snprintf(nc->info_str, sizeof(nc->info_str), "vhost-user%d to %s", + i, chr->label); nc->queue_index = i; if (!nc0) { nc0 = nc; @@ -354,16 +355,6 @@ static int net_vhost_user_init(NetClientState *peer, const char *device, assert(s->vhost_net); - /* Store startup parameters */ - nc0->stored_config = g_new0(NetdevInfo, 1); - nc0->stored_config->type = NET_BACKEND_VHOST_USER; - stored = &nc0->stored_config->u.vhost_user; - - stored->chardev = g_strdup(chardev); - - stored->has_queues = true; - stored->queues = queues; - return 0; err: @@ -455,6 +446,5 @@ int net_init_vhost_user(const Netdev *netdev, const char *name, return -1; } - return net_vhost_user_init(peer, "vhost_user", name, - vhost_user_opts->chardev, chr, queues); + return net_vhost_user_init(peer, "vhost_user", name, chr, queues); } |