From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Lnx8A-0001eL-5g
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 11:41:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Lnx89-0001e2-JX
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 11:41:01 -0400
Received: from [199.232.76.173] (port=34528 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Lnx89-0001dw-BZ
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 11:41:01 -0400
Received: from savannah.gnu.org ([199.232.41.3]:59239 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 1Lnx88-000317-WA
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 11:41:01 -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 1Lnx88-0006R8-Fu
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 15:41:00 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1Lnx88-0006R3-5n
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 15:41:00 +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: <E1Lnx88-0006R3-5n@cvs.savannah.gnu.org>
Date: Sun, 29 Mar 2009 15:41:00 +0000
Subject: [Qemu-devel] [6954] Misc scsi disk/cdrom fixes/improvements 4/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: 6954
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6954
Author:   blueswir1
Date:     2009-03-29 15:40:59 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
Misc scsi disk/cdrom fixes/improvements 4/4

Implement Test Unit Ready command (return NOT READY as above
if !bdrv_is_inserted(...))

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:42 UTC (rev 6953)
+++ trunk/hw/scsi-disk.c	2009-03-29 15:40:59 UTC (rev 6954)
@@ -417,6 +417,8 @@
     switch (command) {
     case 0x0:
 	DPRINTF("Test Unit Ready\n");
+        if (!bdrv_is_inserted(s->bdrv))
+            goto notready;
 	break;
     case 0x03:
         DPRINTF("Request Sense (len %d)\n", len);
@@ -766,6 +768,7 @@
             outbuf[7] = 0;
             r->buf_len = 8;
         } else {
+        notready:
             scsi_command_complete(r, STATUS_CHECK_CONDITION, SENSE_NOT_READY);
             return 0;
         }