* [Qemu-devel] [PATCH] virtio-ccw: fix ring sizing
@ 2017-01-12 21:26 Michael S. Tsirkin
2017-01-13 10:04 ` Cornelia Huck
0 siblings, 1 reply; 2+ messages in thread
From: Michael S. Tsirkin @ 2017-01-12 21:26 UTC (permalink / raw)
To: qemu-devel
Cc: Cornelia Huck, Christian Borntraeger, Richard Henderson, Alexander Graf
Current code seems to assume ring size is
always decreased but this is not required by spec:
what spec says is just that size can not exceed
the maximum. Fix it up.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/virtio/virtio.h | 1 +
hw/s390x/virtio-ccw.c | 2 +-
hw/virtio/virtio.c | 5 +++++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index e5541c6..6523bac 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -228,6 +228,7 @@ void virtio_queue_set_addr(VirtIODevice *vdev, int n, hwaddr addr);
hwaddr virtio_queue_get_addr(VirtIODevice *vdev, int n);
void virtio_queue_set_num(VirtIODevice *vdev, int n, int num);
int virtio_queue_get_num(VirtIODevice *vdev, int n);
+int virtio_queue_get_max_num(VirtIODevice *vdev, int n);
int virtio_get_num_queues(VirtIODevice *vdev);
void virtio_queue_set_rings(VirtIODevice *vdev, int n, hwaddr desc,
hwaddr avail, hwaddr used);
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 0765068..63c4637 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -149,7 +149,7 @@ static int virtio_ccw_set_vqs(SubchDev *sch, VqInfoBlock *info,
} else {
if (info) {
/* virtio-1 allows changing the ring size. */
- if (virtio_queue_get_num(vdev, index) < num) {
+ if (virtio_queue_get_max_num(vdev, index) < num) {
/* Fail if we exceed the maximum number. */
return -EINVAL;
}
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 34065c7..e52fd8e 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -1256,6 +1256,11 @@ int virtio_queue_get_num(VirtIODevice *vdev, int n)
return vdev->vq[n].vring.num;
}
+int virtio_queue_get_max_num(VirtIODevice *vdev, int n)
+{
+ return vdev->vq[n].vring.num_default;
+}
+
int virtio_get_num_queues(VirtIODevice *vdev)
{
int i;
--
MST
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] virtio-ccw: fix ring sizing
2017-01-12 21:26 [Qemu-devel] [PATCH] virtio-ccw: fix ring sizing Michael S. Tsirkin
@ 2017-01-13 10:04 ` Cornelia Huck
0 siblings, 0 replies; 2+ messages in thread
From: Cornelia Huck @ 2017-01-13 10:04 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: qemu-devel, Christian Borntraeger, Richard Henderson, Alexander Graf
On Thu, 12 Jan 2017 23:26:22 +0200
"Michael S. Tsirkin" <mst@redhat.com> wrote:
> Current code seems to assume ring size is
> always decreased but this is not required by spec:
> what spec says is just that size can not exceed
> the maximum. Fix it up.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> include/hw/virtio/virtio.h | 1 +
> hw/s390x/virtio-ccw.c | 2 +-
> hw/virtio/virtio.c | 5 +++++
> 3 files changed, 7 insertions(+), 1 deletion(-)
Yes, makes sense. Queued to s390-next.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-13 10:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-12 21:26 [Qemu-devel] [PATCH] virtio-ccw: fix ring sizing Michael S. Tsirkin
2017-01-13 10:04 ` Cornelia Huck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.