qxl: create slots on post_load in vga state

[qemu.git] / blockdev.c

diff --git a/blockdev.c b/blockdev.c
index 154cc8456ec518596e98f13a0d179d8919536ce9..0827bf77438a7d245b1f308c52ef809f9535c2ca 100644 (file)
--- a/blockdev.c
+++ b/blockdev.c
@@ -635,7 +635,8 @@ static int eject_device(Monitor *mon, BlockDriverState *bs, int force)
         qerror_report(QERR_DEVICE_NOT_REMOVABLE, bdrv_get_device_name(bs));
         return -1;
     }
-    if (!force && bdrv_dev_is_medium_locked(bs)) {
+    if (!force && !bdrv_dev_is_tray_open(bs)
+        && bdrv_dev_is_medium_locked(bs)) {
         qerror_report(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs));
         return -1;
     }