From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXrSN-0002Si-EV for qemu-devel@nongnu.org; Fri, 25 May 2012 06:09:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SXrSK-00062U-5A for qemu-devel@nongnu.org; Fri, 25 May 2012 06:09:15 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:46545) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXrSJ-00062B-Sd for qemu-devel@nongnu.org; Fri, 25 May 2012 06:09:12 -0400 Received: by pbbro12 with SMTP id ro12so1745885pbb.4 for ; Fri, 25 May 2012 03:09:09 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <4FBF5A3F.5090300@redhat.com> Date: Fri, 25 May 2012 12:09:03 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1337939061-13629-1-git-send-email-kraxel@redhat.com> <1337939061-13629-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1337939061-13629-10-git-send-email-kraxel@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 09/10] usb-storage: add scsi_off, remove scsi_buf List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: qemu-devel@nongnu.org Il 25/05/2012 11:44, Gerd Hoffmann ha scritto: > Repace the running buffer pointer (scsi_buf) with a buffer offset > field (scsi_off). The later is alot easier to live-migrate. > > Signed-off-by: Gerd Hoffmann > --- > hw/usb/dev-storage.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c > index 1477599..1975d26 100644 > --- a/hw/usb/dev-storage.c > +++ b/hw/usb/dev-storage.c > @@ -48,8 +48,8 @@ struct usb_msd_csw { > typedef struct { > USBDevice dev; > enum USBMSDMode mode; > + uint32_t scsi_off; > uint32_t scsi_len; > - uint8_t *scsi_buf; > uint32_t data_len; > struct usb_msd_csw csw; > SCSIRequest *req; > @@ -178,9 +178,9 @@ static void usb_msd_copy_data(MSDState *s, USBPacket *p) > len = p->iov.size - p->result; > if (len > s->scsi_len) > len = s->scsi_len; > - usb_packet_copy(p, s->scsi_buf, len); > + usb_packet_copy(p, scsi_req_get_buf(s->req) + s->scsi_off, len); > s->scsi_len -= len; > - s->scsi_buf += len; > + s->scsi_off += len; > s->data_len -= len; > if (s->scsi_len == 0 || s->data_len == 0) { > scsi_req_continue(s->req); > @@ -219,7 +219,7 @@ static void usb_msd_transfer_data(SCSIRequest *req, uint32_t len) > > assert((s->mode == USB_MSDM_DATAOUT) == (req->cmd.mode == SCSI_XFER_TO_DEV)); > s->scsi_len = len; > - s->scsi_buf = scsi_req_get_buf(req); > + s->scsi_off = 0; > if (p) { > usb_msd_copy_data(s, p); > p = s->packet; Reviewed-by: Paolo Bonzini