From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:56830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RyTNU-0003hY-2u for qemu-devel@nongnu.org; Fri, 17 Feb 2012 14:21:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RyTNS-0006Ne-K6 for qemu-devel@nongnu.org; Fri, 17 Feb 2012 14:21:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59386) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RyTNS-0006NU-AC for qemu-devel@nongnu.org; Fri, 17 Feb 2012 14:21:54 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1HJLriJ023441 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 17 Feb 2012 14:21:53 -0500 From: Luiz Capitulino Date: Fri, 17 Feb 2012 17:21:43 -0200 Message-Id: <1329506504-29152-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1329506504-29152-1-git-send-email-lcapitulino@redhat.com> References: <1329506504-29152-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 4/5] ide: drop ide_tray_state_post_load() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, eblake@redhat.com, armbru@redhat.com 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 --- 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 0856385..ce570a7 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), -- 1.7.9.111.gf3fb0.dirty