virtio-s390: introduce virito s390 queue limit

Cc: Alexander Graf <agraf@suse.de>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Jason Wang 2015-05-29 14:15:29 +08:00 committed by Michael S. Tsirkin
parent 10ceaa1e8f
commit 74c85296dc
1 changed files with 4 additions and 2 deletions

View File

@ -45,6 +45,8 @@
do { } while (0) do { } while (0)
#endif #endif
#define VIRTIO_S390_QUEUE_MAX 64
static void virtio_s390_bus_new(VirtioBusState *bus, size_t bus_size, static void virtio_s390_bus_new(VirtioBusState *bus, size_t bus_size,
VirtIOS390Device *dev); VirtIOS390Device *dev);
@ -352,7 +354,7 @@ static ram_addr_t s390_virtio_device_num_vq(VirtIOS390Device *dev)
VirtIODevice *vdev = dev->vdev; VirtIODevice *vdev = dev->vdev;
int num_vq; 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)) { if (!virtio_queue_get_num(vdev, num_vq)) {
break; break;
} }
@ -475,7 +477,7 @@ VirtIOS390Device *s390_virtio_bus_find_vring(VirtIOS390Bus *bus,
QTAILQ_FOREACH(kid, &bus->bus.children, sibling) { QTAILQ_FOREACH(kid, &bus->bus.children, sibling) {
VirtIOS390Device *dev = (VirtIOS390Device *)kid->child; 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)) if (!virtio_queue_get_addr(dev->vdev, i))
break; break;
if (virtio_queue_get_addr(dev->vdev, i) == mem) { if (virtio_queue_get_addr(dev->vdev, i) == mem) {