From 95a635e4dfb97cd5684a8102e4ccd023cfa2d0b8 Mon Sep 17 00:00:00 2001 From: Xiao Wang Date: Mon, 10 Aug 2015 05:09:26 +0200 Subject: [PATCH 05/16] virtio-serial: fix ANY_LAYOUT Message-id: <1439183375-4841-6-git-send-email-jasowang@redhat.com> Patchwork-id: 67432 O-Subject: [RHEL7.2 qemu-kvm-rhev PATCH 05/14] virtio-serial: fix ANY_LAYOUT Bugzilla: 1248312 RH-Acked-by: Vlad Yasevich RH-Acked-by: Paolo Bonzini RH-Acked-by: Michael S. Tsirkin From: "Michael S. Tsirkin" 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 (cherry picked from commit 7882080388be5088e72c425b02223c02e6cb4295) Signed-off-by: Miroslav Rezanina --- 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 dc5c5ac..fee417d 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); -- 1.8.3.1