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

ahci: assert is_ncq for process_ncq

Browse Source 
We already checked this in the handle_cmd phase, so just
change this to an assertion and simplify the error logic.

(Also, fix the switch indent, because checkpatch.pl yelled.)
((Sorry for churn.))

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1435767578-32743-4-git-send-email-jsnow@redhat.com
This commit is contained in:
John Snow 2015-07-04 02:06:04 -04:00
parent 4614619ee4
commit 922f893e57
1 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
hw/ide/ahci.c
View File

@ -987,6 +987,7 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis,
NCQTransferState *ncq_tfs = &ad->ncq_tfs[tag]; NCQTransferState *ncq_tfs = &ad->ncq_tfs[tag];
size_t size; size_t size;
g_assert(is_ncq(ncq_fis->command));
if (ncq_tfs->used) { if (ncq_tfs->used) {
/* error - already in use */ /* error - already in use */
fprintf(stderr, "%s: tag %d already used\n", __FUNCTION__, tag); fprintf(stderr, "%s: tag %d already used\n", __FUNCTION__, tag);
@ -1049,44 +1050,35 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis,
ide_state->nb_sectors - 1); ide_state->nb_sectors - 1);
switch (ncq_tfs->cmd) { switch (ncq_tfs->cmd) {
case READ_FPDMA_QUEUED: case READ_FPDMA_QUEUED:
DPRINTF(port, "NCQ reading %d sectors from LBA %"PRId64", " DPRINTF(port, "NCQ reading %d sectors from LBA %"PRId64", tag %d\n",
"tag %d\n", ncq_tfs->sector_count, ncq_tfs->lba, ncq_tfs->tag);
ncq_tfs->sector_count, ncq_tfs->lba, ncq_tfs->tag);
DPRINTF(port, "tag %d aio read %"PRId64"\n", DPRINTF(port, "tag %d aio read %"PRId64"\n",
ncq_tfs->tag, ncq_tfs->lba); ncq_tfs->tag, ncq_tfs->lba);
dma_acct_start(ide_state->blk, &ncq_tfs->acct, dma_acct_start(ide_state->blk, &ncq_tfs->acct,
&ncq_tfs->sglist, BLOCK_ACCT_READ); &ncq_tfs->sglist, BLOCK_ACCT_READ);
ncq_tfs->aiocb = dma_blk_read(ide_state->blk, ncq_tfs->aiocb = dma_blk_read(ide_state->blk, &ncq_tfs->sglist,
&ncq_tfs->sglist, ncq_tfs->lba, ncq_tfs->lba, ncq_cb, ncq_tfs);
ncq_cb, ncq_tfs); break;
break; case WRITE_FPDMA_QUEUED:
case WRITE_FPDMA_QUEUED: DPRINTF(port, "NCQ writing %d sectors to LBA %"PRId64", tag %d\n",
DPRINTF(port, "NCQ writing %d sectors to LBA %"PRId64", tag %d\n", ncq_tfs->sector_count, ncq_tfs->lba, ncq_tfs->tag);
ncq_tfs->sector_count, ncq_tfs->lba, ncq_tfs->tag);
DPRINTF(port, "tag %d aio write %"PRId64"\n", DPRINTF(port, "tag %d aio write %"PRId64"\n",
ncq_tfs->tag, ncq_tfs->lba); ncq_tfs->tag, ncq_tfs->lba);
dma_acct_start(ide_state->blk, &ncq_tfs->acct, dma_acct_start(ide_state->blk, &ncq_tfs->acct,
&ncq_tfs->sglist, BLOCK_ACCT_WRITE); &ncq_tfs->sglist, BLOCK_ACCT_WRITE);
ncq_tfs->aiocb = dma_blk_write(ide_state->blk, ncq_tfs->aiocb = dma_blk_write(ide_state->blk, &ncq_tfs->sglist,
&ncq_tfs->sglist, ncq_tfs->lba, ncq_tfs->lba, ncq_cb, ncq_tfs);
ncq_cb, ncq_tfs); break;
break; default:
default: DPRINTF(port, "error: unsupported NCQ command (0x%02x) received\n",
if (is_ncq(cmd_fis[2])) { ncq_tfs->cmd);
DPRINTF(port, qemu_sglist_destroy(&ncq_tfs->sglist);
"error: unsupported NCQ command (0x%02x) received\n", ncq_err(ncq_tfs);
cmd_fis[2]);
} else {
DPRINTF(port,
"error: tried to process non-NCQ command as NCQ\n");
}
qemu_sglist_destroy(&ncq_tfs->sglist);
ncq_err(ncq_tfs);
} }
} }