Fix bug #191795 - cdrom emulation

Package-Manager: portage-2.1.3.7

4 files changed, 77 insertions, 13 deletions

diff --git a/app-emulation/qemu-softmmu/ChangeLog b/app-emulation/qemu-softmmu/ChangeLog
index f250be9e39af..bc2fc6713d48 100644
--- a/app-emulation/qemu-softmmu/ChangeLog
+++ b/app-emulation/qemu-softmmu/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-emulation/qemu-softmmu
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.40 2007/07/02 14:01:30 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.41 2007/09/09 09:13:29 lu_zero Exp $
 
-  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
+  09 Sep 2007; Luca Barbato <lu_zero@gentoo.org>
+  +files/qemu-softmmu-0.9.0-ide-cd.patch, qemu-softmmu-0.9.0.ebuild:
+  Address a glitch in the ide/cdrom emulation, thanks to Carlo Marcelo Arenas
+  Belon <carenas@sajinet.com.pe> for pointing the patch and reporting the
+  issue
+
+  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
   qemu-softmmu-0.8.0.ebuild, qemu-softmmu-0.8.0.20060329.ebuild,
   qemu-softmmu-0.8.1.ebuild, qemu-softmmu-0.8.1-r1.ebuild,
   qemu-softmmu-0.8.2.ebuild, qemu-softmmu-0.8.2-r1.ebuild,
@@ -19,7 +25,7 @@
   08 May 2007; Markus Ullmann <jokey@gentoo.org> qemu-softmmu-0.9.0.ebuild:
   Stable on x86 wrt security bug #176674
 
-  21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+  21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
 
   10 Feb 2007; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.9.0.ebuild:
@@ -133,7 +139,7 @@
   x86 stable for qemu-softmmu-0.8.0 bug #123972.
 
   08 Jan 2006; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.8.0.ebuild:
-  Disable gcc checks, thanks to Robert Führicht <the_master_of_disaster@gmx.at>
+  Disable gcc checks, thanks to Robert Führicht <the_master_of_disaster@gmx.at>
 
 *qemu-softmmu-0.8.0 (23 Dec 2005)
 
diff --git a/app-emulation/qemu-softmmu/Manifest b/app-emulation/qemu-softmmu/Manifest
index 5891f812280f..2caf0593ebf4 100644
--- a/app-emulation/qemu-softmmu/Manifest
+++ b/app-emulation/qemu-softmmu/Manifest
@@ -14,6 +14,10 @@ AUX qemu-0.8.2-sparc-fp.patch 591 RMD160 bbce6e754d32e8e5cb4c28e534b7a8ae27bee4b
 MD5 b3e7fd1797acd3ca68ffa4a31750d518 files/qemu-0.8.2-sparc-fp.patch 591
 RMD160 bbce6e754d32e8e5cb4c28e534b7a8ae27bee4b7 files/qemu-0.8.2-sparc-fp.patch 591
 SHA256 839166847b3b39fa481b49e27110aaf207067cc5acecaf55131d2ec31d92ad59 files/qemu-0.8.2-sparc-fp.patch 591
