virtio-net: remove virtio queues if the guest doesn't support multiqueue

PATCH Superseded Wen Congyang 2 participants 5 messages Jul 15, 2015

Share & tools

Wen Congyang

author

2015-07-15 06:20 UTC #0 lore raw

PATCH 1/1 virtio-net: remove virtio queues if the guest doesn't support multiqueue

commit da51a335 adds all queues in .realize(). But if the guest doesn't support multiqueue, we forget to remove them. And we cannot handle the ctrl vq corretly. The guest will hang.

Signed-off-by Wen Congyang <[email protected]>

---
 hw/net/virtio-net.c | 69 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 15 deletions(-)

hw/net/virtio-net.c +54 ~~-15~~

index e3c2db3..658806a 100644
@@ -1306,9 +1306,62 @@ static void virtio_net_tx_bh(void *opaque)
     }
 }
 
+static void virtio_net_add_queue(VirtIONet *n, int index)
+{
+    VirtIODevice *vdev = VIRTIO_DEVICE(n);
+
+    n->vqs[index].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx);
+    if (n->net_conf.tx && !strcmp(n->net_conf.tx, "timer")) {
+        n->vqs[index].tx_vq =
+            virtio_add_queue(vdev, 256, virtio_net_handle_tx_timer);
+        n->vqs[index].tx_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
+                                              virtio_net_tx_timer,
+                                              &n->vqs[index]);
+    } else {
+        n->vqs[index].tx_vq =
+            virtio_add_queue(vdev, 256, virtio_net_handle_tx_bh);
+        n->vqs[index].tx_bh = qemu_bh_new(virtio_net_tx_bh, &n->vqs[index]);
+    }
+
+    n->vqs[index].tx_waiting = 0;
+    n->vqs[index].n = n;
+}
+
+static void virtio_net_change_num_queues(VirtIONet *n, int new_max_queues)
+{
+    VirtIODevice *vdev = VIRTIO_DEVICE(n);
+    int old_num_queues = virtio_get_num_queues(vdev);
+    int new_num_queues = new_max_queues * 2 + 1;
+    int i;
+
+    assert(old_num_queues >= 3);
+    assert(old_num_queues % 2 == 1);
+
+    if (old_num_queues == new_num_queues) {
+        return;
+    }
+
+    /* Remove ctrl_vq first */
+    virtio_del_queue(vdev, old_num_queues - 1);
+
+    for (i = new_num_queues - 1; i < old_num_queues - 1; i++) {
+        virtio_del_queue(vdev, i);
+    }
+
+    for (i = old_num_queues - 1; i < new_num_queues - 1; i += 2) {
+        virtio_net_add_queue(n, i / 2);
+    }
+
+    /* add ctrl_vq last */
+    n->ctrl_vq = virtio_add_queue(vdev, 64, virtio_net_handle_ctrl);
+}
+
 static void virtio_net_set_multiqueue(VirtIONet *n, int multiqueue)
 {
+    int max = multiqueue ? n->max_queues : 1;
+
     n->multiqueue = multiqueue;
+    virtio_net_change_num_queues(n, max);
 
     virtio_net_set_queues(n);
 }

@@ -1583,21 +1636,7 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
     }
 
     for (i = 0; i < n->max_queues; i++) {
-        n->vqs[i].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx);
-        if (n->net_conf.tx && !strcmp(n->net_conf.tx, "timer")) {
-            n->vqs[i].tx_vq =
-                virtio_add_queue(vdev, 256, virtio_net_handle_tx_timer);
-            n->vqs[i].tx_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
-                                              virtio_net_tx_timer,
-                                              &n->vqs[i]);
-        } else {
-            n->vqs[i].tx_vq =
-                virtio_add_queue(vdev, 256, virtio_net_handle_tx_bh);
-            n->vqs[i].tx_bh = qemu_bh_new(virtio_net_tx_bh, &n->vqs[i]);
-        }
-
-        n->vqs[i].tx_waiting = 0;
-        n->vqs[i].n = n;
+        virtio_net_add_queue(n, i);
     }
 
     n->ctrl_vq = virtio_add_queue(vdev, 64, virtio_net_handle_ctrl);

