From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Kevin Wolf" <kwolf@redhat.com>, "Thomas Huth" <thuth@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
qemu-block@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"John Snow" <jsnow@redhat.com>,
"Richard Henderson" <rth@twiddle.net>
Subject: [PATCH v9 03/10] floppy: make isa_fdc_get_drive_max_chs static
Date: Wed, 17 Jun 2020 09:11:31 +0200 [thread overview]
Message-ID: <20200617071138.11159-4-kraxel@redhat.com> (raw)
In-Reply-To: <20200617071138.11159-1-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>
---
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 c15ff4c62315..5d71cf972268 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 c92436772292..5a634ab46302 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -2744,8 +2744,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;
--
2.18.4
next prev parent reply other threads:[~2020-06-17 7:14 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 7:11 [PATCH v9 00/10] acpi: i386 tweaks Gerd Hoffmann
2020-06-17 7:11 ` [PATCH v9 01/10] acpi: bios-tables-test: show more context on asl diffs Gerd Hoffmann
2020-06-17 7:31 ` Philippe Mathieu-Daudé
2020-06-17 7:11 ` [PATCH v9 02/10] acpi: move aml builder code for floppy device Gerd Hoffmann
2020-06-17 8:40 ` Thomas Huth
2020-06-17 11:31 ` Gerd Hoffmann
2020-06-17 11:34 ` Thomas Huth
2020-06-18 20:07 ` Michael S. Tsirkin
2020-06-17 7:11 ` Gerd Hoffmann [this message]
2020-06-17 7:11 ` [PATCH v9 04/10] floppy: move cmos_get_fd_drive_type() from pc Gerd Hoffmann
2020-06-17 7:11 ` [PATCH v9 05/10] acpi: move aml builder code for i8042 (kbd+mouse) device Gerd Hoffmann
2020-06-18 20:05 ` Michael S. Tsirkin
2020-06-17 7:11 ` [PATCH v9 06/10] acpi: factor out fw_cfg_add_acpi_dsdt() Gerd Hoffmann
2020-06-17 7:11 ` [PATCH v9 07/10] acpi: simplify build_isa_devices_aml() Gerd Hoffmann
2020-06-17 7:11 ` [PATCH v9 08/10] acpi: drop serial/parallel enable bits from dsdt Gerd Hoffmann
2020-06-18 20:08 ` Michael S. Tsirkin
2020-06-17 7:11 ` [PATCH v9 09/10] acpi: drop build_piix4_pm() Gerd Hoffmann
2020-06-17 7:11 ` [PATCH v9 10/10] acpi: q35: drop _SB.PCI0.ISA.LPCD opregion Gerd Hoffmann
2020-06-17 7:24 ` [PATCH v9 00/10] acpi: i386 tweaks no-reply
2020-06-17 7:42 ` no-reply
2020-06-17 7:47 ` no-reply
2020-06-18 20:09 ` Michael S. Tsirkin
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=20200617071138.11159-4-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/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).