proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-15 01:01:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

floppy: save and restore DIR register

Browse Source 
We need to keep DIR register unchanged across migration, but currently it
depends on the media_changed flags from block layer. Since we do not
save/restore it and the bdrv_open() called in dest node may set the
media_changed flag when trying to open floppy image, guest driver may think the
floppy have changed after migration. To fix this, a new filed media_changed in
FDrive strcutre was introduced in order to save and restore the it from block
layer through pre_save/post_load callbacks.

Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Jason Wang 2011-04-06 18:34:31 +08:00 committed by Kevin Wolf
parent 33897dc7d6
commit 7d905f716b
1 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
hw/fdc.c
View File

@ -36,6 +36,7 @@
#include "qdev-addr.h" #include "qdev-addr.h"
#include "blockdev.h" #include "blockdev.h"
#include "sysemu.h" #include "sysemu.h"
#include "block_int.h"
/********************************************************/ /********************************************************/
/* debug Floppy devices */ /* debug Floppy devices */
@ -82,6 +83,7 @@ typedef struct FDrive {
uint8_t max_track; /* Nb of tracks */ uint8_t max_track; /* Nb of tracks */
uint16_t bps; /* Bytes per sector */ uint16_t bps; /* Bytes per sector */
uint8_t ro; /* Is read-only */ uint8_t ro; /* Is read-only */
uint8_t media_changed; /* Is media changed */
} FDrive; } FDrive;
static void fd_init(FDrive *drv) static void fd_init(FDrive *drv)
@ -533,16 +535,63 @@ static CPUWriteMemoryFunc * const fdctrl_mem_write_strict[3] = {
NULL, NULL,
}; };
static void fdrive_media_changed_pre_save(void *opaque)
{
FDrive *drive = opaque;
drive->media_changed = drive->bs->media_changed;
}
static int fdrive_media_changed_post_load(void *opaque, int version_id)
{
FDrive *drive = opaque;
if (drive->bs != NULL) {
drive->bs->media_changed = drive->media_changed;
}
/* User ejected the floppy when drive->bs == NULL */
return 0;
}
static bool fdrive_media_changed_needed(void *opaque)
{
FDrive *drive = opaque;
return (drive->bs != NULL && drive->bs->media_changed != 1);
}
static const VMStateDescription vmstate_fdrive_media_changed = {
.name = "fdrive/media_changed",
.version_id = 1,
.minimum_version_id = 1,
.minimum_version_id_old = 1,
.pre_save = fdrive_media_changed_pre_save,
.post_load = fdrive_media_changed_post_load,
.fields = (VMStateField[]) {
VMSTATE_UINT8(media_changed, FDrive),
VMSTATE_END_OF_LIST()
}
};
static const VMStateDescription vmstate_fdrive = { static const VMStateDescription vmstate_fdrive = {
.name = "fdrive", .name = "fdrive",
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.minimum_version_id_old = 1, .minimum_version_id_old = 1,
.fields = (VMStateField []) { .fields = (VMStateField[]) {
VMSTATE_UINT8(head, FDrive), VMSTATE_UINT8(head, FDrive),
VMSTATE_UINT8(track, FDrive), VMSTATE_UINT8(track, FDrive),
VMSTATE_UINT8(sect, FDrive), VMSTATE_UINT8(sect, FDrive),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
},
.subsections = (VMStateSubsection[]) {
{
.vmsd = &vmstate_fdrive_media_changed,
.needed = &fdrive_media_changed_needed,
} , {
/* empty */
}
} }
}; };