diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-05-15 18:01:46 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-05-15 18:01:47 +0100 |
| commit | ba43bc25c9793ae57d7b5539fecc26015a96107f (patch) | |
| tree | d12167b0f2c198436028e728d410379d23d1c3cb /hw | |
| parent | 895527eea5e57695f76c5e41def531d7f1d80917 (diff) | |
| parent | 937251408051e0489f78e4db3c92e045b147b38b (diff) | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio update
looks like a quiet week
minor bugfix in virtio by myself
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Tue 13 May 2014 14:37:23 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream:
virtio: allow mapping up to max queue size
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/virtio/virtio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 7f4e7eca0e..3557c178f1 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -430,7 +430,7 @@ void virtqueue_map_sg(struct iovec *sg, hwaddr *addr, unsigned int i; hwaddr len; - if (num_sg >= VIRTQUEUE_MAX_SIZE) { + if (num_sg > VIRTQUEUE_MAX_SIZE) { error_report("virtio: map attempt out of bounds: %zd > %d", num_sg, VIRTQUEUE_MAX_SIZE); exit(1); |