Commit 6624fecd authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'pmaydell/tags/pull-arm-devs-20130812' into staging 



arm-devs queue

# gpg: Signature made Mon 12 Aug 2013 05:58:14 AM CDT using RSA key ID 14360CDE
# gpg: Can't check signature: public key not found

# By Peter Maydell
# Via Peter Maydell
* pmaydell/tags/pull-arm-devs-20130812:
  hw/virtio/virtio-mmio: Make QueueNumMax read 0 for unavailable queues
  hw/virtio/virtio: Don't allow guests to add/remove queues

Message-id: 1376305261-29561-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 3bba9c11 f7b803b3

hw/virtio/virtio-mmio.c

+3 −0
Original line number Diff line number Diff line
@@ -151,6 +151,9 @@ static uint64_t virtio_mmio_read(void *opaque, hwaddr offset, unsigned size) 
        }

        return proxy->host_features;

    case VIRTIO_MMIO_QUEUENUMMAX:

        if (!virtio_queue_get_num(vdev, vdev->queue_sel)) {

            return 0;

        }

        return VIRTQUEUE_MAX_SIZE;

    case VIRTIO_MMIO_QUEUEPFN:

        return virtio_queue_get_addr(vdev, vdev->queue_sel)

hw/virtio/virtio.c

+9 −3
Original line number Diff line number Diff line
@@ -673,11 +673,17 @@ hwaddr virtio_queue_get_addr(VirtIODevice *vdev, int n) 


void virtio_queue_set_num(VirtIODevice *vdev, int n, int num)

{

    if (num <= VIRTQUEUE_MAX_SIZE) {

    /* Don't allow guest to flip queue between existent and

     * nonexistent states, or to set it to an invalid size.

     */

    if (!!num != !!vdev->vq[n].vring.num ||

        num > VIRTQUEUE_MAX_SIZE ||

        num < 0) {

        return;

    }

    vdev->vq[n].vring.num = num;

    virtqueue_init(&vdev->vq[n]);

}

}



int virtio_queue_get_num(VirtIODevice *vdev, int n)

{