From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sdx73-0007Zr-Nq for qemu-devel@nongnu.org; Mon, 11 Jun 2012 01:24:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sdx71-0002Xz-LJ for qemu-devel@nongnu.org; Mon, 11 Jun 2012 01:24:25 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:61782) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sdx71-0002XU-D8 for qemu-devel@nongnu.org; Mon, 11 Jun 2012 01:24:23 -0400 Received: by werf3 with SMTP id f3so2113868wer.4 for ; Sun, 10 Jun 2012 22:24:21 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 11 Jun 2012 07:24:06 +0200 Message-Id: <1339392246-20201-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1339392246-20201-1-git-send-email-pbonzini@redhat.com> References: <1339392246-20201-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] scsi-disk: implement READ DISC INFORMATION List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster This command is not necessary for CD-ROM and DVD-ROM, but some versions of udev trip on its absence. Cc: Markus Armbruster Signed-off-by: Paolo Bonzini --- hw/scsi-defs.h | 1 + hw/scsi-disk.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/hw/scsi-defs.h b/hw/scsi-defs.h index 219c84d..3c9f1b5 100644 --- a/hw/scsi-defs.h +++ b/hw/scsi-defs.h @@ -82,6 +82,7 @@ #define GET_EVENT_STATUS_NOTIFICATION 0x4a #define LOG_SELECT 0x4c #define LOG_SENSE 0x4d +#define READ_DISC_INFORMATION 0x51 #define RESERVE_TRACK 0x53 #define MODE_SELECT_10 0x55 #define RESERVE_10 0x56 diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 8882f69..c4ad2ba 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -713,6 +713,39 @@ static inline bool media_is_cd(SCSIDiskState *s) return nb_sectors <= CD_MAX_SECTORS; } +static int scsi_read_disc_information(SCSIDiskState *s, SCSIDiskReq *r, + uint8_t *outbuf) +{ + uint8_t type = r->req.cmd.buf[1] & 7; + + if (s->qdev.type != TYPE_ROM) { + return -1; + } + + /* Types 1/2 are only defined for Blu-Ray. */ + if (type != 0) { + scsi_check_condition(r, SENSE_CODE(INVALID_FIELD)); + return -1; + } + + memset(outbuf, 0, 34); + outbuf[1] = 32; + outbuf[2] = 0xe; /* last session complete, disc finalized */ + outbuf[3] = 1; /* first track on disc */ + outbuf[4] = 1; /* # of sessions */ + outbuf[5] = 1; /* first track of last session */ + outbuf[6] = 1; /* last track of last session */ + outbuf[7] = 0x20; /* unrestricted use */ + outbuf[8] = 0x00; /* CD-ROM or DVD-ROM */ + /* 9-10-11: most significant byte corresponding bytes 4-5-6 */ + /* 12-23: not meaningful for CD-ROM or DVD-ROM */ + /* 24-31: disc bar code */ + /* 32: disc application code */ + /* 33: number of OPC tables */ + + return 34; +} + static int scsi_read_dvd_structure(SCSIDiskState *s, SCSIDiskReq *r, uint8_t *outbuf) { @@ -1352,6 +1385,12 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r) goto illegal_request; } break; + case READ_DISC_INFORMATION: + buflen = scsi_read_disc_information(s, r, outbuf); + if (buflen < 0) { + goto illegal_request; + } + break; case READ_DVD_STRUCTURE: buflen = scsi_read_dvd_structure(s, r, outbuf); if (buflen < 0) { @@ -1479,6 +1518,7 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) case ALLOW_MEDIUM_REMOVAL: case READ_CAPACITY_10: case READ_TOC: + case READ_DISC_INFORMATION: case READ_DVD_STRUCTURE: case GET_CONFIGURATION: case GET_EVENT_STATUS_NOTIFICATION: -- 1.7.10.1