From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38201) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlhTX-0006A4-U4 for qemu-devel@nongnu.org; Tue, 26 Jul 2011 09:15:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QlhTT-0005f2-Ux for qemu-devel@nongnu.org; Tue, 26 Jul 2011 09:15:07 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35533 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlhTT-0005er-Mg for qemu-devel@nongnu.org; Tue, 26 Jul 2011 09:15:03 -0400 Message-ID: <4E2EBDD6.50205@suse.de> Date: Tue, 26 Jul 2011 15:15:02 +0200 From: Hannes Reinecke MIME-Version: 1.0 References: <1311346277-32329-1-git-send-email-hare@suse.de> <1311346277-32329-7-git-send-email-hare@suse.de> <4E2EBC01.9020808@redhat.com> In-Reply-To: <4E2EBC01.9020808@redhat.com> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 6/6] scsi-disk: Check for supported commands List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: Alexander Graf , qemu-devel@nongnu.org, kvm@vger.kernel.org, Markus Armbruster On 07/26/2011 03:07 PM, Kevin Wolf wrote: > Am 22.07.2011 16:51, schrieb Hannes Reinecke: >> Not every command is support for any device type. This patch adds >> a check for rejecting unsupported commands. >> >> Signed-off-by: Hannes Reinecke >> --- >> hw/scsi-disk.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++= +++++++++- >> 1 files changed, 103 insertions(+), 1 deletions(-) >> >> diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c >> index ae2c157..8ad90c0 100644 >> --- a/hw/scsi-disk.c >> +++ b/hw/scsi-disk.c >> @@ -361,13 +361,107 @@ static int scsi_get_sense(SCSIRequest *req, uin= t8_t *outbuf, int len) >> return scsi_build_sense(s->sense, outbuf, len, len> 14); >> } >> >> +#define GENERIC_CMD (uint32_t)0xFFFFFFFF >> +#define DISK_CMD (1u<< TYPE_DISK) >> +#define TAPE_CMD (1u<< TYPE_TAPE) >> +#define PRINTER_CMD (1u<< TYPE_PRINTER) >> +#define PROCESSOR_CMD (1u<< TYPE_PROCESSOR) >> +#define WORM_CMD (1u<< TYPE_WORM) >> +#define ROM_CMD (1u<< TYPE_ROM) >> +#define SCANNER_CMD (1u<< TYPE_SCANNER) >> +#define MOD_CMD (1u<< TYPE_MOD) >> +#define MEDIUM_CHANGER_CMD (1u<< TYPE_MEDIUM_CHANGER) >> +#define ARRAY_CMD (1u<< TYPE_STORAGE_ARRAY) >> +#define ENCLOSURE_CMD (1u<< TYPE_ENCLOSURE) >> +#define RBC_CMD (1u<< TYPE_RBC) >> +#define OSD_CMD (1u<< TYPE_OSD) >> + >> +#define NO_ROM_CMD (GENERIC_CMD | ~ROM_CMD) >> + >> +uint32_t scsi_cmd_table[0x100] =3D { >> + [TEST_UNIT_READY] =3D GENERIC_CMD, >> + [REWIND] =3D TAPE_CMD, >> + [REQUEST_SENSE] =3D GENERIC_CMD, >> + [FORMAT_UNIT] =3D DISK_CMD|ROM_CMD, >> + [READ_BLOCK_LIMITS] =3D TAPE_CMD, >> + [REASSIGN_BLOCKS] =3D DISK_CMD|WORM_CMD|MOD_CMD, >> + [READ_6] =3D DISK_CMD|TAPE_CMD|WORM_CMD|ROM_CM= D|MOD_CMD, >> + [WRITE_6] =3D DISK_CMD|TAPE_CMD|WORM_CMD|MOD_CM= D, >> + [READ_REVERSE] =3D TAPE_CMD, >> + [WRITE_FILEMARKS] =3D TAPE_CMD, >> + [SPACE] =3D TAPE_CMD, >> + [INQUIRY] =3D GENERIC_CMD, >> + [MODE_SELECT] =3D GENERIC_CMD, >> + [RESERVE] =3D TAPE_CMD|PRINTER_CMD, >> + [RELEASE] =3D TAPE_CMD|PRINTER_CMD, >> + [ERASE] =3D TAPE_CMD, >> + [MODE_SENSE] =3D GENERIC_CMD, >> + [START_STOP] =3D GENERIC_CMD, >> + [RECEIVE_DIAGNOSTIC] =3D GENERIC_CMD, >> + [SEND_DIAGNOSTIC] =3D GENERIC_CMD, >> + [ALLOW_MEDIUM_REMOVAL] =3D GENERIC_CMD, >> + [READ_CAPACITY_10] =3D DISK_CMD|WORM_CMD|MOD_CMD, >> + [READ_10] =3D DISK_CMD|WORM_CMD|ROM_CMD|MOD_CMD= , >> + [WRITE_10] =3D DISK_CMD|WORM_CMD|ROM_CMD|MOD_CMD= , >> + [SEEK_10] =3D TAPE_CMD|WORM_CMD|ROM_CMD|MOD_CMD= , >> + [WRITE_VERIFY_10] =3D DISK_CMD|WORM_CMD|ROM_CMD|MOD_CMD= , >> + [VERIFY_10] =3D DISK_CMD|WORM_CMD|ROM_CMD|MOD_CMD= , >> + [READ_POSITION] =3D TAPE_CMD, >> + [SYNCHRONIZE_CACHE] =3D DISK_CMD|WORM_CMD|ROM_CMD|MOD_CMD= |RBC_CMD, >> + [WRITE_BUFFER] =3D GENERIC_CMD, >> + [READ_BUFFER] =3D GENERIC_CMD, >> + [READ_LONG_10] =3D DISK_CMD|WORM_CMD|MOD_CMD, >> + [WRITE_LONG_10] =3D DISK_CMD|WORM_CMD|MOD_CMD, >> + [WRITE_SAME_10] =3D DISK_CMD, >> + [UNMAP] =3D DISK_CMD, >> + [READ_TOC] =3D ROM_CMD, >> + [REPORT_DENSITY_SUPPORT] =3D TAPE_CMD, >> + [GET_CONFIGURATION] =3D ROM_CMD, >> + [LOG_SELECT] =3D GENERIC_CMD, >> + [LOG_SENSE] =3D GENERIC_CMD, >> + [MODE_SELECT_10] =3D GENERIC_CMD, >> + [RESERVE_10] =3D PRINTER_CMD, >> + [RELEASE_10] =3D PRINTER_CMD, >> + [MODE_SENSE_10] =3D GENERIC_CMD, >> + [PERSISTENT_RESERVE_IN] =3D GENERIC_CMD, >> + [PERSISTENT_RESERVE_OUT] =3D GENERIC_CMD, >> + [VARLENGTH_CDB] =3D OSD_CMD, >> + [WRITE_FILEMARKS_16] =3D TAPE_CMD, >> + [ATA_PASSTHROUGH] =3D DISK_CMD|ROM_CMD|RBC_CMD, >> + [READ_16] =3D DISK_CMD|TAPE_CMD|WORM_CMD|MOD_CM= D|RBC_CMD, >> + [WRITE_16] =3D DISK_CMD|TAPE_CMD|WORM_CMD|MOD_CM= D|RBC_CMD, >> + [WRITE_VERIFY_16] =3D DISK_CMD|WORM_CMD|MOD_CMD|RBC_CMD= , >> + [SYNCHRONIZE_CACHE_16] =3D DISK_CMD|TAPE_CMD|WORM_CMD|MOD_CM= D|RBC_CMD, >> + [LOCATE_16] =3D TAPE_CMD, >> + [WRITE_SAME_16] =3D DISK_CMD|TAPE_CMD, >> + [SERVICE_ACTION_IN] =3D GENERIC_CMD, >> + [REPORT_LUNS] =3D NO_ROM_CMD, >> + [BLANK] =3D ROM_CMD, >> + [MAINTENANCE_IN] =3D NO_ROM_CMD, >> + [MAINTENANCE_OUT] =3D NO_ROM_CMD, >> + [MOVE_MEDIUM] =3D MEDIUM_CHANGER_CMD, >> + [LOAD_UNLOAD] =3D ROM_CMD|MEDIUM_CHANGER_CMD, >> + [READ_12] =3D DISK_CMD|WORM_CMD|ROM_CMD|MOD_CMD= , >> + [WRITE_12] =3D DISK_CMD|WORM_CMD|ROM_CMD|MOD_CMD= , >> + [WRITE_VERIFY_12] =3D DISK_CMD|WORM_CMD|MOD_CMD, >> + [VERIFY_12] =3D DISK_CMD|WORM_CMD|MOD_CMD, >> + [READ_ELEMENT_STATUS] =3D WORM_CMD|MOD_CMD, >> + [SET_CD_SPEED] =3D ROM_CMD >> +}; >> + >> +static bool scsi_command_supported(uint8_t scsi_type, uint8_t cmd) >> +{ >> + uint32_t mask =3D (1u<< scsi_type); >> + return scsi_cmd_table[cmd]& mask; >> +} >> + >> static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outb= uf) >> { >> SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, req->dev); >> int buflen =3D 0; >> >> if (req->cmd.buf[1]& 0x2) { >> - /* Command support data - optional, not implemented */ >> + /* Command support data - obsolete */ >> BADF("optional INQUIRY command support request not implement= ed\n"); >> return -1; >> } >> @@ -1032,6 +1126,14 @@ static int32_t scsi_send_command(SCSIRequest *r= eq, uint8_t *buf) >> return 0; >> } >> } >> + if (!scsi_command_supported(command, s->qdev.type)) { > > Wrong parameter order? > Don't be picky :-) Cheers, Hannes --=20 Dr. Hannes Reinecke zSeries & Storage hare@suse.de +49 911 74053 688 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg GF: J. Hawn, J. Guild, F. Imend=F6rffer, HRB 16746 (AG N=FCrnberg)