Signature · 1 line

2.4.3

Jason Wang

2015-07-15 06:59 UTC #1 lore raw

Quoted 5 lines · Wen Congyang

commit da51a335 adds all queues in .realize(). But if the guest doesn't support multiqueue, we forget to remove them. And we cannot handle the ctrl vq corretly. The guest will hang.
Signed-off-by Wen Congyang <[email protected]>

Thanks for the patch, some questions, see below.

Quoted 39 lines

---
 hw/net/virtio-net.c | 69 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 15 deletions(-)

hw/net/virtio-net.c +27 -0

index e3c2db3..658806a 100644
@@ -1306,9 +1306,62 @@ static void virtio_net_tx_bh(void *opaque)
     }
 }
 
+static void virtio_net_add_queue(VirtIONet *n, int index)
+{
+    VirtIODevice *vdev = VIRTIO_DEVICE(n);
+
+    n->vqs[index].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx);
+    if (n->net_conf.tx && !strcmp(n->net_conf.tx, "timer")) {
+        n->vqs[index].tx_vq =
+            virtio_add_queue(vdev, 256, virtio_net_handle_tx_timer);
+        n->vqs[index].tx_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
+                                              virtio_net_tx_timer,
+                                              &n->vqs[index]);
+    } else {
+        n->vqs[index].tx_vq =
+            virtio_add_queue(vdev, 256, virtio_net_handle_tx_bh);
+        n->vqs[index].tx_bh = qemu_bh_new(virtio_net_tx_bh, &n->vqs[index]);
+    }
+
+    n->vqs[index].tx_waiting = 0;
+    n->vqs[index].n = n;
+}
+
+static void virtio_net_change_num_queues(VirtIONet *n, int new_max_queues)
+{
+    VirtIODevice *vdev = VIRTIO_DEVICE(n);
+    int old_num_queues = virtio_get_num_queues(vdev);
+    int new_num_queues = new_max_queues * 2 + 1;
+    int i;

hw/net/virtio-net.c static void virtio_net_tx_bh(void *opaque) · line 1345

Quoted 10 lines

hw/net/virtio-net.c +10 -0

+
+    assert(old_num_queues >= 3);
+    assert(old_num_queues % 2 == 1);
+
+    if (old_num_queues == new_num_queues) {
+        return;
+    }
+
+    /* Remove ctrl_vq first */
+    virtio_del_queue(vdev, old_num_queues - 1);

Why ctrl vq must be first to be deleted?

hw/net/virtio-net.c static void virtio_net_tx_bh(void *opaque) · line 1348

Quoted 3 lines

hw/net/virtio-net.c +3 -0

+
+    for (i = new_num_queues - 1; i < old_num_queues - 1; i++) {
+        virtio_del_queue(vdev, i);

Do we need to delete bh and timer also here?

Quoted 42 lines

hw/net/virtio-net.c +14 ~~-15~~

+    }
+
+    for (i = old_num_queues - 1; i < new_num_queues - 1; i += 2) {
+        virtio_net_add_queue(n, i / 2);
+    }
+
+    /* add ctrl_vq last */
+    n->ctrl_vq = virtio_add_queue(vdev, 64, virtio_net_handle_ctrl);
+}
+
 static void virtio_net_set_multiqueue(VirtIONet *n, int multiqueue)
 {
+    int max = multiqueue ? n->max_queues : 1;
+
     n->multiqueue = multiqueue;
+    virtio_net_change_num_queues(n, max);
 
     virtio_net_set_queues(n);
 }

