[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/19] floppy: make isa_fdc_get_drive_max_chs static
From: |
Michael S. Tsirkin |
Subject: |
[PULL 04/19] floppy: make isa_fdc_get_drive_max_chs static |
Date: |
Wed, 24 Jun 2020 19:06:38 -0400 |
From: Gerd Hoffmann <kraxel@redhat.com>
acpi aml generator needs this, but it is in floppy code now
so we can make the function static.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: John Snow <jsnow@redhat.com>
Message-Id: <20200619091905.21676-5-kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/block/fdc.h | 2 --
hw/block/fdc.c | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h
index c15ff4c623..5d71cf9722 100644
--- a/include/hw/block/fdc.h
+++ b/include/hw/block/fdc.h
@@ -16,7 +16,5 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base,
DriveInfo **fds, qemu_irq *fdc_tc);
FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i);
-void isa_fdc_get_drive_max_chs(FloppyDriveType type,
- uint8_t *maxc, uint8_t *maxh, uint8_t *maxs);
#endif
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 5244df6f91..f1da83f08e 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -2747,8 +2747,8 @@ FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc,
int i)
return isa->state.drives[i].drive;
}
-void isa_fdc_get_drive_max_chs(FloppyDriveType type,
- uint8_t *maxc, uint8_t *maxh, uint8_t *maxs)
+static void isa_fdc_get_drive_max_chs(FloppyDriveType type, uint8_t *maxc,
+ uint8_t *maxh, uint8_t *maxs)
{
const FDFormat *fdf;
--
MST
- [PULL 00/19] virtio,acpi,pci: fixes, cleanups, tools., Michael S. Tsirkin, 2020/06/24
- [PULL 02/19] acpi: bios-tables-test: show more context on asl diffs, Michael S. Tsirkin, 2020/06/24
- [PULL 04/19] floppy: make isa_fdc_get_drive_max_chs static,
Michael S. Tsirkin <=
- [PULL 01/19] qtest: allow DSDT acpi table changes, Michael S. Tsirkin, 2020/06/24
- [PULL 03/19] acpi: move aml builder code for floppy device, Michael S. Tsirkin, 2020/06/24
- [PULL 05/19] floppy: move cmos_get_fd_drive_type() from pc, Michael S. Tsirkin, 2020/06/24
- [PULL 06/19] acpi: move aml builder code for i8042 (kbd+mouse) device, Michael S. Tsirkin, 2020/06/24
- [PULL 07/19] acpi: factor out fw_cfg_add_acpi_dsdt(), Michael S. Tsirkin, 2020/06/24
- [PULL 08/19] acpi: simplify build_isa_devices_aml(), Michael S. Tsirkin, 2020/06/24
- [PULL 09/19] acpi: drop serial/parallel enable bits from dsdt, Michael S. Tsirkin, 2020/06/24
- [PULL 10/19] acpi: drop build_piix4_pm(), Michael S. Tsirkin, 2020/06/24
- [PULL 11/19] acpi: q35: drop _SB.PCI0.ISA.LPCD opregion., Michael S. Tsirkin, 2020/06/24
- [PULL 12/19] tests/acpi: update expected data files, Michael S. Tsirkin, 2020/06/24