[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 22/45] ide/atapi: Avoid physical/virtual tray sta
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 22/45] ide/atapi: Avoid physical/virtual tray state mismatch |
Date: |
Wed, 3 Aug 2011 15:08:01 +0200 |
When ide-cd is backed by a physical drive, we want the physical tray
match the virtual one. To that end, we call bdrv_eject() on guest's
load/eject, and bdrv_lock_medium() on guest's prevent/allow removal.
But we don't set the initial state on device model init. Fix that.
While there, also unlock on device model exit.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/ide/core.c | 4 ++++
hw/ide/qdev.c | 18 ++++++++++++++++++
2 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 5bcc857..d8b1d43 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -1839,6 +1839,10 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs,
IDEDriveKind kind,
ide_reset(s);
bdrv_set_removable(bs, s->drive_kind == IDE_CD);
+ if (s->drive_kind == IDE_CD) {
+ bdrv_lock_medium(bs, s->tray_locked);
+ bdrv_eject(bs, s->tray_open);
+ }
return 0;
}
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index 3b7b306..bc2f426 100644
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -182,6 +182,12 @@ static int ide_cd_initfn(IDEDevice *dev)
return ide_dev_initfn(dev, IDE_CD);
}
+static int ide_cd_exitfn(IDEDevice *dev)
+{
+ bdrv_lock_medium(dev->conf.bs, 0);
+ return 0;
+}
+
static int ide_drive_initfn(IDEDevice *dev)
{
DriveInfo *dinfo = drive_get_by_blockdev(dev->conf.bs);
@@ -189,6 +195,16 @@ static int ide_drive_initfn(IDEDevice *dev)
return ide_dev_initfn(dev, dinfo->media_cd ? IDE_CD : IDE_HD);
}
+static int ide_drive_exitfn(IDEDevice *dev)
+{
+ DriveInfo *dinfo = drive_get_by_blockdev(dev->conf.bs);
+
+ if (dinfo->media_cd) {
+ return ide_cd_exitfn(dev);
+ }
+ return 0;
+}
+
#define DEFINE_IDE_DEV_PROPERTIES() \
DEFINE_BLOCK_PROPERTIES(IDEDrive, dev.conf), \
DEFINE_PROP_STRING("ver", IDEDrive, dev.version), \
@@ -211,6 +227,7 @@ static IDEDeviceInfo ide_dev_info[] = {
.qdev.desc = "virtual IDE CD-ROM",
.qdev.size = sizeof(IDEDrive),
.init = ide_cd_initfn,
+ .exit = ide_cd_exitfn,
.qdev.props = (Property[]) {
DEFINE_IDE_DEV_PROPERTIES(),
DEFINE_PROP_END_OF_LIST(),
@@ -221,6 +238,7 @@ static IDEDeviceInfo ide_dev_info[] = {
.qdev.desc = "virtual IDE disk or CD-ROM (legacy)",
.qdev.size = sizeof(IDEDrive),
.init = ide_drive_initfn,
+ .exit = ide_drive_exitfn,
.qdev.props = (Property[]) {
DEFINE_IDE_DEV_PROPERTIES(),
DEFINE_PROP_END_OF_LIST(),
--
1.7.6
- [Qemu-devel] [PATCH v2 05/45] ide: Clean up case label indentation in ide_exec_cmd(), (continued)
- [Qemu-devel] [PATCH v2 05/45] ide: Clean up case label indentation in ide_exec_cmd(), Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 09/45] ide/atapi: Clean up misleading name in cmd_start_stop_unit(), Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 10/45] ide/atapi: Track tray open/close state, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 24/45] scsi-disk: Avoid physical/virtual tray state mismatch, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 33/45] xen: Clean up pci_piix3_xen_ide_unplug()'s test for "not a CD", Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 21/45] ide/atapi: Don't fail eject when tray is already open, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 25/45] ide: Give vmstate structs internal linkage where possible, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 34/45] spitz tosa: Simplify "drive is suitable for microdrive" test, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 42/45] block: Reset buffer alignment on detach, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 22/45] ide/atapi: Avoid physical/virtual tray state mismatch,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 26/45] ide/atapi: Preserve tray state on migration, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 39/45] hw: Trim superfluous #include "block_int.h", Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 32/45] savevm: Include writable devices with removable media, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 29/45] block: Leave tracking media change to device models, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 20/45] ide: Provide IDEDeviceInfo method exit(), Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 36/45] block: Drop BlockDriverState member removable, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 45/45] ide/atapi scsi-disk: Make monitor eject -f, then change work, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 41/45] block: New bdrv_set_buffer_alignment(), Markus Armbruster, 2011/08/03