@@ -1583,21 +1636,7 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
     }
 
     for (i = 0; i < n->max_queues; i++) {
-        n->vqs[i].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx);
-        if (n->net_conf.tx && !strcmp(n->net_conf.tx, "timer")) {
-            n->vqs[i].tx_vq =
-                virtio_add_queue(vdev, 256, virtio_net_handle_tx_timer);
-            n->vqs[i].tx_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
-                                              virtio_net_tx_timer,
-                                              &n->vqs[i]);
-        } else {
-            n->vqs[i].tx_vq =
-                virtio_add_queue(vdev, 256, virtio_net_handle_tx_bh);
-            n->vqs[i].tx_bh = qemu_bh_new(virtio_net_tx_bh, &n->vqs[i]);
-        }
-
-        n->vqs[i].tx_waiting = 0;
-        n->vqs[i].n = n;
+        virtio_net_add_queue(n, i);
     }
 
     n->ctrl_vq = virtio_add_queue(vdev, 64, virtio_net_handle_ctrl);

Wen Congyang

author

2015-07-15 07:09 UTC #2 lore raw

Quoted 54 lines · Jason Wang

Quoted 5 lines · Wen Congyang

commit da51a335 adds all queues in .realize(). But if the guest doesn't support multiqueue, we forget to remove them. And we cannot handle the ctrl vq corretly. The guest will hang.
Signed-off-by Wen Congyang <[email protected]>

Thanks for the patch, some questions, see below.

Quoted 43 lines

---
 hw/net/virtio-net.c | 69 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 15 deletions(-)

hw/net/virtio-net.c +31 -0

index e3c2db3..658806a 100644
@@ -1306,9 +1306,62 @@ static void virtio_net_tx_bh(void *opaque)
     }
 }
 
+static void virtio_net_add_queue(VirtIONet *n, int index)
+{
+    VirtIODevice *vdev = VIRTIO_DEVICE(n);
+
+    n->vqs[index].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx);
+    if (n->net_conf.tx && !strcmp(n->net_conf.tx, "timer")) {
+        n->vqs[index].tx_vq =
+            virtio_add_queue(vdev, 256, virtio_net_handle_tx_timer);
+        n->vqs[index].tx_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
+                                              virtio_net_tx_timer,
+                                              &n->vqs[index]);
+    } else {
+        n->vqs[index].tx_vq =
+            virtio_add_queue(vdev, 256, virtio_net_handle_tx_bh);
+        n->vqs[index].tx_bh = qemu_bh_new(virtio_net_tx_bh, &n->vqs[index]);
+    }
+
+    n->vqs[index].tx_waiting = 0;
+    n->vqs[index].n = n;
+}
+
+static void virtio_net_change_num_queues(VirtIONet *n, int new_max_queues)
+{
+    VirtIODevice *vdev = VIRTIO_DEVICE(n);
+    int old_num_queues = virtio_get_num_queues(vdev);
+    int new_num_queues = new_max_queues * 2 + 1;
+    int i;
+
+    assert(old_num_queues >= 3);
+    assert(old_num_queues % 2 == 1);
+

Quoted 8 lines

hw/net/virtio-net.c static void virtio_net_tx_bh(void *opaque) · line 1345
Quoted 6 lines
hw/net/virtio-net.c +6 -0
+    if (old_num_queues == new_num_queues) {
+        return;
+    }
+
+    /* Remove ctrl_vq first */
+    virtio_del_queue(vdev, old_num_queues - 1);
Why ctrl vq must be first to be deleted?

It just make the codes clean. We always need to remove and add ctrl vq if old_num_queues != new_num_queues. We only enter one of the two loops.

Quoted 6 lines

hw/net/virtio-net.c static void virtio_net_tx_bh(void *opaque) · line 1348
Quoted 4 lines
hw/net/virtio-net.c +3 -0
+
+    for (i = new_num_queues - 1; i < old_num_queues - 1; i++) {
+        virtio_del_queue(vdev, i);
Do we need to delete bh and timer also here?

I think we should delete it too. Before commit da51a335, we only call virtio_del_queue(), so I forgot to do it.

Thanks
Wen Congyang

Quoted 46 lines

Quoted 33 lines

hw/net/virtio-net.c +13 -9

+    }
+
+    for (i = old_num_queues - 1; i < new_num_queues - 1; i += 2) {
+        virtio_net_add_queue(n, i / 2);
+    }
+
+    /* add ctrl_vq last */
+    n->ctrl_vq = virtio_add_queue(vdev, 64, virtio_net_handle_ctrl);
+}
+
 static void virtio_net_set_multiqueue(VirtIONet *n, int multiqueue)
 {
+    int max = multiqueue ? n->max_queues : 1;
+
     n->multiqueue = multiqueue;
+    virtio_net_change_num_queues(n, max);
 
     virtio_net_set_queues(n);
 }

