diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2021-04-07 15:37:42 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2021-04-09 18:00:29 +0200 |
| commit | da64789d3a16b2c5b5f1be9c75b00c2b8ae393a0 (patch) | |
| tree | 2aa0484bbef3fb0b0ed66c1a8be6afae5b4766f3 | |
| parent | f940b0ac6fa67deb9d0b671cf83070f0286c67e1 (diff) | |
| download | qemu-da64789d3a16b2c5b5f1be9c75b00c2b8ae393a0.zip qemu-da64789d3a16b2c5b5f1be9c75b00c2b8ae393a0.tar.gz qemu-da64789d3a16b2c5b5f1be9c75b00c2b8ae393a0.tar.bz2 | |
hw/block/fdc: Fix 'fallback' property on sysbus floppy disk controllers
Setting the 'fallback' property corrupts the QOM instance state
(FDCtrlSysBus) because it accesses an incorrect offset (it uses
the offset of the FDCtrlISABus state).
Cc: qemu-stable@nongnu.org
Fixes: a73275dd6fc ("fdc: Add fallback option")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210407133742.1680424-1-f4bug@amsat.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | hw/block/fdc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 82afda7..a825c2a 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2893,7 +2893,7 @@ static Property sysbus_fdc_properties[] = { DEFINE_PROP_SIGNED("fdtypeB", FDCtrlSysBus, state.qdev_for_drives[1].type, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), - DEFINE_PROP_SIGNED("fallback", FDCtrlISABus, state.fallback, + DEFINE_PROP_SIGNED("fallback", FDCtrlSysBus, state.fallback, FLOPPY_DRIVE_TYPE_144, qdev_prop_fdc_drive_type, FloppyDriveType), DEFINE_PROP_END_OF_LIST(), @@ -2918,7 +2918,7 @@ static Property sun4m_fdc_properties[] = { DEFINE_PROP_SIGNED("fdtype", FDCtrlSysBus, state.qdev_for_drives[0].type, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), - DEFINE_PROP_SIGNED("fallback", FDCtrlISABus, state.fallback, + DEFINE_PROP_SIGNED("fallback", FDCtrlSysBus, state.fallback, FLOPPY_DRIVE_TYPE_144, qdev_prop_fdc_drive_type, FloppyDriveType), DEFINE_PROP_END_OF_LIST(), |