| Message ID | 20250115232247.30364-16-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/i386/pc: Remove deprecated 2.4 and 2.5 PC machines | expand |
On Thu, Jan 16, 2025 at 12:22:41AM +0100, Philippe Mathieu-Daudé wrote: > The "fallback" property was only used by the hw_compat_2_5[] array, > as 'fallback=144'. We removed all machines using that array, lets > remove ISA floppy drive 'fallback' property, manually setting the > default value in isabus_fdc_realize(). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > hw/block/fdc-isa.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel
diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c index a10c24aab10..9e99a183c1d 100644 --- a/hw/block/fdc-isa.c +++ b/hw/block/fdc-isa.c @@ -112,6 +112,7 @@ static void isabus_fdc_realize(DeviceState *dev, Error **errp) } qdev_set_legacy_instance_id(dev, isa->iobase, 2); + qdev_prop_set_enum(dev, "fallback", FLOPPY_DRIVE_TYPE_288); fdctrl_realize_common(dev, fdctrl, &err); if (err != NULL) { @@ -293,9 +294,6 @@ static const Property isa_fdc_properties[] = { DEFINE_PROP_SIGNED("fdtypeB", FDCtrlISABus, state.qdev_for_drives[1].type, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), - DEFINE_PROP_SIGNED("fallback", FDCtrlISABus, state.fallback, - FLOPPY_DRIVE_TYPE_288, qdev_prop_fdc_drive_type, - FloppyDriveType), }; static void isabus_fdc_class_init(ObjectClass *klass, void *data)
The "fallback" property was only used by the hw_compat_2_5[] array, as 'fallback=144'. We removed all machines using that array, lets remove ISA floppy drive 'fallback' property, manually setting the default value in isabus_fdc_realize(). Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/block/fdc-isa.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)