From: Luiz Capitulino Date: Fri, 17 Feb 2012 18:40:00 +0000 (-0200) Subject: ide: drop ide_tray_state_post_load() X-Git-Tag: v1.1-rc0~320^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bde25388d1cee6576ff12dd40f9abf489f0031ed;p=thirdparty%2Fqemu.git ide: drop ide_tray_state_post_load() This is used to sync the physical tray state after migration when using CD-ROM passthrough. However, migrating when using passthrough is broken anyway and shouldn't be supported... So, drop this function as it causes a problem with the DEVICE_TRAY_MOVED event, which is going to be introduced by the next commit. Signed-off-by: Luiz Capitulino Reviewed-by: Markus Armbruster Acked-by: Kevin Wolf --- diff --git a/hw/ide/core.c b/hw/ide/core.c index 0856385f1e5..ce570a7ce5c 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2077,15 +2077,6 @@ static bool ide_drive_pio_state_needed(void *opaque) || (s->bus->error_status & BM_STATUS_PIO_RETRY); } -static int ide_tray_state_post_load(void *opaque, int version_id) -{ - IDEState *s = opaque; - - bdrv_eject(s->bs, s->tray_open); - bdrv_lock_medium(s->bs, s->tray_locked); - return 0; -} - static bool ide_tray_state_needed(void *opaque) { IDEState *s = opaque; @@ -2125,7 +2116,6 @@ static const VMStateDescription vmstate_ide_tray_state = { .version_id = 1, .minimum_version_id = 1, .minimum_version_id_old = 1, - .post_load = ide_tray_state_post_load, .fields = (VMStateField[]) { VMSTATE_BOOL(tray_open, IDEState), VMSTATE_BOOL(tray_locked, IDEState),