diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-29 12:45:54 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-29 12:45:54 +0100 |
| commit | 76fbbec9315f8712d921411fbb4dad1fbcf1b151 (patch) | |
| tree | 30b76243b8a5c98b64840c40e65597f94c08bfa0 /hw/net/virtio-net.c | |
| parent | 2d80e0ab4b4326e340df7e0bcc687b2bc63c68d8 (diff) | |
| parent | 5e80dd223ded254b1802bdd6417ef118456eadce (diff) | |
| download | focaccia-qemu-76fbbec9315f8712d921411fbb4dad1fbcf1b151.tar.gz focaccia-qemu-76fbbec9315f8712d921411fbb4dad1fbcf1b151.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
Net patches # gpg: Signature made Fri 27 Jun 2014 14:10:57 BST using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" * remotes/stefanha/tags/net-pull-request: hw/net/eepro100: Implement read-only bits in MDI registers net: move queue number into NICPeers net: L2TPv3 transport qemu-bridge-helper: Fix fd leak in main() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/virtio-net.c')
| -rw-r--r-- | hw/net/virtio-net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 00b5e07ddd..e51d753cee 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1542,7 +1542,7 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) virtio_init(vdev, "virtio-net", VIRTIO_ID_NET, n->config_size); - n->max_queues = MAX(n->nic_conf.queues, 1); + n->max_queues = MAX(n->nic_conf.peers.queues, 1); 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; |