diff options
author | Jason Wang <jasowang@redhat.com> | 2021-04-02 11:05:20 +0800 |
---|---|---|
committer | Jason Wang <jasowang@redhat.com> | 2021-04-08 17:33:59 +0800 |
commit | f9bb0c1f9862dc959ba84977620fc8267623463e (patch) | |
tree | e709382573ed7ee7851d8e53cd0e318206b34692 /net/vhost-user.c | |
parent | 22317309df52d165c02a20bddfdd710c8deed583 (diff) |
Revert "qapi: net: Add query-netdev command"
Several issues has been reported for query-netdev series. Consider
it's late in the rc, this reverts commit
d32ad10a14d46dfe9304e3ed5858a11dcd5c71a0.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'net/vhost-user.c')
-rw-r--r-- | net/vhost-user.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/net/vhost-user.c b/net/vhost-user.c index 5b7056be25..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); @@ -356,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: @@ -457,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); } |