sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

scsi-disk: commonize iovec creation between reads and writes 

Also, consistently use qiov.size instead of iov.iov_len.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2011-09-16 16:40:03 +02:00 committed by Kevin Wolf
parent c3adb5b916
commit 103b40f51e
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
hw/scsi-disk.c
View File

@ -108,6 +108,13 @@ static void scsi_cancel_io(SCSIRequest *req)
r->req.aiocb = NULL; r->req.aiocb = NULL;
} }
static uint32_t scsi_init_iovec(SCSIDiskReq *r)
{
r->iov.iov_len = MIN(r->sector_count * 512, SCSI_DMA_BUF_SIZE);
qemu_iovec_init_external(&r->qiov, &r->iov, 1);
return r->qiov.size / 512;
}
static void scsi_read_complete(void * opaque, int ret) static void scsi_read_complete(void * opaque, int ret)
{ {
SCSIDiskReq *r = (SCSIDiskReq *)opaque; SCSIDiskReq *r = (SCSIDiskReq *)opaque;
@ -125,12 +132,12 @@ static void scsi_read_complete(void * opaque, int ret)
} }
} }
DPRINTF("Data ready tag=0x%x len=%zd\n", r->req.tag, r->iov.iov_len); DPRINTF("Data ready tag=0x%x len=%zd\n", r->req.tag, r->qiov.size);
n = r->iov.iov_len / 512; n = r->qiov.size / 512;
r->sector += n; r->sector += n;
r->sector_count -= n; r->sector_count -= n;
scsi_req_data(&r->req, r->iov.iov_len); scsi_req_data(&r->req, r->qiov.size);
} }
static void scsi_flush_complete(void * opaque, int ret) static void scsi_flush_complete(void * opaque, int ret)
@ -181,16 +188,10 @@ static void scsi_read_data(SCSIRequest *req)
return; return;
} }
n = r->sector_count;
if (n > SCSI_DMA_BUF_SIZE / 512)
n = SCSI_DMA_BUF_SIZE / 512;
if (s->tray_open) { if (s->tray_open) {
scsi_read_complete(r, -ENOMEDIUM); scsi_read_complete(r, -ENOMEDIUM);
} }
r->iov.iov_len = n * 512; n = scsi_init_iovec(r);
qemu_iovec_init_external(&r->qiov, &r->iov, 1);
bdrv_acct_start(s->bs, &r->acct, n * BDRV_SECTOR_SIZE, BDRV_ACCT_READ); bdrv_acct_start(s->bs, &r->acct, n * BDRV_SECTOR_SIZE, BDRV_ACCT_READ);
r->req.aiocb = bdrv_aio_readv(s->bs, r->sector, &r->qiov, n, r->req.aiocb = bdrv_aio_readv(s->bs, r->sector, &r->qiov, n,
scsi_read_complete, r); scsi_read_complete, r);
@ -239,7 +240,6 @@ static void scsi_write_complete(void * opaque, int ret)
{ {
SCSIDiskReq *r = (SCSIDiskReq *)opaque; SCSIDiskReq *r = (SCSIDiskReq *)opaque;
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
uint32_t len;
uint32_t n; uint32_t n;
if (r->req.aiocb != NULL) { if (r->req.aiocb != NULL) {
@ -253,19 +253,15 @@ static void scsi_write_complete(void * opaque, int ret)
} }
} }
n = r->iov.iov_len / 512; n = r->qiov.size / 512;
r->sector += n; r->sector += n;
r->sector_count -= n; r->sector_count -= n;
if (r->sector_count == 0) { if (r->sector_count == 0) {
scsi_req_complete(&r->req, GOOD); scsi_req_complete(&r->req, GOOD);
} else { } else {
len = r->sector_count * 512; scsi_init_iovec(r);
if (len > SCSI_DMA_BUF_SIZE) { DPRINTF("Write complete tag=0x%x more=%d\n", r->req.tag, r->qiov.size);
len = SCSI_DMA_BUF_SIZE; scsi_req_data(&r->req, r->qiov.size);
}
r->iov.iov_len = len;
DPRINTF("Write complete tag=0x%x more=%d\n", r->req.tag, len);
scsi_req_data(&r->req, len);
} }
} }
@ -284,21 +280,19 @@ static void scsi_write_data(SCSIRequest *req)
return; return;
} }
n = r->iov.iov_len / 512; n = r->qiov.size / 512;
if (n) { if (n) {
if (s->tray_open) { if (s->tray_open) {
scsi_write_complete(r, -ENOMEDIUM); scsi_write_complete(r, -ENOMEDIUM);
} }
qemu_iovec_init_external(&r->qiov, &r->iov, 1);
bdrv_acct_start(s->bs, &r->acct, n * BDRV_SECTOR_SIZE, BDRV_ACCT_WRITE); bdrv_acct_start(s->bs, &r->acct, n * BDRV_SECTOR_SIZE, BDRV_ACCT_WRITE);
r->req.aiocb = bdrv_aio_writev(s->bs, r->sector, &r->qiov, n, r->req.aiocb = bdrv_aio_writev(s->bs, r->sector, &r->qiov, n,
scsi_write_complete, r); scsi_write_complete, r);
if (r->req.aiocb == NULL) { if (r->req.aiocb == NULL) {
scsi_write_complete(r, -ENOMEM); scsi_write_complete(r, -ENOMEM);
} }
} else { } else {
/* Invoke completion routine to fetch data from host. */ /* Called for the first time. Ask the driver to send us more data. */
scsi_write_complete(r, 0); scsi_write_complete(r, 0);
} }
} }