[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 31/57] virtio-net: adding all queues in .realize()
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 31/57] virtio-net: adding all queues in .realize() |
Date: |
Sun, 31 May 2015 20:36:18 +0200 |
From: Jason Wang <address@hidden>
Instead of adding queues for multiqueue during feature set. This patch
did this in .realize(), this will help the following patches that
count the number of virtqueues used in .device_plugged() callback.
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/net/virtio-net.c | 59 +++++++++++++++--------------------------------------
1 file changed, 17 insertions(+), 42 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 3af6faf..3edb1c4 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1301,39 +1301,8 @@ static void virtio_net_tx_bh(void *opaque)
static void virtio_net_set_multiqueue(VirtIONet *n, int multiqueue)
{
- VirtIODevice *vdev = VIRTIO_DEVICE(n);
- int i, max = multiqueue ? n->max_queues : 1;
-
n->multiqueue = multiqueue;
- for (i = 2; i < n->max_queues * 2 + 1; i++) {
- virtio_del_queue(vdev, i);
- }
-
- for (i = 1; i < max; i++) {
- n->vqs[i].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx);
- if (n->vqs[i].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;
- }
-
- /* Note: Minux Guests (version 3.2.1) use ctrl vq but don't ack
- * VIRTIO_NET_F_CTRL_VQ. Create ctrl vq unconditionally to avoid
- * breaking them.
- */
- n->ctrl_vq = virtio_add_queue(vdev, 64, virtio_net_handle_ctrl);
-
virtio_net_set_queues(n);
}
@@ -1594,9 +1563,7 @@ static void virtio_net_device_realize(DeviceState *dev,
Error **errp)
return;
}
n->vqs = g_malloc0(sizeof(VirtIONetQueue) * n->max_queues);
- n->vqs[0].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx);
n->curr_queues = 1;
- n->vqs[0].n = n;
n->tx_timeout = n->net_conf.txtimer;
if (n->net_conf.tx && strcmp(n->net_conf.tx, "timer")
@@ -1607,16 +1574,24 @@ static void virtio_net_device_realize(DeviceState *dev,
Error **errp)
error_report("Defaulting to \"bh\"");
}
- if (n->net_conf.tx && !strcmp(n->net_conf.tx, "timer")) {
- n->vqs[0].tx_vq = virtio_add_queue(vdev, 256,
- virtio_net_handle_tx_timer);
- n->vqs[0].tx_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
virtio_net_tx_timer,
- &n->vqs[0]);
- } else {
- n->vqs[0].tx_vq = virtio_add_queue(vdev, 256,
- virtio_net_handle_tx_bh);
- n->vqs[0].tx_bh = qemu_bh_new(virtio_net_tx_bh, &n->vqs[0]);
+ 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;
}
+
n->ctrl_vq = virtio_add_queue(vdev, 64, virtio_net_handle_ctrl);
qemu_macaddr_default_if_unset(&n->nic_conf.macaddr);
memcpy(&n->mac[0], &n->nic_conf.macaddr, sizeof(n->mac));
--
MST
- [Qemu-devel] [PULL 21/57] pc: Don't use QEMUMachine anymore, (continued)
- [Qemu-devel] [PULL 21/57] pc: Don't use QEMUMachine anymore, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 22/57] pc: Remove qemu_register_pc_machine() function, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 23/57] machine: Remove unused fields from QEMUMachine, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 24/57] piix: Add kvmclock_enabled, pci_enabled globals, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 25/57] piix: Eliminate pc_init_pci(), Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 27/57] pc: acpi: fix pvpanic for buggy guests, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 26/57] pc: Generate init functions with a macro, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 28/57] virtio: move host_features, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 29/57] virtio-ccw: Don't advertise VIRTIO_F_BAD_FEATURE, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 30/57] virtio: move VIRTIO_F_NOTIFY_ON_EMPTY into core, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 31/57] virtio-net: adding all queues in .realize(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 32/57] virtio: device_plugged() can fail, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 33/57] virtio: introduce virtio_get_num_queues(), Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 34/57] virtio-ccw: introduce ccw specific queue limit, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 35/57] virtio-ccw: validate the number of queues against bus limitation, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 36/57] virtio-s390: introduce virito s390 queue limit, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 37/57] virtio-s390: introduce virtio_s390_device_plugged(), Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 38/57] virtio: rename VIRTIO_PCI_QUEUE_MAX to VIRTIO_QUEUE_MAX, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 39/57] virtio: increase the queue limit to 1024, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 40/57] i386/pc: pc_basic_device_init(): delegate FDC creation request, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 41/57] i386/pc: '-drive if=floppy' should imply a board-default FDC, Michael S. Tsirkin, 2015/05/31