From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:57669) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOXiA-0002f2-2R for qemu-devel@nongnu.org; Mon, 23 May 2011 12:10:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QOXi9-0001ST-8J for qemu-devel@nongnu.org; Mon, 23 May 2011 12:10:30 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:41673) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOXi9-0001Qu-3k for qemu-devel@nongnu.org; Mon, 23 May 2011 12:10:29 -0400 Received: by mail-pz0-f45.google.com with SMTP id 30so3212485pzk.4 for ; Mon, 23 May 2011 09:10:28 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 23 May 2011 18:09:06 +0200 Message-Id: <1306166949-19698-22-git-send-email-pbonzini@redhat.com> In-Reply-To: <1306166949-19698-1-git-send-email-pbonzini@redhat.com> References: <1306166949-19698-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v4 21/24] esp: rename sense to status List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: hch@lst.de This mirrors the LSI patch that was recently committed. Signed-off-by: Paolo Bonzini Cc: Christoph Hellwig --- hw/esp.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/esp.c b/hw/esp.c index 381a8fb..0b80529 100644 --- a/hw/esp.c +++ b/hw/esp.c @@ -61,7 +61,7 @@ struct ESPState { int32_t ti_size; uint32_t ti_rptr, ti_wptr; uint8_t ti_buf[TI_BUFSZ]; - uint32_t sense; + uint32_t status; uint32_t dma; SCSIBus bus; SCSIDevice *current_dev; @@ -318,8 +318,8 @@ static void handle_satn_stop(ESPState *s) static void write_response(ESPState *s) { - DPRINTF("Transfer status (sense=%d)\n", s->sense); - s->ti_buf[0] = s->sense; + DPRINTF("Transfer status (status=%d)\n", s->status); + s->ti_buf[0] = s->status; s->ti_buf[1] = 0; if (s->dma) { s->dma_memory_write(s->dma_opaque, s->ti_buf, 2); @@ -408,7 +408,7 @@ static void esp_command_complete(SCSIRequest *req, int reason, uint32_t arg) s->async_len = 0; if (arg) DPRINTF("Command failed\n"); - s->sense = arg; + s->status = arg; s->rregs[ESP_RSTAT] = STAT_ST; esp_dma_done(s); if (s->current_req) { @@ -688,7 +688,7 @@ static const VMStateDescription vmstate_esp = { VMSTATE_UINT32(ti_rptr, ESPState), VMSTATE_UINT32(ti_wptr, ESPState), VMSTATE_BUFFER(ti_buf, ESPState), - VMSTATE_UINT32(sense, ESPState), + VMSTATE_UINT32(status, ESPState), VMSTATE_UINT32(dma, ESPState), VMSTATE_BUFFER(cmdbuf, ESPState), VMSTATE_UINT32(cmdlen, ESPState), -- 1.7.4.4