[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/8] atapi: implement eject requests
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 7/8] atapi: implement eject requests |
Date: |
Tue, 25 Oct 2011 12:53:39 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/ide/atapi.c | 11 ++++++++---
hw/ide/core.c | 13 +++++++++++++
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index 90b6729..1fed359 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -516,9 +516,14 @@ static unsigned int event_status_media(IDEState *s,
/* Event notification descriptor */
event_code = MEC_NO_CHANGE;
- if (media_status != MS_TRAY_OPEN && s->events.new_media) {
- event_code = MEC_NEW_MEDIA;
- s->events.new_media = false;
+ if (media_status != MS_TRAY_OPEN) {
+ if (s->events.new_media) {
+ event_code = MEC_NEW_MEDIA;
+ s->events.new_media = false;
+ } else if (s->events.eject_request) {
+ event_code = MEC_EJECT_REQUESTED;
+ s->events.eject_request = false;
+ }
}
buf[4] = event_code;
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 1f366e7..237d17c 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -804,6 +804,18 @@ static void ide_cd_change_cb(void *opaque, bool load)
*/
s->cdrom_changed = 1;
s->events.new_media = true;
+ s->events.eject_request = false;
+ ide_set_irq(s->bus);
+}
+
+static void ide_cd_eject_request_cb(void *opaque, bool force)
+{
+ IDEState *s = opaque;
+
+ s->events.eject_request = true;
+ if (force) {
+ s->tray_locked = false;
+ }
ide_set_irq(s->bus);
}
@@ -1811,6 +1823,7 @@ static bool ide_cd_is_medium_locked(void *opaque)
static const BlockDevOps ide_cd_block_ops = {
.change_media_cb = ide_cd_change_cb,
+ .eject_request_cb = ide_cd_eject_request_cb,
.is_tray_open = ide_cd_is_tray_open,
.is_medium_locked = ide_cd_is_medium_locked,
};
--
1.7.6
- [Qemu-devel] [PATCH 2/8] scsi-disk: bump SCSIRequest reference count until aio completion runs, (continued)
- [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, 2011/10/25
- [Qemu-devel] [PATCH 7/8] atapi: implement eject requests,
Paolo Bonzini <=
- [Qemu-devel] ping Re: [PATCH 0/5] My remaining block/SCSI patches for 1.0, Paolo Bonzini, 2011/10/27