[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V4 11/19] virtio-s390: switch to bus specific queue
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PATCH V4 11/19] virtio-s390: switch to bus specific queue limit |
Date: |
Wed, 18 Mar 2015 17:35:01 +0800 |
Instead of depending on marco, switch to use a bus specific queue
limit.
Cc: Alexander Graf <address@hidden>
Cc: Richard Henderson <address@hidden>
Cc: Christian Borntraeger <address@hidden>
Cc: Cornelia Huck <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/s390x/s390-virtio-bus.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
index 2b41e32..9d6028d 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);
@@ -344,7 +346,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_get_queue_max(vdev); num_vq++) {
if (!virtio_queue_get_num(vdev, num_vq)) {
break;
}
@@ -446,7 +448,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_get_queue_max(dev->vdev); i++) {
if (!virtio_queue_get_addr(dev->vdev, i))
break;
if (virtio_queue_get_addr(dev->vdev, i) == mem) {
@@ -715,7 +717,7 @@ static void virtio_s390_bus_class_init(ObjectClass *klass,
void *data)
bus_class->max_dev = 1;
k->notify = virtio_s390_notify;
k->get_features = virtio_s390_get_features;
- k->queue_max = VIRTIO_PCI_QUEUE_MAX;
+ k->queue_max = VIRTIO_S390_QUEUE_MAX;
}
static const TypeInfo virtio_s390_bus_info = {
--
2.1.0
- Re: [Qemu-devel] [PATCH V4 08/19] virtio-net: fix the upper bound when trying to delete queues, (continued)
- [Qemu-devel] [PATCH V4 07/19] virtio-net: validate backend queue numbers against bus limitation, Jason Wang, 2015/03/18
- [Qemu-devel] [PATCH V4 10/19] virtio-ccw: introduce ccw specific queue limit, Jason Wang, 2015/03/18
- [Qemu-devel] [PATCH V4 09/19] virito: introduce bus specific queue limit, Jason Wang, 2015/03/18
- [Qemu-devel] [PATCH V4 11/19] virtio-s390: switch to bus specific queue limit,
Jason Wang <=
- [Qemu-devel] [PATCH V4 13/19] virtio-pci: switch to use bus specific queue limit, Jason Wang, 2015/03/18
- [Qemu-devel] [PATCH V4 12/19] virtio-mmio: switch to bus specific queue limit, Jason Wang, 2015/03/18
- [Qemu-devel] [PATCH V4 14/19] virtio: introduce vector to virtqueues mapping, Jason Wang, 2015/03/18
- [Qemu-devel] [PATCH V4 16/19] virtio-pci: speedup MSI-X masking and unmasking, Jason Wang, 2015/03/18
- [Qemu-devel] [PATCH V4 15/19] virtio: introduce virtio_queue_get_index(), Jason Wang, 2015/03/18
- [Qemu-devel] [PATCH V4 17/19] virtio-pci: increase the maximum number of virtqueues to 513, Jason Wang, 2015/03/18
- [Qemu-devel] [PATCH V4 18/19] pci: remove hard-coded bar size in msix_init_exclusive_bar(), Jason Wang, 2015/03/18