From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:51556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qiq6c-00051C-SL for qemu-devel@nongnu.org; Mon, 18 Jul 2011 11:51:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qiq6b-0002iU-Ij for qemu-devel@nongnu.org; Mon, 18 Jul 2011 11:51:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59270) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qiq6a-0002i9-QR for qemu-devel@nongnu.org; Mon, 18 Jul 2011 11:51:37 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p6IFpZ58017406 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 18 Jul 2011 11:51:35 -0400 From: Gerd Hoffmann Date: Mon, 18 Jul 2011 17:51:24 +0200 Message-Id: <1311004288-10970-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1311004288-10970-1-git-send-email-kraxel@redhat.com> References: <1311004288-10970-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 5/9] usb-serial: iovec support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Add full support for iovecs to usb-serial. Signed-off-by: Gerd Hoffmann --- hw/usb-serial.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/hw/usb-serial.c b/hw/usb-serial.c index 4a00211..1133e8d 100644 --- a/hw/usb-serial.c +++ b/hw/usb-serial.c @@ -359,38 +359,42 @@ static int usb_serial_handle_control(USBDevice *dev, USBPacket *p, static int usb_serial_handle_data(USBDevice *dev, USBPacket *p) { USBSerialState *s = (USBSerialState *)dev; - int ret = 0; + int i, ret = 0; uint8_t devep = p->devep; - uint8_t *data = p->iov.iov[0].iov_base; - int len = p->iov.iov[0].iov_len; - int first_len; + struct iovec *iov; + uint8_t header[2]; + int first_len, len; - assert(p->iov.niov == 1); /* temporary */ switch (p->pid) { case USB_TOKEN_OUT: if (devep != 2) goto fail; - qemu_chr_write(s->cs, data, len); + for (i = 0; i < p->iov.niov; i++) { + iov = p->iov.iov + i; + qemu_chr_write(s->cs, iov->iov_base, iov->iov_len); + } break; case USB_TOKEN_IN: if (devep != 1) goto fail; first_len = RECV_BUF - s->recv_ptr; + len = p->iov.size; if (len <= 2) { ret = USB_RET_NAK; break; } - *data++ = usb_get_modem_lines(s) | 1; + header[0] = usb_get_modem_lines(s) | 1; /* We do not have the uart details */ /* handle serial break */ if (s->event_trigger && s->event_trigger & FTDI_BI) { s->event_trigger &= ~FTDI_BI; - *data = FTDI_BI; + header[1] = FTDI_BI; + usb_packet_copy(p, header, 2); ret = 2; break; } else { - *data++ = 0; + header[1] = 0; } len -= 2; if (len > s->recv_used) @@ -401,9 +405,10 @@ static int usb_serial_handle_data(USBDevice *dev, USBPacket *p) } if (first_len > len) first_len = len; - memcpy(data, s->recv_buf + s->recv_ptr, first_len); + usb_packet_copy(p, header, 2); + usb_packet_copy(p, s->recv_buf + s->recv_ptr, first_len); if (len > first_len) - memcpy(data + first_len, s->recv_buf, len - first_len); + usb_packet_copy(p, s->recv_buf, len - first_len); s->recv_used -= len; s->recv_ptr = (s->recv_ptr + len) % RECV_BUF; ret = len + 2; -- 1.7.1