|
@@ -549,7 +549,14 @@ static RxFilterInfo *virtio_net_query_rxfilter(NetClientState *nc)
|
|
|
static void virtio_net_queue_reset(VirtIODevice *vdev, uint32_t queue_index)
|
|
|
{
|
|
|
VirtIONet *n = VIRTIO_NET(vdev);
|
|
|
- NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(queue_index));
|
|
|
+ NetClientState *nc;
|
|
|
+
|
|
|
+ /* validate queue_index and skip for cvq */
|
|
|
+ if (queue_index >= n->max_queue_pairs * 2) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ nc = qemu_get_subqueue(n->nic, vq2q(queue_index));
|
|
|
|
|
|
if (!nc->peer) {
|
|
|
return;
|
|
@@ -566,9 +573,16 @@ static void virtio_net_queue_reset(VirtIODevice *vdev, uint32_t queue_index)
|
|
|
static void virtio_net_queue_enable(VirtIODevice *vdev, uint32_t queue_index)
|
|
|
{
|
|
|
VirtIONet *n = VIRTIO_NET(vdev);
|
|
|
- NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(queue_index));
|
|
|
+ NetClientState *nc;
|
|
|
int r;
|
|
|
|
|
|
+ /* validate queue_index and skip for cvq */
|
|
|
+ if (queue_index >= n->max_queue_pairs * 2) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ nc = qemu_get_subqueue(n->nic, vq2q(queue_index));
|
|
|
+
|
|
|
if (!nc->peer || !vdev->vhost_started) {
|
|
|
return;
|
|
|
}
|