From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTaad-0007zz-2B for qemu-devel@nongnu.org; Wed, 10 Feb 2016 14:38:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTaac-00032k-AT for qemu-devel@nongnu.org; Wed, 10 Feb 2016 14:38:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTaac-00032d-4e for qemu-devel@nongnu.org; Wed, 10 Feb 2016 14:38:14 -0500 From: John Snow Date: Wed, 10 Feb 2016 14:37:59 -0500 Message-Id: <1455133089-31903-3-git-send-email-jsnow@redhat.com> In-Reply-To: <1455133089-31903-1-git-send-email-jsnow@redhat.com> References: <1455133089-31903-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PULL 01/11] ide: Prohibit RESET on IDE drives 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 command is meant for ATAPI devices only, prohibit acknowledging it with a command aborted response when an IDE device is busy. Signed-off-by: John Snow Reported-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi Message-id: 1453225191-11871-2-git-send-email-jsnow@redhat.com --- hw/ide/core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 4c46453..88d5fab 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1877,9 +1877,13 @@ void ide_exec_cmd(IDEBus *bus, uint32_t val) return; } - /* Only DEVICE RESET is allowed while BSY or/and DRQ are set */ - if ((s->status & (BUSY_STAT|DRQ_STAT)) && val != WIN_DEVICE_RESET) - return; + /* Only RESET is allowed while BSY and/or DRQ are set, + * and only to ATAPI devices. */ + if (s->status & (BUSY_STAT|DRQ_STAT)) { + if (val != WIN_DEVICE_RESET || s->drive_kind != IDE_CD) { + return; + } + } if (!ide_cmd_permitted(s, val)) { ide_abort_command(s); -- 2.4.3