diff options
| author | Markus Armbruster <armbru@redhat.com> | 2021-03-09 17:12:12 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2021-03-19 15:18:43 +0100 |
| commit | f2a9a6c2a86570ccbf8c5c30cbb8bf723168c459 (patch) | |
| tree | c719f48fbd70d35293582ce89d973ec6dbcddc82 /hw | |
| parent | 36585e2b12c25133b88fc8acfc5c603b0b539074 (diff) | |
| download | qemu-f2a9a6c2a86570ccbf8c5c30cbb8bf723168c459.zip qemu-f2a9a6c2a86570ccbf8c5c30cbb8bf723168c459.tar.gz qemu-f2a9a6c2a86570ccbf8c5c30cbb8bf723168c459.tar.bz2 | |
fdc: Inline fdctrl_connect_drives() into fdctrl_realize_common()
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>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20210309161214.1402527-4-armbru@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/block/fdc.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/hw/block/fdc.c b/hw/block/fdc.c index f978ddf..32701c2 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[] = { |