diff options
Diffstat (limited to 'hw/char')
34 files changed, 80 insertions, 16 deletions
diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c index 94679d276c..3f855196e3 100644 --- a/hw/char/bcm2835_aux.c +++ b/hw/char/bcm2835_aux.c @@ -22,6 +22,9 @@ #include "qemu/osdep.h" #include "hw/char/bcm2835_aux.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index fa25fe24da..0e315b2376 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -23,12 +23,14 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "chardev/char-fe.h" #include "chardev/char-serial.h" #include "qemu/timer.h" #include "qemu/log.h" #include "qemu/module.h" #include "hw/char/cadence_uart.h" +#include "hw/irq.h" #ifdef CADENCE_UART_ERR_DEBUG #define DB_PRINT(...) do { \ diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c index 606c9cc7d6..9e1aa43bd3 100644 --- a/hw/char/cmsdk-apb-uart.c +++ b/hw/char/cmsdk-apb-uart.c @@ -21,10 +21,12 @@ #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/registerfields.h" #include "chardev/char-fe.h" #include "chardev/char-serial.h" #include "hw/char/cmsdk-apb-uart.h" +#include "hw/irq.h" REG32(DATA, 0) REG32(STATE, 4) diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c index e1b6d1190f..5c592e091b 100644 --- a/hw/char/debugcon.c +++ b/hw/char/debugcon.c @@ -27,9 +27,9 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/hw.h" #include "chardev/char-fe.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #define TYPE_ISA_DEBUGCON_DEVICE "isa-debugcon" #define ISA_DEBUGCON_DEVICE(obj) \ diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c index e4ac8435c8..974a2619dd 100644 --- a/hw/char/digic-uart.c +++ b/hw/char/digic-uart.c @@ -27,13 +27,14 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "chardev/char-fe.h" #include "qemu/log.h" #include "qemu/module.h" #include "hw/char/digic-uart.h" +#include "hw/qdev-properties.h" enum { ST_RX_RDY = (1 << 0), diff --git a/hw/char/escc.c b/hw/char/escc.c index 8ddbb4be4f..e185522e27 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -23,8 +23,10 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "hw/char/escc.h" #include "ui/console.h" diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c index 9745bca86c..15ac12ef22 100644 --- a/hw/char/etraxfs_ser.c +++ b/hw/char/etraxfs_ser.c @@ -23,6 +23,8 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" #include "qemu/log.h" diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c index c5700eeaec..d6b6b62366 100644 --- a/hw/char/exynos4210_uart.c +++ b/hw/char/exynos4210_uart.c @@ -21,13 +21,15 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/module.h" -#include "sysemu/sysemu.h" #include "chardev/char-fe.h" #include "chardev/char-serial.h" #include "hw/arm/exynos4210.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" #undef DEBUG_UART #undef DEBUG_UART_EXTEND diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c index c2bb3ac153..fe3cbf41a3 100644 --- a/hw/char/grlib_apbuart.c +++ b/hw/char/grlib_apbuart.c @@ -23,6 +23,8 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sparc/grlib.h" #include "hw/sysbus.h" #include "qemu/module.h" diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c index 0655a9571b..fddde9b43d 100644 --- a/hw/char/imx_serial.c +++ b/hw/char/imx_serial.c @@ -20,7 +20,9 @@ #include "qemu/osdep.h" #include "hw/char/imx_serial.h" -#include "sysemu/sysemu.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c index 5ab731e408..66c163ba26 100644 --- a/hw/char/ipoctal232.c +++ b/hw/char/ipoctal232.c @@ -10,6 +10,9 @@ #include "qemu/osdep.h" #include "hw/ipack/ipack.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/module.h" #include "chardev/char-fe.h" diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c index 41a3ec81e3..e0b1bd6555 100644 --- a/hw/char/lm32_juart.c +++ b/hw/char/lm32_juart.c @@ -18,13 +18,14 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "trace.h" #include "chardev/char-fe.h" #include "hw/char/lm32_juart.h" +#include "hw/qdev-properties.h" enum { LM32_JUART_MIN_SAVE_VERSION = 0, diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c index d047a44e34..32f29c44cf 100644 --- a/hw/char/lm32_uart.c +++ b/hw/char/lm32_uart.c @@ -23,8 +23,10 @@ #include "qemu/osdep.h" -#include "hw/hw.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "trace.h" #include "chardev/char-fe.h" #include "qemu/error-report.h" diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index 7b06110c4d..58323baf43 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -7,10 +7,11 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "hw/m68k/mcf.h" +#include "hw/qdev-properties.h" #include "chardev/char-fe.h" typedef struct { diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c index 8a78fcca8f..c358ca07f3 100644 --- a/hw/char/milkymist-uart.c +++ b/hw/char/milkymist-uart.c @@ -22,8 +22,10 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "trace.h" #include "chardev/char-fe.h" #include "qemu/error-report.h" diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c index c90b491477..2777afe366 100644 --- a/hw/char/nrf51_uart.c +++ b/hw/char/nrf51_uart.c @@ -16,6 +16,9 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/char/nrf51_uart.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "migration/vmstate.h" #include "trace.h" static void nrf51_uart_update_irq(NRF51UARTState *s) diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c index b3bb1cfcec..13e4f43c4c 100644 --- a/hw/char/omap_uart.c +++ b/hw/char/omap_uart.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" #include "chardev/char.h" -#include "hw/hw.h" #include "hw/arm/omap.h" #include "hw/char/serial.h" #include "exec/address-spaces.h" diff --git a/hw/char/parallel-isa.c b/hw/char/parallel-isa.c index a043832e72..bcc577f61c 100644 --- a/hw/char/parallel-isa.c +++ b/hw/char/parallel-isa.c @@ -8,9 +8,11 @@ * * SPDX-License-Identifier: MIT */ + #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "hw/char/parallel.h" static void parallel_init(ISABus *bus, int index, Chardev *chr) diff --git a/hw/char/parallel.c b/hw/char/parallel.c index 1cd4c54a02..40174eeda1 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -26,11 +26,14 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/hw.h" #include "chardev/char-parallel.h" #include "chardev/char-fe.h" +#include "hw/irq.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" +#include "migration/vmstate.h" #include "hw/char/parallel.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/char/pl011.c b/hw/char/pl011.c index c1ae2f31f5..84ad8ff9fb 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -20,7 +20,9 @@ #include "qemu/osdep.h" #include "hw/char/pl011.h" +#include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "chardev/char-fe.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c index 691dc870ed..392606259d 100644 --- a/hw/char/sclpconsole-lm.c +++ b/hw/char/sclpconsole-lm.c @@ -14,14 +14,15 @@ */ #include "qemu/osdep.h" -#include "hw/qdev.h" #include "qemu/thread.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "chardev/char-fe.h" #include "hw/s390x/sclp.h" +#include "migration/vmstate.h" #include "hw/s390x/event-facility.h" +#include "hw/qdev-properties.h" #include "hw/s390x/ebcdic.h" #define SIZE_BUFFER 4096 diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c index 09b1d45d7a..da126f0133 100644 --- a/hw/char/sclpconsole.c +++ b/hw/char/sclpconsole.c @@ -13,12 +13,13 @@ */ #include "qemu/osdep.h" -#include "hw/qdev.h" #include "qemu/thread.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/s390x/sclp.h" +#include "migration/vmstate.h" +#include "hw/qdev-properties.h" #include "hw/s390x/event-facility.h" #include "chardev/char-fe.h" diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c index 610426111a..9e31c51bb6 100644 --- a/hw/char/serial-isa.c +++ b/hw/char/serial-isa.c @@ -26,8 +26,11 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" +#include "sysemu/sysemu.h" #include "hw/char/serial.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" +#include "migration/vmstate.h" #define ISA_SERIAL(obj) OBJECT_CHECK(ISASerialState, (obj), TYPE_ISA_SERIAL) diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c index 63dcbaa984..5f13b5663b 100644 --- a/hw/char/serial-pci-multi.c +++ b/hw/char/serial-pci-multi.c @@ -30,7 +30,10 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/char/serial.h" +#include "hw/irq.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" +#include "migration/vmstate.h" #define PCI_SERIAL_MAX_PORTS 4 diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c index 9028efbda8..cb9b76e22b 100644 --- a/hw/char/serial-pci.c +++ b/hw/char/serial-pci.c @@ -29,7 +29,10 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/char/serial.h" +#include "hw/irq.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" +#include "migration/vmstate.h" typedef struct PCISerialState { PCIDevice dev; diff --git a/hw/char/serial.c b/hw/char/serial.c index 7c42a2abfc..b4aa250950 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -25,9 +25,13 @@ #include "qemu/osdep.h" #include "hw/char/serial.h" +#include "hw/irq.h" +#include "migration/vmstate.h" #include "chardev/char-serial.h" #include "qapi/error.h" #include "qemu/timer.h" +#include "sysemu/reset.h" +#include "sysemu/runstate.h" #include "qemu/error-report.h" #include "trace.h" diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index 67740b7ee6..07dc16be13 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -24,8 +24,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" -#include "hw/hw.h" +#include "hw/irq.h" #include "hw/sh4/sh.h" #include "chardev/char-fe.h" #include "qapi/error.h" diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c index 871d2666f3..7f860fcce7 100644 --- a/hw/char/spapr_vty.c +++ b/hw/char/spapr_vty.c @@ -3,10 +3,12 @@ #include "qemu/module.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/qdev.h" +#include "migration/vmstate.h" #include "chardev/char-fe.h" +#include "hw/irq.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" +#include "hw/qdev-properties.h" #define VTERM_BUFSIZE 16 diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c index 40c365b908..4ec843de38 100644 --- a/hw/char/stm32f2xx_usart.c +++ b/hw/char/stm32f2xx_usart.c @@ -24,6 +24,8 @@ #include "qemu/osdep.h" #include "hw/char/stm32f2xx_usart.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c index 3785886c25..6859c1bcb2 100644 --- a/hw/char/terminal3270.c +++ b/hw/char/terminal3270.c @@ -15,6 +15,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "chardev/char-fe.h" +#include "hw/qdev-properties.h" #include "hw/s390x/3270-ccw.h" /* Enough spaces for different window sizes. */ diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index 1bbeb00fae..c13649f1ef 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -15,6 +15,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "trace.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-serial.h" #include "qapi/error.h" #include "qapi/qapi-events-char.h" diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index f7a54f261b..4e0ed829ae 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -21,10 +21,13 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/iov.h" +#include "qemu/main-loop.h" #include "qemu/module.h" +#include "migration/qemu-file-types.h" #include "monitor/monitor.h" #include "qemu/error-report.h" #include "qemu/queue.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "trace.h" #include "hw/virtio/virtio-serial.h" diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index 47e1092263..63153dfde4 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -24,7 +24,7 @@ #include <termios.h> #include "qapi/error.h" -#include "hw/hw.h" +#include "sysemu/sysemu.h" #include "chardev/char-fe.h" #include "hw/xen/xen-legacy-backend.h" diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c index 880962a756..2c47275068 100644 --- a/hw/char/xilinx_uartlite.c +++ b/hw/char/xilinx_uartlite.c @@ -23,6 +23,9 @@ */ #include "qemu/osdep.h" +#include "hw/hw.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "chardev/char-fe.h" |