From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38379) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcxWN-0007Ev-1k for qemu-devel@nongnu.org; Fri, 18 Sep 2015 11:24:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZcxWM-00064A-57 for qemu-devel@nongnu.org; Fri, 18 Sep 2015 11:24:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37507) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcxDU-0001DR-R4 for qemu-devel@nongnu.org; Fri, 18 Sep 2015 11:04:48 -0400 From: John Snow Date: Fri, 18 Sep 2015 11:04:38 -0400 Message-Id: <1442588681-18564-9-git-send-email-jsnow@redhat.com> In-Reply-To: <1442588681-18564-1-git-send-email-jsnow@redhat.com> References: <1442588681-18564-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PULL 08/11] ahci: remove dead reset code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com 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 Signed-off-by: John Snow Reviewed-by: Stefan Hajnoczi Message-id: 1441140641-17631-2-git-send-email-jsnow@redhat.com --- hw/ide/ahci.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index ad05527..0c699a7 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; -- 2.4.3