| Message ID | 20210309161214.1402527-4-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Drop deprecated floppy config & bogus -drive if=T | expand |
On Tue, Mar 09, 2021 at 05:12:12PM +0100, Markus Armbruster wrote: > The previous commit rendered the name fdctrl_connect_drives() somewhat > misleading. Get rid of it by inlining the (now pretty simple) > function into its only caller. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > hw/block/fdc.c | 23 ++++++++--------------- > 1 file changed, 8 insertions(+), 15 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
On 3/9/21 8:12 AM, Markus Armbruster wrote: > @@ -2565,6 +2551,7 @@ static void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl, > Error **errp) > { > int i, j; > + FDrive *drive; > static int command_tables_inited = 0; > > if (fdctrl->fallback == FLOPPY_DRIVE_TYPE_AUTO) { > @@ -2604,7 +2591,13 @@ static void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl, > } > > floppy_bus_create(fdctrl, &fdctrl->bus, dev); > - fdctrl_connect_drives(fdctrl, dev, errp); > + > + for (i = 0; i < MAX_FD; i++) { > + drive = &fdctrl->drives[i]; FWIW, the declaration could be local to this loop. r~
Richard Henderson <richard.henderson@linaro.org> writes: > On 3/9/21 8:12 AM, Markus Armbruster wrote: >> @@ -2565,6 +2551,7 @@ static void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl, >> Error **errp) >> { >> int i, j; >> + FDrive *drive; >> static int command_tables_inited = 0; >> if (fdctrl->fallback == FLOPPY_DRIVE_TYPE_AUTO) { >> @@ -2604,7 +2591,13 @@ static void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl, >> } >> floppy_bus_create(fdctrl, &fdctrl->bus, dev); >> - fdctrl_connect_drives(fdctrl, dev, errp); >> + >> + for (i = 0; i < MAX_FD; i++) { >> + drive = &fdctrl->drives[i]; > > FWIW, the declaration could be local to this loop. Old-school habits. John, got a preference?
diff --git a/hw/block/fdc.c b/hw/block/fdc.c index f978ddf647..32701c2bc5 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2511,20 +2511,6 @@ void isa_fdc_init_drives(ISADevice *fdc, DriveInfo **fds) fdctrl_init_drives(&ISA_FDC(fdc)->state.bus, fds); } -static void fdctrl_connect_drives(FDCtrl *fdctrl, DeviceState *fdc_dev, - Error **errp) -{ - unsigned int i; - FDrive *drive; - - for (i = 0; i < MAX_FD; i++) { - drive = &fdctrl->drives[i]; - drive->fdctrl = fdctrl; - fd_init(drive); - fd_revalidate(drive); - } -} - void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, hwaddr mmio_base, DriveInfo **fds) { @@ -2565,6 +2551,7 @@ static void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl, Error **errp) { int i, j; + FDrive *drive; static int command_tables_inited = 0; if (fdctrl->fallback == FLOPPY_DRIVE_TYPE_AUTO) { @@ -2604,7 +2591,13 @@ static void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl, } floppy_bus_create(fdctrl, &fdctrl->bus, dev); - fdctrl_connect_drives(fdctrl, dev, errp); + + for (i = 0; i < MAX_FD; i++) { + drive = &fdctrl->drives[i]; + drive->fdctrl = fdctrl; + fd_init(drive); + fd_revalidate(drive); + } } static const MemoryRegionPortio fdc_portio_list[] = {
The previous commit rendered the name fdctrl_connect_drives() somewhat misleading. Get rid of it by inlining the (now pretty simple) function into its only caller. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- hw/block/fdc.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-)