summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Snow2015-09-01 22:50:38 +0200
committerJohn Snow2015-09-18 16:58:56 +0200
commitf91a0aa3743c8bdf0dc0f646606a3dc8bb2c7df8 (patch)
treed8a5529b24b52798bb005bb4df1323e7b7693286
parentatapi: abort transfers with 0 byte limits (diff)
downloadqemu-f91a0aa3743c8bdf0dc0f646606a3dc8bb2c7df8.tar.gz
qemu-f91a0aa3743c8bdf0dc0f646606a3dc8bb2c7df8.tar.xz
qemu-f91a0aa3743c8bdf0dc0f646606a3dc8bb2c7df8.zip
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
-rw-r--r--hw/ide/ahci.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index ad05527166..0c699a76f2 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;