@@ -1583,21 +1636,7 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
     }
 
     for (i = 0; i < n->max_queues; i++) {
-        n->vqs[i].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx);
-        if (n->net_conf.tx && !strcmp(n->net_conf.tx, "timer")) {
-            n->vqs[i].tx_vq =
-                virtio_add_queue(vdev, 256, virtio_net_handle_tx_timer);
-            n->vqs[i].tx_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
-                                              virtio_net_tx_timer,
-                                              &n->vqs[i]);
-        } else {
-            n->vqs[i].tx_vq =

hw/net/virtio-net.c static void virtio_net_device_realize(DeviceState *dev, Error **errp) · line 1642

Quoted 10 lines

hw/net/virtio-net.c +1 -6

-                virtio_add_queue(vdev, 256, virtio_net_handle_tx_bh);
-            n->vqs[i].tx_bh = qemu_bh_new(virtio_net_tx_bh, &n->vqs[i]);
-        }
-
-        n->vqs[i].tx_waiting = 0;
-        n->vqs[i].n = n;
+        virtio_net_add_queue(n, i);
     }
 
     n->ctrl_vq = virtio_add_queue(vdev, 64, virtio_net_handle_ctrl);

Jason Wang

2015-07-15 07:41 UTC #3 lore raw

Quoted 66 lines · Wen Congyang

Quoted 51 lines · Jason Wang

Quoted 5 lines · Wen Congyang

commit da51a335 adds all queues in .realize(). But if the guest doesn't support multiqueue, we forget to remove them. And we cannot handle the ctrl vq corretly. The guest will hang.
Signed-off-by Wen Congyang <[email protected]>

Thanks for the patch, some questions, see below.

Quoted 42 lines

---
 hw/net/virtio-net.c | 69 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 15 deletions(-)

hw/net/virtio-net.c +30 -0

index e3c2db3..658806a 100644
@@ -1306,9 +1306,62 @@ static void virtio_net_tx_bh(void *opaque)
     }
 }
 
+static void virtio_net_add_queue(VirtIONet *n, int index)
+{
+    VirtIODevice *vdev = VIRTIO_DEVICE(n);
+
+    n->vqs[index].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx);
+    if (n->net_conf.tx && !strcmp(n->net_conf.tx, "timer")) {
+        n->vqs[index].tx_vq =
+            virtio_add_queue(vdev, 256, virtio_net_handle_tx_timer);
+        n->vqs[index].tx_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
+                                              virtio_net_tx_timer,
+                                              &n->vqs[index]);
+    } else {
+        n->vqs[index].tx_vq =
+            virtio_add_queue(vdev, 256, virtio_net_handle_tx_bh);
+        n->vqs[index].tx_bh = qemu_bh_new(virtio_net_tx_bh, &n->vqs[index]);
+    }
+
+    n->vqs[index].tx_waiting = 0;
+    n->vqs[index].n = n;
+}
+
+static void virtio_net_change_num_queues(VirtIONet *n, int new_max_queues)
+{
+    VirtIODevice *vdev = VIRTIO_DEVICE(n);
+    int old_num_queues = virtio_get_num_queues(vdev);
+    int new_num_queues = new_max_queues * 2 + 1;
+    int i;
+
+    assert(old_num_queues >= 3);
+    assert(old_num_queues % 2 == 1);

Quoted 8 lines

hw/net/virtio-net.c static void virtio_net_tx_bh(void *opaque) · line 1345
Quoted 7 lines
hw/net/virtio-net.c +7 -0
+
+    if (old_num_queues == new_num_queues) {
+        return;
+    }
+
+    /* Remove ctrl_vq first */
+    virtio_del_queue(vdev, old_num_queues - 1);
Why ctrl vq must be first to be deleted?

It just make the codes clean. We always need to remove and add ctrl vq if old_num_queues != new_num_queues. We only enter one of the two loops.

Quoted 3 lines

hw/net/virtio-net.c +3 -0

+
+    for (i = new_num_queues - 1; i < old_num_queues - 1; i++) {
+        virtio_del_queue(vdev, i);

Quoted 6 lines

Quoted 1 line
Do we need to delete bh and timer also here?
I think we should delete it too. Before commit da51a335, we only call virtio_del_queue(), so I forgot to do it.
Thanks
Wen Congyang

I believe we need this patch for 2.4. So could you please do this in V2?

Thanks

Quoted 46 lines

Quoted 45 lines

Quoted 33 lines

hw/net/virtio-net.c +13 -9

+    }
+
+    for (i = old_num_queues - 1; i < new_num_queues - 1; i += 2) {
+        virtio_net_add_queue(n, i / 2);
+    }
+
+    /* add ctrl_vq last */
+    n->ctrl_vq = virtio_add_queue(vdev, 64, virtio_net_handle_ctrl);
+}
+
 static void virtio_net_set_multiqueue(VirtIONet *n, int multiqueue)
 {
+    int max = multiqueue ? n->max_queues : 1;
+
     n->multiqueue = multiqueue;
+    virtio_net_change_num_queues(n, max);
 
     virtio_net_set_queues(n);
 }

