From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBGbu-0006ZF-De for qemu-devel@nongnu.org; Sat, 04 Jul 2015 02:07:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZBGbs-0003Z0-Ef for qemu-devel@nongnu.org; Sat, 04 Jul 2015 02:07:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33248) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBGbs-0003Ys-7j for qemu-devel@nongnu.org; Sat, 04 Jul 2015 02:07:32 -0400 From: John Snow Date: Sat, 4 Jul 2015 02:07:01 -0400 Message-Id: <1435990034-8945-23-git-send-email-jsnow@redhat.com> In-Reply-To: <1435990034-8945-1-git-send-email-jsnow@redhat.com> References: <1435990034-8945-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PULL 22/35] ahci: stash ncq command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com 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 Reviewed-by: Stefan Hajnoczi Message-id: 1435767578-32743-3-git-send-email-jsnow@redhat.com --- hw/ide/ahci.c | 3 ++- hw/ide/ahci.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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; -- 2.1.0