Commit b6fe41fa authored by John Snow's avatar John Snow
Browse files

ahci: use shorter variables 



Trivial cleanup that I didn't want to tack-on to anything else.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 1435016308-6150-3-git-send-email-jsnow@redhat.com
parent 7763ed15

hw/ide/ahci.c

+10 −8
Original line number Diff line number Diff line
@@ -972,9 +972,11 @@ static int is_ncq(uint8_t ata_cmd) 
static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis,

                                int slot)

{

    AHCIDevice *ad = &s->dev[port];

    IDEState *ide_state = &ad->port.ifs[0];

    NCQFrame *ncq_fis = (NCQFrame*)cmd_fis;

    uint8_t tag = ncq_fis->tag >> 3;

    NCQTransferState *ncq_tfs = &s->dev[port].ncq_tfs[tag];

    NCQTransferState *ncq_tfs = &ad->ncq_tfs[tag];



    if (ncq_tfs->used) {

        /* error - already in use */
@@ -983,7 +985,7 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, 
    }



    ncq_tfs->used = 1;

    ncq_tfs->drive = &s->dev[port];

    ncq_tfs->drive = ad;

    ncq_tfs->slot = slot;

    ncq_tfs->lba = ((uint64_t)ncq_fis->lba5 << 40) |

                   ((uint64_t)ncq_fis->lba4 << 32) |
@@ -1000,9 +1002,9 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, 
    DPRINTF(port, "NCQ transfer LBA from %"PRId64" to %"PRId64", "

            "drive max %"PRId64"\n",

            ncq_tfs->lba, ncq_tfs->lba + ncq_tfs->sector_count - 2,

            s->dev[port].port.ifs[0].nb_sectors - 1);

            ide_state->nb_sectors - 1);



    ahci_populate_sglist(&s->dev[port], &ncq_tfs->sglist, 0);

    ahci_populate_sglist(ad, &ncq_tfs->sglist, 0);

    ncq_tfs->tag = tag;



    switch(ncq_fis->command) {
@@ -1014,9 +1016,9 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, 
            DPRINTF(port, "tag %d aio read %"PRId64"\n",

                    ncq_tfs->tag, ncq_tfs->lba);



            dma_acct_start(ncq_tfs->drive->port.ifs[0].blk, &ncq_tfs->acct,

            dma_acct_start(ide_state->blk, &ncq_tfs->acct,

                           &ncq_tfs->sglist, BLOCK_ACCT_READ);

            ncq_tfs->aiocb = dma_blk_read(ncq_tfs->drive->port.ifs[0].blk,

            ncq_tfs->aiocb = dma_blk_read(ide_state->blk,

                                          &ncq_tfs->sglist, ncq_tfs->lba,

                                          ncq_cb, ncq_tfs);

            break;
@@ -1027,9 +1029,9 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, 
            DPRINTF(port, "tag %d aio write %"PRId64"\n",

                    ncq_tfs->tag, ncq_tfs->lba);



            dma_acct_start(ncq_tfs->drive->port.ifs[0].blk, &ncq_tfs->acct,

            dma_acct_start(ide_state->blk, &ncq_tfs->acct,

                           &ncq_tfs->sglist, BLOCK_ACCT_WRITE);

            ncq_tfs->aiocb = dma_blk_write(ncq_tfs->drive->port.ifs[0].blk,

            ncq_tfs->aiocb = dma_blk_write(ide_state->blk,

                                           &ncq_tfs->sglist, ncq_tfs->lba,

                                           ncq_cb, ncq_tfs);

            break;