From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50866) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyDaG-0005lP-Hr for qemu-devel@nongnu.org; Fri, 29 May 2015 02:15:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyDaF-0004QX-Mc for qemu-devel@nongnu.org; Fri, 29 May 2015 02:15:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48779) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyDaF-0004QK-5X for qemu-devel@nongnu.org; Fri, 29 May 2015 02:15:55 -0400 From: Jason Wang Date: Fri, 29 May 2015 14:15:28 +0800 Message-Id: <1432880132-28477-6-git-send-email-jasowang@redhat.com> In-Reply-To: <1432880132-28477-1-git-send-email-jasowang@redhat.com> References: <1432880132-28477-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PATCH V8 5/9] virtio-ccw: validate the number of queues against bus limitation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com, Jason Wang , Alexander Graf , Christian Borntraeger , cornelia.huck@de.ibm.com, Richard Henderson Cc: Cornelia Huck Cc: Christian Borntraeger Cc: Richard Henderson Cc: Alexander Graf Signed-off-by: Jason Wang --- hw/s390x/virtio-ccw.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index aaa9833..18fc697 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -1416,7 +1416,16 @@ static int virtio_ccw_load_config(DeviceState *d, QEMUFile *f) static void virtio_ccw_device_plugged(DeviceState *d, Error **errp) { VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d); + VirtIODevice *vdev = virtio_bus_get_device(&dev->bus); SubchDev *sch = dev->sch; + int n = virtio_get_num_queues(vdev); + + if (virtio_get_num_queues(vdev) > VIRTIO_CCW_QUEUE_MAX) { + error_setg(errp, "The nubmer of virtqueues %d " + "exceeds ccw limit %d", n, + VIRTIO_CCW_QUEUE_MAX); + return; + } sch->id.cu_model = virtio_bus_get_vdev_id(&dev->bus); -- 2.1.4