[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/5] block: Don't call bdrv_eject() if the tray stat
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 3/5] block: Don't call bdrv_eject() if the tray state didn't change |
Date: |
Thu, 23 Feb 2012 12:42:52 -0200 |
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 <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Acked-by: Kevin Wolf <address@hidden>
---
hw/ide/atapi.c | 7 +++++--
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 0adb27b..5919cf5 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 a5d2fd1..091ecdc 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;
}
--
1.7.9.111.gf3fb0.dirty
- [Qemu-devel] [PULL 0/5]: QMP queue, Luiz Capitulino, 2012/02/23
- [Qemu-devel] [PATCH 1/5] block: Rename bdrv_mon_event() & BlockMonEventAction, Luiz Capitulino, 2012/02/23
- [Qemu-devel] [PATCH 5/5] qmp: add DEVICE_TRAY_MOVED event, Luiz Capitulino, 2012/02/23
- [Qemu-devel] [PATCH 4/5] ide: drop ide_tray_state_post_load(), Luiz Capitulino, 2012/02/23
- [Qemu-devel] [PATCH 2/5] block: bdrv_eject(): Make eject_flag a real bool, Luiz Capitulino, 2012/02/23
- [Qemu-devel] [PATCH 3/5] block: Don't call bdrv_eject() if the tray state didn't change,
Luiz Capitulino <=
- Re: [Qemu-devel] [PULL 0/5]: QMP queue, Anthony Liguori, 2012/02/24