diff options
| author | Michael S. Tsirkin | 2015-07-15 12:47:31 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2015-07-20 13:19:40 +0200 |
| commit | d345ed2da3279b015605823397235b8c5ca5251f (patch) | |
| tree | 32d2e4c5a7f07a978b64175d89d93dce8bb86ee2 /hw/net/vhost_net.c | |
| parent | ich9: fix skipped vmstate_memhp_state subsection (diff) | |
| download | qemu-d345ed2da3279b015605823397235b8c5ca5251f.tar.gz qemu-d345ed2da3279b015605823397235b8c5ca5251f.tar.xz qemu-d345ed2da3279b015605823397235b8c5ca5251f.zip | |
Revert "vhost-user: add multi queue support"
This reverts commit 830d70db692e374b55555f4407f96a1ceefdcc97.
The interface isn't fully backwards-compatible, which is bad.
Let's redo this properly after 2.4.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/net/vhost_net.c')
| -rw-r--r-- | hw/net/vhost_net.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index 9bd360bd17..5c1d11f517 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -160,7 +160,6 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options) net->dev.nvqs = 2; net->dev.vqs = net->vqs; - net->dev.vq_index = net->nc->queue_index; r = vhost_dev_init(&net->dev, options->opaque, options->backend_type); @@ -287,7 +286,7 @@ static void vhost_net_stop_one(struct vhost_net *net, for (file.index = 0; file.index < net->dev.nvqs; ++file.index) { const VhostOps *vhost_ops = net->dev.vhost_ops; int r = vhost_ops->vhost_call(&net->dev, VHOST_RESET_OWNER, - &file); + NULL); assert(r >= 0); } } |