From nobody Mon Feb 9 20:46:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1621276835; cv=none; d=zohomail.com; s=zohoarc; b=HUrCo+17zx5uKmPXt0TNwcc/Ulx0X10YMWEIbz4Katp58HpDHOKQx5mWleEKZ0DT+V+YQYLLmt4c78Z2jvmO4czIBPJASKyOu11/AuP6jRY4KccO0oZ03Y61dEqbzeSTFSRj2B/PUk7VASRr9Lukdwn75Tidy3eCdF+QKBjgT58= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621276835; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Mwkhq1zzg8MDDjVW8AOR0NelXXYM0Xsfxsfa4jWuzBw=; b=AWEYwyI7tvVgs14DlzB1zJO+DY5ETQDo9rUrwXfHX1TMCW4MSqZwT76InR/60IRNa2t0ltuyTU6dtaFqGdyUoFZKjw87NViA7lLgdnlHZ/6NK1OiLGoDqT3kN8vAtS11HE6DWhNrerj9LJHruVVxdhl85yXNoMNTWjYQTopzwN4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621276835619104.48363435838155; Mon, 17 May 2021 11:40:35 -0700 (PDT) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-321-G2Lu4sGpNXejf7181eAx2Q-1; Mon, 17 May 2021 14:40:32 -0400 Received: by mail-ed1-f71.google.com with SMTP id y19-20020a0564022713b029038a9f36060dso4401975edd.4 for ; Mon, 17 May 2021 11:40:32 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id h9sm11495572ede.93.2021.05.17.11.40.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 11:40:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621276834; 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=Mwkhq1zzg8MDDjVW8AOR0NelXXYM0Xsfxsfa4jWuzBw=; b=BTjbrUIPyI/k4/hSOsmLxINJvFnQ3AF0fEor+cn8lZwGO81kyy3gMI8pzfVzTJscxBOSGD o0xLGqxdbJZXIKy2uSV8+aEkoWMhCV/Gmuvu2/Y3jUDqLCVi39BjlyqLhCQu9gtI3wyHIr NyDANYnDOQWCgx1vCIGU/FmfmMNxaCU= X-MC-Unique: G2Lu4sGpNXejf7181eAx2Q-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=Mwkhq1zzg8MDDjVW8AOR0NelXXYM0Xsfxsfa4jWuzBw=; b=KrAWRLeeF4L2P/CUygE3lUSU9u+DrJQdfuLodAVNd/DdhAnIA+a8UP1HvPuvLRmlk0 mgcgPqU8zeIscBB8TwbToyZKaAAqRlIo3MBPvBcwNkfZYz6GzP2bUH4frwrHIXYZTt8c f/LUp4RJ6rJWN1nAjJ7A+KzZpocnuAQecmOIdcAYGC2Ked+2yLHbgAxGVo1bl+epEfVF 3rBKcNa+TkF0Md9ThKVmseyvqx43jT0heeRLV9YXyb66SymRsOwSdR421Apyh20EVKeG AO7ZMcwWQEYGSBgFrvG0JrSXISKe8PdfaBKgLY67uqa7jdi5bLxkhvzemzvWrpbS5HFZ JUIw== X-Gm-Message-State: AOAM531k7wfpX6/KExaU8IenduGMRQPMG+ZvlYXSoBjTKZEGohZZVOlb Hl7Ioys/Kold9MGVKfnoZYN8AAsjov9goUH7SEfGNprRvK7knDWfHtxxURzHEnntw2GmdYe8R8a l4J0tjIBNiVIobA== X-Received: by 2002:a17:906:e210:: with SMTP id gf16mr1395497ejb.472.1621276830904; Mon, 17 May 2021 11:40:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3FyylJz9rEUQeR+rcxPghET00Zy2irTsEucFBAYrxDLoOU5LMCTH4kqnD9dgishQm5kAKdw== X-Received: by 2002:a17:906:e210:: with SMTP id gf16mr1395478ejb.472.1621276830669; Mon, 17 May 2021 11:40:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, John Snow Cc: Richard Henderson , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland Subject: [PATCH v4 7/9] hw/sparc/sun4m: Inline sun4m_fdctrl_init() Date: Mon, 17 May 2021 20:39:52 +0200 Message-Id: <20210517183954.1223193-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517183954.1223193-1-philmd@redhat.com> References: <20210517183954.1223193-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 Reviewed-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 42e139849ed..c08c650da72 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -816,6 +816,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(MachineState *machine) { const struct sun4m_hwdef *hwdef =3D SUN4M_MACHINE_GET_CLASS(machine)->= hwdef; --=20 2.26.3