From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Lnx7s-0001XH-0r
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 11:40:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Lnx7r-0001Wu-E7
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 11:40:43 -0400
Received: from [199.232.76.173] (port=34526 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Lnx7r-0001Wo-AS
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 11:40:43 -0400
Received: from savannah.gnu.org ([199.232.41.3]:59231 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <blauwirbel@gmail.com>)
	id 1Lnx7r-000309-1i
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 11:40:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <blauwirbel@gmail.com>) id 1Lnx7q-0006OA-Hv
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 15:40:42 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1Lnx7q-0006O6-Bm
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 15:40:42 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1Lnx7q-0006O6-Bm@cvs.savannah.gnu.org>
Date: Sun, 29 Mar 2009 15:40:42 +0000
Subject: [Qemu-devel] [6953] misc scsi disk/cdrom fixes/improvements 3/4
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6953
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6953
Author:   blueswir1
Date:     2009-03-29 15:40:42 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
misc scsi disk/cdrom fixes/improvements 3/4

Add asc 0x3a, ascq 0: Medium not present to NOT READY sense
(needed to keep some guests from retrying causing long sleeps in the
kernel)

Signed-off-by: Juergen Lock <nox@jelal.kn-bremen.de>

Modified Paths:
--------------
    trunk/hw/scsi-disk.c

Modified: trunk/hw/scsi-disk.c
===================================================================
--- trunk/hw/scsi-disk.c	2009-03-29 15:40:21 UTC (rev 6952)
+++ trunk/hw/scsi-disk.c	2009-03-29 15:40:42 UTC (rev 6953)
@@ -423,10 +423,18 @@
         if (len < 4)
             goto fail;
         memset(outbuf, 0, 4);
+        r->buf_len = 4;
+        if (s->sense == SENSE_NOT_READY && len >= 18) {
+            memset(outbuf, 0, 18);
+            r->buf_len = 18;
+            outbuf[7] = 10;
+            /* asc 0x3a, ascq 0: Medium not present */
+            outbuf[12] = 0x3a;
+            outbuf[13] = 0;
+        }
         outbuf[0] = 0xf0;
         outbuf[1] = 0;
         outbuf[2] = s->sense;
-        r->buf_len = 4;
         break;
     case 0x12:
         DPRINTF("Inquiry (len %d)\n", len);