diff options
| author | Luiz Capitulino <lcapitulino@redhat.com> | 2012-02-17 11:05:21 -0200 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2012-02-22 17:23:21 -0200 |
| commit | d88b1819dd6c6ba4b2270c98bf52ce67a315066d (patch) | |
| tree | b5afd9cd7c853c7d75ab0dc76c8273c823007e33 | |
| parent | f36f394952bd6703ca3ad8d649b41a9edd02db0c (diff) | |
| download | focaccia-qemu-d88b1819dd6c6ba4b2270c98bf52ce67a315066d.tar.gz focaccia-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>
| -rw-r--r-- | hw/ide/atapi.c | 7 | ||||
| -rw-r--r-- | hw/scsi-disk.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 0adb27b799..5919cf52d8 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -883,8 +883,11 @@ static void cmd_start_stop_unit(IDEState *s, uint8_t* buf) ide_atapi_cmd_error(s, sense, ASC_MEDIA_REMOVAL_PREVENTED); return; } - bdrv_eject(s->bs, !start); - s->tray_open = !start; + + if (s->tray_open != !start) { + bdrv_eject(s->bs, !start); + s->tray_open = !start; + } } ide_atapi_cmd_ok(s); 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; } |