From: Michael S. Tsirkin <mst@redhat.com>
Date: Thu, 23 Jul 2015 14:52:02 +0000 (+0300)
Subject: virtio-serial: fix ANY_LAYOUT
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~21^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7882080388be5088e72c425b02223c02e6cb4295;p=sdk%2Femulator%2Fqemu.git

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>
---

diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index 78c73e5..929e49c 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -195,7 +195,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);