[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/5] atapi: make change media detection for guests e
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 3/5] atapi: make change media detection for guests easier |
Date: |
Fri, 30 Nov 2012 14:02:27 +0100 |
From: Pavel Hrdina <address@hidden>
If you have a guest with a media in the optical drive and you change
it, the windows guest cannot properly recognize this media change.
Windows needs to detect sense "NOT_READY with ASC_MEDIUM_NOT_PRESENT"
before we send sense "UNIT_ATTENTION with ASC_MEDIUM_MAY_HAVE_CHANGED".
Signed-off-by: Pavel Hrdina <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
hw/ide/atapi.c | 15 ++++++++++-----
hw/ide/core.c | 6 ------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index 685cbaa..861fd2b 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -1124,12 +1124,17 @@ void ide_atapi_cmd(IDEState *s)
* GET_EVENT_STATUS_NOTIFICATION to detect such tray open/close
* states rely on this behavior.
*/
- if (!s->tray_open && bdrv_is_inserted(s->bs) && s->cdrom_changed) {
- ide_atapi_cmd_error(s, NOT_READY, ASC_MEDIUM_NOT_PRESENT);
+ if (!(atapi_cmd_table[s->io_buffer[0]].flags & ALLOW_UA) &&
+ !s->tray_open && bdrv_is_inserted(s->bs) && s->cdrom_changed) {
+
+ if (s->cdrom_changed == 1) {
+ ide_atapi_cmd_error(s, NOT_READY, ASC_MEDIUM_NOT_PRESENT);
+ s->cdrom_changed = 2;
+ } else {
+ ide_atapi_cmd_error(s, UNIT_ATTENTION,
ASC_MEDIUM_MAY_HAVE_CHANGED);
+ s->cdrom_changed = 0;
+ }
- s->cdrom_changed = 0;
- s->sense_key = UNIT_ATTENTION;
- s->asc = ASC_MEDIUM_MAY_HAVE_CHANGED;
return;
}
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 8da894f..c4f93d0 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -2160,12 +2160,6 @@ static int ide_drive_post_load(void *opaque, int
version_id)
{
IDEState *s = opaque;
- if (version_id < 3) {
- if (s->sense_key == UNIT_ATTENTION &&
- s->asc == ASC_MEDIUM_MAY_HAVE_CHANGED) {
- s->cdrom_changed = 1;
- }
- }
if (s->identify_set) {
bdrv_set_enable_write_cache(s->bs, !!(s->identify_data[85] & (1 <<
5)));
}
--
1.7.6.5
- [Qemu-devel] [PULL 0/5] Block patches for 1.3.0-rc2, Kevin Wolf, 2012/11/30
- [Qemu-devel] [PATCH 5/5] coroutine-sigaltstack.c: Use stack_t, not struct sigaltstack, Kevin Wolf, 2012/11/30
- [Qemu-devel] [PATCH 1/5] Documentation: Update block cache mode information, Kevin Wolf, 2012/11/30
- [Qemu-devel] [PATCH 3/5] atapi: make change media detection for guests easier,
Kevin Wolf <=
- [Qemu-devel] [PATCH 4/5] stream: fix ratelimit_set_speed, Kevin Wolf, 2012/11/30
- [Qemu-devel] [PATCH 2/5] Documentation: Update image format information, Kevin Wolf, 2012/11/30
- Re: [Qemu-devel] [PULL 0/5] Block patches for 1.3.0-rc2, Anthony Liguori, 2012/11/30