summaryrefslogtreecommitdiffstats
path: root/hw/scsi-disk.c
diff options
context:
space:
mode:
authorLuiz Capitulino2012-02-17 14:05:21 +0100
committerLuiz Capitulino2012-02-22 20:23:21 +0100
commitd88b1819dd6c6ba4b2270c98bf52ce67a315066d (patch)
treeb5afd9cd7c853c7d75ab0dc76c8273c823007e33 /hw/scsi-disk.c
parentblock: bdrv_eject(): Make eject_flag a real bool (diff)
downloadqemu-d88b1819dd6c6ba4b2270c98bf52ce67a315066d.tar.gz
qemu-d88b1819dd6c6ba4b2270c98bf52ce67a315066d.tar.xz
qemu-d88b1819dd6c6ba4b2270c98bf52ce67a315066d.zip
block: Don't call bdrv_eject() if the tray state didn't change
It's not needed. Besides we can then assume that bdrv_eject() is only called when there's a tray state change, which is useful to the DEVICE_TRAY_MOVED event (going to be added in a future commit). Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Acked-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/scsi-disk.c')
-rw-r--r--hw/scsi-disk.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index a5d2fd1d34..091ecdcc87 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -1050,8 +1050,11 @@ static int scsi_disk_emulate_start_stop(SCSIDiskReq *r)
: SENSE_CODE(NOT_READY_REMOVAL_PREVENTED));
return -1;
}
- bdrv_eject(s->qdev.conf.bs, !start);
- s->tray_open = !start;
+
+ if (s->tray_open != !start) {
+ bdrv_eject(s->qdev.conf.bs, !start);
+ s->tray_open = !start;
+ }
}
return 0;
}