[Qemu-devel] [PATCH 4/5] ide: drop ide_tray_state_post_load()

2012-02-23 Thread Luiz Capitulino 
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 lcapitul...@redhat.com
Reviewed-by: Markus Armbruster arm...@redhat.com
Acked-by: Kevin Wolf kw...@redhat.com
---
 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

Re: [Qemu-devel] [PATCH 4/5] ide: drop ide_tray_state_post_load()

2012-02-20 Thread Markus Armbruster 
Luiz Capitulino lcapitul...@redhat.com writes:

 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.

I added ide_tray_state_post_load() mostly to satisfy an urge to always
call bdrv_eject() when tray_state changes, not because it's actually
useful.  I'm fine with dropping it.  Perhaps preventing migration while
the host CD-ROM is passed through would be even better.

[Qemu-devel] [PATCH 4/5] ide: drop ide_tray_state_post_load()

2012-02-17 Thread Luiz Capitulino 
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 lcapitul...@redhat.com
---
 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