[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/15] floppy: save and restore DIR register
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 13/15] floppy: save and restore DIR register |
Date: |
Thu, 7 Apr 2011 16:49:22 +0200 |
From: Jason Wang <address@hidden>
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 <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
hw/fdc.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/hw/fdc.c b/hw/fdc.c
index 9fdbc75..edf0360 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -36,6 +36,7 @@
#include "qdev-addr.h"
#include "blockdev.h"
#include "sysemu.h"
+#include "block_int.h"
/********************************************************/
/* debug Floppy devices */
@@ -82,6 +83,7 @@ typedef struct FDrive {
uint8_t max_track; /* Nb of tracks */
uint16_t bps; /* Bytes per sector */
uint8_t ro; /* Is read-only */
+ uint8_t media_changed; /* Is media changed */
} FDrive;
static void fd_init(FDrive *drv)
@@ -533,16 +535,63 @@ static CPUWriteMemoryFunc * const
fdctrl_mem_write_strict[3] = {
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 = {
.name = "fdrive",
.version_id = 1,
.minimum_version_id = 1,
.minimum_version_id_old = 1,
- .fields = (VMStateField []) {
+ .fields = (VMStateField[]) {
VMSTATE_UINT8(head, FDrive),
VMSTATE_UINT8(track, FDrive),
VMSTATE_UINT8(sect, FDrive),
VMSTATE_END_OF_LIST()
+ },
+ .subsections = (VMStateSubsection[]) {
+ {
+ .vmsd = &vmstate_fdrive_media_changed,
+ .needed = &fdrive_media_changed_needed,
+ } , {
+ /* empty */
+ }
}
};
--
1.7.2.3
- [Qemu-devel] [PATCH 01/15] hw/xen_disk: ioreq not finished on error, (continued)
- [Qemu-devel] [PATCH 01/15] hw/xen_disk: ioreq not finished on error, Kevin Wolf, 2011/04/07
- [Qemu-devel] [PATCH 04/15] block: Do not cache device size for removable media, Kevin Wolf, 2011/04/07
- [Qemu-devel] [PATCH 05/15] qemu-img: Initial progress printing support, Kevin Wolf, 2011/04/07
- [Qemu-devel] [PATCH 06/15] qemu-img rebase: Fix segfault if backing file can't be opened, Kevin Wolf, 2011/04/07
- [Qemu-devel] [PATCH 07/15] exit if -drive specified is invalid instead of ignoring the "wrong" -drive, Kevin Wolf, 2011/04/07
- [Qemu-devel] [PATCH 08/15] ide: consolidate drive_get(IF_IDE), Kevin Wolf, 2011/04/07
- [Qemu-devel] [PATCH 10/15] Set errno=ENOTSUP for attempts to use UNIX sockets on Windows platforms, Kevin Wolf, 2011/04/07
- [Qemu-devel] [PATCH 12/15] NBD device: Separate out parsing configuration and opening sockets., Kevin Wolf, 2011/04/07
- [Qemu-devel] [PATCH 14/15] Fix integer overflow in block migration bandwidth calculation, Kevin Wolf, 2011/04/07
- [Qemu-devel] [PATCH 11/15] NBD: Use qemu_socket functions to open TCP and UNIX sockets, Kevin Wolf, 2011/04/07
- [Qemu-devel] [PATCH 13/15] floppy: save and restore DIR register,
Kevin Wolf <=
- [Qemu-devel] [PATCH 09/15] NBD library: whitespace changes, Kevin Wolf, 2011/04/07
- [Qemu-devel] [PATCH 15/15] virtio-blk: fail unaligned requests, Kevin Wolf, 2011/04/07
- Re: [Qemu-devel] [PULL 00/15] Block patches, Anthony Liguori, 2011/04/07