[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 35/57] virtio-ccw: validate the number of queues agai
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 35/57] virtio-ccw: validate the number of queues against bus limitation |
Date: |
Sun, 31 May 2015 20:36:31 +0200 |
From: Jason Wang <address@hidden>
Cc: Cornelia Huck <address@hidden>
Cc: Christian Borntraeger <address@hidden>
Cc: Richard Henderson <address@hidden>
Cc: Alexander Graf <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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 60d60d6..ef90fed 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -1381,7 +1381,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);
--
MST
- [Qemu-devel] [PULL 25/57] piix: Eliminate pc_init_pci(), (continued)
- [Qemu-devel] [PULL 25/57] piix: Eliminate pc_init_pci(), Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 27/57] pc: acpi: fix pvpanic for buggy guests, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 26/57] pc: Generate init functions with a macro, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 28/57] virtio: move host_features, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 29/57] virtio-ccw: Don't advertise VIRTIO_F_BAD_FEATURE, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 30/57] virtio: move VIRTIO_F_NOTIFY_ON_EMPTY into core, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 31/57] virtio-net: adding all queues in .realize(), Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 32/57] virtio: device_plugged() can fail, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 33/57] virtio: introduce virtio_get_num_queues(), Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 34/57] virtio-ccw: introduce ccw specific queue limit, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 35/57] virtio-ccw: validate the number of queues against bus limitation,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 36/57] virtio-s390: introduce virito s390 queue limit, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 37/57] virtio-s390: introduce virtio_s390_device_plugged(), Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 38/57] virtio: rename VIRTIO_PCI_QUEUE_MAX to VIRTIO_QUEUE_MAX, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 39/57] virtio: increase the queue limit to 1024, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 40/57] i386/pc: pc_basic_device_init(): delegate FDC creation request, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 41/57] i386/pc: '-drive if=floppy' should imply a board-default FDC, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 42/57] i386/pc_q35: don't insist on board FDC if there's no default floppy, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 43/57] i386: drop FDC in pc-q35-2.4+ if neither it nor floppy drives are wanted, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 44/57] acpi: Simplify printing to dynamic string, Michael S. Tsirkin, 2015/05/31
- [Qemu-devel] [PULL 45/57] Add stream ID to MSI write, Michael S. Tsirkin, 2015/05/31