[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/16] atapi: implement eject requests
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 03/16] atapi: implement eject requests |
Date: |
Fri, 11 Nov 2011 18:39:15 +0100 |
From: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Kevin Wolf <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 9a2fd30..93a1a68 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.4
- [Qemu-devel] [PULL 00/16] Block patches for 1.0, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 01/16] vvfat: Fix read-write mode, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 02/16] block: add eject request callback, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 03/16] atapi: implement eject requests,
Kevin Wolf <=
- [Qemu-devel] [PATCH 04/16] scsi-disk: implement eject requests, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 05/16] nbd: treat EPIPE from NBD_DO_IT as success, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 07/16] qemu-nbd: rename socket variable, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 09/16] qemu-nbd: print error messages from the daemon through a pipe, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 08/16] qemu-nbd: move client to a thread, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 11/16] qemu-nbd: open the block device after starting the client thread, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 15/16] block: Introduce bdrv_co_flush_to_os, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 14/16] block: Rename bdrv_co_flush to bdrv_co_flush_to_disk, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 16/16] block: Make cache=unsafe flush to the OS, Kevin Wolf, 2011/11/11
- [Qemu-devel] [PATCH 10/16] qemu-nbd: fix socket creation race, Kevin Wolf, 2011/11/11