From patchwork Fri Sep 17 10:03:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krishna Kumar X-Patchwork-Id: 187742 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 o8HA3UOD006052 for ; Fri, 17 Sep 2010 10:03:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752302Ab0IQKDU (ORCPT ); Fri, 17 Sep 2010 06:03:20 -0400 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:58361 "EHLO e28smtp07.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752179Ab0IQKDU (ORCPT ); Fri, 17 Sep 2010 06:03:20 -0400 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by e28smtp07.in.ibm.com (8.14.4/8.13.1) with ESMTP id o8HA3GmE032538; Fri, 17 Sep 2010 15:33:16 +0530 Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o8HA3FPp2961434; Fri, 17 Sep 2010 15:33:15 +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 o8HA3EbN012445; Fri, 17 Sep 2010 20:03:15 +1000 Received: from krkumar2.in.ibm.com ([9.124.220.25]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o8HA3DHS012431; Fri, 17 Sep 2010 20:03:14 +1000 From: Krishna Kumar To: rusty@rustcorp.com.au, davem@davemloft.net, mst@redhat.com Cc: kvm@vger.kernel.org, arnd@arndb.de, netdev@vger.kernel.org, avi@redhat.com, anthony@codemonkey.ws, Krishna Kumar Date: Fri, 17 Sep 2010 15:33:13 +0530 Message-Id: <20100917100313.21276.64524.sendpatchset@krkumar2.in.ibm.com> In-Reply-To: <20100917100307.21276.79185.sendpatchset@krkumar2.in.ibm.com> References: <20100917100307.21276.79185.sendpatchset@krkumar2.in.ibm.com> Subject: [v2 RFC PATCH 1/4] 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.3 (demeter1.kernel.org [140.211.167.41]); Fri, 17 Sep 2010 10:03:31 +0000 (UTC) diff -ruNp org2/include/linux/virtio.h tx_only2/include/linux/virtio.h --- org2/include/linux/virtio.h 2010-06-02 18:46:43.000000000 +0530 +++ tx_only2/include/linux/virtio.h 2010-09-16 15:24:01.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 org2/drivers/virtio/virtio_pci.c tx_only2/drivers/virtio/virtio_pci.c --- org2/drivers/virtio/virtio_pci.c 2010-08-05 14:48:06.000000000 +0530 +++ tx_only2/drivers/virtio/virtio_pci.c 2010-09-16 15:24:01.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; @@ -185,11 +182,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. */ @@ -385,7 +381,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; @@ -408,6 +403,7 @@ static struct virtqueue *setup_vq(struct goto out_activate_queue; } + vq->queue_index = index; vq->priv = info; info->vq = vq; @@ -446,7 +442,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,