30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
|
From: "Michael S. Tsirkin" <mst@redhat.com>
|
||
|
|
Date: Thu, 23 Jul 2015 17:52:02 +0300
|
||
|
|
Subject: [PATCH] virtio-serial: fix ANY_LAYOUT
|
||
|
|
|
||
|
|
Don't assume a specific layout for control messages.
|
||
|
|
Required by virtio 1.
|
||
|
|
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Reviewed-by: Amit Shah <amit.shah@redhat.com>
|
||
|
|
Reviewed-by: Jason Wang <jasowang@redhat.com>
|
||
|
|
(cherry picked from commit 7882080388be5088e72c425b02223c02e6cb4295)
|
||
|
|
---
|
||
|
|
hw/char/virtio-serial-bus.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
|
||
|
|
index e336bdb..2565521 100644
|
||
|
|
--- a/hw/char/virtio-serial-bus.c
|
||
|
|
+++ b/hw/char/virtio-serial-bus.c
|
||
|
|
@@ -194,7 +194,8 @@ static size_t send_control_msg(VirtIOSerial *vser, void *buf, size_t len)
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
- memcpy(elem.in_sg[0].iov_base, buf, len);
|
||
|
|
+ /* TODO: detect a buffer that's too short, set NEEDS_RESET */
|
||
|
|
+ iov_from_buf(elem.in_sg, elem.in_num, 0, buf, len);
|
||
|
|
|
||
|
|
virtqueue_push(vq, &elem, len);
|
||
|
|
virtio_notify(VIRTIO_DEVICE(vser), vq);
|