From: John Snow <jsnow@redhat.com>
Date: Tue, 1 Sep 2015 20:50:38 +0000 (-0400)
Subject: ahci: remove dead reset code
X-Git-Tag: v2.5.0-rc0~117^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f91a0aa3743c8bdf0dc0f646606a3dc8bb2c7df8;p=thirdparty%2Fqemu.git

ahci: remove dead reset code

This check is dead due to an earlier conditional.
AHCI does not currently support hotplugging, so
checks to see if devices are present or not are useless.

Remove it.

Reported-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1441140641-17631-2-git-send-email-jsnow@redhat.com
---

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index ad055271665..0c699a76f29 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -602,10 +602,7 @@ static void ahci_reset_port(AHCIState *s, int port)
     }
 
     s->dev[port].port_state = STATE_RUN;
-    if (!ide_state->blk) {
-        pr->sig = 0;
-        ide_state->status = SEEK_STAT | WRERR_STAT;
-    } else if (ide_state->drive_kind == IDE_CD) {
+    if (ide_state->drive_kind == IDE_CD) {
         pr->sig = SATA_SIGNATURE_CDROM;
         ide_state->lcyl = 0x14;
         ide_state->hcyl = 0xeb;