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 7F11BC433B4 for ; Fri, 30 Apr 2021 16:53:34 +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 D316D6146D for ; Fri, 30 Apr 2021 16:53:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D316D6146D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcWOS-00006v-P3 for qemu-devel@archiver.kernel.org; Fri, 30 Apr 2021 12:53:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcVyZ-0002mr-G7; Fri, 30 Apr 2021 12:26:47 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:38183) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcVyV-0004l4-LT; Fri, 30 Apr 2021 12:26:47 -0400 Received: from [192.168.100.1] ([82.142.15.170]) by mrelayeu.kundenserver.de (mreue011 [213.165.67.103]) with ESMTPSA (Nemesis) id 1MN5Nt-1ltLtz44ov-00IywC; Fri, 30 Apr 2021 18:26:39 +0200 Subject: Re: [PATCH] hw: Remove superfluous includes of hw/hw.h To: Thomas Huth , qemu-devel@nongnu.org References: <20210326151848.2217216-1-thuth@redhat.com> From: Laurent Vivier Message-ID: Date: Fri, 30 Apr 2021 18:26:38 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210326151848.2217216-1-thuth@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: fr Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:TRc2K7w26OvqLJpfcRCEPrc3020w/kEyUejNNApf0/m6MuEOLwf PSKb9tRJlBnYnuKWnXhzsci7V35WcVSlYotnEwn3+K0vhHhgX68PCxq84r3WZ4dbD9UfIM7 EtZE6sfP80VKz3DYqwiu8oVZcpBElCwfvzTw0cLwvNUjn6xvoVHikxpsbnnL4oAj2b3+VXU /7E72Li5rWKtBS5RSYzMw== X-UI-Out-Filterresults: notjunk:1;V03:K0:G/Lropu1WRs=:vXcGCM/yQGjYco6B+oI/Cp lnLkVIeRo2EodtKdiMY3YGVF744cBl4xsokMk67CwZ4V5ihpyi2KN6GiZoAAodREu2FtFBsCa JHVl7sBz3eUGDrlA0zDBKY9JYO9Q5QdE85uPnVIbWXaNlRKMUX99ue2sz1JcpX9DVwnwOooFd AZtWlXfIEKt5gONw+lqFTiXYauDUzTN26F1dut2MhWNOKPdOpNQnPZ0456XrTCW8EhOULQvNC Rxy01OzAkJ7HeolIid1VEk/S8WeIr05FWJFMRssG+g8cY5Gogxr3n18FnVYx39yTJwhuPJj0I ePdpOET+GSEsPuKnhz5eTdssX90IaH5Me/xbmJP7OzrZBZL5x/G4/TcHmTd7G/JWkBHUzJ8sR QYM/8+qSGxUGsIAvvjt0Pia1qKEiGm4Xr7Bcpu3hRHRq0phd4qIy3QFxH1WPL81O4r2yO91qV uVq/dWVyR2MJTq2ZRqltFcuug3vCCp6cetjAcq81zoHK6MDAN6M9AjCc1O7o9cG+DmFv2pGAR AKCU/wTWt47XnSnxrEndaQ= Received-SPF: none client-ip=212.227.126.134; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=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: qemu-trivial@nongnu.org, Markus Armbruster Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Le 26/03/2021 à 16:18, Thomas Huth a écrit : > The include/hw/hw.h header only has a prototype for hw_error(), > so it does not make sense to include this in files that do not > use this function. > > Signed-off-by: Thomas Huth > --- > hw/arm/musicpal.c | 1 - > hw/char/sifive_uart.c | 1 - > hw/display/next-fb.c | 1 - > hw/dma/sifive_pdma.c | 1 - > hw/dma/xlnx_csu_dma.c | 1 - > hw/hppa/lasi.c | 1 - > hw/input/lasips2.c | 1 - > hw/m68k/mcf_intc.c | 1 - > hw/m68k/next-kbd.c | 1 - > hw/m68k/q800.c | 1 - > hw/m68k/virt.c | 1 - > hw/misc/mchp_pfsoc_dmc.c | 1 - > hw/misc/mchp_pfsoc_ioscb.c | 1 - > hw/misc/mchp_pfsoc_sysreg.c | 1 - > hw/misc/sifive_e_prci.c | 1 - > hw/misc/sifive_test.c | 1 - > hw/rx/rx-gdbsim.c | 1 - > hw/rx/rx62n.c | 1 - > hw/vfio/pci-quirks.c | 1 - > include/hw/char/avr_usart.h | 1 - > include/hw/misc/avr_power.h | 1 - > include/hw/misc/stm32f4xx_exti.h | 1 - > include/hw/misc/stm32f4xx_syscfg.h | 1 - > include/hw/pci-host/i440fx.h | 1 - > include/hw/timer/avr_timer16.h | 1 - > 25 files changed, 25 deletions(-) > > diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c > index 9cebece2de..7d67dc7254 100644 > --- a/hw/arm/musicpal.c > +++ b/hw/arm/musicpal.c > @@ -19,7 +19,6 @@ > #include "sysemu/sysemu.h" > #include "hw/boards.h" > #include "hw/char/serial.h" > -#include "hw/hw.h" > #include "qemu/timer.h" > #include "hw/ptimer.h" > #include "hw/qdev-properties.h" > diff --git a/hw/char/sifive_uart.c b/hw/char/sifive_uart.c > index 3a00ba7f00..ee7adb8e30 100644 > --- a/hw/char/sifive_uart.c > +++ b/hw/char/sifive_uart.c > @@ -22,7 +22,6 @@ > #include "hw/sysbus.h" > #include "chardev/char.h" > #include "chardev/char-fe.h" > -#include "hw/hw.h" > #include "hw/irq.h" > #include "hw/char/sifive_uart.h" > > diff --git a/hw/display/next-fb.c b/hw/display/next-fb.c > index e2d895109d..cc134c2d5b 100644 > --- a/hw/display/next-fb.c > +++ b/hw/display/next-fb.c > @@ -24,7 +24,6 @@ > #include "qemu/osdep.h" > #include "qapi/error.h" > #include "ui/console.h" > -#include "hw/hw.h" > #include "hw/boards.h" > #include "hw/loader.h" > #include "framebuffer.h" > diff --git a/hw/dma/sifive_pdma.c b/hw/dma/sifive_pdma.c > index e1f6fedbda..9b2ac2017d 100644 > --- a/hw/dma/sifive_pdma.c > +++ b/hw/dma/sifive_pdma.c > @@ -24,7 +24,6 @@ > #include "qemu/bitops.h" > #include "qemu/log.h" > #include "qapi/error.h" > -#include "hw/hw.h" > #include "hw/irq.h" > #include "hw/qdev-properties.h" > #include "hw/sysbus.h" > diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c > index 98324dadcd..797b4fed8f 100644 > --- a/hw/dma/xlnx_csu_dma.c > +++ b/hw/dma/xlnx_csu_dma.c > @@ -21,7 +21,6 @@ > #include "qemu/osdep.h" > #include "qemu/log.h" > #include "qapi/error.h" > -#include "hw/hw.h" > #include "hw/irq.h" > #include "hw/qdev-properties.h" > #include "hw/sysbus.h" > diff --git a/hw/hppa/lasi.c b/hw/hppa/lasi.c > index 1a85657948..a8f5defcd0 100644 > --- a/hw/hppa/lasi.c > +++ b/hw/hppa/lasi.c > @@ -15,7 +15,6 @@ > #include "qapi/error.h" > #include "cpu.h" > #include "trace.h" > -#include "hw/hw.h" > #include "hw/irq.h" > #include "sysemu/sysemu.h" > #include "sysemu/runstate.h" > diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c > index 0786e57338..60afb94c78 100644 > --- a/hw/input/lasips2.c > +++ b/hw/input/lasips2.c > @@ -24,7 +24,6 @@ > #include "qemu/osdep.h" > #include "qemu/log.h" > #include "hw/qdev-properties.h" > -#include "hw/hw.h" > #include "hw/input/ps2.h" > #include "hw/input/lasips2.h" > #include "hw/sysbus.h" > diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c > index cf02f57a71..4cd30188c0 100644 > --- a/hw/m68k/mcf_intc.c > +++ b/hw/m68k/mcf_intc.c > @@ -11,7 +11,6 @@ > #include "qemu/module.h" > #include "qemu/log.h" > #include "cpu.h" > -#include "hw/hw.h" > #include "hw/irq.h" > #include "hw/sysbus.h" > #include "hw/m68k/mcf.h" > diff --git a/hw/m68k/next-kbd.c b/hw/m68k/next-kbd.c > index c11b5281f1..bee40e25bc 100644 > --- a/hw/m68k/next-kbd.c > +++ b/hw/m68k/next-kbd.c > @@ -30,7 +30,6 @@ > #include "qemu/osdep.h" > #include "qemu/log.h" > #include "exec/address-spaces.h" > -#include "hw/hw.h" > #include "hw/sysbus.h" > #include "hw/m68k/next-cube.h" > #include "ui/console.h" > diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c > index 4d2e866eec..1c7f7aa07f 100644 > --- a/hw/m68k/q800.c > +++ b/hw/m68k/q800.c > @@ -26,7 +26,6 @@ > #include "qemu/datadir.h" > #include "sysemu/sysemu.h" > #include "cpu.h" > -#include "hw/hw.h" > #include "hw/boards.h" > #include "hw/irq.h" > #include "hw/or-irq.h" > diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c > index e9a5d4c69b..18e6f11041 100644 > --- a/hw/m68k/virt.c > +++ b/hw/m68k/virt.c > @@ -12,7 +12,6 @@ > #include "qemu-common.h" > #include "sysemu/sysemu.h" > #include "cpu.h" > -#include "hw/hw.h" > #include "hw/boards.h" > #include "hw/irq.h" > #include "hw/qdev-properties.h" > diff --git a/hw/misc/mchp_pfsoc_dmc.c b/hw/misc/mchp_pfsoc_dmc.c > index 15cf3d7725..43d8e970ab 100644 > --- a/hw/misc/mchp_pfsoc_dmc.c > +++ b/hw/misc/mchp_pfsoc_dmc.c > @@ -24,7 +24,6 @@ > #include "qemu/bitops.h" > #include "qemu/log.h" > #include "qapi/error.h" > -#include "hw/hw.h" > #include "hw/sysbus.h" > #include "hw/misc/mchp_pfsoc_dmc.h" > > diff --git a/hw/misc/mchp_pfsoc_ioscb.c b/hw/misc/mchp_pfsoc_ioscb.c > index 8b0d1cacd7..f4fd55a0e5 100644 > --- a/hw/misc/mchp_pfsoc_ioscb.c > +++ b/hw/misc/mchp_pfsoc_ioscb.c > @@ -24,7 +24,6 @@ > #include "qemu/bitops.h" > #include "qemu/log.h" > #include "qapi/error.h" > -#include "hw/hw.h" > #include "hw/sysbus.h" > #include "hw/misc/mchp_pfsoc_ioscb.h" > > diff --git a/hw/misc/mchp_pfsoc_sysreg.c b/hw/misc/mchp_pfsoc_sysreg.c > index 248a313345..89571eded5 100644 > --- a/hw/misc/mchp_pfsoc_sysreg.c > +++ b/hw/misc/mchp_pfsoc_sysreg.c > @@ -24,7 +24,6 @@ > #include "qemu/bitops.h" > #include "qemu/log.h" > #include "qapi/error.h" > -#include "hw/hw.h" > #include "hw/sysbus.h" > #include "hw/misc/mchp_pfsoc_sysreg.h" > > diff --git a/hw/misc/sifive_e_prci.c b/hw/misc/sifive_e_prci.c > index 8ec4ee4b41..a8702c6a5d 100644 > --- a/hw/misc/sifive_e_prci.c > +++ b/hw/misc/sifive_e_prci.c > @@ -23,7 +23,6 @@ > #include "qapi/error.h" > #include "qemu/log.h" > #include "qemu/module.h" > -#include "hw/hw.h" > #include "hw/misc/sifive_e_prci.h" > > static uint64_t sifive_e_prci_read(void *opaque, hwaddr addr, unsigned int size) > diff --git a/hw/misc/sifive_test.c b/hw/misc/sifive_test.c > index 2deb2072cc..56df45bfe5 100644 > --- a/hw/misc/sifive_test.c > +++ b/hw/misc/sifive_test.c > @@ -24,7 +24,6 @@ > #include "qemu/log.h" > #include "qemu/module.h" > #include "sysemu/runstate.h" > -#include "hw/hw.h" > #include "hw/misc/sifive_test.h" > > static uint64_t sifive_test_read(void *opaque, hwaddr addr, unsigned int size) > diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c > index b1d7c2488f..8c611b0a59 100644 > --- a/hw/rx/rx-gdbsim.c > +++ b/hw/rx/rx-gdbsim.c > @@ -22,7 +22,6 @@ > #include "qapi/error.h" > #include "qemu-common.h" > #include "cpu.h" > -#include "hw/hw.h" > #include "hw/sysbus.h" > #include "hw/loader.h" > #include "hw/rx/rx62n.h" > diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c > index 9c34ce14de..31ddccf2cd 100644 > --- a/hw/rx/rx62n.c > +++ b/hw/rx/rx62n.c > @@ -23,7 +23,6 @@ > #include "qemu/osdep.h" > #include "qapi/error.h" > #include "qemu/error-report.h" > -#include "hw/hw.h" > #include "hw/rx/rx62n.h" > #include "hw/loader.h" > #include "hw/sysbus.h" > diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c > index b90cf3d37c..e21a6ede11 100644 > --- a/hw/vfio/pci-quirks.c > +++ b/hw/vfio/pci-quirks.c > @@ -22,7 +22,6 @@ > #include "qapi/error.h" > #include "qapi/visitor.h" > #include > -#include "hw/hw.h" > #include "hw/nvram/fw_cfg.h" > #include "hw/qdev-properties.h" > #include "pci.h" > diff --git a/include/hw/char/avr_usart.h b/include/hw/char/avr_usart.h > index bb57532403..62eaa1528e 100644 > --- a/include/hw/char/avr_usart.h > +++ b/include/hw/char/avr_usart.h > @@ -24,7 +24,6 @@ > > #include "hw/sysbus.h" > #include "chardev/char-fe.h" > -#include "hw/hw.h" > #include "qom/object.h" > > /* Offsets of registers. */ > diff --git a/include/hw/misc/avr_power.h b/include/hw/misc/avr_power.h > index 707df030b1..388e421aa7 100644 > --- a/include/hw/misc/avr_power.h > +++ b/include/hw/misc/avr_power.h > @@ -26,7 +26,6 @@ > #define HW_MISC_AVR_POWER_H > > #include "hw/sysbus.h" > -#include "hw/hw.h" > #include "qom/object.h" > > > diff --git a/include/hw/misc/stm32f4xx_exti.h b/include/hw/misc/stm32f4xx_exti.h > index 24b6fa7724..ea6b0097b0 100644 > --- a/include/hw/misc/stm32f4xx_exti.h > +++ b/include/hw/misc/stm32f4xx_exti.h > @@ -26,7 +26,6 @@ > #define HW_STM_EXTI_H > > #include "hw/sysbus.h" > -#include "hw/hw.h" > #include "qom/object.h" > > #define EXTI_IMR 0x00 > diff --git a/include/hw/misc/stm32f4xx_syscfg.h b/include/hw/misc/stm32f4xx_syscfg.h > index 8c31feccd3..6f8ca49228 100644 > --- a/include/hw/misc/stm32f4xx_syscfg.h > +++ b/include/hw/misc/stm32f4xx_syscfg.h > @@ -26,7 +26,6 @@ > #define HW_STM_SYSCFG_H > > #include "hw/sysbus.h" > -#include "hw/hw.h" > #include "qom/object.h" > > #define SYSCFG_MEMRMP 0x00 > diff --git a/include/hw/pci-host/i440fx.h b/include/hw/pci-host/i440fx.h > index 24fd53942c..7fcfd9485c 100644 > --- a/include/hw/pci-host/i440fx.h > +++ b/include/hw/pci-host/i440fx.h > @@ -11,7 +11,6 @@ > #ifndef HW_PCI_I440FX_H > #define HW_PCI_I440FX_H > > -#include "hw/hw.h" > #include "hw/pci/pci_bus.h" > #include "hw/pci-host/pam.h" > #include "qom/object.h" > diff --git a/include/hw/timer/avr_timer16.h b/include/hw/timer/avr_timer16.h > index 0536254337..a1a032a24d 100644 > --- a/include/hw/timer/avr_timer16.h > +++ b/include/hw/timer/avr_timer16.h > @@ -30,7 +30,6 @@ > > #include "hw/sysbus.h" > #include "qemu/timer.h" > -#include "hw/hw.h" > #include "qom/object.h" > > enum NextInterrupt { > Applied to my trivial-patches branch. Thanks, Laurent