Просмотр исходного кода

hw: Remove superfluous includes of hw/hw.h

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 <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210326151848.2217216-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Thomas Huth 4 лет назад
Родитель
Сommit
e06054368c

+ 0 - 1
hw/arm/musicpal.c

@@ -19,7 +19,6 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/boards.h"
 #include "hw/char/serial.h"
 #include "hw/char/serial.h"
-#include "hw/hw.h"
 #include "qemu/timer.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
 #include "hw/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties.h"

+ 0 - 1
hw/char/sifive_uart.c

@@ -22,7 +22,6 @@
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
 #include "chardev/char.h"
 #include "chardev/char.h"
 #include "chardev/char-fe.h"
 #include "chardev/char-fe.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/irq.h"
 #include "hw/char/sifive_uart.h"
 #include "hw/char/sifive_uart.h"
 
 

+ 0 - 1
hw/display/next-fb.c

@@ -24,7 +24,6 @@
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "ui/console.h"
 #include "ui/console.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
 #include "hw/loader.h"
 #include "framebuffer.h"
 #include "framebuffer.h"

+ 0 - 1
hw/dma/sifive_pdma.c

@@ -24,7 +24,6 @@
 #include "qemu/bitops.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"

+ 0 - 1
hw/dma/xlnx_csu_dma.c

@@ -21,7 +21,6 @@
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"

+ 0 - 1
hw/hppa/lasi.c

@@ -15,7 +15,6 @@
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "cpu.h"
 #include "cpu.h"
 #include "trace.h"
 #include "trace.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/irq.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/runstate.h"
 #include "sysemu/runstate.h"

+ 0 - 1
hw/input/lasips2.c

@@ -24,7 +24,6 @@
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/log.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties.h"
-#include "hw/hw.h"
 #include "hw/input/ps2.h"
 #include "hw/input/ps2.h"
 #include "hw/input/lasips2.h"
 #include "hw/input/lasips2.h"
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"

+ 0 - 1
hw/m68k/mcf_intc.c

@@ -11,7 +11,6 @@
 #include "qemu/module.h"
 #include "qemu/module.h"
 #include "qemu/log.h"
 #include "qemu/log.h"
 #include "cpu.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
 #include "hw/m68k/mcf.h"
 #include "hw/m68k/mcf.h"

+ 0 - 1
hw/m68k/next-kbd.c

@@ -30,7 +30,6 @@
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/log.h"
 #include "exec/address-spaces.h"
 #include "exec/address-spaces.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
 #include "hw/m68k/next-cube.h"
 #include "hw/m68k/next-cube.h"
 #include "ui/console.h"
 #include "ui/console.h"

+ 0 - 1
hw/m68k/q800.c

@@ -26,7 +26,6 @@
 #include "qemu/datadir.h"
 #include "qemu/datadir.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/sysemu.h"
 #include "cpu.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/boards.h"
 #include "hw/irq.h"
 #include "hw/irq.h"
 #include "hw/or-irq.h"
 #include "hw/or-irq.h"

+ 0 - 1
hw/m68k/virt.c

@@ -12,7 +12,6 @@
 #include "qemu-common.h"
 #include "qemu-common.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/sysemu.h"
 #include "cpu.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/boards.h"
 #include "hw/irq.h"
 #include "hw/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties.h"

+ 0 - 1
hw/misc/mchp_pfsoc_dmc.c

@@ -24,7 +24,6 @@
 #include "qemu/bitops.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
 #include "hw/misc/mchp_pfsoc_dmc.h"
 #include "hw/misc/mchp_pfsoc_dmc.h"
 
 

+ 0 - 1
hw/misc/mchp_pfsoc_ioscb.c

@@ -24,7 +24,6 @@
 #include "qemu/bitops.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
 #include "hw/misc/mchp_pfsoc_ioscb.h"
 #include "hw/misc/mchp_pfsoc_ioscb.h"
 
 

+ 0 - 1
hw/misc/mchp_pfsoc_sysreg.c

@@ -24,7 +24,6 @@
 #include "qemu/bitops.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
 #include "hw/misc/mchp_pfsoc_sysreg.h"
 #include "hw/misc/mchp_pfsoc_sysreg.h"
 
 

+ 0 - 1
hw/misc/sifive_e_prci.c

