From 8620f420d3c2846d26f15b43249d81c3cd20e290 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Wed, 29 Feb 2012 20:01:04 +0100 Subject: [PATCH 09/11] ide: drop ide_tray_state_post_load() RH-Author: Luiz Capitulino Message-id: <1330545665-1595-5-git-send-email-lcapitulino@redhat.com> Patchwork-id: 37790 O-Subject: [PATCH RHEL6.3 qemu-kvm 4/5] ide: drop ide_tray_state_post_load() Bugzilla: 575159 RH-Acked-by: Paolo Bonzini RH-Acked-by: Markus Armbruster RH-Acked-by: Kevin Wolf 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 (cherry picked from commit bde25388d1cee6576ff12dd40f9abf489f0031ed) --- hw/ide/core.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) Signed-off-by: Michal Novotny --- hw/ide/core.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 73bc133..0eb1da1 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2060,15 +2060,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; @@ -2108,7 +2099,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), -- 1.7.7.6