OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

usb-storage: add scsi_off, remove scsi_buf

Browse Source 
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 <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2012-05-16 15:03:40 +02:00
parent 1e6ed80b90
commit 1dc903673a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/usb/dev-storage.c
View File

@ -48,8 +48,8 @@ struct usb_msd_csw {
typedef struct { typedef struct {
USBDevice dev; USBDevice dev;
enum USBMSDMode mode; enum USBMSDMode mode;
uint32_t scsi_off;
uint32_t scsi_len; uint32_t scsi_len;
uint8_t *scsi_buf;
uint32_t data_len; uint32_t data_len;
struct usb_msd_csw csw; struct usb_msd_csw csw;
SCSIRequest *req; SCSIRequest *req;
@ -178,9 +178,9 @@ static void usb_msd_copy_data(MSDState *s, USBPacket *p)
len = p->iov.size - p->result; len = p->iov.size - p->result;
if (len > s->scsi_len) if (len > s->scsi_len)
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_len -= len;
s->scsi_buf += len; s->scsi_off += len;
s->data_len -= len; s->data_len -= len;
if (s->scsi_len == 0 || s->data_len == 0) { if (s->scsi_len == 0 || s->data_len == 0) {
scsi_req_continue(s->req); 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)); assert((s->mode == USB_MSDM_DATAOUT) == (req->cmd.mode == SCSI_XFER_TO_DEV));
s->scsi_len = len; s->scsi_len = len;
s->scsi_buf = scsi_req_get_buf(req); s->scsi_off = 0;
if (p) { if (p) {
usb_msd_copy_data(s, p); usb_msd_copy_data(s, p);
p = s->packet; p = s->packet;