qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Markus Armbruster <armbru@redhat.com>
Subject: [Qemu-devel] [PATCH 04/10] scsi-disk: implement READ DISC INFORMATION
Date: Tue, 12 Jun 2012 18:42:36 +0200	[thread overview]
Message-ID: <1339519362-18852-5-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1339519362-18852-1-git-send-email-pbonzini@redhat.com>

This command is not necessary for CD-ROM and DVD-ROM, but some versions of
udev trip on its absence.

Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 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.2

  parent reply	other threads:[~2012-06-12 16:43 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-12 16:42 [Qemu-devel] [PULL 00/10] SCSI updates for 2012-06-12 Paolo Bonzini
2012-06-12 16:42 ` [Qemu-devel] [PATCH 01/10] scsi: simplify handling of the VPD page length field Paolo Bonzini
2012-06-12 16:42 ` [Qemu-devel] [PATCH 02/10] scsi: add a qdev property for the disk's WWN Paolo Bonzini
2012-06-12 16:42 ` [Qemu-devel] [PATCH 03/10] atapi: implement READ DISC INFORMATION Paolo Bonzini
2012-06-12 16:42 ` Paolo Bonzini [this message]
2012-06-12 16:42 ` [Qemu-devel] [PATCH 05/10] ISCSI: Add SCSI passthrough via scsi-generic to libiscsi Paolo Bonzini
2012-06-12 16:42 ` [Qemu-devel] [PATCH 06/10] ISCSI: force use of sg for SMC and SSC devices Paolo Bonzini
2012-06-12 16:42 ` [Qemu-devel] [PATCH 07/10] megasas: Add header file Paolo Bonzini
2012-06-12 16:42 ` [Qemu-devel] [PATCH 08/10] megasas: LSI Megaraid SAS HBA emulation Paolo Bonzini
2012-06-12 16:42 ` [Qemu-devel] [PATCH 09/10] megasas: Add trace events Paolo Bonzini
2012-06-12 16:42 ` [Qemu-devel] [PATCH 10/10] virtio-scsi: do not crash on adding buffers to the event queue Paolo Bonzini
2012-06-20 13:11 ` [Qemu-devel] [PULL 00/10] SCSI updates for 2012-06-12 Anthony Liguori

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=1339519362-18852-5-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=armbru@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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).