[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 04/12] fdc: add disk field
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v5 04/12] fdc: add disk field |
Date: |
Fri, 22 Jan 2016 15:50:57 -0500 |
Currently, 'drive' is used both to represent the current diskette
type as well as the current drive type.
This patch adds a 'disk' field that is updated explicitly to match
the type of the disk.
As of this patch, disk and drive are always the same, but forthcoming
patches to change the behavior of pick_geometry will invalidate this
assumption.
disk does not need to be migrated because it is not user-visible state
nor is it currently used for any calculations. It is purely informative,
and will be rebuilt automatically via fd_revalidate on the new host.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
hw/block/fdc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index e37934d..18e363b 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -141,6 +141,7 @@ typedef struct FDrive {
uint8_t track;
uint8_t sect;
/* Media */
+ FloppyDriveType disk; /* Current disk type */
FDiskFlags flags;
uint8_t last_sect; /* Nb sector per track */
uint8_t max_track; /* Nb of tracks */
@@ -158,6 +159,7 @@ static void fd_init(FDrive *drv)
drv->drive = FLOPPY_DRIVE_TYPE_NONE;
drv->perpendicular = 0;
/* Disk */
+ drv->disk = FLOPPY_DRIVE_TYPE_NONE;
drv->last_sect = 0;
drv->max_track = 0;
}
@@ -287,6 +289,7 @@ static void pick_geometry(FDrive *drv)
drv->max_track = parse->max_track;
drv->last_sect = parse->last_sect;
drv->drive = parse->drive;
+ drv->disk = drv->media_inserted ? parse->drive : FLOPPY_DRIVE_TYPE_NONE;
drv->media_rate = parse->rate;
}
--
2.4.3
- [Qemu-devel] [PATCH v5 00/12] fdc: fix 2.88mb floppy diskette support, John Snow, 2016/01/22
- [Qemu-devel] [PATCH v5 02/12] fdc: reduce number of pick_geometry arguments, John Snow, 2016/01/22
- [Qemu-devel] [PATCH v5 01/12] fdc: move pick_geometry, John Snow, 2016/01/22
- [Qemu-devel] [PATCH v5 05/12] fdc: Throw an assertion on misconfigured fd_formats table, John Snow, 2016/01/22
- [Qemu-devel] [PATCH v5 03/12] fdc: add drive type qapi enum, John Snow, 2016/01/22
- [Qemu-devel] [PATCH v5 07/12] fdc: Add fallback option, John Snow, 2016/01/22
- [Qemu-devel] [PATCH v5 08/12] fdc: add drive type option, John Snow, 2016/01/22
- [Qemu-devel] [PATCH v5 11/12] qtest/fdc: Support for 2.88MB drives, John Snow, 2016/01/22
- [Qemu-devel] [PATCH v5 04/12] fdc: add disk field,
John Snow <=
- [Qemu-devel] [PATCH v5 06/12] fdc: add pick_drive, John Snow, 2016/01/22
- [Qemu-devel] [PATCH v5 10/12] fdc: rework pick_geometry, John Snow, 2016/01/22
- [Qemu-devel] [PATCH v5 09/12] fdc: add physical disk sizes, John Snow, 2016/01/22
- [Qemu-devel] [PATCH v5 12/12] fdc: change auto fallback drive for ISA FDC to 288, John Snow, 2016/01/22