@@ -1583,21 +1636,7 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
     }
 
     for (i = 0; i < n->max_queues; i++) {
-        n->vqs[i].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx);
-        if (n->net_conf.tx && !strcmp(n->net_conf.tx, "timer")) {
-            n->vqs[i].tx_vq =
-                virtio_add_queue(vdev, 256, virtio_net_handle_tx_timer);
-            n->vqs[i].tx_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
-                                              virtio_net_tx_timer,
-                                              &n->vqs[i]);
-        } else {
-            n->vqs[i].tx_vq =

hw/net/virtio-net.c static void virtio_net_device_realize(DeviceState *dev, Error **errp) · line 1642

Quoted 10 lines

hw/net/virtio-net.c +1 -6

-                virtio_add_queue(vdev, 256, virtio_net_handle_tx_bh);
-            n->vqs[i].tx_bh = qemu_bh_new(virtio_net_tx_bh, &n->vqs[i]);
-        }
-
-        n->vqs[i].tx_waiting = 0;
-        n->vqs[i].n = n;
+        virtio_net_add_queue(n, i);
     }
 
     n->ctrl_vq = virtio_add_queue(vdev, 64, virtio_net_handle_ctrl);

Wen Congyang

author

2015-07-15 08:12 UTC #4 lore raw

Quoted 69 lines · Jason Wang

Quoted 66 lines · Wen Congyang

Quoted 51 lines · Jason Wang

Quoted 5 lines · Wen Congyang

commit da51a335 adds all queues in .realize(). But if the guest doesn't support multiqueue, we forget to remove them. And we cannot handle the ctrl vq corretly. The guest will hang.
Signed-off-by Wen Congyang <[email protected]>

Thanks for the patch, some questions, see below.

Quoted 42 lines

---
 hw/net/virtio-net.c | 69 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 15 deletions(-)

hw/net/virtio-net.c +30 -0

index e3c2db3..658806a 100644
@@ -1306,9 +1306,62 @@ static void virtio_net_tx_bh(void *opaque)
     }
 }
 
