qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com
Subject: [Qemu-devel] [PATCH v2 13/33] scsi-disk: report media changed via GET EVENT STATUS NOTIFICATION
Date: Tue, 25 Oct 2011 12:40:21 +0200	[thread overview]
Message-ID: <1319539241-26436-14-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1319539241-26436-1-git-send-email-pbonzini@redhat.com>

This adds support for media change notification via the GET EVENT STATUS
NOTIFICATION command, used by Linux versions 2.6.38 and newer.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/scsi-disk.c |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 4ed2fc1..ec8f20e 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -72,6 +72,7 @@ struct SCSIDiskState
     uint32_t removable;
     uint64_t max_lba;
     bool media_changed;
+    bool media_event;
     QEMUBH *bh;
     char *version;
     char *serial;
@@ -687,11 +688,58 @@ fail:
     return -1;
 }
 
-static int scsi_get_event_status_notification(SCSIDiskState *s,
-                                              SCSIDiskReq *r, uint8_t *outbuf)
+static int scsi_event_status_media(SCSIDiskState *s, uint8_t *outbuf)
 {
-    scsi_check_condition(r, SENSE_CODE(INVALID_OPCODE));
-    return -1;
+    uint8_t event_code, media_status;
+
+    media_status = 0;
+    if (s->tray_open) {
+        media_status = MS_TRAY_OPEN;
+    } else if (bdrv_is_inserted(s->bs)) {
+        media_status = MS_MEDIA_PRESENT;
+    }
+
+    /* Event notification descriptor */
+    event_code = MEC_NO_CHANGE;
+    if (media_status != MS_TRAY_OPEN && s->media_event) {
+        event_code = MEC_NEW_MEDIA;
+        s->media_event = false;
+    }
+
+    outbuf[0] = event_code;
+    outbuf[1] = media_status;
+
+    /* These fields are reserved, just clear them. */
+    outbuf[2] = 0;
+    outbuf[3] = 0;
+    return 4;
+}
+
+static int scsi_get_event_status_notification(SCSIDiskState *s, SCSIDiskReq *r,
+                                              uint8_t *outbuf)
+{
+    int size;
+    uint8_t *buf = r->req.cmd.buf;
+    uint8_t notification_class_request = buf[4];
+    if (s->qdev.type != TYPE_ROM) {
+        return -1;
+    }
+    if ((buf[1] & 1) == 0) {
+        /* asynchronous */
+        return -1;
+    }
+
+    size = 4;
+    outbuf[0] = outbuf[1] = 0;
+    outbuf[3] = 1 << GESN_MEDIA; /* supported events */
+    if (notification_class_request & (1 << GESN_MEDIA)) {
+        outbuf[2] = GESN_MEDIA;
+        size += scsi_event_status_media(s, &outbuf[size]);
+    } else {
+        outbuf[2] = 0x80;
+    }
+    stw_be_p(outbuf, size - 4);
+    return size;
 }
 
 static int scsi_get_configuration(SCSIDiskState *s, uint8_t *outbuf)
@@ -1442,6 +1490,7 @@ static void scsi_cd_change_media_cb(void *opaque, bool load)
     s->media_changed = load;
     s->tray_open = !load;
     s->qdev.unit_attention = SENSE_CODE(UNIT_ATTENTION_NO_MEDIUM);
+    s->media_event = true;
 }
 
 static bool scsi_cd_is_tray_open(void *opaque)
-- 
1.7.6

  parent reply	other threads:[~2011-10-25 10:41 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-25 10:40 [Qemu-devel] [PULL v2 00/33] SCSI changes for 1.0, part 1 of 2 Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 01/33] scsi: pass correct sense code for ENOMEDIUM Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 02/33] atapi/scsi: unify definitions for MMC Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 03/33] atapi: move GESN definitions to scsi-defs.h Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 04/33] atapi: cleanup/fix mode sense results Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 05/33] scsi: notify the device when unit attention is reported Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 06/33] scsi-disk: report media changed via unit attention sense codes Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 07/33] scsi-disk: fix coding style issues (braces) Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 08/33] scsi-disk: add stubs for more MMC commands Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 09/33] scsi-disk: store valid mode pages in a table Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 10/33] atapi/scsi-disk: make mode page values coherent between the two Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 11/33] scsi-disk: support DVD profile in GET CONFIGURATION Paolo Bonzini
2012-01-25 16:34   ` Artyom Tarasenko
2012-01-25 17:03     ` Paolo Bonzini
2012-01-25 20:13       ` Artyom Tarasenko
2012-01-26  8:09         ` Paolo Bonzini
2012-01-26  8:23           ` ronnie sahlberg
2012-01-26  8:51             ` Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 12/33] scsi-disk: support READ DVD STRUCTURE Paolo Bonzini
2011-10-25 10:40 ` Paolo Bonzini [this message]
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 14/33] scsi: move tcq/ndev to SCSIBusOps (now SCSIBusInfo) Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 15/33] qdev: switch children device list to QTAILQ Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 16/33] scsi: remove devs array from SCSIBus Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 17/33] scsi: implement REPORT LUNS for arbitrary LUNs Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 18/33] scsi: allow " Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 19/33] scsi: add channel to addressing Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 20/33] scsi-disk: fail READ CAPACITY if LBA != 0 but PMI == 0 Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 21/33] scsi-disk: fix retrying a flush Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 22/33] scsi-generic: drop SCSIGenericState Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 23/33] scsi-generic: remove scsi_req_fixup Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 24/33] scsi-generic: check ioctl statuses when SG_IO succeeds Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 25/33] scsi-generic: look at host status Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 26/33] scsi-generic: snoop READ CAPACITY commands to get block size Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 27/33] scsi-disk: do not duplicate BlockDriverState member Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 28/33] scsi-disk: remove cluster_size Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 29/33] scsi-disk: small clean up to INQUIRY Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 30/33] scsi: move max_lba to SCSIDevice Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 31/33] scsi: make reqops const Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 32/33] scsi: export scsi_generic_reqops Paolo Bonzini
2011-10-25 10:40 ` [Qemu-devel] [PATCH v2 33/33] scsi: pass cdb to alloc_req Paolo Bonzini
2011-10-27 11:45 ` [Qemu-devel] ping Re: [PULL v2 00/33] SCSI changes for 1.0, part 1 of 2 Paolo Bonzini

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=1319539241-26436-14-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@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).