From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyDaI-0005pi-Pp for qemu-devel@nongnu.org; Fri, 29 May 2015 02:15:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyDaH-0004Te-W8 for qemu-devel@nongnu.org; Fri, 29 May 2015 02:15:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37203) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyDaH-0004TX-Rh for qemu-devel@nongnu.org; Fri, 29 May 2015 02:15:57 -0400 From: Jason Wang Date: Fri, 29 May 2015 14:15:29 +0800 Message-Id: <1432880132-28477-7-git-send-email-jasowang@redhat.com> In-Reply-To: <1432880132-28477-1-git-send-email-jasowang@redhat.com> References: <1432880132-28477-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PATCH V8 6/9] virtio-s390: introduce virito s390 queue limit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: cornelia.huck@de.ibm.com, Jason Wang , Richard Henderson , Alexander Graf , mst@redhat.com Cc: Alexander Graf Cc: Richard Henderson Signed-off-by: Jason Wang --- hw/s390x/s390-virtio-bus.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index 0e35ac9..3801c73 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -45,6 +45,8 @@ do { } while (0) #endif +#define VIRTIO_S390_QUEUE_MAX 64 + static void virtio_s390_bus_new(VirtioBusState *bus, size_t bus_size, VirtIOS390Device *dev); @@ -354,7 +356,7 @@ static ram_addr_t s390_virtio_device_num_vq(VirtIOS390Device *dev) VirtIODevice *vdev = dev->vdev; int num_vq; - for (num_vq = 0; num_vq < VIRTIO_PCI_QUEUE_MAX; num_vq++) { + for (num_vq = 0; num_vq < VIRTIO_S390_QUEUE_MAX; num_vq++) { if (!virtio_queue_get_num(vdev, num_vq)) { break; } @@ -476,7 +478,7 @@ VirtIOS390Device *s390_virtio_bus_find_vring(VirtIOS390Bus *bus, QTAILQ_FOREACH(kid, &bus->bus.children, sibling) { VirtIOS390Device *dev = (VirtIOS390Device *)kid->child; - for(i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) { + for (i = 0; i < VIRTIO_S390_QUEUE_MAX; i++) { if (!virtio_queue_get_addr(dev->vdev, i)) break; if (virtio_queue_get_addr(dev->vdev, i) == mem) { -- 2.1.4