From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49FF6C433B4 for ; Wed, 28 Apr 2021 07:59:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 909EB613C5 for ; Wed, 28 Apr 2021 07:59:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 909EB613C5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ilande.co.uk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lbf6K-0008RK-BX for qemu-devel@archiver.kernel.org; Wed, 28 Apr 2021 03:59:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbf54-0007tl-Ao; Wed, 28 Apr 2021 03:57:58 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:37164 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbf52-0005GD-GG; Wed, 28 Apr 2021 03:57:58 -0400 Received: from host109-146-177-131.range109-146.btcentralplus.com ([109.146.177.131] helo=[192.168.1.65]) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1lbf59-0004z8-RW; Wed, 28 Apr 2021 08:58:04 +0100 To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , John Snow , qemu-devel@nongnu.org References: <20210415102321.3987935-1-philmd@redhat.com> From: Mark Cave-Ayland Message-ID: Date: Wed, 28 Apr 2021 08:57:34 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <20210415102321.3987935-1-philmd@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 109.146.177.131 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: Re: [PATCH 0/4] hw/block/fdc: Allow Kconfig-selecting ISA bus/SysBus floppy controllers X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Aleksandar Rikalo , Eduardo Habkost , qemu-block@nongnu.org, "Michael S. Tsirkin" , Richard Henderson , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Max Reitz , Aurelien Jarno , Paolo Bonzini , Miroslav Rezanina , Artyom Tarasenko Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 15/04/2021 11:23, Philippe Mathieu-Daudé wrote: > Hi, > > The floppy disc controllers pulls in irrelevant devices (sysbus in > an ISA-only machine, ISA bus + isa devices on a sysbus-only machine). > > This series clean that by extracting each device in its own file, > adding the corresponding Kconfig symbols: FDC_ISA and FDC_SYSBUS. > > Regards, > > Phil. > > Philippe Mathieu-Daudé (4): > hw/block/fdc: Replace disabled fprintf() by trace event > hw/block/fdc: Declare shared prototypes in fdc-internal.h > hw/block/fdc: Extract ISA floppy controllers to fdc-isa.c > hw/block/fdc: Extract SysBus floppy controllers to fdc-sysbus.c > > hw/block/fdc-internal.h | 155 ++++++++++ > hw/block/fdc-isa.c | 313 +++++++++++++++++++++ > hw/block/fdc-sysbus.c | 252 +++++++++++++++++ > hw/block/fdc.c | 608 +--------------------------------------- > MAINTAINERS | 3 + > hw/block/Kconfig | 8 + > hw/block/meson.build | 2 + > hw/block/trace-events | 3 + > hw/i386/Kconfig | 2 +- > hw/isa/Kconfig | 6 +- > hw/mips/Kconfig | 2 +- > hw/sparc/Kconfig | 2 +- > hw/sparc64/Kconfig | 2 +- > 13 files changed, 751 insertions(+), 607 deletions(-) > create mode 100644 hw/block/fdc-internal.h > create mode 100644 hw/block/fdc-isa.c > create mode 100644 hw/block/fdc-sysbus.c This basically looks good to me. You may be able to simplify this further by removing the global legacy init functions fdctrl_init_sysbus() and sun4m_fdctrl_init(): from what I can see fdctrl_init_sysbus() is only used in hw/mips/jazz.c and sun4m_fdctrl_init() is only used in hw/sparc/sun4m.c so you might as well inline them or move the functions to the relevant files. Acked-by: Mark Cave-Ayland ATB, Mark.