From 3abd71cd98deff0209fdacd2bb7583428914075d Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 20 May 2013 13:06:47 +0200 Subject: scsi: reset cdrom tray statuses on scsi_disk_reset Tray statuses should be also reset. Some guests may lock the tray and right after resetting the guest it should be unlocked and closed. This is done on power-on, reset and resume from suspend/hibernate on bare-metal. This fix is already committed for IDE CD. Check the commit a7f3d65b65b8c86a5ff0c0abcfefb45e2ec6fe4c. Test results on bare-metal: - on reset/power-on the CD-ROM tray is closed even before the monitor is turned on - on resume from suspend/hibernate the tray is also closed before the monitor is turned on From test results it seems that this behavior is OS and probably BIOS independent. Cc: qemu-stable@nongnu.org Signed-off-by: Pavel Hrdina Signed-off-by: Paolo Bonzini (cherry picked from commit 7721c7f7c272fd2ed9d58500b7e99c33ab8a1af1) Signed-off-by: Michael Roth --- hw/scsi/scsi-disk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index c8d2a99593..02733dc507 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -1984,6 +1984,9 @@ static void scsi_disk_reset(DeviceState *dev) nb_sectors--; } s->qdev.max_lba = nb_sectors; + /* reset tray statuses */ + s->tray_locked = 0; + s->tray_open = 0; } static void scsi_destroy(SCSIDevice *dev) -- cgit v1.2.1