| Message ID | 20200507131640.14041-16-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | acpi: i386 tweaks | expand |
On 5/7/20 3:16 PM, Gerd Hoffmann wrote: > 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> > --- > 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 40faa088b5f7..499a580b993c 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; > >
On 5/7/20 10:06 AM, Philippe Mathieu-Daudé wrote: > On 5/7/20 3:16 PM, Gerd Hoffmann wrote: >> 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> I trust Philippe :)
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 40faa088b5f7..499a580b993c 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;