From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46816) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK1dh-0002QM-RE for qemu-devel@nongnu.org; Tue, 28 Jul 2015 05:57:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZK1dh-0001wT-40 for qemu-devel@nongnu.org; Tue, 28 Jul 2015 05:57:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37837) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK1dg-0001wP-UX for qemu-devel@nongnu.org; Tue, 28 Jul 2015 05:57:37 -0400 Date: Tue, 28 Jul 2015 12:57:34 +0300 From: "Michael S. Tsirkin" Message-ID: <1438077261-16651-3-git-send-email-mst@redhat.com> References: <1438077261-16651-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1438077261-16651-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 02/10] virtio-serial: fix ANY_LAYOUT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Amit Shah , Peter Maydell , Jason Wang Don't assume a specific layout for control messages. Required by virtio 1. Signed-off-by: Michael S. Tsirkin Reviewed-by: Amit Shah Reviewed-by: Jason Wang --- 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 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); -- MST