From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org, John Snow <jsnow@redhat.com>
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
qemu-block@nongnu.org
Subject: [PATCH v4 9/9] hw/mips/jazz: Inline fdctrl_init_sysbus()
Date: Mon, 17 May 2021 20:39:54 +0200 [thread overview]
Message-ID: <20210517183954.1223193-10-philmd@redhat.com> (raw)
In-Reply-To: <20210517183954.1223193-1-philmd@redhat.com>
There is only one call site for fdctrl_init_sysbus(), and this
function is specific to the jazz machines, not part of the
SYSBUS_FDC API. Move it locally with the machine code, and
remove its declaration in "hw/block/fdc.h".
Suggested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/hw/block/fdc.h | 3 ---
hw/block/fdc-sysbus.c | 16 ----------------
hw/mips/jazz.c | 16 ++++++++++++++++
3 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h
index 06612218630..ac99d6bcaa0 100644
--- a/include/hw/block/fdc.h
+++ b/include/hw/block/fdc.h
@@ -1,7 +1,6 @@
#ifndef HW_FDC_H
#define HW_FDC_H
-#include "exec/hwaddr.h"
#include "qapi/qapi-types-block.h"
#include "hw/sysbus.h"
@@ -12,8 +11,6 @@
void isa_fdc_init_drives(ISADevice *fdc, DriveInfo **fds);
void sysbus_fdc_init_drives(SysBusDevice *dev, DriveInfo **fds);
-void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
- hwaddr mmio_base, DriveInfo **fds);
FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i);
int cmos_get_fd_drive_type(FloppyDriveType fd0);
diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c
index 74c7c8f2e01..5c7e49bcc3f 100644
--- a/hw/block/fdc-sysbus.c
+++ b/hw/block/fdc-sysbus.c
@@ -103,22 +103,6 @@ void sysbus_fdc_init_drives(SysBusDevice *dev, DriveInfo **fds)
fdctrl_init_drives(&fdc->state.bus, fds);
}
-void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
- hwaddr mmio_base, DriveInfo **fds)
-{
- DeviceState *dev;
- SysBusDevice *sbd;
-
- dev = qdev_new("sysbus-fdc");
- qdev_prop_set_int32(dev, "dma-channel", dma_chann);
- sbd = SYS_BUS_DEVICE(dev);
- sysbus_realize_and_unref(sbd, &error_fatal);
- sysbus_connect_irq(sbd, 0, irq);
- sysbus_mmio_map(sbd, 0, mmio_base);
-
- sysbus_fdc_init_drives(sbd, fds);
-}
-
static void sysbus_fdc_common_initfn(Object *obj)
{
DeviceState *dev = DEVICE(obj);
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index dba2088ed1a..13f26c5991f 100644
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -143,6 +143,22 @@ static void mips_jazz_do_transaction_failed(CPUState *cs, hwaddr physaddr,
}
#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */
+static void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
+ hwaddr mmio_base, DriveInfo **fds)
+{
+ DeviceState *dev;
+ SysBusDevice *sbd;
+
+ dev = qdev_new("sysbus-fdc");
+ qdev_prop_set_int32(dev, "dma-channel", dma_chann);
+ sbd = SYS_BUS_DEVICE(dev);
+ sysbus_realize_and_unref(sbd, &error_fatal);
+ sysbus_connect_irq(sbd, 0, irq);
+ sysbus_mmio_map(sbd, 0, mmio_base);
+
+ sysbus_fdc_init_drives(sbd, fds);
+}
+
static void mips_jazz_init(MachineState *machine,
enum jazz_model_e jazz_model)
{
--
2.26.3
next prev parent reply other threads:[~2021-05-17 19:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 18:39 [PATCH v4 0/9] hw/block/fdc: Allow Kconfig-selecting ISA bus/SysBus floppy controllers Philippe Mathieu-Daudé
2021-05-17 18:39 ` [PATCH v4 1/9] hw/isa/Kconfig: Fix missing dependency ISA_SUPERIO -> FDC Philippe Mathieu-Daudé
2021-05-17 18:39 ` [PATCH v4 2/9] hw/block/fdc: Replace disabled fprintf() by trace event Philippe Mathieu-Daudé
2021-05-17 18:39 ` [PATCH v4 3/9] hw/block/fdc: Declare shared prototypes in fdc-internal.h Philippe Mathieu-Daudé
2021-05-17 18:39 ` [PATCH v4 4/9] hw/block/fdc: Extract ISA floppy controllers to fdc-isa.c Philippe Mathieu-Daudé
2021-05-17 18:39 ` [PATCH v4 5/9] hw/block/fdc: Extract SysBus floppy controllers to fdc-sysbus.c Philippe Mathieu-Daudé
2021-05-17 18:39 ` [PATCH v4 6/9] hw/block/fdc: Add sysbus_fdc_init_drives() method Philippe Mathieu-Daudé
2021-05-17 18:39 ` [PATCH v4 7/9] hw/sparc/sun4m: Inline sun4m_fdctrl_init() Philippe Mathieu-Daudé
2021-05-17 18:39 ` [PATCH v4 8/9] hw/block/fdc-sysbus: Add 'dma-channel' property Philippe Mathieu-Daudé
2021-05-17 18:39 ` Philippe Mathieu-Daudé [this message]
2021-05-17 19:19 ` [PATCH v4 0/9] hw/block/fdc: Allow Kconfig-selecting ISA bus/SysBus floppy controllers John Snow
2021-05-17 20:50 ` Philippe Mathieu-Daudé
2021-05-17 21:11 ` John Snow
2021-05-18 7:14 ` Philippe Mathieu-Daudé
2021-05-22 6:51 ` Hervé Poussineau
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=20210517183954.1223193-10-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=jsnow@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--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).