From nobody Mon Feb 9 16:18:35 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=1621273833; cv=none; d=zohomail.com; s=zohoarc; b=JM+SxIWokS/Oto2kFX5WxCUx26r8IKzVU453I595uCiw3pthx/wkU49s9C6NtfbNjH/QBtYmvX07mXyF6Gv2Bgx1VWVQTWrN2tesk9t7osx/Arzo+CCgkO+Yz99Hjm67uDtdqYopjd5pstygLveoWm2FwZty+usmPIB5LNdlp4k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621273833; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=hRToPB7aVX8q9xnZeseUZTykg3nheLziCrX7lqUCi3Q=; b=iwYYGYD8ECivjIoN7Po7s2rjbFzn/xyccqobg3K0uCtZu3LG9U5MBiZW2yC44wlz/aduOeDCtdhPcjkd8M8SFryXXM/NdVCDiQGmVVyh2mZjtsk5Pq9GyI4sajRA9YKuWXF+7I1RIKRhx4Ls01X5nfguqDGxr7s2p1eIrcKsUGY= 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 16212738339481021.5050501933767; Mon, 17 May 2021 10:50:33 -0700 (PDT) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-264-aL84w38NPGCsWWF4S_iijA-1; Mon, 17 May 2021 13:50:28 -0400 Received: by mail-ed1-f70.google.com with SMTP id y17-20020a0564023591b02903886c26ada4so4340092edc.5 for ; Mon, 17 May 2021 10:50:28 -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 x9sm11516147edv.22.2021.05.17.10.50.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 10:50:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621273832; 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=hRToPB7aVX8q9xnZeseUZTykg3nheLziCrX7lqUCi3Q=; b=Tl93oeKdt1W2WdoMQT9+SIiWLrBi5w72Y4rHkJ1aUlehACD5qHMCID0uyKSLwKeGpx9pNj Op6JPz1RSaAXYUiAolSCW02/HrA+eCa53L8VLLpr7v8RnWcD3nzJS34D70sU4ycJNGuIQ3 QrY01cIQgvOokd1f8HghMHZEirtJ6zs= X-MC-Unique: aL84w38NPGCsWWF4S_iijA-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=hRToPB7aVX8q9xnZeseUZTykg3nheLziCrX7lqUCi3Q=; b=B4jI6mJf0Pbbe62y6QwYIs21nlg+W2cTK64uIYnjO/cQOm5fHsGV9+kzb4wDY9DPJL x++0g5QDuUdetZG6cFRdG50XCQ7XkvF/gJ/kdvUmcF6BM8Kc1J/5AH6l5f/8dXbUqFS1 DwUEDuMON5iNiG/CIWDypLEQIMoRw/1m099/3m8fY/ee4JoMNmbTyrimlrR9ipBFQ89H COEAlwxmivj7r+bu+enJbT0QD8vVRbqU9wu0Ft4uXH+AAEG9syrCsrJTzKbTvyGlXy6w uBSosuc7u68E+FMVYxLeJG0u8DjJK9DKZ6s2hgDDeP5FcXinLa57hyEpgZnJCOjUZX0F c4qg== X-Gm-Message-State: AOAM533aYvTBEpm+xAvDOsinwTOFqBmqM8VO8EsN+fyj0RlJZ4Ie3G0H 1LOrBq9DoAmJIEPXA2pHpX/lu8aG2g0EjlwSoZW+tPjxNuz1TjWyik8/LacUuNhiGKTRKZTxNy0 Mn8e/9+DsmVwYjg== X-Received: by 2002:a17:907:7629:: with SMTP id jy9mr1194515ejc.34.1621273826950; Mon, 17 May 2021 10:50:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzODUm3mVPwuOlFVr10c9JlN9Z6uTvJ41uIv8E7SHmszJEhEAC2RWiHaq++zdOshgjCLcWwaQ== X-Received: by 2002:a17:907:7629:: with SMTP id jy9mr1194499ejc.34.1621273826749; Mon, 17 May 2021 10:50:26 -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 8/8] hw/mips/jazz: Inline fdctrl_init_sysbus() Date: Mon, 17 May 2021 19:49:47 +0200 Message-Id: <20210517174947.1199649-9-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 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 Reviewed-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 =20 -#include "exec/hwaddr.h" #include "qapi/qapi-types-block.h" #include "hw/sysbus.h" =20 @@ -12,8 +11,6 @@ =20 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); =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 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, DriveIn= fo **fds) fdctrl_init_drives(&fdc->state.bus, fds); } =20 -void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, - hwaddr mmio_base, DriveInfo **fds) -{ - DeviceState *dev; - SysBusDevice *sbd; - - dev =3D qdev_new("sysbus-fdc"); - qdev_prop_set_int32(dev, "dma-channel", dma_chann); - sbd =3D 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 =3D 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 */ =20 +static void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, + hwaddr mmio_base, DriveInfo **fds) +{ + DeviceState *dev; + SysBusDevice *sbd; + + dev =3D qdev_new("sysbus-fdc"); + qdev_prop_set_int32(dev, "dma-channel", dma_chann); + sbd =3D 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) { --=20 2.26.3