From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=53484 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PLDHy-00066J-E6 for qemu-devel@nongnu.org; Wed, 24 Nov 2010 06:13:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PLDHw-0005nZ-5f for qemu-devel@nongnu.org; Wed, 24 Nov 2010 06:13:26 -0500 Received: from cantor2.suse.de ([195.135.220.15]:53553 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PLDHv-0005mo-QI for qemu-devel@nongnu.org; Wed, 24 Nov 2010 06:13:24 -0500 From: Hannes Reinecke Date: Wed, 24 Nov 2010 12:16:02 +0100 Message-Id: <1290597370-21365-8-git-send-email-hare@suse.de> In-Reply-To: <1290597370-21365-1-git-send-email-hare@suse.de> References: <1290597370-21365-1-git-send-email-hare@suse.de> Subject: [Qemu-devel] [PATCH 07/15] lsi53c895a: Rename 'sense' to 'status' List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: stefanha@gmail.com, nab@linux-iscsi.org, kraxel@redhat.com The 'sense' field in the HBA status structure is misnamed, as it actually carries the SCSI status. Rename it. Signed-off-by: Hannes Reinecke Reviewed-by: Stefan Hajnoczi --- hw/lsi53c895a.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index f97335e..8246ee8 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -189,7 +189,7 @@ typedef struct { uint32_t script_ram_base; int carry; /* ??? Should this be an a visible register somewhere? */ - int sense; + int status; /* Action to take at the end of a MSG IN phase. 0 = COMMAND, 1 = disconnect, 2 = DATA OUT, 3 = DATA IN. */ int msg_action; @@ -695,8 +695,8 @@ static void lsi_command_complete(SCSIBus *bus, int reason, uint32_t tag, out = (s->sstat1 & PHASE_MASK) == PHASE_DO; if (reason == SCSI_REASON_DONE) { - DPRINTF("Command complete sense=%d\n", (int)arg); - s->sense = arg; + DPRINTF("Command complete status=%d\n", (int)arg); + s->status = arg; s->command_complete = 2; if (s->waiting && s->dbc != 0) { /* Raise phase mismatch for short transfers. */ @@ -783,14 +783,14 @@ static void lsi_do_command(LSIState *s) static void lsi_do_status(LSIState *s) { - uint8_t sense; - DPRINTF("Get status len=%d sense=%d\n", s->dbc, s->sense); + uint8_t status; + DPRINTF("Get status len=%d status=%d\n", s->dbc, s->status); if (s->dbc != 1) BADF("Bad Status move\n"); s->dbc = 1; - sense = s->sense; - s->sfbr = sense; - cpu_physical_memory_write(s->dnad, &sense, 1); + status = s->status; + s->sfbr = status; + cpu_physical_memory_write(s->dnad, &status, 1); lsi_set_phase(s, PHASE_MI); s->msg_action = 1; lsi_add_msg_byte(s, 0); /* COMMAND COMPLETE */ @@ -2067,7 +2067,7 @@ static const VMStateDescription vmstate_lsi_scsi = { VMSTATE_PCI_DEVICE(dev, LSIState), VMSTATE_INT32(carry, LSIState), - VMSTATE_INT32(sense, LSIState), + VMSTATE_INT32(status, LSIState), VMSTATE_INT32(msg_action, LSIState), VMSTATE_INT32(msg_len, LSIState), VMSTATE_BUFFER(msg, LSIState), -- 1.6.0.2