+static void virtio_net_add_queue(VirtIONet *n, int index)
+{
+    VirtIODevice *vdev = VIRTIO_DEVICE(n);
+
+    n->vqs[index].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx);
+    if (n->net_conf.tx && !strcmp(n->net_conf.tx, "timer")) {
+        n->vqs[index].tx_vq =
+            virtio_add_queue(vdev, 256, virtio_net_handle_tx_timer);
+        n->vqs[index].tx_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
+                                              virtio_net_tx_timer,
+                                              &n->vqs[index]);
+    } else {
+        n->vqs[index].tx_vq =
+            virtio_add_queue(vdev, 256, virtio_net_handle_tx_bh);
+        n->vqs[index].tx_bh = qemu_bh_new(virtio_net_tx_bh, &n->vqs[index]);
+    }
+
+    n->vqs[index].tx_waiting = 0;
+    n->vqs[index].n = n;
+}
+
+static void virtio_net_change_num_queues(VirtIONet *n, int new_max_queues)
+{
+    VirtIODevice *vdev = VIRTIO_DEVICE(n);
+    int old_num_queues = virtio_get_num_queues(vdev);
+    int new_num_queues = new_max_queues * 2 + 1;
+    int i;
+
+    assert(old_num_queues >= 3);
+    assert(old_num_queues % 2 == 1);

Quoted 8 lines

hw/net/virtio-net.c static void virtio_net_tx_bh(void *opaque) · line 1345
Quoted 7 lines
hw/net/virtio-net.c +7 -0
+
+    if (old_num_queues == new_num_queues) {
+        return;
+    }
+
+    /* Remove ctrl_vq first */
+    virtio_del_queue(vdev, old_num_queues - 1);
Why ctrl vq must be first to be deleted?

It just make the codes clean. We always need to remove and add ctrl vq if old_num_queues != new_num_queues. We only enter one of the two loops.

Quoted 3 lines

hw/net/virtio-net.c +3 -0

+
+    for (i = new_num_queues - 1; i < old_num_queues - 1; i++) {
+        virtio_del_queue(vdev, i);

Quoted 8 lines

Quoted 6 lines
Quoted 1 line
Do we need to delete bh and timer also here?
I think we should delete it too. Before commit da51a335, we only call virtio_del_queue(), so I forgot to do it.
Thanks
Wen Congyang
I believe we need this patch for 2.4. So could you please do this in V2?

OK, I am updating it now. Just wait for a moment.

Thanks
Wen Congyang

Quoted 51 lines

Thanks

Quoted 42 lines

hw/net/virtio-net.c +14 ~~-15~~

+    }
+
+    for (i = old_num_queues - 1; i < new_num_queues - 1; i += 2) {
+        virtio_net_add_queue(n, i / 2);
+    }
+
+    /* add ctrl_vq last */
+    n->ctrl_vq = virtio_add_queue(vdev, 64, virtio_net_handle_ctrl);
+}
+
 static void virtio_net_set_multiqueue(VirtIONet *n, int multiqueue)
 {
+    int max = multiqueue ? n->max_queues : 1;
+
     n->multiqueue = multiqueue;
+    virtio_net_change_num_queues(n, max);
 
     virtio_net_set_queues(n);
 }

@@ -1583,21 +1636,7 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
     }
 
     for (i = 0; i < n->max_queues; i++) {
-        n->vqs[i].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx);
-        if (n->net_conf.tx && !strcmp(n->net_conf.tx, "timer")) {
-            n->vqs[i].tx_vq =
-                virtio_add_queue(vdev, 256, virtio_net_handle_tx_timer);
-            n->vqs[i].tx_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
-                                              virtio_net_tx_timer,
-                                              &n->vqs[i]);
-        } else {
-            n->vqs[i].tx_vq =
-                virtio_add_queue(vdev, 256, virtio_net_handle_tx_bh);
-            n->vqs[i].tx_bh = qemu_bh_new(virtio_net_tx_bh, &n->vqs[i]);
-        }
-
-        n->vqs[i].tx_waiting = 0;
-        n->vqs[i].n = n;
+        virtio_net_add_queue(n, i);
     }

Quoted 4 lines

Quoted 3 lines
hw/net/virtio-net.c static void virtio_net_device_realize(DeviceState *dev, Error **errp) · line 1642
Quoted 1 line
hw/net/virtio-net.c +0 -0
     n->ctrl_vq = virtio_add_queue(vdev, 64, virtio_net_handle_ctrl);
.