mirror of https://github.com/proxmox/mirror_qemu
fdc: Open-code fdctrl_init_isa()
Helper function fdctrl_init_isa() is less than helpful: one of three places creating "isa-fdc" devices use it. Open-code it there, and drop the function. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20200622094227.1271650-6-armbru@redhat.com>master
parent
6172e067a4
commit
fed2c1731c
|
@ -2565,20 +2565,6 @@ static void fdctrl_connect_drives(FDCtrl *fdctrl, DeviceState *fdc_dev,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds)
|
|
||||||
{
|
|
||||||
ISADevice *isadev;
|
|
||||||
|
|
||||||
isadev = isa_try_new(TYPE_ISA_FDC);
|
|
||||||
if (!isadev) {
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
isa_realize_and_unref(isadev, bus, &error_fatal);
|
|
||||||
|
|
||||||
isa_fdc_init_drives(isadev, fds);
|
|
||||||
return isadev;
|
|
||||||
}
|
|
||||||
|
|
||||||
void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
|
void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
|
||||||
hwaddr mmio_base, DriveInfo **fds)
|
hwaddr mmio_base, DriveInfo **fds)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1142,7 +1142,7 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl, bool no_vmport)
|
||||||
int i;
|
int i;
|
||||||
DriveInfo *fd[MAX_FD];
|
DriveInfo *fd[MAX_FD];
|
||||||
qemu_irq *a20_line;
|
qemu_irq *a20_line;
|
||||||
ISADevice *i8042, *port92, *vmmouse;
|
ISADevice *fdc, *i8042, *port92, *vmmouse;
|
||||||
|
|
||||||
serial_hds_isa_init(isa_bus, 0, MAX_ISA_SERIAL_PORTS);
|
serial_hds_isa_init(isa_bus, 0, MAX_ISA_SERIAL_PORTS);
|
||||||
parallel_hds_isa_init(isa_bus, MAX_PARALLEL_PORTS);
|
parallel_hds_isa_init(isa_bus, MAX_PARALLEL_PORTS);
|
||||||
|
@ -1152,7 +1152,11 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl, bool no_vmport)
|
||||||
create_fdctrl |= !!fd[i];
|
create_fdctrl |= !!fd[i];
|
||||||
}
|
}
|
||||||
if (create_fdctrl) {
|
if (create_fdctrl) {
|
||||||
fdctrl_init_isa(isa_bus, fd);
|
fdc = isa_new(TYPE_ISA_FDC);
|
||||||
|
if (fdc) {
|
||||||
|
isa_realize_and_unref(fdc, isa_bus, &error_fatal);
|
||||||
|
isa_fdc_init_drives(fdc, fd);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
i8042 = isa_create_simple(isa_bus, "i8042");
|
i8042 = isa_create_simple(isa_bus, "i8042");
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
#define TYPE_ISA_FDC "isa-fdc"
|
#define TYPE_ISA_FDC "isa-fdc"
|
||||||
|
|
||||||
void isa_fdc_init_drives(ISADevice *fdc, DriveInfo **fds);
|
void isa_fdc_init_drives(ISADevice *fdc, DriveInfo **fds);
|
||||||
ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds);
|
|
||||||
void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
|
void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
|
||||||
hwaddr mmio_base, DriveInfo **fds);
|
hwaddr mmio_base, DriveInfo **fds);
|
||||||
void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base,
|
void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base,
|
||||||
|
|
Loading…
Reference in New Issue