Signed-off-by: Laurent Vivier <Laurent.Vivier@bull.net>
---
 hw/scsi-disk.c    |   28 ++++++++++++++--------------
 hw/scsi-generic.c |    8 ++++----
 2 files changed, 18 insertions(+), 18 deletions(-)

Index: qemu/hw/scsi-generic.c
===================================================================
--- qemu.orig/hw/scsi-generic.c	2008-09-26 17:00:54.000000000 +0200
+++ qemu/hw/scsi-generic.c	2008-09-26 17:00:58.000000000 +0200
@@ -158,15 +158,15 @@ static void scsi_command_complete(void *
 
     s->driver_status = r->io_header.driver_status;
     if (ret != 0)
-        sense = HARDWARE_ERROR;
+        sense = CHECK_CONDITION;
     else {
         if (s->driver_status & SG_ERR_DRIVER_TIMEOUT) {
-            sense = HARDWARE_ERROR;
+            sense = CHECK_CONDITION;
             BADF("Driver Timeout\n");
         } else if ((s->driver_status & SG_ERR_DRIVER_SENSE) == 0)
-            sense = NO_SENSE;
+            sense = GOOD;
         else
-            sense = s->sensebuf[2];
+            sense = CHECK_CONDITION;
     }
 
     DPRINTF("Command complete 0x%p tag=0x%x sense=%d\n", r, r->tag, sense);
Index: qemu/hw/scsi-disk.c
===================================================================
--- qemu.orig/hw/scsi-disk.c	2008-09-26 17:00:51.000000000 +0200
+++ qemu/hw/scsi-disk.c	2008-09-26 17:00:58.000000000 +0200
@@ -29,10 +29,10 @@ do { fprintf(stderr, "scsi-disk: " fmt ,
 #include "block.h"
 #include "scsi-disk.h"
 
-#define SENSE_NO_SENSE        0
-#define SENSE_NOT_READY       2
-#define SENSE_HARDWARE_ERROR  4
-#define SENSE_ILLEGAL_REQUEST 5
+#define STATUS_GOOD            0
+#define STATUS_CHECK_CONDITION 1
+#define STATUS_BUSY            4
+#define STATUS_ILLEGAL         (0xff)
 
 #define SCSI_DMA_BUF_SIZE    131072
 
@@ -157,7 +157,7 @@ static void scsi_read_complete(void * op
 
     if (ret) {
         DPRINTF("IO error\n");
-        scsi_command_complete(r, SENSE_HARDWARE_ERROR);
+        scsi_command_complete(r, STATUS_CHECK_CONDITION);
         return;
     }
     DPRINTF("Data ready tag=0x%x len=%d\n", r->tag, r->buf_len);
@@ -176,7 +176,7 @@ static void scsi_read_data(SCSIDevice *d
     if (!r) {
         BADF("Bad read tag 0x%x\n", tag);
         /* ??? This is the wrong error.  */
-        scsi_command_complete(r, SENSE_HARDWARE_ERROR);
+        scsi_command_complete(r, STATUS_CHECK_CONDITION);
         return;
     }
     if (r->sector_count == (uint32_t)-1) {
@@ -187,7 +187,7 @@ static void scsi_read_data(SCSIDevice *d
     }
     DPRINTF("Read sector_count=%d\n", r->sector_count);
     if (r->sector_count == 0) {
-        scsi_command_complete(r, SENSE_NO_SENSE);
+        scsi_command_complete(r, STATUS_GOOD);
         return;
     }
 
@@ -199,7 +199,7 @@ static void scsi_read_data(SCSIDevice *d
     r->aiocb = bdrv_aio_read(s->bdrv, r->sector, r->dma_buf, n,
                              scsi_read_complete, r);
     if (r->aiocb == NULL)
-        scsi_command_complete(r, SENSE_HARDWARE_ERROR);
+        scsi_command_complete(r, STATUS_CHECK_CONDITION);
     r->sector += n;
     r->sector_count -= n;
 }
@@ -217,7 +217,7 @@ static void scsi_write_complete(void * o
 
     r->aiocb = NULL;
     if (r->sector_count == 0) {
-        scsi_command_complete(r, SENSE_NO_SENSE);
+        scsi_command_complete(r, STATUS_GOOD);
     } else {
         len = r->sector_count * 512;
         if (len > SCSI_DMA_BUF_SIZE) {
@@ -241,7 +241,7 @@ static int scsi_write_data(SCSIDevice *d
     r = scsi_find_request(s, tag);
     if (!r) {
         BADF("Bad write tag 0x%x\n", tag);
-        scsi_command_complete(r, SENSE_HARDWARE_ERROR);
+        scsi_command_complete(r, STATUS_CHECK_CONDITION);
         return 1;
     }
     if (r->aiocb)
@@ -251,7 +251,7 @@ static int scsi_write_data(SCSIDevice *d
         r->aiocb = bdrv_aio_write(s->bdrv, r->sector, r->dma_buf, n,
                                   scsi_write_complete, r);
         if (r->aiocb == NULL)
-            scsi_command_complete(r, SENSE_HARDWARE_ERROR);
+            scsi_command_complete(r, STATUS_CHECK_CONDITION);
         r->sector += n;
         r->sector_count -= n;
     } else {
@@ -670,7 +670,7 @@ static int32_t scsi_send_command(SCSIDev
             outbuf[7] = 0;
             r->buf_len = 8;
         } else {
-            scsi_command_complete(r, SENSE_NOT_READY);
+            scsi_command_complete(r, STATUS_BUSY);
             return 0;
         }
 	break;
@@ -757,11 +757,11 @@ static int32_t scsi_send_command(SCSIDev
     default:
 	DPRINTF("Unknown SCSI command (%2.2x)\n", buf[0]);
     fail:
-        scsi_command_complete(r, SENSE_ILLEGAL_REQUEST);
+        scsi_command_complete(r, STATUS_ILLEGAL);
 	return 0;
     }
     if (r->sector_count == 0 && r->buf_len == 0) {
-        scsi_command_complete(r, SENSE_NO_SENSE);
+        scsi_command_complete(r, STATUS_GOOD);
     }
     len = r->sector_count * 512 + r->buf_len;
     if (is_write) {