[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/8] scsi-disk: implement eject requests
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 8/8] scsi-disk: implement eject requests |
Date: |
Tue, 25 Oct 2011 12:53:40 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi-disk.c | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index f407e2b..241a676 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -65,6 +65,7 @@ struct SCSIDiskState
uint32_t removable;
bool media_changed;
bool media_event;
+ bool eject_request;
QEMUBH *bh;
char *version;
char *serial;
@@ -671,9 +672,14 @@ static int scsi_event_status_media(SCSIDiskState *s,
uint8_t *outbuf)
/* 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;
+ if (media_status != MS_TRAY_OPEN) {
+ if (s->media_event) {
+ event_code = MEC_NEW_MEDIA;
+ s->media_event = false;
+ } else if (s->eject_request) {
+ event_code = MEC_EJECT_REQUESTED;
+ s->eject_request = false;
+ }
}
outbuf[0] = event_code;
@@ -1470,6 +1476,17 @@ static void scsi_cd_change_media_cb(void *opaque, bool
load)
s->tray_open = !load;
s->qdev.unit_attention = SENSE_CODE(UNIT_ATTENTION_NO_MEDIUM);
s->media_event = true;
+ s->eject_request = false;
+}
+
+static void scsi_cd_eject_request_cb(void *opaque, bool force)
+{
+ SCSIDiskState *s = opaque;
+
+ s->eject_request = true;
+ if (force) {
+ s->tray_locked = false;
+ }
}
static bool scsi_cd_is_tray_open(void *opaque)
@@ -1484,6 +1501,7 @@ static bool scsi_cd_is_medium_locked(void *opaque)
static const BlockDevOps scsi_cd_block_ops = {
.change_media_cb = scsi_cd_change_media_cb,
+ .eject_request_cb = scsi_cd_eject_request_cb,
.is_tray_open = scsi_cd_is_tray_open,
.is_medium_locked = scsi_cd_is_medium_locked,
};
--
1.7.6
- [Qemu-devel] [PATCH 0/5] My remaining block/SCSI patches for 1.0, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH 2/8] scsi-disk: bump SCSIRequest reference count until aio completion runs, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH 3/8] scsi-generic: bump SCSIRequest reference count until aio completion runs, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH 1/8] scsi: do not call transfer_data after canceling a request, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH 4/8] scsi: push request restart to SCSIDevice, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH 6/8] block: add eject request callback, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH 5/8] scsi-disk: add scsi-block for device passthrough, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH 8/8] scsi-disk: implement eject requests,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 7/8] atapi: implement eject requests, Paolo Bonzini, 2011/10/25
- [Qemu-devel] ping Re: [PATCH 0/5] My remaining block/SCSI patches for 1.0, Paolo Bonzini, 2011/10/27