+AUX qemu-softmmu-0.9.0-ide-cd.patch 1764 RMD160 5d19bd67c74734c4e66f67dc136adb6f08fa418f SHA1 152fd0403c0644c275ac4aee539139ee5bffd262 SHA256 1f0d9d52e3ead71f0f250902993d1a7d3fb9c88be23870f5559a1596c42bdaf5
+MD5 2d1cb9b1a1f632bbe58d484b0a26e731 files/qemu-softmmu-0.9.0-ide-cd.patch 1764
+RMD160 5d19bd67c74734c4e66f67dc136adb6f08fa418f files/qemu-softmmu-0.9.0-ide-cd.patch 1764
+SHA256 1f0d9d52e3ead71f0f250902993d1a7d3fb9c88be23870f5559a1596c42bdaf5 files/qemu-softmmu-0.9.0-ide-cd.patch 1764
 DIST kqemu-0.7.2.tar.gz 79314 RMD160 cdb154d51eb616d6ad9924da0175276a655edba7 SHA1 39dda2566a9c47bfc5e76c76cf9aa41500d708f3 SHA256 4158b2c67603f5256a78d0065d715bde068a457aa58bbfef12dda20fe7f7ad8b
 DIST qemu-0.8.0.20060329.tar.bz2 1325034 RMD160 a6ec15e1b08dd6e2dd88d953bfa31e3db1dc212e SHA1 c4f97764043c21c0bf2a486be76024a66c03fb99 SHA256 4ccb27692ffaee119728442298da84198d6319de79a18d497d14604e140c3eb0
 DIST qemu-0.8.0.tar.gz 1497965 RMD160 3fc6da938f75364d0805ca0ecf8cb84a4b546dc7 SHA1 f7bcf2f0eee9e5207cba265f3c47ae781244628e SHA256 de388539ce86971a2cbe8474fca8b6160898c95772e3e6e08a7794d48db32a61
@@ -44,14 +48,14 @@ EBUILD qemu-softmmu-0.8.2.ebuild 2593 RMD160 7fb7c01942585ff2fbf50f06083e6a67914
 MD5 f60a727b51a3a9b186f99ae917701ea4 qemu-softmmu-0.8.2.ebuild 2593
 RMD160 7fb7c01942585ff2fbf50f06083e6a67914558d4 qemu-softmmu-0.8.2.ebuild 2593
 SHA256 e94c8502bbed833a99c5c685e735aadc3f88f664cfdf55345d7ad994589a705d qemu-softmmu-0.8.2.ebuild 2593
-EBUILD qemu-softmmu-0.9.0.ebuild 3088 RMD160 77828aee9bf3abd94945fe2e9f06bea65a9363cb SHA1 005fe88183e22591ce218e5df619adea015c200f SHA256 9277bc28190af3c77ae14fdafe959f79c4500b66375b1db17f59169c29467d21
-MD5 ca6dd85d6ec35c869ee0ffe0c9511472 qemu-softmmu-0.9.0.ebuild 3088
-RMD160 77828aee9bf3abd94945fe2e9f06bea65a9363cb qemu-softmmu-0.9.0.ebuild 3088
-SHA256 9277bc28190af3c77ae14fdafe959f79c4500b66375b1db17f59169c29467d21 qemu-softmmu-0.9.0.ebuild 3088
-MISC ChangeLog 6802 RMD160 cfb5e7f9b4bfcf1952871b710bd34695f8d9e926 SHA1 20f71451e75526a0aaf36d4b106f6a31ee69aa50 SHA256 2293e816606473da74ca4d495f88ea5d9cafdac8722738ac4b5f54fc0da97a74
-MD5 5b9bab74b8bdc06fda1b6369c1d19b4d ChangeLog 6802
-RMD160 cfb5e7f9b4bfcf1952871b710bd34695f8d9e926 ChangeLog 6802
-SHA256 2293e816606473da74ca4d495f88ea5d9cafdac8722738ac4b5f54fc0da97a74 ChangeLog 6802
+EBUILD qemu-softmmu-0.9.0.ebuild 3129 RMD160 dc0666aa7499db65af3f78d0d94a4253750927d5 SHA1 7493550b324f11ee72aa5ca994cdd207eb383c6f SHA256 ddd4eb920698c27d70a27d20eb1877b37a7824689340821f8cfe16698100942c
+MD5 6fb80563a1841195b1fb63a0bac13c9f qemu-softmmu-0.9.0.ebuild 3129
+RMD160 dc0666aa7499db65af3f78d0d94a4253750927d5 qemu-softmmu-0.9.0.ebuild 3129
+SHA256 ddd4eb920698c27d70a27d20eb1877b37a7824689340821f8cfe16698100942c qemu-softmmu-0.9.0.ebuild 3129
+MISC ChangeLog 7089 RMD160 64ef51f802de5386019b546a74c9a93e964a41ca SHA1 816990ff4bc7a9e570ebb1137f6c59030c255eac SHA256 aa00bb882dc0cb111b467bd7471be7085c33a1035c6eeb1d8b122ec043d53044
+MD5 ec2f8b03bf994f36481278aa99e5fdf0 ChangeLog 7089
+RMD160 64ef51f802de5386019b546a74c9a93e964a41ca ChangeLog 7089
+SHA256 aa00bb882dc0cb111b467bd7471be7085c33a1035c6eeb1d8b122ec043d53044 ChangeLog 7089
 MISC metadata.xml 223 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 SHA1 fcf66d2b271369d296150dde06603d850623ed27 SHA256 64a96c3c9929aec46b50a63ae1fd8c46cef4a8423f448d6f6fff09e20510c98b
 MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 metadata.xml 223
