Clean up includes
Subsystems (3)
cover Clean up includes
Back in 2016, we discussed[1] rules for headers, and these were generally liked:
1. Have a carefully curated header that's included everywhere first. We got that already thanks to Peter: osdep.h.
2. Headers should normally include everything they need beyond osdep.h. If exceptions are needed for some reason, they must be documented in the header. If all that's needed from a header is typedefs, put those into qemu/typedefs.h instead of including the header.
3. Cyclic inclusion is forbidden.
This series fixes a number of rule violations.
It is based on
[PATCH 0/4] hw/ppc: Clean up includes
[PATCH 0/5] include/hw/pci include/hw/cxl: Clean up includes [PATCH 0/3] block: Clean up includes
[PATCH 0/4] coroutine: Clean up includes
With all of these applied, just three inclusion loops remain reachable from include/:
target/microblaze/cpu.h target/microblaze/mmu.h
target/nios2/cpu.h target/nios2/mmu.h
target/riscv/cpu.h target/riscv/pmp.h
Breaking them would be nice, but I'm out of steam.
[1] Message-ID: <[email protected]>
https://lists.nongnu.org/archive/html/qemu-devel/2016-03/msg03345.html
Based-on: <[email protected]>
Markus Armbruster (2):
include/hw/virtio: Break inclusion loop
include: Include headers where needed
include/exec/plugin-gen.h | 1 + include/hw/acpi/erst.h | 3 +++ include/hw/char/cmsdk-apb-uart.h | 1 + include/hw/char/goldfish_tty.h | 1 + include/hw/char/xilinx_uartlite.h | 1 + include/hw/cris/etraxfs.h | 1 + include/hw/display/macfb.h | 3 ++- include/hw/dma/sifive_pdma.h | 2 ++ include/hw/i386/ioapic_internal.h | 1 + include/hw/i386/sgx-epc.h | 1 + include/hw/intc/goldfish_pic.h | 2 ++ include/hw/intc/loongarch_pch_msi.h | 2 ++ include/hw/intc/loongarch_pch_pic.h | 2 ++ include/hw/intc/nios2_vic.h | 2 ++ include/hw/misc/mchp_pfsoc_dmc.h | 2 ++ include/hw/misc/mchp_pfsoc_ioscb.h | 2 ++ include/hw/misc/mchp_pfsoc_sysreg.h | 2 ++ include/hw/misc/pvpanic.h | 1 + include/hw/misc/sifive_e_prci.h | 3 ++- include/hw/misc/sifive_u_otp.h | 3 ++- include/hw/misc/sifive_u_prci.h | 3 ++- include/hw/misc/virt_ctrl.h | 2 ++ include/hw/misc/xlnx-versal-pmc-iou-slcr.h | 1 + include/hw/net/lasi_82596.h | 2 +- include/hw/net/xlnx-zynqmp-can.h | 1 + include/hw/ppc/pnv_psi.h | 2 +- include/hw/riscv/boot_opensbi.h | 2 ++ include/hw/riscv/microchip_pfsoc.h | 3 +++ include/hw/riscv/numa.h | 1 + include/hw/riscv/sifive_u.h | 2 ++ include/hw/riscv/spike.h | 2 +- include/hw/riscv/virt.h | 2 +- include/hw/ssi/sifive_spi.h | 3 +++ include/hw/timer/sse-timer.h | 1 + include/hw/usb/hcd-dwc3.h | 1 + include/hw/usb/hcd-musb.h | 2 ++ include/hw/usb/xlnx-usb-subsystem.h | 2 ++ include/hw/usb/xlnx-versal-usb2-ctrl-regs.h | 3 +++ include/hw/virtio/virtio-mmio.h | 2 +- include/hw/virtio/virtio.h | 1 - include/qemu/plugin-memory.h | 3 +++ include/sysemu/dirtyrate.h | 2 ++ include/sysemu/dump.h | 1 + include/user/syscall-trace.h | 1 + hw/virtio/virtio.c | 1 + 45 files changed, 72 insertions(+), 10 deletions(-)
Signature · 1 line
2.37.3
PATCH 1/2 include/hw/virtio: Break inclusion loop
hw/virtio/virtio.h and hw/virtio/vhost.h include each other. The former doesn't actually need the latter, so drop that inclusion to break the loop.
--- include/hw/virtio/virtio.h | 1 - hw/virtio/virtio.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)
include/hw/virtio/virtio.h +0 -1
@@ -22,7 +22,6 @@#include "standard-headers/linux/virtio_config.h" #include "standard-headers/linux/virtio_ring.h" #include "qom/object.h" -#include "hw/virtio/vhost.h" /* * A guest should never accept this. It implies negotiation is broken
hw/virtio/virtio.c +1 -0
@@ -26,6 +26,7 @@#include "qemu/module.h" #include "qom/object_interfaces.h" #include "hw/virtio/virtio.h" +#include "hw/virtio/vhost.h" #include "migration/qemu-file-types.h" #include "qemu/atomic.h" #include "hw/virtio/virtio-bus.h"
Signature · 1 line
2.37.3
Re: [PATCH 1/2] include/hw/virtio: Break inclusion loop
Quoted 9 lines · Markus Armbruster
hw/virtio/virtio.handhw/virtio/vhost.hinclude each other. The former doesn't actually need the latter, so drop that inclusion to break the loop.Signed-off-by Markus Armbruster <[email protected]>--- include/hw/virtio/virtio.h | 1 - hw/virtio/virtio.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)
Re: [PATCH 1/2] include/hw/virtio: Break inclusion loop
In reply to Markus ArmbrusterQuoted 6 lines · Markus Armbruster
hw/virtio/virtio.handhw/virtio/vhost.hinclude each other. The former doesn't actually need the latter, so drop that inclusion to break the loop.Signed-off-by Markus Armbruster <[email protected]>
Alistair
Quoted 33 lines
--- include/hw/virtio/virtio.h | 1 - hw/virtio/virtio.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)include/hw/virtio/virtio.h +0
-1@@ -22,7 +22,6 @@#include "standard-headers/linux/virtio_config.h" #include "standard-headers/linux/virtio_ring.h" #include "qom/object.h" -#include "hw/virtio/vhost.h" /* * A guest should never accept this. It implies negotiation is broken hw/virtio/virtio.c +1
-1@@ -26,6 +26,7 @@#include "qemu/module.h" #include "qom/object_interfaces.h" #include "hw/virtio/virtio.h" +#include "hw/virtio/vhost.h" #include "migration/qemu-file-types.h" #include "qemu/atomic.h" #include "hw/virtio/virtio-bus.h" --2.37.3
Re: [PATCH 1/2] include/hw/virtio: Break inclusion loop
In reply to Markus ArmbrusterQuoted 9 lines · Markus Armbruster
hw/virtio/virtio.handhw/virtio/vhost.hinclude each other. The former doesn't actually need the latter, so drop that inclusion to break the loop.Signed-off-by Markus Armbruster <[email protected]>---
include/hw/virtio/virtio.h| 1 -hw/virtio/virtio.c| 1 +2 files changed, 1 insertion(+), 1 deletion(-)
Quoted 29 lines
include/hw/virtio/virtio.h +0
-1@@ -22,7 +22,6 @@#include "standard-headers/linux/virtio_config.h" #include "standard-headers/linux/virtio_ring.h" #include "qom/object.h" -#include "hw/virtio/vhost.h" /* * A guest should never accept this. It implies negotiation is broken hw/virtio/virtio.c +1
-0@@ -26,6 +26,7 @@#include "qemu/module.h" #include "qom/object_interfaces.h" #include "hw/virtio/virtio.h" +#include "hw/virtio/vhost.h" #include "migration/qemu-file-types.h" #include "qemu/atomic.h" #include "hw/virtio/virtio-bus.h" Signature · 1 line
2.37.3
Re: [PATCH 1/2] include/hw/virtio: Break inclusion loop
In reply to Markus ArmbrusterQuoted 5 lines · Markus Armbruster
hw/virtio/virtio.handhw/virtio/vhost.hinclude each other. The former doesn't actually need the latter, so drop that inclusion to break the loop.Signed-off-by Markus Armbruster <[email protected]>
feel free to merge
Quoted 34 lines
--- include/hw/virtio/virtio.h | 1 - hw/virtio/virtio.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)include/hw/virtio/virtio.h +0
-1@@ -22,7 +22,6 @@#include "standard-headers/linux/virtio_config.h" #include "standard-headers/linux/virtio_ring.h" #include "qom/object.h" -#include "hw/virtio/vhost.h" /* * A guest should never accept this. It implies negotiation is broken hw/virtio/virtio.c +1
-0@@ -26,6 +26,7 @@#include "qemu/module.h" #include "qom/object_interfaces.h" #include "hw/virtio/virtio.h" +#include "hw/virtio/vhost.h" #include "migration/qemu-file-types.h" #include "qemu/atomic.h" #include "hw/virtio/virtio-bus.h" Signature · 1 line
2.37.3
PATCH 2/2 include: Include headers where needed
In reply to Markus ArmbrusterA number of headers neglect to include everything they need. They compile only if the headers they need are already included from elsewhere. Fix that.
--- include/exec/plugin-gen.h | 1 + include/hw/acpi/erst.h | 3 +++ include/hw/char/cmsdk-apb-uart.h | 1 + include/hw/char/goldfish_tty.h | 1 + include/hw/char/xilinx_uartlite.h | 1 + include/hw/cris/etraxfs.h | 1 + include/hw/display/macfb.h | 3 ++- include/hw/dma/sifive_pdma.h | 2 ++ include/hw/i386/ioapic_internal.h | 1 + include/hw/i386/sgx-epc.h | 1 + include/hw/intc/goldfish_pic.h | 2 ++ include/hw/intc/loongarch_pch_msi.h | 2 ++ include/hw/intc/loongarch_pch_pic.h | 2 ++ include/hw/intc/nios2_vic.h | 2 ++ include/hw/misc/mchp_pfsoc_dmc.h | 2 ++ include/hw/misc/mchp_pfsoc_ioscb.h | 2 ++ include/hw/misc/mchp_pfsoc_sysreg.h | 2 ++ include/hw/misc/pvpanic.h | 1 + include/hw/misc/sifive_e_prci.h | 3 ++- include/hw/misc/sifive_u_otp.h | 3 ++- include/hw/misc/sifive_u_prci.h | 3 ++- include/hw/misc/virt_ctrl.h | 2 ++ include/hw/misc/xlnx-versal-pmc-iou-slcr.h | 1 + include/hw/net/lasi_82596.h | 2 +- include/hw/net/xlnx-zynqmp-can.h | 1 + include/hw/ppc/pnv_psi.h | 2 +- include/hw/riscv/boot_opensbi.h | 2 ++ include/hw/riscv/microchip_pfsoc.h | 3 +++ include/hw/riscv/numa.h | 1 + include/hw/riscv/sifive_u.h | 2 ++ include/hw/riscv/spike.h | 2 +- include/hw/riscv/virt.h | 2 +- include/hw/ssi/sifive_spi.h | 3 +++ include/hw/timer/sse-timer.h | 1 + include/hw/usb/hcd-dwc3.h | 1 + include/hw/usb/hcd-musb.h | 2 ++ include/hw/usb/xlnx-usb-subsystem.h | 2 ++ include/hw/usb/xlnx-versal-usb2-ctrl-regs.h | 3 +++ include/hw/virtio/virtio-mmio.h | 2 +- include/qemu/plugin-memory.h | 3 +++ include/sysemu/dirtyrate.h | 2 ++ include/sysemu/dump.h | 1 + include/user/syscall-trace.h | 1 + 43 files changed, 71 insertions(+), 9 deletions(-)
include/exec/plugin-gen.h +1 -0
@@ -12,6 +12,7 @@#ifndef QEMU_PLUGIN_GEN_H #define QEMU_PLUGIN_GEN_H +#include "exec/cpu_ldst.h" #include "qemu/plugin.h" #include "tcg/tcg.h"
include/hw/acpi/erst.h +3 -0
@@ -11,6 +11,9 @@#ifndef HW_ACPI_ERST_H #define HW_ACPI_ERST_H +#include "hw/acpi/bios-linker-loader.h" +#include "qom/object.h" +void build_erst (GArray *table_data,BIOSLinker *linker,Object *erst_dev,const char *oem_id,const char *oem_table_id);
include/hw/char/cmsdk-apb-uart.h +1 -0
@@ -15,6 +15,7 @@#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" +#include "qapi/error.h" #include "qom/object.h" #define TYPE_CMSDK_APB_UART "cmsdk-apb-uart"
include/hw/char/goldfish_tty.h +1 -0
@@ -12,6 +12,7 @@#include "qemu/fifo8.h" #include "chardev/char-fe.h" +#include "hw/sysbus.h" #define TYPE_GOLDFISH_TTY "goldfish_tty"OBJECT_DECLARE_SIMPLE_TYPE (GoldfishTTYState,GOLDFISH_TTY )
include/hw/char/xilinx_uartlite.h +1 -0
@@ -17,6 +17,7 @@#include "hw/qdev-properties.h" #include "hw/sysbus.h" +#include "qapi/error.h" static inline DeviceState *xilinx_uartlite_create(hwaddr addr, qemu_irq irq,
include/hw/cris/etraxfs.h +1 -0
@@ -29,6 +29,7 @@#include "hw/cris/etraxfs_dma.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" +#include "qapi/error.h" DeviceState *etraxfs_eth_init(NICInfo *nd, hwaddr base, int phyaddr, struct etraxfs_dma_client *dma_out,
include/hw/display/macfb.h +2 -1
@@ -15,9 +15,10 @@#include "exec/memory.h" #include "hw/irq.h" +#include "hw/nubus/nubus.h" +#include "hw/sysbus.h" #include "ui/console.h" #include "qemu/timer.h" -#include "qom/object.h" typedef enum { MACFB_DISPLAY_APPLE_21_COLOR = 0,
include/hw/dma/sifive_pdma.h +2 -0
@@ -23,6 +23,8 @@ #ifndef SIFIVE_PDMA_H #define SIFIVE_PDMA_H +#include "hw/sysbus.h" + struct sifive_pdma_chan { uint32_t control; uint32_t next_config;
include/hw/i386/ioapic_internal.h +1 -0
@@ -23,6 +23,7 @@#define QEMU_IOAPIC_INTERNAL_H #include "exec/memory.h" +#include "hw/i386/ioapic.h" #include "hw/sysbus.h" #include "qemu/notify.h" #include "qom/object.h"
include/hw/i386/sgx-epc.h +1 -0
@@ -12,6 +12,7 @@#ifndef QEMU_SGX_EPC_H #define QEMU_SGX_EPC_H +#include "hw/qdev-core.h" #include "hw/i386/hostmem-epc.h" #define TYPE_SGX_EPC "sgx-epc"
include/hw/intc/goldfish_pic.h +2 -0
@@ -10,6 +10,8 @@#ifndef HW_INTC_GOLDFISH_PIC_H #define HW_INTC_GOLDFISH_PIC_H +#include "hw/sysbus.h" +#define TYPE_GOLDFISH_PIC "goldfish_pic"OBJECT_DECLARE_SIMPLE_TYPE (GoldfishPICState,GOLDFISH_PIC )
include/hw/intc/loongarch_pch_msi.h +2 -0
@@ -5,6 +5,8 @@* Copyright (C) 2021 Loongson Technology Corporation Limited */ +#include "hw/sysbus.h" +#define TYPE_LOONGARCH_PCH_MSI "loongarch_pch_msi"OBJECT_DECLARE_SIMPLE_TYPE (LoongArchPCHMSI,LOONGARCH_PCH_MSI )
include/hw/intc/loongarch_pch_pic.h +2 -0
@@ -5,6 +5,8 @@* Copyright (c) 2021 Loongson Technology Corporation Limited */ +#include "hw/sysbus.h" +#define TYPE_LOONGARCH_PCH_PIC "loongarch_pch_pic"#define PCH_PIC_NAME (name) TYPE_LOONGARCH_PCH_PIC#nameOBJECT_DECLARE_SIMPLE_TYPE (LoongArchPCHPIC,LOONGARCH_PCH_PIC )
include/hw/intc/nios2_vic.h +2 -0
@@ -35,6 +35,8 @@#ifndef HW_INTC_NIOS2_VIC_H #define HW_INTC_NIOS2_VIC_H +#include "hw/sysbus.h" +#define TYPE_NIOS2_VIC "nios2-vic"OBJECT_DECLARE_SIMPLE_TYPE (Nios2VIC,NIOS2_VIC )
include/hw/misc/mchp_pfsoc_dmc.h +2 -0
@@ -23,6 +23,8 @@#ifndef MCHP_PFSOC_DMC_H #define MCHP_PFSOC_DMC_H +#include "hw/sysbus.h" +/* DDR SGMII PHY module */ #define MCHP_PFSOC_DDR_SGMII_PHY_REG_SIZE 0x1000
include/hw/misc/mchp_pfsoc_ioscb.h +2 -0
@@ -23,6 +23,8 @@ #ifndef MCHP_PFSOC_IOSCB_H #define MCHP_PFSOC_IOSCB_H +#include "hw/sysbus.h" + typedef struct MchpPfSoCIoscbState { SysBusDevice parent; MemoryRegion container;
include/hw/misc/mchp_pfsoc_sysreg.h +2 -0
@@ -23,6 +23,8 @@ #ifndef MCHP_PFSOC_SYSREG_H #define MCHP_PFSOC_SYSREG_H +#include "hw/sysbus.h" + #define MCHP_PFSOC_SYSREG_REG_SIZE 0x2000 typedef struct MchpPfSoCSysregState {
include/hw/misc/pvpanic.h +1 -0
@@ -15,6 +15,7 @@#ifndef HW_MISC_PVPANIC_H #define HW_MISC_PVPANIC_H +#include "exec/memory.h" #include "qom/object.h" #define TYPE_PVPANIC_ISA_DEVICE "pvpanic"
include/hw/misc/sifive_e_prci.h +2 -1
@@ -18,7 +18,8 @@#ifndef HW_SIFIVE_E_PRCI_H #define HW_SIFIVE_E_PRCI_H -#include "qom/object.h" + +#include "hw/sysbus.h" enum { SIFIVE_E_PRCI_HFROSCCFG = 0x0,
include/hw/misc/sifive_u_otp.h +2 -1
@@ -18,7 +18,8 @@#ifndef HW_SIFIVE_U_OTP_H #define HW_SIFIVE_U_OTP_H -#include "qom/object.h" + +#include "hw/sysbus.h" #define SIFIVE_U_OTP_PA 0x00#define SIFIVE_U_OTP_PAIO 0x04
include/hw/misc/sifive_u_prci.h +2 -1
@@ -18,7 +18,8 @@#ifndef HW_SIFIVE_U_PRCI_H #define HW_SIFIVE_U_PRCI_H -#include "qom/object.h" + +#include "hw/sysbus.h" #define SIFIVE_U_PRCI_HFXOSCCFG 0x00#define SIFIVE_U_PRCI_COREPLLCFG0 0x04
include/hw/misc/virt_ctrl.h +2 -0
@@ -7,6 +7,8 @@#ifndef VIRT_CTRL_H #define VIRT_CTRL_H +#include "hw/sysbus.h" +#define TYPE_VIRT_CTRL "virt-ctrl"OBJECT_DECLARE_SIMPLE_TYPE (VirtCtrlState,VIRT_CTRL )
include/hw/misc/xlnx-versal-pmc-iou-slcr.h +1 -0
@@ -54,6 +54,7 @@#ifndef XLNX_VERSAL_PMC_IOU_SLCR_H #define XLNX_VERSAL_PMC_IOU_SLCR_H +#include "hw/sysbus.h" #include "hw/register.h" #define TYPE_XILINX_VERSAL_PMC_IOU_SLCR "xlnx.versal-pmc-iou-slcr"
include/hw/net/lasi_82596.h +1 -1
@@ -10,7 +10,7 @@#include "net/net.h" #include "hw/net/i82596.h" -#include "qom/object.h" +#include "hw/sysbus.h" #define TYPE_LASI_82596 "lasi_82596"typedef struct SysBusI82596State SysBusI82596State ;
include/hw/net/xlnx-zynqmp-can.h +1 -0
@@ -30,6 +30,7 @@#ifndef XLNX_ZYNQMP_CAN_H #define XLNX_ZYNQMP_CAN_H +#include "hw/sysbus.h" #include "hw/register.h" #include "net/can_emu.h" #include "net/can_host.h"
include/hw/ppc/pnv_psi.h +1 -1
@@ -23,7 +23,7 @@#include "hw/sysbus.h" #include "hw/ppc/xics.h" #include "hw/ppc/xive.h" -#include "qom/object.h" +#include "hw/qdev-core.h" #define TYPE_PNV_PSI "pnv-psi" OBJECT_DECLARE_TYPE(PnvPsi, PnvPsiClass,
include/hw/riscv/boot_opensbi.h +2 -0
@@ -8,6 +8,8 @@#ifndef RISCV_BOOT_OPENSBI_H #define RISCV_BOOT_OPENSBI_H +#include "exec/cpu-defs.h" +/** Expected value of info magic ('OSBI' ascii string in hex) */ #define FW_DYNAMIC_INFO_MAGIC_VALUE 0x4942534f
include/hw/riscv/microchip_pfsoc.h +3 -0
@@ -22,13 +22,16 @@ #ifndef HW_MICROCHIP_PFSOC_H #define HW_MICROCHIP_PFSOC_H +#include "hw/boards.h" #include "hw/char/mchp_pfsoc_mmuart.h" +#include "hw/cpu/cluster.h" #include "hw/dma/sifive_pdma.h" #include "hw/misc/mchp_pfsoc_dmc.h" #include "hw/misc/mchp_pfsoc_ioscb.h" #include "hw/misc/mchp_pfsoc_sysreg.h" #include "hw/net/cadence_gem.h" #include "hw/sd/cadence_sdhci.h" +#include "hw/riscv/riscv_hart.h" typedef struct MicrochipPFSoCState { /*< private >*/
include/hw/riscv/numa.h +1 -0
@@ -19,6 +19,7 @@#ifndef RISCV_NUMA_H #define RISCV_NUMA_H +#include "hw/boards.h" #include "hw/sysbus.h" #include "sysemu/numa.h"
include/hw/riscv/sifive_u.h +2 -0
@@ -19,6 +19,8 @@#ifndef HW_SIFIVE_U_H #define HW_SIFIVE_U_H +#include "hw/boards.h" +#include "hw/cpu/cluster.h" #include "hw/dma/sifive_pdma.h" #include "hw/net/cadence_gem.h" #include "hw/riscv/riscv_hart.h"
include/hw/riscv/spike.h +1 -1
@@ -19,9 +19,9 @@#ifndef HW_RISCV_SPIKE_H #define HW_RISCV_SPIKE_H +#include "hw/boards.h" #include "hw/riscv/riscv_hart.h" #include "hw/sysbus.h" -#include "qom/object.h" #define SPIKE_CPUS_MAX 8#define SPIKE_SOCKETS_MAX 8
include/hw/riscv/virt.h +1 -1
@@ -19,10 +19,10 @@#ifndef HW_RISCV_VIRT_H #define HW_RISCV_VIRT_H +#include "hw/boards.h" #include "hw/riscv/riscv_hart.h" #include "hw/sysbus.h" #include "hw/block/flash.h" -#include "qom/object.h" #define VIRT_CPUS_MAX_BITS 9#define VIRT_CPUS_MAX (1 << VIRT_CPUS_MAX_BITS)
include/hw/ssi/sifive_spi.h +3 -0
@@ -22,6 +22,9 @@#ifndef HW_SIFIVE_SPI_H #define HW_SIFIVE_SPI_H +#include "qemu/fifo8.h" +#include "hw/sysbus.h" +#define SIFIVE_SPI_REG_NUM (0x78 / 4)#define TYPE_SIFIVE_SPI "sifive.spi"
include/hw/timer/sse-timer.h +1 -0
@@ -25,6 +25,7 @@#define SSE_TIMER_H #include "hw/sysbus.h" +#include "qemu/timer.h" #include "qom/object.h" #include "hw/timer/sse-counter.h"
include/hw/usb/hcd-dwc3.h +1 -0
@@ -26,6 +26,7 @@#ifndef HCD_DWC3_H #define HCD_DWC3_H +#include "hw/register.h" #include "hw/usb/hcd-xhci.h" #include "hw/usb/hcd-xhci-sysbus.h"
include/hw/usb/hcd-musb.h +2 -0
@@ -13,6 +13,8 @@#ifndef HW_USB_HCD_MUSB_H #define HW_USB_HCD_MUSB_H +#include "exec/hwaddr.h" +enum musb_irq_source_e { musb_irq_suspend =0 , musb_irq_resume,
include/hw/usb/xlnx-usb-subsystem.h +2 -0
@@ -25,6 +25,8 @@#ifndef XLNX_USB_SUBSYSTEM_H #define XLNX_USB_SUBSYSTEM_H +#include "hw/register.h" +#include "hw/sysbus.h" #include "hw/usb/xlnx-versal-usb2-ctrl-regs.h" #include "hw/usb/hcd-dwc3.h"
include/hw/usb/xlnx-versal-usb2-ctrl-regs.h +3 -0
@@ -26,6 +26,9 @@#ifndef XLNX_VERSAL_USB2_CTRL_REGS_H #define XLNX_VERSAL_USB2_CTRL_REGS_H +#include "hw/register.h" +#include "hw/sysbus.h" +#define TYPE_XILINX_VERSAL_USB2_CTRL_REGS "xlnx.versal-usb2-ctrl-regs"#define XILINX_VERSAL_USB2_CTRL_REGS (obj) \
include/hw/virtio/virtio-mmio.h +1 -1
@@ -22,8 +22,8 @@#ifndef HW_VIRTIO_MMIO_H #define HW_VIRTIO_MMIO_H +#include "hw/sysbus.h" #include "hw/virtio/virtio-bus.h" -#include "qom/object.h" /* QOM macros */ /* virtio-mmio-bus */
include/qemu/plugin-memory.h +3 -0
@@ -9,6 +9,9 @@ #ifndef PLUGIN_MEMORY_H #define PLUGIN_MEMORY_H +#include "exec/cpu-defs.h" +#include "exec/hwaddr.h" + struct qemu_plugin_hwaddr { bool is_io; bool is_store;
include/sysemu/dirtyrate.h +2 -0
@@ -13,6 +13,8 @@ #ifndef QEMU_DIRTYRATE_H #define QEMU_DIRTYRATE_H +#include "qapi/qapi-types-migration.h" + typedef struct VcpuStat { int nvcpu; /* number of vcpu */ DirtyRateVcpu *rates; /* array of dirty rate for each vcpu */
include/sysemu/dump.h +1 -0
@@ -15,6 +15,7 @@#define DUMP_H #include "qapi/qapi-types-dump.h" +#include "qemu/thread.h" #define MAKEDUMPFILE_SIGNATURE "makedumpfile"#define MAX_SIZE_MDF_HEADER (4096)/* max size of makedumpfile_header */
include/user/syscall-trace.h +1 -0
@@ -10,6 +10,7 @@#ifndef SYSCALL_TRACE_H #define SYSCALL_TRACE_H +#include "exec/user/abitypes.h" #include "trace/trace-root.h" /*
Signature · 1 line
2.37.3
Re: [PATCH 2/2] include: Include headers where needed
Quoted 6 lines · Markus Armbruster
A number of headers neglect to include everything they need. They compile only if the headers they need are already included from elsewhere. Fix that.
Signed-off-by Markus Armbruster <[email protected]>
Alistair
Quoted 618 lines
--- include/exec/plugin-gen.h | 1 + include/hw/acpi/erst.h | 3 +++ include/hw/char/cmsdk-apb-uart.h | 1 + include/hw/char/goldfish_tty.h | 1 + include/hw/char/xilinx_uartlite.h | 1 + include/hw/cris/etraxfs.h | 1 + include/hw/display/macfb.h | 3 ++- include/hw/dma/sifive_pdma.h | 2 ++ include/hw/i386/ioapic_internal.h | 1 + include/hw/i386/sgx-epc.h | 1 + include/hw/intc/goldfish_pic.h | 2 ++ include/hw/intc/loongarch_pch_msi.h | 2 ++ include/hw/intc/loongarch_pch_pic.h | 2 ++ include/hw/intc/nios2_vic.h | 2 ++ include/hw/misc/mchp_pfsoc_dmc.h | 2 ++ include/hw/misc/mchp_pfsoc_ioscb.h | 2 ++ include/hw/misc/mchp_pfsoc_sysreg.h | 2 ++ include/hw/misc/pvpanic.h | 1 + include/hw/misc/sifive_e_prci.h | 3 ++- include/hw/misc/sifive_u_otp.h | 3 ++- include/hw/misc/sifive_u_prci.h | 3 ++- include/hw/misc/virt_ctrl.h | 2 ++ include/hw/misc/xlnx-versal-pmc-iou-slcr.h | 1 + include/hw/net/lasi_82596.h | 2 +- include/hw/net/xlnx-zynqmp-can.h | 1 + include/hw/ppc/pnv_psi.h | 2 +- include/hw/riscv/boot_opensbi.h | 2 ++ include/hw/riscv/microchip_pfsoc.h | 3 +++ include/hw/riscv/numa.h | 1 + include/hw/riscv/sifive_u.h | 2 ++ include/hw/riscv/spike.h | 2 +- include/hw/riscv/virt.h | 2 +- include/hw/ssi/sifive_spi.h | 3 +++ include/hw/timer/sse-timer.h | 1 + include/hw/usb/hcd-dwc3.h | 1 + include/hw/usb/hcd-musb.h | 2 ++ include/hw/usb/xlnx-usb-subsystem.h | 2 ++ include/hw/usb/xlnx-versal-usb2-ctrl-regs.h | 3 +++ include/hw/virtio/virtio-mmio.h | 2 +- include/qemu/plugin-memory.h | 3 +++ include/sysemu/dirtyrate.h | 2 ++ include/sysemu/dump.h | 1 + include/user/syscall-trace.h | 1 + 43 files changed, 71 insertions(+), 9 deletions(-)include/exec/plugin-gen.h +1
-0@@ -12,6 +12,7 @@#ifndef QEMU_PLUGIN_GEN_H #define QEMU_PLUGIN_GEN_H +#include "exec/cpu_ldst.h" #include "qemu/plugin.h" #include "tcg/tcg.h" include/hw/acpi/erst.h +3
-0@@ -11,6 +11,9 @@#ifndef HW_ACPI_ERST_H #define HW_ACPI_ERST_H +#include "hw/acpi/bios-linker-loader.h" +#include "qom/object.h" +void build_erst (GArray *table_data,BIOSLinker *linker,Object *erst_dev,const char *oem_id,const char *oem_table_id);include/hw/char/cmsdk-apb-uart.h +1
-0@@ -15,6 +15,7 @@#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" +#include "qapi/error.h" #include "qom/object.h" #define TYPE_CMSDK_APB_UART "cmsdk-apb-uart"include/hw/char/goldfish_tty.h +1
-0@@ -12,6 +12,7 @@#include "qemu/fifo8.h" #include "chardev/char-fe.h" +#include "hw/sysbus.h" #define TYPE_GOLDFISH_TTY "goldfish_tty"OBJECT_DECLARE_SIMPLE_TYPE (GoldfishTTYState,GOLDFISH_TTY )include/hw/char/xilinx_uartlite.h +1
-0@@ -17,6 +17,7 @@#include "hw/qdev-properties.h" #include "hw/sysbus.h" +#include "qapi/error.h" static inline DeviceState *xilinx_uartlite_create(hwaddr addr, qemu_irq irq,include/hw/cris/etraxfs.h +1
-0@@ -29,6 +29,7 @@#include "hw/cris/etraxfs_dma.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" +#include "qapi/error.h" DeviceState *etraxfs_eth_init(NICInfo *nd, hwaddr base, int phyaddr, struct etraxfs_dma_client *dma_out,include/hw/display/macfb.h +2
-1@@ -15,9 +15,10 @@#include "exec/memory.h" #include "hw/irq.h" +#include "hw/nubus/nubus.h" +#include "hw/sysbus.h" #include "ui/console.h" #include "qemu/timer.h" -#include "qom/object.h" typedef enum { MACFB_DISPLAY_APPLE_21_COLOR = 0,include/hw/dma/sifive_pdma.h +2
-0@@ -23,6 +23,8 @@ #ifndef SIFIVE_PDMA_H #define SIFIVE_PDMA_H +#include "hw/sysbus.h" + struct sifive_pdma_chan { uint32_t control; uint32_t next_config;include/hw/i386/ioapic_internal.h +1
-0@@ -23,6 +23,7 @@#define QEMU_IOAPIC_INTERNAL_H #include "exec/memory.h" +#include "hw/i386/ioapic.h" #include "hw/sysbus.h" #include "qemu/notify.h" #include "qom/object.h" include/hw/i386/sgx-epc.h +1
-0@@ -12,6 +12,7 @@#ifndef QEMU_SGX_EPC_H #define QEMU_SGX_EPC_H +#include "hw/qdev-core.h" #include "hw/i386/hostmem-epc.h" #define TYPE_SGX_EPC "sgx-epc"include/hw/intc/goldfish_pic.h +2
-0@@ -10,6 +10,8 @@#ifndef HW_INTC_GOLDFISH_PIC_H #define HW_INTC_GOLDFISH_PIC_H +#include "hw/sysbus.h" +#define TYPE_GOLDFISH_PIC "goldfish_pic"OBJECT_DECLARE_SIMPLE_TYPE (GoldfishPICState,GOLDFISH_PIC )include/hw/intc/loongarch_pch_msi.h +2
-0@@ -5,6 +5,8 @@* Copyright (C) 2021 Loongson Technology Corporation Limited */ +#include "hw/sysbus.h" +#define TYPE_LOONGARCH_PCH_MSI "loongarch_pch_msi"OBJECT_DECLARE_SIMPLE_TYPE (LoongArchPCHMSI,LOONGARCH_PCH_MSI )include/hw/intc/loongarch_pch_pic.h +2
-0@@ -5,6 +5,8 @@* Copyright (c) 2021 Loongson Technology Corporation Limited */ +#include "hw/sysbus.h" +#define TYPE_LOONGARCH_PCH_PIC "loongarch_pch_pic"#define PCH_PIC_NAME (name) TYPE_LOONGARCH_PCH_PIC#nameOBJECT_DECLARE_SIMPLE_TYPE (LoongArchPCHPIC,LOONGARCH_PCH_PIC )include/hw/intc/nios2_vic.h +2
-0@@ -35,6 +35,8 @@#ifndef HW_INTC_NIOS2_VIC_H #define HW_INTC_NIOS2_VIC_H +#include "hw/sysbus.h" +#define TYPE_NIOS2_VIC "nios2-vic"OBJECT_DECLARE_SIMPLE_TYPE (Nios2VIC,NIOS2_VIC )include/hw/misc/mchp_pfsoc_dmc.h +2
-0@@ -23,6 +23,8 @@#ifndef MCHP_PFSOC_DMC_H #define MCHP_PFSOC_DMC_H +#include "hw/sysbus.h" +/* DDR SGMII PHY module */ #define MCHP_PFSOC_DDR_SGMII_PHY_REG_SIZE 0x1000include/hw/misc/mchp_pfsoc_ioscb.h +2
-0@@ -23,6 +23,8 @@ #ifndef MCHP_PFSOC_IOSCB_H #define MCHP_PFSOC_IOSCB_H +#include "hw/sysbus.h" + typedef struct MchpPfSoCIoscbState { SysBusDevice parent; MemoryRegion container;include/hw/misc/mchp_pfsoc_sysreg.h +2
-0@@ -23,6 +23,8 @@ #ifndef MCHP_PFSOC_SYSREG_H #define MCHP_PFSOC_SYSREG_H +#include "hw/sysbus.h" + #define MCHP_PFSOC_SYSREG_REG_SIZE 0x2000 typedef struct MchpPfSoCSysregState {include/hw/misc/pvpanic.h +1
-0@@ -15,6 +15,7 @@#ifndef HW_MISC_PVPANIC_H #define HW_MISC_PVPANIC_H +#include "exec/memory.h" #include "qom/object.h" #define TYPE_PVPANIC_ISA_DEVICE "pvpanic"include/hw/misc/sifive_e_prci.h +2
-1@@ -18,7 +18,8 @@#ifndef HW_SIFIVE_E_PRCI_H #define HW_SIFIVE_E_PRCI_H -#include "qom/object.h" + +#include "hw/sysbus.h" enum { SIFIVE_E_PRCI_HFROSCCFG = 0x0,include/hw/misc/sifive_u_otp.h +2
-1@@ -18,7 +18,8 @@#ifndef HW_SIFIVE_U_OTP_H #define HW_SIFIVE_U_OTP_H -#include "qom/object.h" + +#include "hw/sysbus.h" #define SIFIVE_U_OTP_PA 0x00#define SIFIVE_U_OTP_PAIO 0x04include/hw/misc/sifive_u_prci.h +2
-1@@ -18,7 +18,8 @@#ifndef HW_SIFIVE_U_PRCI_H #define HW_SIFIVE_U_PRCI_H -#include "qom/object.h" + +#include "hw/sysbus.h" #define SIFIVE_U_PRCI_HFXOSCCFG 0x00#define SIFIVE_U_PRCI_COREPLLCFG0 0x04include/hw/misc/virt_ctrl.h +2
-0@@ -7,6 +7,8 @@#ifndef VIRT_CTRL_H #define VIRT_CTRL_H +#include "hw/sysbus.h" +#define TYPE_VIRT_CTRL "virt-ctrl"OBJECT_DECLARE_SIMPLE_TYPE (VirtCtrlState,VIRT_CTRL )include/hw/misc/xlnx-versal-pmc-iou-slcr.h +1
-0@@ -54,6 +54,7 @@#ifndef XLNX_VERSAL_PMC_IOU_SLCR_H #define XLNX_VERSAL_PMC_IOU_SLCR_H +#include "hw/sysbus.h" #include "hw/register.h" #define TYPE_XILINX_VERSAL_PMC_IOU_SLCR "xlnx.versal-pmc-iou-slcr"include/hw/net/lasi_82596.h +1
-1@@ -10,7 +10,7 @@#include "net/net.h" #include "hw/net/i82596.h" -#include "qom/object.h" +#include "hw/sysbus.h" #define TYPE_LASI_82596 "lasi_82596"typedef struct SysBusI82596State SysBusI82596State ;include/hw/net/xlnx-zynqmp-can.h +1
-0@@ -30,6 +30,7 @@#ifndef XLNX_ZYNQMP_CAN_H #define XLNX_ZYNQMP_CAN_H +#include "hw/sysbus.h" #include "hw/register.h" #include "net/can_emu.h" #include "net/can_host.h" include/hw/ppc/pnv_psi.h +1
-1@@ -23,7 +23,7 @@#include "hw/sysbus.h" #include "hw/ppc/xics.h" #include "hw/ppc/xive.h" -#include "qom/object.h" +#include "hw/qdev-core.h" #define TYPE_PNV_PSI "pnv-psi" OBJECT_DECLARE_TYPE(PnvPsi, PnvPsiClass,include/hw/riscv/boot_opensbi.h +2
-0@@ -8,6 +8,8 @@#ifndef RISCV_BOOT_OPENSBI_H #define RISCV_BOOT_OPENSBI_H +#include "exec/cpu-defs.h" +/** Expected value of info magic ('OSBI' ascii string in hex) */ #define FW_DYNAMIC_INFO_MAGIC_VALUE 0x4942534finclude/hw/riscv/microchip_pfsoc.h +3
-0@@ -22,13 +22,16 @@ #ifndef HW_MICROCHIP_PFSOC_H #define HW_MICROCHIP_PFSOC_H +#include "hw/boards.h" #include "hw/char/mchp_pfsoc_mmuart.h" +#include "hw/cpu/cluster.h" #include "hw/dma/sifive_pdma.h" #include "hw/misc/mchp_pfsoc_dmc.h" #include "hw/misc/mchp_pfsoc_ioscb.h" #include "hw/misc/mchp_pfsoc_sysreg.h" #include "hw/net/cadence_gem.h" #include "hw/sd/cadence_sdhci.h" +#include "hw/riscv/riscv_hart.h" typedef struct MicrochipPFSoCState { /*< private >*/include/hw/riscv/numa.h +1
-0@@ -19,6 +19,7 @@#ifndef RISCV_NUMA_H #define RISCV_NUMA_H +#include "hw/boards.h" #include "hw/sysbus.h" #include "sysemu/numa.h" include/hw/riscv/sifive_u.h +2
-0@@ -19,6 +19,8 @@#ifndef HW_SIFIVE_U_H #define HW_SIFIVE_U_H +#include "hw/boards.h" +#include "hw/cpu/cluster.h" #include "hw/dma/sifive_pdma.h" #include "hw/net/cadence_gem.h" #include "hw/riscv/riscv_hart.h" include/hw/riscv/spike.h +1
-1@@ -19,9 +19,9 @@#ifndef HW_RISCV_SPIKE_H #define HW_RISCV_SPIKE_H +#include "hw/boards.h" #include "hw/riscv/riscv_hart.h" #include "hw/sysbus.h" -#include "qom/object.h" #define SPIKE_CPUS_MAX 8#define SPIKE_SOCKETS_MAX 8include/hw/riscv/virt.h +1
-1@@ -19,10 +19,10 @@#ifndef HW_RISCV_VIRT_H #define HW_RISCV_VIRT_H +#include "hw/boards.h" #include "hw/riscv/riscv_hart.h" #include "hw/sysbus.h" #include "hw/block/flash.h" -#include "qom/object.h" #define VIRT_CPUS_MAX_BITS 9#define VIRT_CPUS_MAX (1 << VIRT_CPUS_MAX_BITS)include/hw/ssi/sifive_spi.h +3
-0@@ -22,6 +22,9 @@#ifndef HW_SIFIVE_SPI_H #define HW_SIFIVE_SPI_H +#include "qemu/fifo8.h" +#include "hw/sysbus.h" +#define SIFIVE_SPI_REG_NUM (0x78 / 4)#define TYPE_SIFIVE_SPI "sifive.spi"include/hw/timer/sse-timer.h +1
-0@@ -25,6 +25,7 @@#define SSE_TIMER_H #include "hw/sysbus.h" +#include "qemu/timer.h" #include "qom/object.h" #include "hw/timer/sse-counter.h" include/hw/usb/hcd-dwc3.h +1
-0@@ -26,6 +26,7 @@#ifndef HCD_DWC3_H #define HCD_DWC3_H +#include "hw/register.h" #include "hw/usb/hcd-xhci.h" #include "hw/usb/hcd-xhci-sysbus.h" include/hw/usb/hcd-musb.h +2
-0@@ -13,6 +13,8 @@#ifndef HW_USB_HCD_MUSB_H #define HW_USB_HCD_MUSB_H +#include "exec/hwaddr.h" +enum musb_irq_source_e { musb_irq_suspend =0 , musb_irq_resume,include/hw/usb/xlnx-usb-subsystem.h +2
-0@@ -25,6 +25,8 @@#ifndef XLNX_USB_SUBSYSTEM_H #define XLNX_USB_SUBSYSTEM_H +#include "hw/register.h" +#include "hw/sysbus.h" #include "hw/usb/xlnx-versal-usb2-ctrl-regs.h" #include "hw/usb/hcd-dwc3.h" include/hw/usb/xlnx-versal-usb2-ctrl-regs.h +3
-0@@ -26,6 +26,9 @@#ifndef XLNX_VERSAL_USB2_CTRL_REGS_H #define XLNX_VERSAL_USB2_CTRL_REGS_H +#include "hw/register.h" +#include "hw/sysbus.h" +#define TYPE_XILINX_VERSAL_USB2_CTRL_REGS "xlnx.versal-usb2-ctrl-regs"#define XILINX_VERSAL_USB2_CTRL_REGS (obj) \include/hw/virtio/virtio-mmio.h +1
-1@@ -22,8 +22,8 @@#ifndef HW_VIRTIO_MMIO_H #define HW_VIRTIO_MMIO_H +#include "hw/sysbus.h" #include "hw/virtio/virtio-bus.h" -#include "qom/object.h" /* QOM macros */ /* virtio-mmio-bus */ include/qemu/plugin-memory.h +3
-0@@ -9,6 +9,9 @@ #ifndef PLUGIN_MEMORY_H #define PLUGIN_MEMORY_H +#include "exec/cpu-defs.h" +#include "exec/hwaddr.h" + struct qemu_plugin_hwaddr { bool is_io; bool is_store;include/sysemu/dirtyrate.h +2
-0@@ -13,6 +13,8 @@ #ifndef QEMU_DIRTYRATE_H #define QEMU_DIRTYRATE_H +#include "qapi/qapi-types-migration.h" + typedef struct VcpuStat { int nvcpu; /* number of vcpu */ DirtyRateVcpu *rates; /* array of dirty rate for each vcpu */include/sysemu/dump.h +1
-0@@ -15,6 +15,7 @@#define DUMP_H #include "qapi/qapi-types-dump.h" +#include "qemu/thread.h" #define MAKEDUMPFILE_SIGNATURE "makedumpfile"#define MAX_SIZE_MDF_HEADER (4096)/* max size of makedumpfile_header */ include/user/syscall-trace.h +1
-1@@ -10,6 +10,7 @@#ifndef SYSCALL_TRACE_H #define SYSCALL_TRACE_H +#include "exec/user/abitypes.h" #include "trace/trace-root.h" /* -- 2.37.3
Re: [PATCH 2/2] include: Include headers where needed
In reply to Markus ArmbrusterQuoted 5 lines · Markus Armbruster
A number of headers neglect to include everything they need. They compile only if the headers they need are already included from elsewhere. Fix that.
Signed-off-by Markus Armbruster <[email protected]>
Quoted 619 lines
--- include/exec/plugin-gen.h | 1 + include/hw/acpi/erst.h | 3 +++ include/hw/char/cmsdk-apb-uart.h | 1 + include/hw/char/goldfish_tty.h | 1 + include/hw/char/xilinx_uartlite.h | 1 + include/hw/cris/etraxfs.h | 1 + include/hw/display/macfb.h | 3 ++- include/hw/dma/sifive_pdma.h | 2 ++ include/hw/i386/ioapic_internal.h | 1 + include/hw/i386/sgx-epc.h | 1 + include/hw/intc/goldfish_pic.h | 2 ++ include/hw/intc/loongarch_pch_msi.h | 2 ++ include/hw/intc/loongarch_pch_pic.h | 2 ++ include/hw/intc/nios2_vic.h | 2 ++ include/hw/misc/mchp_pfsoc_dmc.h | 2 ++ include/hw/misc/mchp_pfsoc_ioscb.h | 2 ++ include/hw/misc/mchp_pfsoc_sysreg.h | 2 ++ include/hw/misc/pvpanic.h | 1 + include/hw/misc/sifive_e_prci.h | 3 ++- include/hw/misc/sifive_u_otp.h | 3 ++- include/hw/misc/sifive_u_prci.h | 3 ++- include/hw/misc/virt_ctrl.h | 2 ++ include/hw/misc/xlnx-versal-pmc-iou-slcr.h | 1 + include/hw/net/lasi_82596.h | 2 +- include/hw/net/xlnx-zynqmp-can.h | 1 + include/hw/ppc/pnv_psi.h | 2 +- include/hw/riscv/boot_opensbi.h | 2 ++ include/hw/riscv/microchip_pfsoc.h | 3 +++ include/hw/riscv/numa.h | 1 + include/hw/riscv/sifive_u.h | 2 ++ include/hw/riscv/spike.h | 2 +- include/hw/riscv/virt.h | 2 +- include/hw/ssi/sifive_spi.h | 3 +++ include/hw/timer/sse-timer.h | 1 + include/hw/usb/hcd-dwc3.h | 1 + include/hw/usb/hcd-musb.h | 2 ++ include/hw/usb/xlnx-usb-subsystem.h | 2 ++ include/hw/usb/xlnx-versal-usb2-ctrl-regs.h | 3 +++ include/hw/virtio/virtio-mmio.h | 2 +- include/qemu/plugin-memory.h | 3 +++ include/sysemu/dirtyrate.h | 2 ++ include/sysemu/dump.h | 1 + include/user/syscall-trace.h | 1 + 43 files changed, 71 insertions(+), 9 deletions(-)include/exec/plugin-gen.h +1
-0@@ -12,6 +12,7 @@#ifndef QEMU_PLUGIN_GEN_H #define QEMU_PLUGIN_GEN_H +#include "exec/cpu_ldst.h" #include "qemu/plugin.h" #include "tcg/tcg.h" include/hw/acpi/erst.h +3
-0@@ -11,6 +11,9 @@#ifndef HW_ACPI_ERST_H #define HW_ACPI_ERST_H +#include "hw/acpi/bios-linker-loader.h" +#include "qom/object.h" +void build_erst (GArray *table_data,BIOSLinker *linker,Object *erst_dev,const char *oem_id,const char *oem_table_id);include/hw/char/cmsdk-apb-uart.h +1
-0@@ -15,6 +15,7 @@#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" +#include "qapi/error.h" #include "qom/object.h" #define TYPE_CMSDK_APB_UART "cmsdk-apb-uart"include/hw/char/goldfish_tty.h +1
-0@@ -12,6 +12,7 @@#include "qemu/fifo8.h" #include "chardev/char-fe.h" +#include "hw/sysbus.h" #define TYPE_GOLDFISH_TTY "goldfish_tty"OBJECT_DECLARE_SIMPLE_TYPE (GoldfishTTYState,GOLDFISH_TTY )include/hw/char/xilinx_uartlite.h +1
-0@@ -17,6 +17,7 @@#include "hw/qdev-properties.h" #include "hw/sysbus.h" +#include "qapi/error.h" static inline DeviceState *xilinx_uartlite_create(hwaddr addr, qemu_irq irq,include/hw/cris/etraxfs.h +1
-0@@ -29,6 +29,7 @@#include "hw/cris/etraxfs_dma.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" +#include "qapi/error.h" DeviceState *etraxfs_eth_init(NICInfo *nd, hwaddr base, int phyaddr, struct etraxfs_dma_client *dma_out,include/hw/display/macfb.h +2
-1@@ -15,9 +15,10 @@#include "exec/memory.h" #include "hw/irq.h" +#include "hw/nubus/nubus.h" +#include "hw/sysbus.h" #include "ui/console.h" #include "qemu/timer.h" -#include "qom/object.h" typedef enum { MACFB_DISPLAY_APPLE_21_COLOR = 0,include/hw/dma/sifive_pdma.h +2
-0@@ -23,6 +23,8 @@ #ifndef SIFIVE_PDMA_H #define SIFIVE_PDMA_H +#include "hw/sysbus.h" + struct sifive_pdma_chan { uint32_t control; uint32_t next_config;include/hw/i386/ioapic_internal.h +1
-0@@ -23,6 +23,7 @@#define QEMU_IOAPIC_INTERNAL_H #include "exec/memory.h" +#include "hw/i386/ioapic.h" #include "hw/sysbus.h" #include "qemu/notify.h" #include "qom/object.h" include/hw/i386/sgx-epc.h +1
-0@@ -12,6 +12,7 @@#ifndef QEMU_SGX_EPC_H #define QEMU_SGX_EPC_H +#include "hw/qdev-core.h" #include "hw/i386/hostmem-epc.h" #define TYPE_SGX_EPC "sgx-epc"include/hw/intc/goldfish_pic.h +2
-0@@ -10,6 +10,8 @@#ifndef HW_INTC_GOLDFISH_PIC_H #define HW_INTC_GOLDFISH_PIC_H +#include "hw/sysbus.h" +#define TYPE_GOLDFISH_PIC "goldfish_pic"OBJECT_DECLARE_SIMPLE_TYPE (GoldfishPICState,GOLDFISH_PIC )include/hw/intc/loongarch_pch_msi.h +2
-0@@ -5,6 +5,8 @@* Copyright (C) 2021 Loongson Technology Corporation Limited */ +#include "hw/sysbus.h" +#define TYPE_LOONGARCH_PCH_MSI "loongarch_pch_msi"OBJECT_DECLARE_SIMPLE_TYPE (LoongArchPCHMSI,LOONGARCH_PCH_MSI )include/hw/intc/loongarch_pch_pic.h +2
-0@@ -5,6 +5,8 @@* Copyright (c) 2021 Loongson Technology Corporation Limited */ +#include "hw/sysbus.h" +#define TYPE_LOONGARCH_PCH_PIC "loongarch_pch_pic"#define PCH_PIC_NAME (name) TYPE_LOONGARCH_PCH_PIC#nameOBJECT_DECLARE_SIMPLE_TYPE (LoongArchPCHPIC,LOONGARCH_PCH_PIC )include/hw/intc/nios2_vic.h +2
-0@@ -35,6 +35,8 @@#ifndef HW_INTC_NIOS2_VIC_H #define HW_INTC_NIOS2_VIC_H +#include "hw/sysbus.h" +#define TYPE_NIOS2_VIC "nios2-vic"OBJECT_DECLARE_SIMPLE_TYPE (Nios2VIC,NIOS2_VIC )include/hw/misc/mchp_pfsoc_dmc.h +2
-0@@ -23,6 +23,8 @@#ifndef MCHP_PFSOC_DMC_H #define MCHP_PFSOC_DMC_H +#include "hw/sysbus.h" +/* DDR SGMII PHY module */ #define MCHP_PFSOC_DDR_SGMII_PHY_REG_SIZE 0x1000include/hw/misc/mchp_pfsoc_ioscb.h +2
-0@@ -23,6 +23,8 @@ #ifndef MCHP_PFSOC_IOSCB_H #define MCHP_PFSOC_IOSCB_H +#include "hw/sysbus.h" + typedef struct MchpPfSoCIoscbState { SysBusDevice parent; MemoryRegion container;include/hw/misc/mchp_pfsoc_sysreg.h +2
-0@@ -23,6 +23,8 @@ #ifndef MCHP_PFSOC_SYSREG_H #define MCHP_PFSOC_SYSREG_H +#include "hw/sysbus.h" + #define MCHP_PFSOC_SYSREG_REG_SIZE 0x2000 typedef struct MchpPfSoCSysregState {include/hw/misc/pvpanic.h +1
-0@@ -15,6 +15,7 @@#ifndef HW_MISC_PVPANIC_H #define HW_MISC_PVPANIC_H +#include "exec/memory.h" #include "qom/object.h" #define TYPE_PVPANIC_ISA_DEVICE "pvpanic"include/hw/misc/sifive_e_prci.h +2
-1@@ -18,7 +18,8 @@#ifndef HW_SIFIVE_E_PRCI_H #define HW_SIFIVE_E_PRCI_H -#include "qom/object.h" + +#include "hw/sysbus.h" enum { SIFIVE_E_PRCI_HFROSCCFG = 0x0,include/hw/misc/sifive_u_otp.h +2
-1@@ -18,7 +18,8 @@#ifndef HW_SIFIVE_U_OTP_H #define HW_SIFIVE_U_OTP_H -#include "qom/object.h" + +#include "hw/sysbus.h" #define SIFIVE_U_OTP_PA 0x00#define SIFIVE_U_OTP_PAIO 0x04include/hw/misc/sifive_u_prci.h +2
-1@@ -18,7 +18,8 @@#ifndef HW_SIFIVE_U_PRCI_H #define HW_SIFIVE_U_PRCI_H -#include "qom/object.h" + +#include "hw/sysbus.h" #define SIFIVE_U_PRCI_HFXOSCCFG 0x00#define SIFIVE_U_PRCI_COREPLLCFG0 0x04include/hw/misc/virt_ctrl.h +2
-0@@ -7,6 +7,8 @@#ifndef VIRT_CTRL_H #define VIRT_CTRL_H +#include "hw/sysbus.h" +#define TYPE_VIRT_CTRL "virt-ctrl"OBJECT_DECLARE_SIMPLE_TYPE (VirtCtrlState,VIRT_CTRL )include/hw/misc/xlnx-versal-pmc-iou-slcr.h +1
-0@@ -54,6 +54,7 @@#ifndef XLNX_VERSAL_PMC_IOU_SLCR_H #define XLNX_VERSAL_PMC_IOU_SLCR_H +#include "hw/sysbus.h" #include "hw/register.h" #define TYPE_XILINX_VERSAL_PMC_IOU_SLCR "xlnx.versal-pmc-iou-slcr"include/hw/net/lasi_82596.h +1
-1@@ -10,7 +10,7 @@#include "net/net.h" #include "hw/net/i82596.h" -#include "qom/object.h" +#include "hw/sysbus.h" #define TYPE_LASI_82596 "lasi_82596"typedef struct SysBusI82596State SysBusI82596State ;include/hw/net/xlnx-zynqmp-can.h +1
-0@@ -30,6 +30,7 @@#ifndef XLNX_ZYNQMP_CAN_H #define XLNX_ZYNQMP_CAN_H +#include "hw/sysbus.h" #include "hw/register.h" #include "net/can_emu.h" #include "net/can_host.h" include/hw/ppc/pnv_psi.h +1
-1@@ -23,7 +23,7 @@#include "hw/sysbus.h" #include "hw/ppc/xics.h" #include "hw/ppc/xive.h" -#include "qom/object.h" +#include "hw/qdev-core.h" #define TYPE_PNV_PSI "pnv-psi" OBJECT_DECLARE_TYPE(PnvPsi, PnvPsiClass,include/hw/riscv/boot_opensbi.h +2
-0@@ -8,6 +8,8 @@#ifndef RISCV_BOOT_OPENSBI_H #define RISCV_BOOT_OPENSBI_H +#include "exec/cpu-defs.h" +/** Expected value of info magic ('OSBI' ascii string in hex) */ #define FW_DYNAMIC_INFO_MAGIC_VALUE 0x4942534finclude/hw/riscv/microchip_pfsoc.h +3
-0@@ -22,13 +22,16 @@ #ifndef HW_MICROCHIP_PFSOC_H #define HW_MICROCHIP_PFSOC_H +#include "hw/boards.h" #include "hw/char/mchp_pfsoc_mmuart.h" +#include "hw/cpu/cluster.h" #include "hw/dma/sifive_pdma.h" #include "hw/misc/mchp_pfsoc_dmc.h" #include "hw/misc/mchp_pfsoc_ioscb.h" #include "hw/misc/mchp_pfsoc_sysreg.h" #include "hw/net/cadence_gem.h" #include "hw/sd/cadence_sdhci.h" +#include "hw/riscv/riscv_hart.h" typedef struct MicrochipPFSoCState { /*< private >*/include/hw/riscv/numa.h +1
-0@@ -19,6 +19,7 @@#ifndef RISCV_NUMA_H #define RISCV_NUMA_H +#include "hw/boards.h" #include "hw/sysbus.h" #include "sysemu/numa.h" include/hw/riscv/sifive_u.h +2
-0@@ -19,6 +19,8 @@#ifndef HW_SIFIVE_U_H #define HW_SIFIVE_U_H +#include "hw/boards.h" +#include "hw/cpu/cluster.h" #include "hw/dma/sifive_pdma.h" #include "hw/net/cadence_gem.h" #include "hw/riscv/riscv_hart.h" include/hw/riscv/spike.h +1
-1@@ -19,9 +19,9 @@#ifndef HW_RISCV_SPIKE_H #define HW_RISCV_SPIKE_H +#include "hw/boards.h" #include "hw/riscv/riscv_hart.h" #include "hw/sysbus.h" -#include "qom/object.h" #define SPIKE_CPUS_MAX 8#define SPIKE_SOCKETS_MAX 8include/hw/riscv/virt.h +1
-1@@ -19,10 +19,10 @@#ifndef HW_RISCV_VIRT_H #define HW_RISCV_VIRT_H +#include "hw/boards.h" #include "hw/riscv/riscv_hart.h" #include "hw/sysbus.h" #include "hw/block/flash.h" -#include "qom/object.h" #define VIRT_CPUS_MAX_BITS 9#define VIRT_CPUS_MAX (1 << VIRT_CPUS_MAX_BITS)include/hw/ssi/sifive_spi.h +3
-0@@ -22,6 +22,9 @@#ifndef HW_SIFIVE_SPI_H #define HW_SIFIVE_SPI_H +#include "qemu/fifo8.h" +#include "hw/sysbus.h" +#define SIFIVE_SPI_REG_NUM (0x78 / 4)#define TYPE_SIFIVE_SPI "sifive.spi"include/hw/timer/sse-timer.h +1
-0@@ -25,6 +25,7 @@#define SSE_TIMER_H #include "hw/sysbus.h" +#include "qemu/timer.h" #include "qom/object.h" #include "hw/timer/sse-counter.h" include/hw/usb/hcd-dwc3.h +1
-0@@ -26,6 +26,7 @@#ifndef HCD_DWC3_H #define HCD_DWC3_H +#include "hw/register.h" #include "hw/usb/hcd-xhci.h" #include "hw/usb/hcd-xhci-sysbus.h" include/hw/usb/hcd-musb.h +2
-0@@ -13,6 +13,8 @@#ifndef HW_USB_HCD_MUSB_H #define HW_USB_HCD_MUSB_H +#include "exec/hwaddr.h" +enum musb_irq_source_e { musb_irq_suspend =0 , musb_irq_resume,include/hw/usb/xlnx-usb-subsystem.h +2
-0@@ -25,6 +25,8 @@#ifndef XLNX_USB_SUBSYSTEM_H #define XLNX_USB_SUBSYSTEM_H +#include "hw/register.h" +#include "hw/sysbus.h" #include "hw/usb/xlnx-versal-usb2-ctrl-regs.h" #include "hw/usb/hcd-dwc3.h" include/hw/usb/xlnx-versal-usb2-ctrl-regs.h +3
-0@@ -26,6 +26,9 @@#ifndef XLNX_VERSAL_USB2_CTRL_REGS_H #define XLNX_VERSAL_USB2_CTRL_REGS_H +#include "hw/register.h" +#include "hw/sysbus.h" +#define TYPE_XILINX_VERSAL_USB2_CTRL_REGS "xlnx.versal-usb2-ctrl-regs"#define XILINX_VERSAL_USB2_CTRL_REGS (obj) \include/hw/virtio/virtio-mmio.h +1
-1@@ -22,8 +22,8 @@#ifndef HW_VIRTIO_MMIO_H #define HW_VIRTIO_MMIO_H +#include "hw/sysbus.h" #include "hw/virtio/virtio-bus.h" -#include "qom/object.h" /* QOM macros */ /* virtio-mmio-bus */ include/qemu/plugin-memory.h +3
-0@@ -9,6 +9,9 @@ #ifndef PLUGIN_MEMORY_H #define PLUGIN_MEMORY_H +#include "exec/cpu-defs.h" +#include "exec/hwaddr.h" + struct qemu_plugin_hwaddr { bool is_io; bool is_store;include/sysemu/dirtyrate.h +2
-0@@ -13,6 +13,8 @@ #ifndef QEMU_DIRTYRATE_H #define QEMU_DIRTYRATE_H +#include "qapi/qapi-types-migration.h" + typedef struct VcpuStat { int nvcpu; /* number of vcpu */ DirtyRateVcpu *rates; /* array of dirty rate for each vcpu */include/sysemu/dump.h +1
-0@@ -15,6 +15,7 @@#define DUMP_H #include "qapi/qapi-types-dump.h" +#include "qemu/thread.h" #define MAKEDUMPFILE_SIGNATURE "makedumpfile"#define MAX_SIZE_MDF_HEADER (4096)/* max size of makedumpfile_header */ include/user/syscall-trace.h +1
-0@@ -10,6 +10,7 @@#ifndef SYSCALL_TRACE_H #define SYSCALL_TRACE_H +#include "exec/user/abitypes.h" #include "trace/trace-root.h" /* Signature · 1 line
2.37.3