diff options
| author | Halil Pasic <pasic@linux.vnet.ibm.com> | 2015-12-07 15:21:46 +0100 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2016-01-13 10:53:42 +0100 |
| commit | 1789f4e37c78d408dfa61655dfd8b397554152f9 (patch) | |
| tree | dce3421bedb8ce4a507c0c5c722511ccf748c311 | |
| parent | cf87e0a3eea4ccc91fdb84b96cf9b62f399b6f3d (diff) | |
| download | focaccia-qemu-1789f4e37c78d408dfa61655dfd8b397554152f9.tar.gz focaccia-qemu-1789f4e37c78d408dfa61655dfd8b397554152f9.zip | |
virtio-ccw: fix sanity check for vector
The commit 8dfbaa6ac ("virtio-ccw: introduce ccw specific queue limit")
did not touch the sanity check for the vector argument of the method
virtio_ccw_notify, despite intended as seen from
https://lists.nongnu.org/archive/html/qemu-devel/2015-04/msg02705.html
To be able to scale number of virtqueues using the constant this sanity
check needs to be altered.
Fixes: 8dfbaa6ac ("virtio-ccw: introduce ccw specific queue limit")
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Halil Pasic <pasic@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
| -rw-r--r-- | hw/s390x/virtio-ccw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 63da303864..95a6c142b8 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -1177,7 +1177,8 @@ static void virtio_ccw_notify(DeviceState *d, uint16_t vector) SubchDev *sch = dev->sch; uint64_t indicators; - if (vector >= 128) { + /* queue indicators + secondary indicators */ + if (vector >= VIRTIO_CCW_QUEUE_MAX + 64) { return; } |