[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/12] scsi-disk: report media changed via GET EVENT
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 12/12] scsi-disk: report media changed via GET EVENT STATUS NOTIFICATION |
Date: |
Tue, 20 Sep 2011 17:26:46 +0200 |
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 <address@hidden>
---
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 778332e..6f5d607 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 new_media;
QEMUBH *bh;
char *version;
char *serial;
@@ -681,11 +682,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->new_media) {
+ event_code = MEC_NEW_MEDIA;
+ s->new_media = 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)
@@ -1415,6 +1463,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->new_media = true;
}
static bool scsi_cd_is_tray_open(void *opaque)
--
1.7.6
- [Qemu-devel] [PATCH 00/12] scsi-disk: Add DVD-ROM support and media change + atapi: nitpicking, Paolo Bonzini, 2011/09/20
- [Qemu-devel] [PATCH 04/12] atapi: fill in AUDIO_CTL page correctly, Paolo Bonzini, 2011/09/20
- [Qemu-devel] [PATCH 06/12] scsi-disk: report media changed via unit attention sense codes, Paolo Bonzini, 2011/09/20
- [Qemu-devel] [PATCH 01/12] scsi: pass correct sense code for ENOMEDIUM, Paolo Bonzini, 2011/09/20
- [Qemu-devel] [PATCH 07/12] scsi-disk: add stubs for more MMC commands, Paolo Bonzini, 2011/09/20
- [Qemu-devel] [PATCH 03/12] atapi: move GESN definitions to scsi-defs.h, Paolo Bonzini, 2011/09/20
- [Qemu-devel] [PATCH 09/12] atapi/scsi-disk: make mode page values coherent between the two, Paolo Bonzini, 2011/09/20
- [Qemu-devel] [PATCH 08/12] scsi-disk: store valid mode pages in a table, Paolo Bonzini, 2011/09/20
- [Qemu-devel] [PATCH 05/12] scsi: notify the device when unit attention is reported, Paolo Bonzini, 2011/09/20
- [Qemu-devel] [PATCH 02/12] atapi/scsi: unify definitions for MMC, Paolo Bonzini, 2011/09/20
- [Qemu-devel] [PATCH 12/12] scsi-disk: report media changed via GET EVENT STATUS NOTIFICATION,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 11/12] scsi-disk: support READ DVD STRUCTURE, Paolo Bonzini, 2011/09/20
- [Qemu-devel] [PATCH 10/12] scsi-disk: support DVD profile in GET CONFIGURATION, Paolo Bonzini, 2011/09/20