From patchwork Mon Feb 28 06:34:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krishna Kumar X-Patchwork-Id: 594251 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1S6YiEB018532 for ; Mon, 28 Feb 2011 06:34:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752362Ab1B1Gej (ORCPT ); Mon, 28 Feb 2011 01:34:39 -0500 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:38504 "EHLO e28smtp09.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752413Ab1B1Gei (ORCPT ); Mon, 28 Feb 2011 01:34:38 -0500 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by e28smtp09.in.ibm.com (8.14.4/8.13.1) with ESMTP id p1S5fW9k024993; Mon, 28 Feb 2011 11:11:32 +0530 Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p1S6YYln1171480; Mon, 28 Feb 2011 12:04:34 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p1S6YWHC027656; Mon, 28 Feb 2011 17:34:34 +1100 Received: from krkumar2.in.ibm.com (krkumar2.in.ibm.com [9.124.35.108]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p1S6YWdQ027653; Mon, 28 Feb 2011 17:34:32 +1100 From: Krishna Kumar To: rusty@rustcorp.com.au, davem@davemloft.net, mst@redhat.com Cc: eric.dumazet@gmail.com, arnd@arndb.de, netdev@vger.kernel.org, horms@verge.net.au, avi@redhat.com, anthony@codemonkey.ws, kvm@vger.kernel.org, Krishna Kumar Date: Mon, 28 Feb 2011 12:04:32 +0530 Message-Id: <20110228063432.24908.97160.sendpatchset@krkumar2.in.ibm.com> In-Reply-To: <20110228063427.24908.63561.sendpatchset@krkumar2.in.ibm.com> References: <20110228063427.24908.63561.sendpatchset@krkumar2.in.ibm.com> Subject: [PATCH 1/3] [RFC] Change virtqueue structure Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 28 Feb 2011 06:34:44 +0000 (UTC) diff -ruNp org/include/linux/virtio.h new/include/linux/virtio.h --- org/include/linux/virtio.h 2010-10-11 10:20:22.000000000 +0530 +++ new/include/linux/virtio.h 2011-02-23 16:26:18.000000000 +0530 @@ -22,6 +22,7 @@ struct virtqueue { void (*callback)(struct virtqueue *vq); const char *name; struct virtio_device *vdev; + int queue_index; /* the index of the queue */ void *priv; }; diff -ruNp org/drivers/virtio/virtio_pci.c new/drivers/virtio/virtio_pci.c --- org/drivers/virtio/virtio_pci.c 2011-01-28 11:38:24.000000000 +0530 +++ new/drivers/virtio/virtio_pci.c 2011-02-25 10:11:22.000000000 +0530 @@ -75,9 +75,6 @@ struct virtio_pci_vq_info /* the number of entries in the queue */ int num; - /* the index of the queue */ - int queue_index; - /* the virtual address of the ring queue */ void *queue; @@ -180,11 +177,10 @@ static void vp_reset(struct virtio_devic static void vp_notify(struct virtqueue *vq) { struct virtio_pci_device *vp_dev = to_vp_device(vq->vdev); - struct virtio_pci_vq_info *info = vq->priv; /* we write the queue's selector into the notification register to * signal the other end */ - iowrite16(info->queue_index, vp_dev->ioaddr + VIRTIO_PCI_QUEUE_NOTIFY); + iowrite16(vq->queue_index, vp_dev->ioaddr + VIRTIO_PCI_QUEUE_NOTIFY); } /* Handle a configuration change: Tell driver if it wants to know. */ @@ -380,7 +376,6 @@ static struct virtqueue *setup_vq(struct if (!info) return ERR_PTR(-ENOMEM); - info->queue_index = index; info->num = num; info->msix_vector = msix_vec; @@ -403,6 +398,7 @@ static struct virtqueue *setup_vq(struct goto out_activate_queue; } + vq->queue_index = index; vq->priv = info; info->vq = vq; @@ -441,7 +437,7 @@ static void vp_del_vq(struct virtqueue * list_del(&info->node); spin_unlock_irqrestore(&vp_dev->lock, flags); - iowrite16(info->queue_index, vp_dev->ioaddr + VIRTIO_PCI_QUEUE_SEL); + iowrite16(vq->queue_index, vp_dev->ioaddr + VIRTIO_PCI_QUEUE_SEL); if (vp_dev->msix_enabled) { iowrite16(VIRTIO_MSI_NO_VECTOR,