motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ide/atapi: Preserve tray state on migration

Browse source 
Use a subsection, so that migration to older version still works,
provided the tray is closed and unlocked.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2011-09-06 18:58:50 +02:00 • committed by Kevin Wolf
parent 68bb01f398
commit db118fe725
1 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
hw/ide/core.c
View file

@ -2058,6 +2058,22 @@ static bool ide_drive_pio_state_needed(void *opaque)
|| (s->bus->error_status & BM_STATUS_PIO_RETRY); || (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;
return s->tray_open || s->tray_locked;
}
static bool ide_atapi_gesn_needed(void *opaque) static bool ide_atapi_gesn_needed(void *opaque)
{ {
IDEState *s = opaque; IDEState *s = opaque;
@ -2085,6 +2101,19 @@ static const VMStateDescription vmstate_ide_atapi_gesn_state = {
} }
}; };
static const VMStateDescription vmstate_ide_tray_state = {
.name = "ide_drive/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),
VMSTATE_END_OF_LIST()
}
};
static const VMStateDescription vmstate_ide_drive_pio_state = { static const VMStateDescription vmstate_ide_drive_pio_state = {
.name = "ide_drive/pio_state", .name = "ide_drive/pio_state",
.version_id = 1, .version_id = 1,
@ -2138,6 +2167,9 @@ const VMStateDescription vmstate_ide_drive = {
{ {
.vmsd = &vmstate_ide_drive_pio_state, .vmsd = &vmstate_ide_drive_pio_state,
.needed = ide_drive_pio_state_needed, .needed = ide_drive_pio_state_needed,
}, {
.vmsd = &vmstate_ide_tray_state,
.needed = ide_tray_state_needed,
}, { }, {
.vmsd = &vmstate_ide_atapi_gesn_state, .vmsd = &vmstate_ide_atapi_gesn_state,
.needed = ide_atapi_gesn_needed, .needed = ide_atapi_gesn_needed,