[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 21/24] esp: rename sense to status
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v4 21/24] esp: rename sense to status |
Date: |
Mon, 23 May 2011 18:09:06 +0200 |
This mirrors the LSI patch that was recently committed.
Signed-off-by: Paolo Bonzini <address@hidden>
Cc: Christoph Hellwig <address@hidden>
---
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
- [Qemu-devel] [PATCH v4 11/24] scsi: use scsi_req_complete, (continued)
- [Qemu-devel] [PATCH v4 11/24] scsi: use scsi_req_complete, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 12/24] scsi: Update sense code handling, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 14/24] scsi: introduce scsi_req_new, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 13/24] scsi: do not call send_command directly, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 15/24] scsi: introduce scsi_req_continue, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 16/24] scsi: introduce scsi_req_get_buf, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 17/24] scsi: Implement 'get_sense' callback, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 18/24] scsi-disk: add data direction checking, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 19/24] scsi: make write_data return void, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 20/24] scsi-generic: Handle queue full, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 21/24] esp: rename sense to status,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v4 22/24] scsi: split command_complete callback in two, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 23/24] scsi: rename arguments to the new callbacks, Paolo Bonzini, 2011/05/23
- [Qemu-devel] [PATCH v4 24/24] scsi: ignore LUN field in the CDB, Paolo Bonzini, 2011/05/23