[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 25/55] ide/atapi: Switch from BlockDriverState's loc
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 25/55] ide/atapi: Switch from BlockDriverState's locked to own tray_locked |
Date: |
Wed, 20 Jul 2011 18:23:59 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/ide/atapi.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index 8634e6b..237657f 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -777,8 +777,9 @@ static void cmd_mode_sense(IDEState *s, uint8_t *buf)
buf[12] = 0x71;
buf[13] = 3 << 5;
buf[14] = (1 << 0) | (1 << 3) | (1 << 5);
- if (bdrv_is_locked(s->bs))
+ if (s->tray_locked) {
buf[6] |= 1 << 1;
+ }
buf[15] = 0x00;
cpu_to_ube16(&buf[16], 706);
buf[18] = 0;
--
1.7.2.3
- Re: [Qemu-devel] [PATCH 42/55] block: Clean up bdrv_flush_all(), (continued)
- [Qemu-devel] [PATCH 35/55] scsi-disk: Avoid physical/virtual tray state mismatch, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 45/55] block: Clean up remaining users of "removable", Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 54/55] block: New change_media_cb() parameter load, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 55/55] ide/atapi scsi-disk: Make monitor eject -f, then change work, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 25/55] ide/atapi: Switch from BlockDriverState's locked to own tray_locked,
Markus Armbruster <=
- [Qemu-devel] [PATCH 44/55] spitz tosa: Simplify "drive is suitable for microdrive" test, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 43/55] savevm: Include writable devices with removable media, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 29/55] block: Drop medium lock tracking, ask device models instead, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 46/55] block: Drop BlockDriverState member removable, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 22/55] block: Drop tray status tracking, no longer used, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 28/55] block: Leave enforcing tray lock to device models, Markus Armbruster, 2011/07/20