diff --git a/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.0-ide-cd.patch b/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.0-ide-cd.patch
new file mode 100644
index 000000000000..ceae4bdf7d3f
--- /dev/null
+++ b/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.0-ide-cd.patch
@@ -0,0 +1,52 @@
+From: Brandon Philips <brandon@ifup.org>
+Newsgroups: gmane.comp.emulators.qemu
+Subject: [PATCH][RFC] Fix bugs in the ATAPI cdrom driver
+Date: Fri, 17 Aug 2007 16:43:04 -0700
+Message-ID: <20070817234304.GB10490@ifup.org>
+Reply-To: qemu-devel@nongnu.org
+
+The new libata-eh in the Linux kernel is throwing a fit over the QEMU
+cdrom device for two reasons:
+
+1) DRQ can be set with ERR_STAT set.  This is a violation of the ATAPI
+state machine.
+
+2) After a TEST_UNIT_READY ATAPI command is sent ERR_STAT is getting set
+which is correct.  But, when the OS issues another ATAPI command
+ERR_STAT is still set.  Which is bad since the next expected command
+from the OS is REQUEST_SENSE to find out why ERR_STAT is set.
+
+bug this fixes: https://bugzilla.novell.com/show_bug.cgi?id=291775
+
+Signed-off-by: Brandon Philips <bphilips@suse.de>
+
+---
+ hw/ide.c |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+Index: qemu-0.9.0/hw/ide.c
+===================================================================
+--- qemu-0.9.0.orig/hw/ide.c
++++ qemu-0.9.0/hw/ide.c
+@@ -586,7 +586,9 @@ static void ide_transfer_start(IDEState 
+     s->end_transfer_func = end_transfer_func;
+     s->data_ptr = buf;
+     s->data_end = buf + size;
+-    s->status |= DRQ_STAT;
++    /* don't violate the HSM */
++    if (!(s->status & ERR_STAT))
++        s->status |= DRQ_STAT;
+ }
+ 
+ static void ide_transfer_stop(IDEState *s)
+@@ -1805,6 +1807,7 @@ static void ide_ioport_write(void *opaqu
+             /* overlapping commands not supported */
+             if (s->feature & 0x02)
+                 goto abort_cmd;
++            s->status = READY_STAT;
+             s->atapi_dma = s->feature & 1;
+             s->nsector = 1;
+             ide_transfer_start(s, s->io_buffer, ATAPI_PACKET_SIZE, 
+
+
+
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.9.0.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.9.0.ebuild
index dd9479114297..52b044cc9110 100644
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.9.0.ebuild
+++ b/app-emulation/qemu-softmmu/qemu-softmmu-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.9.0.ebuild,v 1.7 2007/07/02 14:01:30 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.9.0.ebuild,v 1.8 2007/09/09 09:13:29 lu_zero Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -64,6 +64,8 @@ src_unpack() {
 	sed -i 's/\(.\/install.sh\)/#\1/' Makefile
 	# avoid strip
 	sed -i 's:$(INSTALL) -m 755 -s:$(INSTALL) -m 755:' Makefile Makefile.target
+
+	epatch ${FILESDIR}/${P}-ide-cd.patch
 }
 
 src_compile() {