[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/11] virtio-blk: Correct bug in support for fle
From: |
Marc Marí |
Subject: |
[Qemu-devel] [PATCH v4 06/11] virtio-blk: Correct bug in support for flexible descriptor layout |
Date: |
Tue, 12 Aug 2014 13:41:51 +0200 |
Without this correction, only a three descriptor layout is accepted, and
requests with just two descriptors are not completed and no error message is
displayed.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Marc Marí <address@hidden>
---
hw/block/virtio-blk.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index c241c50..302c39e 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -404,19 +404,19 @@ void virtio_blk_handle_request(VirtIOBlockReq *req,
MultiReqBuffer *mrb)
* NB: per existing s/n string convention the string is
* terminated by '\0' only when shorter than buffer.
*/
- strncpy(req->elem.in_sg[0].iov_base,
- s->blk.serial ? s->blk.serial : "",
- MIN(req->elem.in_sg[0].iov_len, VIRTIO_BLK_ID_BYTES));
+ const char *serial = s->blk.serial ? s->blk.serial : "";
+ size_t size = MIN(strlen(serial) + 1,
+ MIN(iov_size(in_iov, in_num),
+ VIRTIO_BLK_ID_BYTES));
+ iov_from_buf(in_iov, in_num, 0, serial, size);
virtio_blk_req_complete(req, VIRTIO_BLK_S_OK);
virtio_blk_free_request(req);
} else if (type & VIRTIO_BLK_T_OUT) {
- qemu_iovec_init_external(&req->qiov, &req->elem.out_sg[1],
- req->elem.out_num - 1);
+ qemu_iovec_init_external(&req->qiov, iov, out_num);
virtio_blk_handle_write(req, mrb);
} else if (type == VIRTIO_BLK_T_IN || type == VIRTIO_BLK_T_BARRIER) {
/* VIRTIO_BLK_T_IN is 0, so we can't just & it. */
- qemu_iovec_init_external(&req->qiov, &req->elem.in_sg[0],
- req->elem.in_num - 1);
+ qemu_iovec_init_external(&req->qiov, in_iov, in_num);
virtio_blk_handle_read(req);
} else {
virtio_blk_req_complete(req, VIRTIO_BLK_S_UNSUPP);
--
1.7.10.4
- Re: [Qemu-devel] [PATCH v4 01/11] tests: Functions bus_foreach and device_find from libqos virtio API, (continued)
- [Qemu-devel] [PATCH v4 02/11] tests: Add virtio device initialization, Marc Marí, 2014/08/12
- [Qemu-devel] [PATCH v4 03/11] libqtest: add QTEST_LOG for debugging qtest testcases, Marc Marí, 2014/08/12
- [Qemu-devel] [PATCH v4 04/11] libqos: Correct mask to align size to PAGE_SIZE in malloc-pc, Marc Marí, 2014/08/12
- [Qemu-devel] [PATCH v4 05/11] libqos: Change free function called in malloc, Marc Marí, 2014/08/12
- [Qemu-devel] [PATCH v4 06/11] virtio-blk: Correct bug in support for flexible descriptor layout,
Marc Marí <=
- [Qemu-devel] [PATCH v4 07/11] libqos: Added basic virtqueue support to virtio implementation, Marc Marí, 2014/08/12
- [Qemu-devel] [PATCH v4 08/11] libqos: Added indirect descriptor support to virtio implementation, Marc Marí, 2014/08/12
- [Qemu-devel] [PATCH v4 09/11] libqos: Added test case for configuration changes in virtio-blk test, Marc Marí, 2014/08/12
- [Qemu-devel] [PATCH v4 10/11] libqos: Added MSI-X support, Marc Marí, 2014/08/12
- [Qemu-devel] [PATCH v4 11/11] libqos: Added EVENT_IDX support, Marc Marí, 2014/08/12