From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44912) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXmle-0006Mp-Oz for qemu-devel@nongnu.org; Fri, 04 Sep 2015 04:54:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZXmlb-0002ng-Cf for qemu-devel@nongnu.org; Fri, 04 Sep 2015 04:54:42 -0400 Received: from e06smtp05.uk.ibm.com ([195.75.94.101]:45193) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXmla-0002mR-TG for qemu-devel@nongnu.org; Fri, 04 Sep 2015 04:54:39 -0400 Received: from /spool/local by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 4 Sep 2015 09:54:37 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 8A80517D8024 for ; Fri, 4 Sep 2015 09:56:17 +0100 (BST) Received: from d06av12.portsmouth.uk.ibm.com (d06av12.portsmouth.uk.ibm.com [9.149.37.247]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t848sYPh34013228 for ; Fri, 4 Sep 2015 08:54:34 GMT Received: from d06av12.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t848sXb1006407 for ; Fri, 4 Sep 2015 02:54:33 -0600 From: Cornelia Huck Date: Fri, 4 Sep 2015 10:54:27 +0200 Message-Id: <1441356869-57861-3-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1441356869-57861-1-git-send-email-cornelia.huck@de.ibm.com> References: <1441356869-57861-1-git-send-email-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PATCH 2/4] virtio-ccw: support ring size changes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Cornelia Huck , borntraeger@de.ibm.com, jasowang@redhat.com, mst@redhat.com Wire up changing the ring size for virtio-1 devices. Signed-off-by: Cornelia Huck --- hw/s390x/virtio-ccw.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index d36373e..85e2a5d 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -307,11 +307,18 @@ static int virtio_ccw_set_vqs(SubchDev *sch, VqInfoBlock *info, if (!desc) { virtio_queue_set_vector(vdev, index, VIRTIO_NO_VECTOR); } else { - /* Fail if we don't have a big enough queue. */ - /* TODO: Add interface to handle vring.num changing */ - if (virtio_queue_get_num(vdev, index) > num) { + if (info) { + /* virtio-1 allows changing the ring size. */ + if (virtio_queue_get_num(vdev, index) < num) { + /* Fail if we exceed the maximum number. */ + return -EINVAL; + } + virtio_queue_set_num(vdev, index, num); + } else if (virtio_queue_get_num(vdev, index) > num) { + /* Fail if we don't have a big enough queue. */ return -EINVAL; } + /* We ignore possible increased num for legacy for compatibility. */ virtio_queue_set_vector(vdev, index, index); } /* tell notify handler in case of config change */ -- 2.3.8