From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Iy9lK-0007jB-MS
	for qemu-devel@nongnu.org; Fri, 30 Nov 2007 12:34:50 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Iy9lJ-0007iS-Sy
	for qemu-devel@nongnu.org; Fri, 30 Nov 2007 12:34:50 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Iy9lJ-0007iI-O8
	for qemu-devel@nongnu.org; Fri, 30 Nov 2007 12:34:49 -0500
Received: from tapir.sajinet.com.pe ([66.139.79.212])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <carenas@sajinet.com.pe>) id 1Iy9lJ-0005VN-BO
	for qemu-devel@nongnu.org; Fri, 30 Nov 2007 12:34:49 -0500
Date: Fri, 30 Nov 2007 11:41:07 -0600
From: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
Message-ID: <20071130174107.GB32198@tapir>
References: <20071130171809.GH28369@tapir>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20071130171809.GH28369@tapir>
Subject: [Qemu-devel] [PATCH 2/2] ide: report model as DVD-ROM for INQUIRY
	and IDENTIFY DEVICE commands
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

This patch complements "Partial IDE DVD emulation" and the previous patch to
reflect that the device is now able to support DVDs by changing the reported
model to be "DVD-ROM" instead of "CD-ROM".

Carlo

---
Index: hw/ide.c
===================================================================
RCS file: /sources/qemu/qemu/hw/ide.c,v
retrieving revision 1.72
diff -u -p -r1.72 ide.c
--- hw/ide.c	18 Nov 2007 01:44:37 -0000	1.72
+++ hw/ide.c	30 Nov 2007 16:57:52 -0000
@@ -1,5 +1,5 @@
 /*
- * QEMU IDE disk and CD-ROM Emulator
+ * QEMU IDE disk and CD/DVD-ROM Emulator
  *
  * Copyright (c) 2003 Fabrice Bellard
  * Copyright (c) 2006 Openedhand Ltd.
@@ -541,7 +541,7 @@ static void ide_atapi_identify(IDEState 
     put_le16(p + 21, 512); /* cache size in sectors */
     put_le16(p + 22, 4); /* ecc bytes */
     padstr((uint8_t *)(p + 23), QEMU_VERSION, 8); /* firmware version */
-    padstr((uint8_t *)(p + 27), "QEMU CD-ROM", 40); /* model */
+    padstr((uint8_t *)(p + 27), "QEMU DVD-ROM", 40); /* model */
     put_le16(p + 48, 1); /* dword I/O (XXX: should not be set on CDROM) */
 #ifdef USE_DMA_CDROM
     put_le16(p + 49, 1 << 9 | 1 << 8); /* DMA and LBA supported */
@@ -1630,7 +1630,7 @@ static void ide_atapi_cmd(IDEState *s)
         buf[6] = 0; /* reserved */
         buf[7] = 0; /* reserved */
         padstr8(buf + 8, 8, "QEMU");
-        padstr8(buf + 16, 16, "QEMU CD-ROM");
+        padstr8(buf + 16, 16, "QEMU DVD-ROM");
         padstr8(buf + 32, 4, QEMU_VERSION);
         ide_atapi_cmd_reply(s, 36, max_len);
         break;