From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, stefano.stabellini@eu.citrix.com,
lcapitulino@redhat.com, hare@suse.de, amit.shah@redhat.com,
pbonzini@redhat.com, hch@lst.de
Subject: [Qemu-devel] [PATCH v3 03/27] ide: Reject ATA commands specific to drive kinds
Date: Tue, 6 Sep 2011 18:58:36 +0200 [thread overview]
Message-ID: <1315328340-6192-4-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1315328340-6192-1-git-send-email-armbru@redhat.com>
ACS-2 Table B.2 explicitly prohibits ATAPI devices from implementing
WIN_RECAL, WIN_READ_EXT, WIN_READDMA_EXT, WIN_READ_NATIVE_MAX,
WIN_MULTREAD_EXT, WIN_WRITE, WIN_WRITE_ONCE, WIN_WRITE_EXT,
WIN_WRITEDMA_EXT, WIN_MULTWRITE_EXT, WIN_WRITE_VERIFY, WIN_VERIFY,
WIN_VERIFY_ONCE, WIN_VERIFY_EXT, WIN_SPECIFY, WIN_MULTREAD,
WIN_MULTWRITE, WIN_SETMULT, WIN_READDMA, WIN_READDMA_ONCE,
WIN_WRITEDMA, WIN_WRITEDMA_ONCE, WIN_FLUSH_CACHE_EXT. Restrict them
to IDE_HD and IDE_CFATA.
Same for CFA_WRITE_SECT_WO_ERASE, CFA_WRITE_MULTI_WO_ERASE. Restrict
them to IDE_CFATA, like the other CFA_ commands.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/ide/core.c | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 65ce289..34b7b83 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -913,27 +913,27 @@ static const uint8_t ide_cmd_table[0x100] = {
[CFA_REQ_EXT_ERROR_CODE] = CFA_OK,
[WIN_DSM] = ALL_OK,
[WIN_DEVICE_RESET] = CD_OK,
- [WIN_RECAL] = ALL_OK,
+ [WIN_RECAL] = HD_CFA_OK,
[WIN_READ] = ALL_OK,
[WIN_READ_ONCE] = ALL_OK,
- [WIN_READ_EXT] = ALL_OK,
- [WIN_READDMA_EXT] = ALL_OK,
- [WIN_READ_NATIVE_MAX_EXT] = ALL_OK,
- [WIN_MULTREAD_EXT] = ALL_OK,
- [WIN_WRITE] = ALL_OK,
- [WIN_WRITE_ONCE] = ALL_OK,
- [WIN_WRITE_EXT] = ALL_OK,
- [WIN_WRITEDMA_EXT] = ALL_OK,
- [CFA_WRITE_SECT_WO_ERASE] = ALL_OK,
- [WIN_MULTWRITE_EXT] = ALL_OK,
- [WIN_WRITE_VERIFY] = ALL_OK,
- [WIN_VERIFY] = ALL_OK,
- [WIN_VERIFY_ONCE] = ALL_OK,
- [WIN_VERIFY_EXT] = ALL_OK,
+ [WIN_READ_EXT] = HD_CFA_OK,
+ [WIN_READDMA_EXT] = HD_CFA_OK,
+ [WIN_READ_NATIVE_MAX_EXT] = HD_CFA_OK,
+ [WIN_MULTREAD_EXT] = HD_CFA_OK,
+ [WIN_WRITE] = HD_CFA_OK,
+ [WIN_WRITE_ONCE] = HD_CFA_OK,
+ [WIN_WRITE_EXT] = HD_CFA_OK,
+ [WIN_WRITEDMA_EXT] = HD_CFA_OK,
+ [CFA_WRITE_SECT_WO_ERASE] = CFA_OK,
+ [WIN_MULTWRITE_EXT] = HD_CFA_OK,
+ [WIN_WRITE_VERIFY] = HD_CFA_OK,
+ [WIN_VERIFY] = HD_CFA_OK,
+ [WIN_VERIFY_ONCE] = HD_CFA_OK,
+ [WIN_VERIFY_EXT] = HD_CFA_OK,
[WIN_SEEK] = HD_CFA_OK,
[CFA_TRANSLATE_SECTOR] = CFA_OK,
[WIN_DIAGNOSE] = ALL_OK,
- [WIN_SPECIFY] = ALL_OK,
+ [WIN_SPECIFY] = HD_CFA_OK,
[WIN_STANDBYNOW2] = ALL_OK,
[WIN_IDLEIMMEDIATE2] = ALL_OK,
[WIN_STANDBY2] = ALL_OK,
@@ -945,14 +945,14 @@ static const uint8_t ide_cmd_table[0x100] = {
[WIN_SMART] = HD_CFA_OK,
[CFA_ACCESS_METADATA_STORAGE] = CFA_OK,
[CFA_ERASE_SECTORS] = CFA_OK,
- [WIN_MULTREAD] = ALL_OK,
- [WIN_MULTWRITE] = ALL_OK,
- [WIN_SETMULT] = ALL_OK,
- [WIN_READDMA] = ALL_OK,
- [WIN_READDMA_ONCE] = ALL_OK,
- [WIN_WRITEDMA] = ALL_OK,
- [WIN_WRITEDMA_ONCE] = ALL_OK,
- [CFA_WRITE_MULTI_WO_ERASE] = ALL_OK,
+ [WIN_MULTREAD] = HD_CFA_OK,
+ [WIN_MULTWRITE] = HD_CFA_OK,
+ [WIN_SETMULT] = HD_CFA_OK,
+ [WIN_READDMA] = HD_CFA_OK,
+ [WIN_READDMA_ONCE] = HD_CFA_OK,
+ [WIN_WRITEDMA] = HD_CFA_OK,
+ [WIN_WRITEDMA_ONCE] = HD_CFA_OK,
+ [CFA_WRITE_MULTI_WO_ERASE] = CFA_OK,
[WIN_STANDBYNOW1] = ALL_OK,
[WIN_IDLEIMMEDIATE] = ALL_OK,
[WIN_STANDBY] = ALL_OK,
@@ -960,7 +960,7 @@ static const uint8_t ide_cmd_table[0x100] = {
[WIN_CHECKPOWERMODE1] = ALL_OK,
[WIN_SLEEPNOW1] = ALL_OK,
[WIN_FLUSH_CACHE] = ALL_OK,
- [WIN_FLUSH_CACHE_EXT] = ALL_OK,
+ [WIN_FLUSH_CACHE_EXT] = HD_CFA_OK,
[WIN_IDENTIFY] = ALL_OK,
[WIN_SETFEATURES] = ALL_OK,
[IBM_SENSE_CONDITION] = CFA_OK,
--
1.7.6
next prev parent reply other threads:[~2011-09-06 16:59 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-06 16:58 [Qemu-devel] [PATCH v3 00/27] Block layer cleanup & fixes Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 01/27] ide: Fix ATA command READ to set ATAPI signature for CD-ROM Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 02/27] ide: Use a table to declare which drive kinds accept each command Markus Armbruster
2011-09-07 15:40 ` Kevin Wolf
2011-09-08 7:05 ` Markus Armbruster
2011-09-06 16:58 ` Markus Armbruster [this message]
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 04/27] ide/atapi: Clean up misleading name in cmd_start_stop_unit() Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 05/27] ide/atapi: Track tray open/close state Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 06/27] scsi-disk: Factor out scsi_disk_emulate_start_stop() Markus Armbruster
2011-09-07 7:04 ` Paolo Bonzini
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 07/27] scsi-disk: Track tray open/close state Markus Armbruster
2011-09-07 7:05 ` Paolo Bonzini
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 08/27] block: Revert entanglement of bdrv_is_inserted() with tray status Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 09/27] block: Drop tray status tracking, no longer used Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 10/27] ide/atapi: Track tray locked state Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 11/27] scsi-disk: " Markus Armbruster
2011-09-07 7:05 ` Paolo Bonzini
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 12/27] block: Leave enforcing tray lock to device models Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 13/27] block: Drop medium lock tracking, ask device models instead Markus Armbruster
2011-09-07 7:06 ` Paolo Bonzini
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 14/27] block: Rename bdrv_set_locked() to bdrv_lock_medium() Markus Armbruster
2011-09-07 15:53 ` Kevin Wolf
2011-09-08 7:06 ` Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 15/27] ide/atapi: Don't fail eject when tray is already open Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 16/27] scsi-disk: Fix START_STOP to fail when it can't eject Markus Armbruster
2011-09-07 7:08 ` Paolo Bonzini
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 17/27] ide/atapi: Preserve tray state on migration Markus Armbruster
2011-09-07 7:14 ` Paolo Bonzini
2011-09-07 7:35 ` Kevin Wolf
2011-09-07 8:00 ` Paolo Bonzini
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 18/27] block: Clean up remaining users of "removable" Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 19/27] block: Drop BlockDriverState member removable Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 20/27] block: Show whether the virtual tray is open in info block Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 21/27] block: Move BlockConf & friends from block_int.h to block.h Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 22/27] hw: Trim superfluous #include "block_int.h" Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 23/27] block: New bdrv_set_buffer_alignment() Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 24/27] block: Reset buffer alignment on detach Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 25/27] nbd: Clean up use of block_int.h Markus Armbruster
2011-09-06 16:58 ` [Qemu-devel] [PATCH v3 26/27] block: New change_media_cb() parameter load Markus Armbruster
2011-09-06 16:59 ` [Qemu-devel] [PATCH v3 27/27] ide/atapi scsi-disk: Make monitor eject -f, then change work Markus Armbruster
2011-09-07 7:09 ` Paolo Bonzini
2011-09-08 11:40 ` [Qemu-devel] [PATCH v3 00/27] Block layer cleanup & fixes Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1315328340-6192-4-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=amit.shah@redhat.com \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=kwolf@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefano.stabellini@eu.citrix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).