target-s390x: Clean up ENV_GET_CPU() usage

[qemu.git] / hw / ide / ahci.c

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index a8be62cf990648cd9b29af168ebee7a46a2c8d0c..fbea9e88865356448195649aae567b659ea45c6f 100644 (file)
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -961,7 +961,8 @@ static int handle_cmd(AHCIState *s, int port, int slot)
         /* We're ready to process the command in FIS byte 2. */
         ide_exec_cmd(&s->dev[port].port, cmd_fis[2]);
 
         /* We're ready to process the command in FIS byte 2. */
         ide_exec_cmd(&s->dev[port].port, cmd_fis[2]);
 

-        if (s->dev[port].port.ifs[0].status & READY_STAT) {
+        if ((s->dev[port].port.ifs[0].status & (READY_STAT|DRQ_STAT|BUSY_STAT)) ==
+            READY_STAT) {

             ahci_write_fis_d2h(&s->dev[port], cmd_fis);
         }
     }
             ahci_write_fis_d2h(&s->dev[port], cmd_fis);
         }
     }