[Qemu-devel] fix ide detection with raw images

[Qemu-devel] fix ide detection with raw images

[Jani Monoses]

[-- Attachment #1: Type: text/plain, Size: 82 bytes --]

This change makes files passed to -hda be detected again with current CVS

Jani



[-- Attachment #2: ,ide.diff --]
[-- Type: text/x-diff, Size: 516 bytes --]

Index: hw/ide.c
===================================================================
RCS file: /cvsroot/qemu/qemu/hw/ide.c,v
retrieving revision 1.26
diff -u -r1.26 ide.c
--- hw/ide.c	25 Jun 2004 14:54:19 -0000	1.26
+++ hw/ide.c	5 Aug 2004 15:33:53 -0000
@@ -1655,10 +1655,9 @@
         break;
     default:
     case 7:
-        if ((!ide_if[0].bs && !ide_if[1].bs) ||
-            (s != ide_if && !s->bs))
+        if (!ide_if[0].bs && !ide_if[1].bs) 
             ret = 0;
	 else    
             ret = s->status;

RE: [Qemu-devel] fix ide detection with raw images

[Natalia Portillo]

Could you explain better? 

> -----Mensaje original-----
> De: qemu-devel-bounces+iosglpgc=teleline.es@nongnu.org 
> [mailto:qemu-devel-bounces+iosglpgc=teleline.es@nongnu.org] 
> En nombre de Jani Monoses
> Enviado el: jueves, 05 de agosto de 2004 16:36
> Para: qemu-devel@nongnu.org
> Asunto: [Qemu-devel] fix ide detection with raw images
> 
> This change makes files passed to -hda be detected again with 
> current CVS
> 
> Jani
> 
> 
> 

Re: [Qemu-devel] fix ide detection with raw images

[Jani Monoses]

> Could you explain better? 
 
I should have added 'for me'. Detecting the ide driver from ecos does not work
because that case in the switch always returned 0; only there in the switch
the bs field was checked for NULL. So reading the status register always gave
0 => no chance for the READY bit to be seen asserted.

> > This change makes files passed to -hda be detected again with 
> > current CVS