mirror of https://github.com/xemu-project/xemu.git
virtio-ccw: support VIRTIO_QUEUE_MAX virtqueues
The maximal number of virtqueues per device can be limited on a per transport basis. For virtio-ccw this limit is defined by VIRTIO_CCW_QUEUE_MAX, however the limitation used to come form the number of adapter routes supported by flic (via notifiers). Recently the limitation of the flic was adjusted so that it can accommodate VIRTIO_QUEUE_MAX queues, and is in the meanwhile checked for separately too. Let us remove the transport specific limitation of virtio-ccw by dropping VIRTIO_CCW_QUEUE_MAX and using VIRTIO_QUEUE_MAX instead. Signed-off-by: Halil Pasic <pasic@linux.vnet.ibm.com> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
parent
069097dad3
commit
b1914b824a
|
@ -63,7 +63,7 @@ static int virtio_ccw_hcall_notify(const uint64_t *args)
|
|||
if (!sch || !css_subch_visible(sch)) {
|
||||
return -EINVAL;
|
||||
}
|
||||
if (queue >= VIRTIO_CCW_QUEUE_MAX) {
|
||||
if (queue >= VIRTIO_QUEUE_MAX) {
|
||||
return -EINVAL;
|
||||
}
|
||||
virtio_queue_notify(virtio_ccw_get_vdev(sch), queue);
|
||||
|
|
|
@ -128,7 +128,7 @@ static int virtio_ccw_set_vqs(SubchDev *sch, VqInfoBlock *info,
|
|||
uint16_t num = info ? info->num : linfo->num;
|
||||
uint64_t desc = info ? info->desc : linfo->queue;
|
||||
|
||||
if (index >= VIRTIO_CCW_QUEUE_MAX) {
|
||||
if (index >= VIRTIO_QUEUE_MAX) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -164,7 +164,7 @@ static int virtio_ccw_set_vqs(SubchDev *sch, VqInfoBlock *info,
|
|||
virtio_queue_set_vector(vdev, index, index);
|
||||
}
|
||||
/* tell notify handler in case of config change */
|
||||
vdev->config_vector = VIRTIO_CCW_QUEUE_MAX;
|
||||
vdev->config_vector = VIRTIO_QUEUE_MAX;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -565,7 +565,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw)
|
|||
ccw.cda,
|
||||
MEMTXATTRS_UNSPECIFIED,
|
||||
NULL);
|
||||
if (vq_config.index >= VIRTIO_CCW_QUEUE_MAX) {
|
||||
if (vq_config.index >= VIRTIO_QUEUE_MAX) {
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
}
|
||||
|
@ -960,11 +960,11 @@ static void virtio_ccw_notify(DeviceState *d, uint16_t vector)
|
|||
uint64_t indicators;
|
||||
|
||||
/* queue indicators + secondary indicators */
|
||||
if (vector >= VIRTIO_CCW_QUEUE_MAX + 64) {
|
||||
if (vector >= VIRTIO_QUEUE_MAX + 64) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (vector < VIRTIO_CCW_QUEUE_MAX) {
|
||||
if (vector < VIRTIO_QUEUE_MAX) {
|
||||
if (!dev->indicators) {
|
||||
return;
|
||||
}
|
||||
|
@ -1325,10 +1325,10 @@ static void virtio_ccw_device_plugged(DeviceState *d, Error **errp)
|
|||
dev->max_rev = 0;
|
||||
}
|
||||
|
||||
if (virtio_get_num_queues(vdev) > VIRTIO_CCW_QUEUE_MAX) {
|
||||
if (virtio_get_num_queues(vdev) > VIRTIO_QUEUE_MAX) {
|
||||
error_setg(errp, "The number of virtqueues %d "
|
||||
"exceeds ccw limit %d", n,
|
||||
VIRTIO_CCW_QUEUE_MAX);
|
||||
"exceeds virtio limit %d", n,
|
||||
VIRTIO_QUEUE_MAX);
|
||||
return;
|
||||
}
|
||||
if (virtio_get_num_queues(vdev) > flic->adapter_routes_max_batch) {
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
* maximum right now.
|
||||
*/
|
||||
#define ADAPTER_ROUTES_MAX_GSI VIRTIO_QUEUE_MAX
|
||||
#define VIRTIO_CCW_QUEUE_MAX 64
|
||||
|
||||
typedef struct AdapterRoutes {
|
||||
AdapterInfo adapter;
|
||||
|
|
Loading…
Reference in New Issue