mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-27 04:13:53 -06:00
virtio-net: Update virtio-net curr_queue_pairs in vdpa backends
It was returned as error before. Instead of it, simply update the corresponding field so qemu can send it in the migration data. Signed-off-by: Eugenio Pérez <eperezma@redhat.com> Acked-by: Si-Wei Liu <si-wei.liu@oracle.com> Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
parent
275ba561cd
commit
ca8717f931
1 changed files with 7 additions and 12 deletions
|
@ -1412,19 +1412,14 @@ static int virtio_net_handle_mq(VirtIONet *n, uint8_t cmd,
|
||||||
return VIRTIO_NET_ERR;
|
return VIRTIO_NET_ERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Avoid changing the number of queue_pairs for vdpa device in
|
|
||||||
* userspace handler. A future fix is needed to handle the mq
|
|
||||||
* change in userspace handler with vhost-vdpa. Let's disable
|
|
||||||
* the mq handling from userspace for now and only allow get
|
|
||||||
* done through the kernel. Ripples may be seen when falling
|
|
||||||
* back to userspace, but without doing it qemu process would
|
|
||||||
* crash on a recursive entry to virtio_net_set_status().
|
|
||||||
*/
|
|
||||||
if (nc->peer && nc->peer->info->type == NET_CLIENT_DRIVER_VHOST_VDPA) {
|
|
||||||
return VIRTIO_NET_ERR;
|
|
||||||
}
|
|
||||||
|
|
||||||
n->curr_queue_pairs = queue_pairs;
|
n->curr_queue_pairs = queue_pairs;
|
||||||
|
if (nc->peer && nc->peer->info->type == NET_CLIENT_DRIVER_VHOST_VDPA) {
|
||||||
|
/*
|
||||||
|
* Avoid updating the backend for a vdpa device: We're only interested
|
||||||
|
* in updating the device model queues.
|
||||||
|
*/
|
||||||
|
return VIRTIO_NET_OK;
|
||||||
|
}
|
||||||
/* stop the backend before changing the number of queue_pairs to avoid handling a
|
/* stop the backend before changing the number of queue_pairs to avoid handling a
|
||||||
* disabled queue */
|
* disabled queue */
|
||||||
virtio_net_set_status(vdev, vdev->status);
|
virtio_net_set_status(vdev, vdev->status);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue