diff options
| author | John Snow <jsnow@redhat.com> | 2015-07-04 02:06:04 -0400 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2015-07-04 02:06:04 -0400 |
| commit | 4614619ee4ad96d2715dc41f9430fb43335c15d2 (patch) | |
| tree | b73ebe441895cc5cfb0162827d1c8c6532bb1f6a /hw | |
| parent | a718978ed58abc1ad92567a9c17525136be02a71 (diff) | |
| download | qemu-4614619ee4ad96d2715dc41f9430fb43335c15d2.zip qemu-4614619ee4ad96d2715dc41f9430fb43335c15d2.tar.gz qemu-4614619ee4ad96d2715dc41f9430fb43335c15d2.tar.bz2 | |
ahci: stash ncq command
For migration and werror=stop/rerror=stop resume purposes,
it will be convenient to have the command handy inside of
ncq_tfs.
Eventually, we'd like to avoid reading from the FIS entirely
after the initial read, so this is a byte (hah!) sized step
in that direction.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1435767578-32743-3-git-send-email-jsnow@redhat.com
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ide/ahci.c | 3 | ||||
| -rw-r--r-- | hw/ide/ahci.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index de1759a..9540a64 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -996,6 +996,7 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, ncq_tfs->used = 1; ncq_tfs->drive = ad; ncq_tfs->slot = slot; + ncq_tfs->cmd = ncq_fis->command; ncq_tfs->lba = ((uint64_t)ncq_fis->lba5 << 40) | ((uint64_t)ncq_fis->lba4 << 32) | ((uint64_t)ncq_fis->lba3 << 24) | @@ -1047,7 +1048,7 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, ncq_tfs->lba, ncq_tfs->lba + ncq_tfs->sector_count - 1, ide_state->nb_sectors - 1); - switch(ncq_fis->command) { + switch (ncq_tfs->cmd) { case READ_FPDMA_QUEUED: DPRINTF(port, "NCQ reading %d sectors from LBA %"PRId64", " "tag %d\n", diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h index b8872a4..33607d7 100644 --- a/hw/ide/ahci.h +++ b/hw/ide/ahci.h @@ -259,6 +259,7 @@ typedef struct NCQTransferState { uint16_t sector_count; uint64_t lba; uint8_t tag; + uint8_t cmd; int slot; int used; } NCQTransferState; |