From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
qemu-block@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"John Snow" <jsnow@redhat.com>
Subject: [PULL 04/19] floppy: make isa_fdc_get_drive_max_chs static
Date: Wed, 24 Jun 2020 19:06:38 -0400 [thread overview]
Message-ID: <20200624230609.703104-5-mst@redhat.com> (raw)
In-Reply-To: <20200624230609.703104-1-mst@redhat.com>
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
next prev parent reply other threads:[~2020-06-24 23:10 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 23:06 [PULL 00/19] virtio,acpi,pci: fixes, cleanups, tools Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 01/19] qtest: allow DSDT acpi table changes Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 02/19] acpi: bios-tables-test: show more context on asl diffs Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 03/19] acpi: move aml builder code for floppy device Michael S. Tsirkin
2020-06-24 23:06 ` Michael S. Tsirkin [this message]
2020-06-24 23:06 ` [PULL 05/19] floppy: move cmos_get_fd_drive_type() from pc Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 06/19] acpi: move aml builder code for i8042 (kbd+mouse) device Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 07/19] acpi: factor out fw_cfg_add_acpi_dsdt() Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 08/19] acpi: simplify build_isa_devices_aml() Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 09/19] acpi: drop serial/parallel enable bits from dsdt Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 10/19] acpi: drop build_piix4_pm() Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 11/19] acpi: q35: drop _SB.PCI0.ISA.LPCD opregion Michael S. Tsirkin
2020-06-24 23:07 ` [PULL 12/19] tests/acpi: update expected data files Michael S. Tsirkin
2020-06-24 23:07 ` [PULL 13/19] acpi: Some build_tpm2() code reshape Michael S. Tsirkin
2020-06-24 23:07 ` [PULL 14/19] arm/acpi: Add the TPM2.0 device under the DSDT Michael S. Tsirkin
2020-06-24 23:07 ` [PULL 15/19] docs/specs/tpm: ACPI boot now supported for TPM/ARM Michael S. Tsirkin
2020-06-24 23:07 ` [PULL 16/19] Stop vhost-user sending uninitialized mmap_offsets Michael S. Tsirkin
2020-06-24 23:07 ` [PULL 17/19] Rename use_acpi_pci_hotplug to more appropriate use_acpi_hotplug_bridge Michael S. Tsirkin
2020-06-24 23:07 ` [PULL 18/19] tests/qtest/bios-tables: Only run the TPM test with CONFIG_TPM enabled Michael S. Tsirkin
2020-06-24 23:07 ` [PULL 19/19] tests: disassemble-asm.sh: generate AML in readable format Michael S. Tsirkin
2020-06-25 5:47 ` [PULL 00/19] virtio,acpi,pci: fixes, cleanups, tools Thomas Huth
2020-06-25 6:49 ` Michael S. Tsirkin
2020-06-25 20:20 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200624230609.703104-5-mst@redhat.com \
--to=mst@redhat.com \
--cc=imammedo@redhat.com \
--cc=jsnow@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).