SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scsi-disk: remove cluster_size

Browse Source 
This field is redundant, and having it makes it more complicated
to share reqops between the upcoming scsi-block and scsi-generic.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2011-10-13 10:35:46 +02:00 committed by Kevin Wolf
parent 44740c3816
commit 69377307b2
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
hw/scsi-disk.c
View File

@ -65,9 +65,6 @@ typedef struct SCSIDiskReq {
struct SCSIDiskState struct SCSIDiskState
{ {
SCSIDevice qdev; SCSIDevice qdev;
/* The qemu block layer uses a fixed 512 byte sector size.
This is the number of 512 byte blocks in a single scsi sector. */
int cluster_size;
uint32_t removable; uint32_t removable;
uint64_t max_lba; uint64_t max_lba;
bool media_changed; bool media_changed;
@ -854,7 +851,7 @@ static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf,
bdrv_get_geometry_hint(bdrv, &cylinders, &heads, &secs); bdrv_get_geometry_hint(bdrv, &cylinders, &heads, &secs);
p[4] = heads & 0xff; p[4] = heads & 0xff;
p[5] = secs & 0xff; p[5] = secs & 0xff;
p[6] = s->cluster_size * 2; p[6] = s->qdev.blocksize >> 8;
p[8] = (cylinders >> 8) & 0xff; p[8] = (cylinders >> 8) & 0xff;
p[9] = cylinders & 0xff; p[9] = cylinders & 0xff;
/* Write precomp start cylinder, disabled */ /* Write precomp start cylinder, disabled */
@ -983,7 +980,7 @@ static int scsi_disk_emulate_mode_sense(SCSIDiskReq *r, uint8_t *outbuf)
} else { /* MODE_SENSE_10 */ } else { /* MODE_SENSE_10 */
outbuf[7] = 8; /* Block descriptor length */ outbuf[7] = 8; /* Block descriptor length */
} }
nb_sectors /= s->cluster_size; nb_sectors /= (s->qdev.blocksize / 512);
if (nb_sectors > 0xffffff) { if (nb_sectors > 0xffffff) {
nb_sectors = 0; nb_sectors = 0;
} }
@ -993,7 +990,7 @@ static int scsi_disk_emulate_mode_sense(SCSIDiskReq *r, uint8_t *outbuf)
p[3] = nb_sectors & 0xff; p[3] = nb_sectors & 0xff;
p[4] = 0; /* reserved */ p[4] = 0; /* reserved */
p[5] = 0; /* bytes 5-7 are the sector size in bytes */ p[5] = 0; /* bytes 5-7 are the sector size in bytes */
p[6] = s->cluster_size * 2; p[6] = s->qdev.blocksize >> 8;
p[7] = 0; p[7] = 0;
p += 8; p += 8;
} }
@ -1044,7 +1041,7 @@ static int scsi_disk_emulate_read_toc(SCSIRequest *req, uint8_t *outbuf)
start_track = req->cmd.buf[6]; start_track = req->cmd.buf[6];
bdrv_get_geometry(s->qdev.conf.bs, &nb_sectors); bdrv_get_geometry(s->qdev.conf.bs, &nb_sectors);
DPRINTF("Read TOC (track %d format %d msf %d)\n", start_track, format, msf >> 1); DPRINTF("Read TOC (track %d format %d msf %d)\n", start_track, format, msf >> 1);
nb_sectors /= s->cluster_size; nb_sectors /= s->qdev.blocksize / 512;
switch (format) { switch (format) {
case 0: case 0:
toclen = cdrom_read_toc(nb_sectors, outbuf, msf, start_track); toclen = cdrom_read_toc(nb_sectors, outbuf, msf, start_track);
@ -1179,7 +1176,7 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r)
if ((req->cmd.buf[8] & 1) == 0 && req->cmd.lba) { if ((req->cmd.buf[8] & 1) == 0 && req->cmd.lba) {
goto illegal_request; goto illegal_request;
} }
nb_sectors /= s->cluster_size; nb_sectors /= s->qdev.blocksize / 512;
/* Returned value is the address of the last sector. */ /* Returned value is the address of the last sector. */
nb_sectors--; nb_sectors--;
/* Remember the new size for read/write sanity checking. */ /* Remember the new size for read/write sanity checking. */
@ -1194,7 +1191,7 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r)
outbuf[3] = nb_sectors & 0xff; outbuf[3] = nb_sectors & 0xff;
outbuf[4] = 0; outbuf[4] = 0;
outbuf[5] = 0; outbuf[5] = 0;
outbuf[6] = s->cluster_size * 2; outbuf[6] = s->qdev.blocksize >> 8;
outbuf[7] = 0; outbuf[7] = 0;
buflen = 8; buflen = 8;
break; break;
@ -1234,7 +1231,7 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r)
if ((req->cmd.buf[14] & 1) == 0 && req->cmd.lba) { if ((req->cmd.buf[14] & 1) == 0 && req->cmd.lba) {
goto illegal_request; goto illegal_request;
} }
nb_sectors /= s->cluster_size; nb_sectors /= s->qdev.blocksize / 512;
/* Returned value is the address of the last sector. */ /* Returned value is the address of the last sector. */
nb_sectors--; nb_sectors--;
/* Remember the new size for read/write sanity checking. */ /* Remember the new size for read/write sanity checking. */
@ -1249,7 +1246,7 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r)
outbuf[7] = nb_sectors & 0xff; outbuf[7] = nb_sectors & 0xff;
outbuf[8] = 0; outbuf[8] = 0;
outbuf[9] = 0; outbuf[9] = 0;
outbuf[10] = s->cluster_size * 2; outbuf[10] = s->qdev.blocksize >> 8;
outbuf[11] = 0; outbuf[11] = 0;
outbuf[12] = 0; outbuf[12] = 0;
outbuf[13] = get_physical_block_exp(&s->qdev.conf); outbuf[13] = get_physical_block_exp(&s->qdev.conf);
@ -1356,8 +1353,8 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf)
if (r->req.cmd.lba > s->max_lba) { if (r->req.cmd.lba > s->max_lba) {
goto illegal_lba; goto illegal_lba;
} }
r->sector = r->req.cmd.lba * s->cluster_size; r->sector = r->req.cmd.lba * (s->qdev.blocksize / 512);
r->sector_count = len * s->cluster_size; r->sector_count = len * (s->qdev.blocksize / 512);
break; break;
case WRITE_6: case WRITE_6:
case WRITE_10: case WRITE_10:
@ -1373,8 +1370,8 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf)
if (r->req.cmd.lba > s->max_lba) { if (r->req.cmd.lba > s->max_lba) {
goto illegal_lba; goto illegal_lba;
} }
r->sector = r->req.cmd.lba * s->cluster_size; r->sector = r->req.cmd.lba * (s->qdev.blocksize / 512);
r->sector_count = len * s->cluster_size; r->sector_count = len * (s->qdev.blocksize / 512);
break; break;
case MODE_SELECT: case MODE_SELECT:
DPRINTF("Mode Select(6) (len %lu)\n", (long)r->req.cmd.xfer); DPRINTF("Mode Select(6) (len %lu)\n", (long)r->req.cmd.xfer);
@ -1417,8 +1414,9 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf)
goto fail; goto fail;
} }
rc = bdrv_discard(s->qdev.conf.bs, r->req.cmd.lba * s->cluster_size, rc = bdrv_discard(s->qdev.conf.bs,
len * s->cluster_size); r->req.cmd.lba * (s->qdev.blocksize / 512),
len * (s->qdev.blocksize / 512));
if (rc < 0) { if (rc < 0) {
/* XXX: better error code ?*/ /* XXX: better error code ?*/
goto fail; goto fail;
@ -1460,7 +1458,7 @@ static void scsi_disk_reset(DeviceState *dev)
scsi_device_purge_requests(&s->qdev, SENSE_CODE(RESET)); scsi_device_purge_requests(&s->qdev, SENSE_CODE(RESET));
bdrv_get_geometry(s->qdev.conf.bs, &nb_sectors); bdrv_get_geometry(s->qdev.conf.bs, &nb_sectors);
nb_sectors /= s->cluster_size; nb_sectors /= s->qdev.blocksize / 512;
if (nb_sectors) { if (nb_sectors) {
nb_sectors--; nb_sectors--;
} }
@ -1561,7 +1559,6 @@ static int scsi_initfn(SCSIDevice *dev, uint8_t scsi_type)
error_report("scsi-disk: Unhandled SCSI type %02x", scsi_type); error_report("scsi-disk: Unhandled SCSI type %02x", scsi_type);
return -1; return -1;
} }
s->cluster_size = s->qdev.blocksize / 512;
bdrv_set_buffer_alignment(s->qdev.conf.bs, s->qdev.blocksize); bdrv_set_buffer_alignment(s->qdev.conf.bs, s->qdev.blocksize);
s->qdev.type = scsi_type; s->qdev.type = scsi_type;