@@ -23,7 +23,6 @@
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qemu/module.h"
-#include "hw/hw.h"
 #include "hw/misc/sifive_e_prci.h"
 #include "hw/misc/sifive_e_prci.h"
 
 
 static uint64_t sifive_e_prci_read(void *opaque, hwaddr addr, unsigned int size)
 static uint64_t sifive_e_prci_read(void *opaque, hwaddr addr, unsigned int size)

+ 0 - 1
hw/misc/sifive_test.c

@@ -24,7 +24,6 @@
 #include "qemu/log.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qemu/module.h"
 #include "sysemu/runstate.h"
 #include "sysemu/runstate.h"
-#include "hw/hw.h"
 #include "hw/misc/sifive_test.h"
 #include "hw/misc/sifive_test.h"
 
 
 static uint64_t sifive_test_read(void *opaque, hwaddr addr, unsigned int size)
 static uint64_t sifive_test_read(void *opaque, hwaddr addr, unsigned int size)

+ 0 - 1
hw/rx/rx-gdbsim.c

@@ -22,7 +22,6 @@
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu-common.h"
 #include "cpu.h"
 #include "cpu.h"
-#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
 #include "hw/loader.h"
 #include "hw/loader.h"
 #include "hw/rx/rx62n.h"
 #include "hw/rx/rx62n.h"

+ 0 - 1
hw/rx/rx62n.c

@@ -23,7 +23,6 @@
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/error-report.h"
-#include "hw/hw.h"
 #include "hw/rx/rx62n.h"
 #include "hw/rx/rx62n.h"
 #include "hw/loader.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"

+ 0 - 1
hw/vfio/pci-quirks.c

@@ -22,7 +22,6 @@
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "qapi/visitor.h"
 #include <sys/ioctl.h>
 #include <sys/ioctl.h>
-#include "hw/hw.h"
 #include "hw/nvram/fw_cfg.h"
 #include "hw/nvram/fw_cfg.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties.h"
 #include "pci.h"
 #include "pci.h"

+ 0 - 1
include/hw/char/avr_usart.h

@@ -24,7 +24,6 @@
 
 
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
 #include "chardev/char-fe.h"
 #include "chardev/char-fe.h"
-#include "hw/hw.h"
 #include "qom/object.h"
 #include "qom/object.h"
 
 
 /* Offsets of registers. */
 /* Offsets of registers. */

+ 0 - 1
include/hw/misc/avr_power.h

@@ -26,7 +26,6 @@
 #define HW_MISC_AVR_POWER_H
 #define HW_MISC_AVR_POWER_H
 
 
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
-#include "hw/hw.h"
 #include "qom/object.h"
 #include "qom/object.h"
 
 
 
 

+ 0 - 1
include/hw/misc/stm32f4xx_exti.h

@@ -26,7 +26,6 @@
 #define HW_STM_EXTI_H
 #define HW_STM_EXTI_H
 
 
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
-#include "hw/hw.h"
 #include "qom/object.h"
 #include "qom/object.h"
 
 
 #define EXTI_IMR   0x00
 #define EXTI_IMR   0x00

+ 0 - 1
include/hw/misc/stm32f4xx_syscfg.h

@@ -26,7 +26,6 @@
 #define HW_STM_SYSCFG_H
 #define HW_STM_SYSCFG_H
 
 
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
-#include "hw/hw.h"
 #include "qom/object.h"
 #include "qom/object.h"
 
 
 #define SYSCFG_MEMRMP  0x00
 #define SYSCFG_MEMRMP  0x00

+ 0 - 1
include/hw/pci-host/i440fx.h

@@ -11,7 +11,6 @@
 #ifndef HW_PCI_I440FX_H
 #ifndef HW_PCI_I440FX_H
 #define HW_PCI_I440FX_H
 #define HW_PCI_I440FX_H
 
 
-#include "hw/hw.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci-host/pam.h"
 #include "hw/pci-host/pam.h"
 #include "qom/object.h"
 #include "qom/object.h"

+ 0 - 1
include/hw/timer/avr_timer16.h

@@ -30,7 +30,6 @@
 
 
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "qemu/timer.h"
-#include "hw/hw.h"
 #include "qom/object.h"
 #include "qom/object.h"
 
 
 enum NextInterrupt {
 enum NextInterrupt {