diff options
| author | John Snow | 2016-02-10 19:29:38 +0100 |
|---|---|---|
| committer | John Snow | 2016-02-10 19:29:38 +0100 |
| commit | 266e77812ce1630f3f3ff02aadccb151aa01e6f6 (patch) | |
| tree | 6989becc1666e2b81a9ab17e84876682d2721d3e /hw/ide/core.c | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| download | qemu-266e77812ce1630f3f3ff02aadccb151aa01e6f6.tar.gz qemu-266e77812ce1630f3f3ff02aadccb151aa01e6f6.tar.xz qemu-266e77812ce1630f3f3ff02aadccb151aa01e6f6.zip | |
ide: Prohibit RESET on IDE drives
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 <jsnow@redhat.com>
Reported-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1453225191-11871-2-git-send-email-jsnow@redhat.com
Diffstat (limited to 'hw/ide/core.c')
| -rw-r--r-- | hw/ide/core.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index 4c46453e27..88d5fabcf3 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); |