From: Markus Armbruster <armbru@redhat.com>
Date: Tue, 6 Sep 2011 16:58:34 +0000 (+0200)
Subject: ide: Fix ATA command READ to set ATAPI signature for CD-ROM
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3f76a7c3815716d21b9932b892825309bf477ee8;p=qemu.git

ide: Fix ATA command READ to set ATAPI signature for CD-ROM

Must set the ATAPI device signature, see ATA4 8.27.5.2 Outputs for
PACKET Command feature set devices, and ACS-2 7.36.6 Outputs for
PACKET feature set devices.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/hw/ide/core.c b/hw/ide/core.c
index 1806e008bc..def01266d0 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -983,8 +983,10 @@ void ide_exec_cmd(IDEBus *bus, uint32_t val)
 	lba48 = 1;
     case WIN_READ:
     case WIN_READ_ONCE:
-        if (!s->bs)
+        if (s->drive_kind == IDE_CD) {
+            ide_set_signature(s); /* odd, but ATA4 8.27.5.2 requires it */
             goto abort_cmd;
+        }
 	ide_cmd_lba48_transform(s, lba48);
         s->req_nb_sectors = 1;
         ide_sector_read(s);