Commit 077805fa authored by Paolo Bonzini's avatar Paolo Bonzini

janitor: do not rely on indirect inclusions of or from qemu-char.h

Various header files rely on qemu-char.h including qemu-config.h or
main-loop.h, but they really do not need qemu-char.h at all (particularly
interesting is the case of the block layer!).  Clean this up, and also
add missing inclusions of qemu-char.h itself.
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8e98e2e8
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include "exec-memory.h" #include "exec-memory.h"
#include "hw/pcspk.h" #include "hw/pcspk.h"
#include "qemu/page_cache.h" #include "qemu/page_cache.h"
#include "qemu-config.h"
#include "qmp-commands.h" #include "qmp-commands.h"
#include "trace.h" #include "trace.h"
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
*/ */
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include "qemu-common.h" #include "qemu-common.h"
#include "main-loop.h"
#include "qemu-char.h" #include "qemu-char.h"
#include "audio.h" #include "audio.h"
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <sys/soundcard.h> #include <sys/soundcard.h>
#endif #endif
#include "qemu-common.h" #include "qemu-common.h"
#include "main-loop.h"
#include "host-utils.h" #include "host-utils.h"
#include "qemu-char.h" #include "qemu-char.h"
#include "audio.h" #include "audio.h"
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
*/ */
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu-config.h"
#include "block_int.h" #include "block_int.h"
#include "module.h" #include "module.h"
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <poll.h> #include <poll.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu-config.h"
#include "qemu-error.h" #include "qemu-error.h"
#include "block_int.h" #include "block_int.h"
#include "trace.h" #include "trace.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "qemu-char.h" #include "qemu-char.h"
#include "net.h" #include "net.h"
#include "bt-host.h" #include "bt-host.h"
#include "main-loop.h"
#ifndef _WIN32 #ifndef _WIN32
# include <errno.h> # include <errno.h>
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "qemu-char.h" #include "qemu-char.h"
#include "net.h" #include "net.h"
#include "hw/bt.h" #include "hw/bt.h"
#include "main-loop.h"
#define VHCI_DEV "/dev/vhci" #define VHCI_DEV "/dev/vhci"
#define VHCI_UDEV "/dev/hci_vhci" #define VHCI_UDEV "/dev/hci_vhci"
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "event_notifier.h" #include "event_notifier.h"
#include "qemu-char.h" #include "qemu-char.h"
#include "main-loop.h"
#ifdef CONFIG_EVENTFD #ifdef CONFIG_EVENTFD
#include <sys/eventfd.h> #include <sys/eventfd.h>
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "kvm.h" #include "kvm.h"
#include "hw/xen.h" #include "hw/xen.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "qemu-config.h"
#include "memory.h" #include "memory.h"
#include "dma.h" #include "dma.h"
#include "exec-memory.h" #include "exec-memory.h"
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "loader.h" #include "loader.h"
#include "elf.h" #include "elf.h"
#include "device_tree.h" #include "device_tree.h"
#include "qemu-config.h"
#define KERNEL_ARGS_ADDR 0x100 #define KERNEL_ARGS_ADDR 0x100
#define KERNEL_LOAD_ADDR 0x00010000 #define KERNEL_LOAD_ADDR 0x00010000
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
*/ */
#include "hw.h" #include "hw.h"
#include "isa.h" #include "isa.h"
#include "main-loop.h"
/* #define DEBUG_DMA */ /* #define DEBUG_DMA */
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "fw_cfg.h" #include "fw_cfg.h"
#include "sysbus.h" #include "sysbus.h"
#include "qemu-error.h" #include "qemu-error.h"
#include "qemu-config.h"
/* debug firmware config */ /* debug firmware config */
//#define DEBUG_FW_CFG //#define DEBUG_FW_CFG
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu-common.h"
#include "console.h" #include "console.h"
#include "pixel_ops.h" #include "pixel_ops.h"
#include "trace.h" #include "trace.h"
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include "hw.h" #include "hw.h"
#include "isa.h" #include "isa.h"
#include "mac_dbdma.h" #include "mac_dbdma.h"
#include "main-loop.h"
/* debug DBDMA */ /* debug DBDMA */
//#define DEBUG_DBDMA //#define DEBUG_DBDMA
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "e500.h" #include "e500.h"
#include "e500-ccsr.h" #include "e500-ccsr.h"
#include "net.h" #include "net.h"
#include "qemu-config.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/serial.h" #include "hw/serial.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
* published by the Free Software Foundation, or any later version. * published by the Free Software Foundation, or any later version.
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#include "qemu-common.h"
#include "console.h" #include "console.h"
#include "elf.h" #include "elf.h"
#include "exec-memory.h" #include "exec-memory.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "monitor.h" #include "monitor.h"
#include "qmp-commands.h" #include "qmp-commands.h"
#include "arch_init.h" #include "arch_init.h"
#include "qemu-config.h"
/* /*
* Aliases were a bad idea from the start. Let's keep them * Aliases were a bad idea from the start. Let's keep them
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "hw/block-common.h" #include "hw/block-common.h"
#include "net/hub.h" #include "net/hub.h"
#include "qapi/qapi-visit-core.h" #include "qapi/qapi-visit-core.h"
#include "qemu-char.h"
void *qdev_get_prop_ptr(DeviceState *dev, Property *prop) void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
{ {
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "sclp.h" #include "sclp.h"
#include "event-facility.h" #include "event-facility.h"
#include "qemu-char.h"
typedef struct ASCIIConsoleData { typedef struct ASCIIConsoleData {
EventBufferHeader ebh; EventBufferHeader ebh;
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#include "exec-memory.h" #include "exec-memory.h"
#include "hw/usb.h" #include "hw/usb.h"
#include "qemu-config.h"
#include <libfdt.h> #include <libfdt.h>
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu-common.h"
#include "console.h" #include "console.h"
#include "pixel_ops.h" #include "pixel_ops.h"
#include "sysbus.h" #include "sysbus.h"
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "hw/usb/desc.h" #include "hw/usb/desc.h"
#include "net.h" #include "net.h"
#include "qemu-queue.h" #include "qemu-queue.h"
#include "qemu-config.h"
#include "sysemu.h" #include "sysemu.h"
#include "iov.h" #include "iov.h"
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "monitor.h" #include "monitor.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu_socket.h" #include "qemu_socket.h"
#include "qemu-config.h"
#include "qmp-commands.h" #include "qmp-commands.h"
#include "hw/qdev.h" #include "hw/qdev.h"
#include "iov.h" #include "iov.h"
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <stdio.h> #include <stdio.h>
#include "qemu-option.h" #include "qemu-option.h"
#include "error.h" #include "error.h"
#include "qemu-option.h"
extern QemuOptsList qemu_fsdev_opts; extern QemuOptsList qemu_fsdev_opts;
extern QemuOptsList qemu_virtfs_opts; extern QemuOptsList qemu_virtfs_opts;
......
#include "config-host.h" #include "config-host.h"
#include "trace.h" #include "trace.h"
#include "ui/qemu-spice.h" #include "ui/qemu-spice.h"
#include "qemu-char.h"
#include <spice.h> #include <spice.h>
#include <spice-experimental.h> #include <spice-experimental.h>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "cpu.h" #include "cpu.h"
#include "gdbstub.h" #include "gdbstub.h"
#include "host-utils.h" #include "host-utils.h"
#include "qemu-config.h"
#include "hw/pc.h" #include "hw/pc.h"
#include "hw/apic.h" #include "hw/apic.h"
#include "ioport.h" #include "ioport.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment