From: Amit Shah <amit.shah@redhat.com>
To: Virtualization List <virtualization@lists.linux-foundation.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>,
"Michael S. Tsirkin" <mst@redhat.com>,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
Amit Shah <amit.shah@redhat.com>
Subject: [PATCH v6 07/11] virtio: net: Move vq initialization into separate function
Date: Thu, 22 Dec 2011 16:58:31 +0530 [thread overview]
Message-ID: <e6161695ce252f328d7616b5f3d2bf88edcf60b6.1324553223.git.amit.shah@redhat.com> (raw)
In-Reply-To: <cover.1324553223.git.amit.shah@redhat.com>
In-Reply-To: <cover.1324553223.git.amit.shah@redhat.com>
The probe and PM restore functions will share this code.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
drivers/net/virtio_net.c | 47 +++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 1b67e8a..ec8c400 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -966,15 +966,38 @@ static void virtnet_config_changed(struct virtio_device *vdev)
virtnet_update_status(vi);
}
+static int init_vqs(struct virtnet_info *vi)
+{
+ struct virtqueue *vqs[3];
+ vq_callback_t *callbacks[] = { skb_recv_done, skb_xmit_done, NULL};
+ const char *names[] = { "input", "output", "control" };
+ int nvqs, err;
+
+ /* We expect two virtqueues, receive then send,
+ * and optionally control. */
+ nvqs = virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ) ? 3 : 2;
+
+ err = vi->vdev->config->find_vqs(vi->vdev, nvqs, vqs, callbacks, names);
+ if (err)
+ return err;
+
+ vi->rvq = vqs[0];
+ vi->svq = vqs[1];
+
+ if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) {
+ vi->cvq = vqs[2];
+
+ if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VLAN))
+ vi->dev->features |= NETIF_F_HW_VLAN_FILTER;
+ }
+ return 0;
+}
+
static int virtnet_probe(struct virtio_device *vdev)
{
int err;
struct net_device *dev;
struct virtnet_info *vi;
- struct virtqueue *vqs[3];
- vq_callback_t *callbacks[] = { skb_recv_done, skb_xmit_done, NULL};
- const char *names[] = { "input", "output", "control" };
- int nvqs;
/* Allocate ourselves a network device with room for our info */
dev = alloc_etherdev(sizeof(struct virtnet_info));
@@ -1046,24 +1069,10 @@ static int virtnet_probe(struct virtio_device *vdev)
if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF))
vi->mergeable_rx_bufs = true;
- /* We expect two virtqueues, receive then send,
- * and optionally control. */
- nvqs = virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ) ? 3 : 2;
-
- err = vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names);
+ err = init_vqs(vi);
if (err)
goto free_stats;
- vi->rvq = vqs[0];
- vi->svq = vqs[1];
-
- if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) {
- vi->cvq = vqs[2];
-
- if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VLAN))
- dev->features |= NETIF_F_HW_VLAN_FILTER;
- }
-
err = register_netdev(dev);
if (err) {
pr_debug("virtio_net: registering device failed\n");
--
1.7.7.4
next prev parent reply other threads:[~2011-12-22 11:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-22 11:28 [PATCH v6 00/11] virtio: s4 support Amit Shah
2011-12-22 11:28 ` [PATCH v6 01/11] virtio: pci: switch to new PM API Amit Shah
2011-12-22 11:28 ` [PATCH v6 02/11] virtio: pci: add PM notification handlers for restore, freeze, thaw, poweroff Amit Shah
2011-12-22 11:28 ` [PATCH v6 03/11] virtio: console: Move vq and vq buf removal into separate functions Amit Shah
2011-12-22 11:28 ` [PATCH v6 04/11] virtio: console: Add freeze and restore handlers to support S4 Amit Shah
2011-12-22 11:28 ` [PATCH v6 05/11] virtio: blk: Move vq initialization to separate function Amit Shah
2011-12-22 11:28 ` [PATCH v6 06/11] virtio: blk: Add freeze, restore handlers to support S4 Amit Shah
2011-12-22 11:28 ` Amit Shah [this message]
2011-12-22 11:28 ` [PATCH v6 08/11] virtio: net: Move vq and vq buf removal into separate function Amit Shah
2011-12-22 11:28 ` [PATCH v6 09/11] virtio: net: Add freeze, restore handlers to support S4 Amit Shah
2011-12-29 16:15 ` Michael S. Tsirkin
2011-12-30 9:38 ` Amit Shah
2012-01-01 11:47 ` Michael S. Tsirkin
2012-01-03 17:07 ` Amit Shah
2012-01-04 2:49 ` Rusty Russell
2011-12-22 11:28 ` [PATCH v6 10/11] virtio: balloon: Move vq initialization into separate function Amit Shah
2011-12-22 11:28 ` [PATCH v6 11/11] virtio: balloon: Add freeze, restore handlers to support S4 Amit Shah
2011-12-29 4:32 ` [PATCH v6 00/11] virtio: s4 support Rusty Russell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e6161695ce252f328d7616b5f3d2bf88edcf60b6.1324553223.git.amit.shah@redhat.com \
--to=amit.shah@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mst@redhat.com \
--cc=rusty@rustcorp.com.au \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).