[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/16] fdc: Open-code fdctrl_init_isa()
From: |
Markus Armbruster |
Subject: |
[PULL 05/16] fdc: Open-code fdctrl_init_isa() |
Date: |
Tue, 23 Jun 2020 16:23:15 +0200 |
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>
---
include/hw/block/fdc.h | 1 -
hw/block/fdc.c | 14 --------------
hw/i386/pc.c | 8 ++++++--
3 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h
index 8855d3476c..d232d3fa1e 100644
--- a/include/hw/block/fdc.h
+++ b/include/hw/block/fdc.h
@@ -10,7 +10,6 @@
#define TYPE_ISA_FDC "isa-fdc"
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,
hwaddr mmio_base, DriveInfo **fds);
void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base,
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 2650dcb0df..d1f7722cff 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -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,
hwaddr mmio_base, DriveInfo **fds)
{
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index d103b8c0ab..f670bcd6e6 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1142,7 +1142,7 @@ static void pc_superio_init(ISABus *isa_bus, bool
create_fdctrl, bool no_vmport)
int i;
DriveInfo *fd[MAX_FD];
qemu_irq *a20_line;
- ISADevice *i8042, *port92, *vmmouse;
+ ISADevice *fdc, *i8042, *port92, *vmmouse;
serial_hds_isa_init(isa_bus, 0, MAX_ISA_SERIAL_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];
}
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");
--
2.26.2
- [PULL 00/16] Qdev patches for 2020-06-23, Markus Armbruster, 2020/06/23
- [PULL 01/16] iotests/172: Include "info block" in test output, Markus Armbruster, 2020/06/23
- [PULL 09/16] qdev: Eliminate get_pointer(), set_pointer(), Markus Armbruster, 2020/06/23
- [PULL 07/16] docs/qdev-device-use.txt: Update section "Default Devices", Markus Armbruster, 2020/06/23
- [PULL 05/16] fdc: Open-code fdctrl_init_isa(),
Markus Armbruster <=
- [PULL 14/16] arm/aspeed: Drop aspeed_board_init_flashes() parameter @errp, Markus Armbruster, 2020/06/23
- [PULL 10/16] qdev: Improve netdev property override error a bit, Markus Armbruster, 2020/06/23
- [PULL 08/16] blockdev: Deprecate -drive with bogus interface type, Markus Armbruster, 2020/06/23
- [PULL 02/16] iotests/172: Cover empty filename and multiple use of drives, Markus Armbruster, 2020/06/23
- [PULL 15/16] sd/pxa2xx_mmci: Don't crash on pxa2xx_mmci_init() error, Markus Armbruster, 2020/06/23
- [PULL 04/16] fdc: Reject clash between -drive if=floppy and -global isa-fdc, Markus Armbruster, 2020/06/23
- [PULL 03/16] iotests/172: Cover -global floppy.drive=..., Markus Armbruster, 2020/06/23
- [PULL 11/16] qdev: Reject drive property override, Markus Armbruster, 2020/06/23
- [PULL 12/16] qdev: Reject chardev property override, Markus Armbruster, 2020/06/23
- [PULL 16/16] sd/milkymist-memcard: Fix error API violation, Markus Armbruster, 2020/06/23