From nobody Mon Feb 9 18:44:01 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=1621273821; cv=none; d=zohomail.com; s=zohoarc; b=k7pPrbqR+v3FhEZgJ9LpqnDOCAG9BIVdf438qGLuFUtsWLj/eQZmuHZrwc1VwbR8Tw3ikzO7QLFMPZjpj2B3GezXq1AGUDS9Lx67V5cDo01FOVQy3vGLntiM73x5uVVZ9C5nJ5QPqywyzavwmrZBE0bPabZc4tN+xdPuZKR/nVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621273821; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Mwkhq1zzg8MDDjVW8AOR0NelXXYM0Xsfxsfa4jWuzBw=; b=On3SxVP3rJxtATB35sH1d2K6NoPmxMD3c43676coTkNexM9djRkLYcwJNqQph22eH0KU+Y6qFAkH5s7jbDCEnkm5PxsAZtmAyG1IG9B27aFRcMXaJsA9oDYsIIdvgAPM8FBUadDtilO9V2pxRl438+sAcuCLFLs8vHJEIbMw6jA= 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 1621273821310497.7586128492434; Mon, 17 May 2021 10:50:21 -0700 (PDT) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-460-5qtxBZx_OwCLsYdAxZMqJg-1; Mon, 17 May 2021 13:50:18 -0400 Received: by mail-ed1-f72.google.com with SMTP id q18-20020a50cc920000b029038cf491864cso4327226edi.14 for ; Mon, 17 May 2021 10:50:18 -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 f7sm11693938edd.5.2021.05.17.10.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 10:50:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621273820; 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=NplQk463yzLVsPeHdrpp6COKeYlrPEmJUI1xQ7zwfyUdlKkZPskcJCjbilQQG6fkfg72Le 3rKvtHJGN7vFc8bi0cSmMH57AklawqCKuahXdWuMuL3jl5H/9TBVkkHsgVlTdJntxJvib3 8YDv5anClXz8me8kL8CCwGQ+LGRRojg= X-MC-Unique: 5qtxBZx_OwCLsYdAxZMqJg-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=Ckm7lpul/S8gFrZ5AODrvtfvpXUyMEGTnHl5M87V6i6e4dMDjIZnZIIqSSWxFYdKYC SNC4rvfBxbaH4K6NyyW+eGy58fDSfwIArss4DJtfhxmWgEiapOnxpXMwLjDdgqbGArwi UfuBbI5vMxnesyCxAe7+d5mfZQoobR2msl/82UTx9CDjrKz9ujHUdYzypwBTPAqhw+4X Szhn7WhleKl29QB1BEKtZjfUweKQPytlQg7guy9o/Ik9r376RtTb64k2C/SiqgfhY90x FXlMQprOU34xvDliuJzac/oG3dhyrHYCPqUVFn54On97530eE9T18SAwhSBHob5RVpDr ds0Q== X-Gm-Message-State: AOAM530ny6IImlcXf0VemdZEVfTOgXXfSDU+sMHakWbhqtgwc7RPJRYW gPH/PIoWhXrEIdhsp2z9L3QC/e7JqogsDHT9Jht6Dqdt5DVNHsnXpPWlRuadDUw5jMl4hy5BJqX P5YewbjEsdd9lzQ== X-Received: by 2002:a05:6402:cb8:: with SMTP id cn24mr1421516edb.325.1621273817355; Mon, 17 May 2021 10:50:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyryAMoN9Q8R4kGyfjyAIC1fA08fGqs1LrNVL4jLrkRuggitFpYC7RHtuzgrCcuEGMY4ZiS+A== X-Received: by 2002:a05:6402:cb8:: with SMTP id cn24mr1421499edb.325.1621273817235; Mon, 17 May 2021 10:50:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, John Snow Cc: qemu-block@nongnu.org, Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 6/8] hw/sparc/sun4m: Inline sun4m_fdctrl_init() Date: Mon, 17 May 2021 19:49:45 +0200 Message-Id: <20210517174947.1199649-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517174947.1199649-1-philmd@redhat.com> References: <20210517174947.1199649-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