From nobody Tue Feb 10 05:27:16 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=1619614311; cv=none; d=zohomail.com; s=zohoarc; b=JjPZr2CaBAAEAC+zn5VL3hWGL/bF9JDrJBb9HddG/hL+bzNAZuNIyyo7rfh+MKq5Ds2Z84W1z6L67ZP5IsA+NCdSxEWvnzOyUOSP6mxkUz2SVvke0M+1+0QfWmdXAwc/U6mlDWVMOCB0tO5Q55ARSRZeOb2U0LaPl0DycW66SD8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619614311; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=EcHyHRkA0AT3lRWO6fsZ2qVIgtA34Zy4SRqfNJ6ObfA=; b=iSEbwdfQAuOP0Fe81ZMInxZxY24Makyflw9ZD4GSadDR0Qo63eu2amDnG41W6b13hoaWZ3TfU8Zn3nmrt6amgTf3c7PuyaCjhgQ208dCvzM5WxqBI5Wr8NOsVlrUGzaT3gEov6TsabafN4e6SIXuLXKMc9Wpa3zS6cDDCWylAvc= 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 1619614311255752.5312795394943; Wed, 28 Apr 2021 05:51:51 -0700 (PDT) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-254-_kFQ9lEHNf-UYZ5gAiKYfg-1; Wed, 28 Apr 2021 08:51:48 -0400 Received: by mail-wm1-f72.google.com with SMTP id d78-20020a1c1d510000b0290132794b7801so5133155wmd.1 for ; Wed, 28 Apr 2021 05:51:48 -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 s83sm3725839wms.16.2021.04.28.05.51.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Apr 2021 05:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619614310; 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=EcHyHRkA0AT3lRWO6fsZ2qVIgtA34Zy4SRqfNJ6ObfA=; b=Td8ltbm/DZOq+Ow/RsMytkD4wTMz+S72D9dIrgGsVhhJ2ARUemKaSJzLTnzwE9CtidghdU Yo7RhaPxckbQ4LBudIWigK8Moq0ScufW7raaMb7KzBUPwIHDQnV+b0tmgW0JOeuPj5kibM RngwCX+pQuzB4dMQZhb99LZcN4VdEdk= X-MC-Unique: _kFQ9lEHNf-UYZ5gAiKYfg-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=EcHyHRkA0AT3lRWO6fsZ2qVIgtA34Zy4SRqfNJ6ObfA=; b=rCp52kPnM36PpIKChbi4HRa0lclnVHPm2zfQbiyhcj+Sxqv3Zr9qlcFvJKu7KZwEQN yMGHTMttVjnTmrCIqFQPkbxjjNF83ogjWk2USEcfEj1pkkz6mFp2A5cNUmxvLTBFFrzn VLeH/su8t6d7PO8FPuBrhano3EFsU52e9ffT3cigf2d+bassnLL35feU+EDU7oIYiMyR jpFvZnk0nFptZR3UjsiBptIwUQIM3qXnPVWyLIO/4JAre/YdDJ6OB2Lrx2uvkZgZYWpm BlxGm6rGlkAmQ07tAXPzPFNnjzW6/rkRGIXBitqRhHmKf8jhkGSuGgdU1MoYEBpNVZL3 23yQ== X-Gm-Message-State: AOAM531MNMVO3AIN1d4nOz+01qfxx0QluHvhPADehSkd4QVHHIlmLN1h SOoeykgFcQP9XlbAcosGVb7KF5mAyt6mldc9QfOvhIuOleU5E2QibgPnIW3rcB3gX+7pQi5HtcQ WrfguJhJ4SeAIlA== X-Received: by 2002:adf:9c8e:: with SMTP id d14mr37209910wre.140.1619614305497; Wed, 28 Apr 2021 05:51:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwQAa7kcnfZvbDvgr1IzJr04cAGqO5ZWnQOHrUaFhLEp3xidNgJz8rIUiO/9ZPAhsaWjhRVw== X-Received: by 2002:adf:9c8e:: with SMTP id d14mr37209893wre.140.1619614305387; Wed, 28 Apr 2021 05:51:45 -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 8/8] hw/mips/jazz: Inline fdctrl_init_sysbus() Date: Wed, 28 Apr 2021 14:51:04 +0200 Message-Id: <20210428125104.358535-9-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 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 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 1a0888a0fd5..34fb6a3de9b 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -144,6 +144,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