From nobody Tue Feb 10 04:14:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619614306; cv=none; d=zohomail.com; s=zohoarc; b=jDbRgmEL8ebypqNxfU8XpEpdSFuCv9svT4nkXxgSBhDr6bfoB8skXiCc8+niWYpijaDiq++56noIMtWbkk9YSh5NAWOJWnYM/EmDGD0J30/Umk6qG/sls797bwmH9ZDzTh8Q0w2LA42HA8KR4/tR5oaXOLen6ltFVDi1E/lABCg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619614306; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=N0dhowChTqRyBuuWWaw5DLSXvEEABTOd2xLvFKLygv0=; b=hxKBNDZUp/j7HjxvrOWZiO+Lo9Kkvm/1va9TXNLW3wgAdxebXX6CEdLT8EK7XjKgYD8PfUnk/gZiEzyzF+UAj54CGyRt3BpFdGk28brT+Q6Nekhbs7OiW77UhTZGu9m4scdj8+TEV24n3/8NQSBfMSljVpirEgvhVJQZcsPixt8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1619614306321689.4495779427613; Wed, 28 Apr 2021 05:51:46 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-550-ywV5bOPTMNCGuuIVb66-Iw-1; Wed, 28 Apr 2021 08:51:39 -0400 Received: by mail-wr1-f69.google.com with SMTP id 32-20020adf92a30000b029010d6849a4e1so2135285wrn.4 for ; Wed, 28 Apr 2021 05:51:38 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id x189sm6770544wmg.17.2021.04.28.05.51.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Apr 2021 05:51:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619614305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N0dhowChTqRyBuuWWaw5DLSXvEEABTOd2xLvFKLygv0=; b=JZ0fCmqpaBKqh8PGd1Tq94OMxVvB0oY5Lq9myCDewdSiNYSGMTztjyomZyR/9kClHigp6N E0nAlOvjWyRkr/liGWrpn4Mv8sOkzx5IyoPDo+dhGlKXftEEZplZT4AtYDpOs1fjW3UrOs KhFSASTsOBheDrKHPW7kyexjksm9LPI= X-MC-Unique: ywV5bOPTMNCGuuIVb66-Iw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N0dhowChTqRyBuuWWaw5DLSXvEEABTOd2xLvFKLygv0=; b=T9paGdEoK6MFbrqVnAk2RxrL3p6F5T8Y4aqZA991pOuHsmfBMEvUhfi2OH9dM8bY3I 6fA5lBJEJNIru0sM4N79VTpH9omJYAX+MoKQyTDcErgI80HpvjYA4xeyodt21rdYwPcF NqZY2CsxCYFOcGYdM5+UV7VcNZUa6lark9X/1csHL26QAaIW6Ox4rTRKD+AR479d3Nhv QlCVS05w7NFjFZXrljTxJr7r58HyC2pM+odTygag0N0GlsmuT6TtsC275q9dOQIBBhSp nf2MRtM3Gcu/s1jL4WK+E7l3s6b62Z1x9qwxWHOJ1DXp26/utX10qHpE95QRuKhoctlj 8GRw== X-Gm-Message-State: AOAM532YlR/DMgxJQLAPJzm0uh0la+cP/C2gWVek/2bJRsHomolJz+E/ 9moVbB29lXrFOA4ud6JSUTHoDEJq9bF/mc/+UDGx75VuShfn+SvUA0gKXYdTVJEICW9P+5bQ4HJ xcCt4AK9AcwU9aw== X-Received: by 2002:a7b:cf3a:: with SMTP id m26mr13888430wmg.49.1619614296230; Wed, 28 Apr 2021 05:51:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysyzOYQFoaX5a3Iv3QV9SuIbCpjqyoOS3fc46vp//pW6STA0imv9e2G9yhC7nFwE9/9z5ogA== X-Received: by 2002:a7b:cf3a:: with SMTP id m26mr13888399wmg.49.1619614296064; Wed, 28 Apr 2021 05:51:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Snow , qemu-devel@nongnu.org Cc: Mark Cave-Ayland , Artyom Tarasenko , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Jiaxun Yang , qemu-block@nongnu.org, Miroslav Rezanina , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Max Reitz Subject: [PATCH v2 6/8] hw/sparc/sun4m: Inline sun4m_fdctrl_init() Date: Wed, 28 Apr 2021 14:51:02 +0200 Message-Id: <20210428125104.358535-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210428125104.358535-1-philmd@redhat.com> References: <20210428125104.358535-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) There is only one call site for sun4m_fdctrl_init(), and this function is specific to the sun4m 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/block/fdc.h | 2 -- hw/block/fdc-sysbus.c | 16 ---------------- hw/sparc/sun4m.c | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index 52e45c53078..06612218630 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -14,8 +14,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); -void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, - DriveInfo **fds, qemu_irq *fdc_tc); =20 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 1163e53165d..8f94c2efb63 100644 --- a/hw/block/fdc-sysbus.c +++ b/hw/block/fdc-sysbus.c @@ -123,22 +123,6 @@ void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, sysbus_fdc_init_drives(sbd, fds); } =20 -void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, - DriveInfo **fds, qemu_irq *fdc_tc) -{ - DeviceState *dev; - SysBusDevice *sbd; - - dev =3D qdev_new("sun-fdtwo"); - sbd =3D SYS_BUS_DEVICE(dev); - sysbus_realize_and_unref(sbd, &error_fatal); - sysbus_connect_irq(sbd, 0, irq); - sysbus_mmio_map(sbd, 0, io_base); - *fdc_tc =3D qdev_get_gpio_in(dev, 0); - - sysbus_fdc_init_drives(sbd, fds); -} - static void sysbus_fdc_common_initfn(Object *obj) { DeviceState *dev =3D DEVICE(obj); diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 1a00816d9a8..27bcea07157 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -837,6 +837,22 @@ static void dummy_fdc_tc(void *opaque, int irq, int le= vel) { } =20 +static void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, + DriveInfo **fds, qemu_irq *fdc_tc) +{ + DeviceState *dev; + SysBusDevice *sbd; + + dev =3D qdev_new("sun-fdtwo"); + sbd =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(sbd, &error_fatal); + sysbus_connect_irq(sbd, 0, irq); + sysbus_mmio_map(sbd, 0, io_base); + *fdc_tc =3D qdev_get_gpio_in(dev, 0); + + sysbus_fdc_init_drives(sbd, fds); +} + static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, MachineState *machine) { --=20 2.26.3