janitor: do not include qemu-char everywhere

Touching char/char.h basically causes the whole of QEMU to
be rebuilt.  Avoid this, it is usually unnecessary.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 564d632d0cdea750b7b574b49869a1c629f99d8b..cd553c2a7b4035bb32d8f5019f86c64dc921ca08 100644 (file)
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -24,7 +24,6 @@
 #include <alsa/asoundlib.h>
 #include "qemu-common.h"
 #include "main-loop.h"
-#include "qemu-char.h"
 #include "audio.h"
 
 #if QEMU_GNUC_PREREQ(4, 3)

diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index 45abe39a6d95752cdde45502a5ceb075a36e67b5..8249a0044935e45a429098cabc6f363b8f8e4c5e 100644 (file)
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -33,7 +33,6 @@
 #include "qemu-common.h"
 #include "main-loop.h"
 #include "host-utils.h"
-#include "qemu-char.h"
 #include "audio.h"
 
 #define AUDIO_CAP "oss"

diff --git a/block/raw-posix.c b/block/raw-posix.c
index abfedbea7330a7e7f4e5908071ae8a6aba5e22d1..48eff2fd831dd83c5a19a5b7393dbf00661ce740 100644 (file)
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -23,7 +23,6 @@
  */
 #include "qemu-common.h"
 #include "qemu-timer.h"
-#include "qemu-char.h"
 #include "qemu-log.h"
 #include "block_int.h"
 #include "module.h"

diff --git a/bt-host.c b/bt-host.c
index 8b47370b263ad822f09983cb38e99351f2b670e0..311864517defc53d4c8e1615c51a291b23c5de64 100644 (file)
--- a/bt-host.c
+++ b/bt-host.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu-common.h"
-#include "qemu-char.h"
 #include "net.h"
 #include "bt-host.h"
 #include "main-loop.h"

diff --git a/bt-vhci.c b/bt-vhci.c
index 878460aeb59c30719b54e8172cac44ee1349d376..6fecb6671688c7529047823cd5587d672d3dbcab 100644 (file)
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu-common.h"
-#include "qemu-char.h"
 #include "net.h"
 #include "hw/bt.h"
 #include "main-loop.h"

diff --git a/buffered_file.c b/buffered_file.c
index bd0f61d8c9684ca8347be8dfdc9d0619219613a5..f13443ee9135b7d4d75d85aa225ea9f3276cba5b 100644 (file)
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -16,7 +16,6 @@
 #include "qemu-common.h"
 #include "hw/hw.h"
 #include "qemu-timer.h"
-#include "qemu-char.h"
 #include "buffered_file.h"
 
 //#define DEBUG_BUFFERED_FILE

diff --git a/console.c b/console.c
index 048b48e721a7297e1d15a2b54088ebb5b7067597..9ac7b287428c541ab71218c2c1c3c2e92966fd8c 100644 (file)
--- a/console.c
+++ b/console.c
@@ -25,6 +25,7 @@
 #include "console.h"
 #include "qemu-timer.h"
 #include "qmp-commands.h"
+#include "qemu-char.h"
 
 //#define DEBUG_CONSOLE
 #define DEFAULT_BACKSCROLL 512

diff --git a/console.h b/console.h
index edb195087160e0fd1e532369c86c8bd154ef5136..33354e437a6c02761636a929bfbb2d160f0f6423 100644 (file)
--- a/console.h
+++ b/console.h
@@ -1,7 +1,6 @@
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
-#include "qemu-char.h"
 #include "qemu-pixman.h"
 #include "qdict.h"
 #include "notify.h"

diff --git a/hmp.c b/hmp.c
index 180ba2bfd90c971c016afeb11bd909434615ccb5..873962f7104c9db888db8b791f073c32f60762ba 100644 (file)
--- a/hmp.c
+++ b/hmp.c
@@ -15,6 +15,7 @@
 
 #include "hmp.h"
 #include "net.h"
+#include "qemu-char.h"
 #include "qemu-option.h"
 #include "qemu-timer.h"
 #include "qmp-commands.h"

diff --git a/hw/9pfs/virtio-9p-coth.c b/hw/9pfs/virtio-9p-coth.c
index 25556cc6a74d152b97f3aca8623b43f60449badd..9368df7610a67e4c258ca7bfcfb6a1fbd74a31ef 100644 (file)
--- a/hw/9pfs/virtio-9p-coth.c
+++ b/hw/9pfs/virtio-9p-coth.c
@@ -12,7 +12,6 @@
  *
  */
 
-#include "qemu-char.h"
 #include "fsdev/qemu-fsdev.h"
 #include "qemu-thread.h"
 #include "qemu-coroutine.h"

diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index cf64f32ac0dfa7f40d41083a5875d0003ddbd872..5c648d98d355fd468a0d65ab4fe77586e3c1956d 100644 (file)
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -24,6 +24,7 @@
 #include "migration.h"
 #include "qerror.h"
 #include "event_notifier.h"
+#include "qemu-char.h"
 
 #include <sys/mman.h>
 #include <sys/types.h>

diff --git a/hw/spapr_hcall.c b/hw/spapr_hcall.c
index 63cadb8d9245a7434afb7fa3b78b48c4eb7e0144..1fac3623293e5f3cfb1ef8dafaca77ab9d72d4cb 100644 (file)
--- a/hw/spapr_hcall.c
+++ b/hw/spapr_hcall.c
@@ -1,8 +1,6 @@
 #include "sysemu.h"
 #include "cpu.h"
-#include "qemu-char.h"
 #include "sysemu.h"
-#include "qemu-char.h"
 #include "helper_regs.h"
 #include "hw/spapr.h"
 

diff --git a/hw/strongarm.c b/hw/strongarm.c
index 43855151cec8f8de212a1aef29879c58a4b8e6e8..44bec34e07cdac182e12571e391160331e92feed 100644 (file)
--- a/hw/strongarm.c
+++ b/hw/strongarm.c
@@ -30,6 +30,7 @@
 #include "strongarm.h"
 #include "qemu-error.h"
 #include "arm-misc.h"
+#include "qemu-char.h"
 #include "sysemu.h"
 #include "ssi.h"
 

diff --git a/hw/xen_disk.c b/hw/xen_disk.c
index e6bb2f20b94bbdbfcddc3521a385e8257d9b8008..423b580cfff241f254cacea931071e86526332e2 100644 (file)
--- a/hw/xen_disk.c
+++ b/hw/xen_disk.c
@@ -36,7 +36,6 @@
 #include <sys/uio.h>
 
 #include "hw.h"
-#include "qemu-char.h"
 #include "xen_backend.h"
 #include "xen_blkif.h"
 #include "blockdev.h"

diff --git a/hw/xen_nic.c b/hw/xen_nic.c
index cf7d5591b36a38f5a281d9e1afcae56332c02091..dadacb1fb5702ceaf612271829b24e22c837be4d 100644 (file)
--- a/hw/xen_nic.c
+++ b/hw/xen_nic.c
@@ -39,7 +39,6 @@
 #include "net.h"
 #include "net/checksum.h"
 #include "net/util.h"
-#include "qemu-char.h"
 #include "xen_backend.h"
 
 #include <xen/io/netif.h>

diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c
index 4575da1765e4c7b33b14c8b7791da4c030394a22..2fd6068428474da858fdd9e5387fb659b13bff4a 100644 (file)
--- a/hw/xilinx_axidma.c
+++ b/hw/xilinx_axidma.c
@@ -23,7 +23,6 @@
  */
 
 #include "sysbus.h"
-#include "qemu-char.h"
 #include "qemu-timer.h"
 #include "ptimer.h"
 #include "qemu-log.h"

diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c
index f2e3bf1274913e9f116dbeee4228405d79fa1411..c859fde09e742cc57f210d4e8b5d2d2225d745e1 100644 (file)
--- a/hw/xilinx_axienet.c
+++ b/hw/xilinx_axienet.c
@@ -23,7 +23,6 @@
  */
 
 #include "sysbus.h"
-#include "qemu-char.h"
 #include "qemu-log.h"
 #include "net.h"
 #include "net/checksum.h"

diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index 4c42edc4eab14c2a7b6ef1a7c21dacb9448b6dea..bc10d3161f4280951958b759c47d763e10c94461 100644 (file)
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -36,6 +36,7 @@
 #include "sysbus.h"
 #include "flash.h"
 #include "blockdev.h"
+#include "qemu-char.h"
 #include "xtensa_bootparam.h"
 
 typedef struct LxBoardDesc {

diff --git a/iohandler.c b/iohandler.c
index 60460a6f88b1f9cfffc1a770460e09fae193df71..258f42d8d215f1387b41e21e81f71ca9fcee6817 100644 (file)
--- a/iohandler.c
+++ b/iohandler.c
@@ -24,7 +24,6 @@
 
 #include "config-host.h"
 #include "qemu-common.h"
-#include "qemu-char.h"
 #include "qemu-queue.h"
 #include "qemu-aio.h"
 #include "main-loop.h"

diff --git a/migration-exec.c b/migration-exec.c
index 2b6fcb426292f56e17bfbbb7393b11819e17e645..b4a3ca392110e6a6dca20d7d1c9dcea656106111 100644 (file)
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -18,7 +18,6 @@
 #include "qemu-common.h"
 #include "qemu_socket.h"
 #include "migration.h"
-#include "qemu-char.h"
 #include "buffered_file.h"
 #include "block.h"
 #include <sys/types.h>

diff --git a/migration-fd.c b/migration-fd.c
index 5fe28e09fda5085c092fceeba3f6b1c548588d51..6d4228791388fb410292500ed5225f951b059824 100644 (file)
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -17,7 +17,6 @@
 #include "qemu_socket.h"
 #include "migration.h"
 #include "monitor.h"
-#include "qemu-char.h"
 #include "buffered_file.h"
 #include "block.h"
 #include "qemu_socket.h"

diff --git a/migration-tcp.c b/migration-tcp.c
index 5e855fe72f4d4246cda629758d857d7d61acd2aa..a9bb817d9912d961796462eb4342068647fb7d75 100644 (file)
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -16,7 +16,6 @@
 #include "qemu-common.h"
 #include "qemu_socket.h"
 #include "migration.h"
-#include "qemu-char.h"
 #include "buffered_file.h"
 #include "block.h"
 

diff --git a/migration-unix.c b/migration-unix.c
index dba72b4a543d9283ab756403cfef361273dd7692..e58e8bc15b2eaf57615f82b0b3bd97c080df3445 100644 (file)
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -16,7 +16,6 @@
 #include "qemu-common.h"
 #include "qemu_socket.h"
 #include "migration.h"
-#include "qemu-char.h"
 #include "buffered_file.h"
 #include "block.h"
 

diff --git a/monitor.h b/monitor.h
index b4ef9559dc16248a80c312ee03c6fd21cb2375a4..4595c217edde8d1991ae8776c17c781c1dcdf102 100644 (file)
--- a/monitor.h
+++ b/monitor.h
@@ -2,7 +2,6 @@
 #define MONITOR_H
 
 #include "qemu-common.h"
-#include "qemu-char.h"
 #include "qerror.h"
 #include "qdict.h"
 #include "block.h"

diff --git a/net/slirp.c b/net/slirp.c
index afb52c3af13207b4e0e111c6e1179d254b616e57..f117412badb5dc3a603a99558a8bf65a91ecee75 100644 (file)
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -35,6 +35,7 @@
 #include "monitor.h"
 #include "qemu_socket.h"
 #include "slirp/libslirp.h"
+#include "qemu-char.h"
 
 static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)
 {

diff --git a/net/socket.c b/net/socket.c
index c01323d4b0e6d05f6a21a43347558364b4bea462..cf309cd5b9612f70e1c3fc6c53bc7a039fee9829 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -26,7 +26,6 @@
 #include "net.h"
 #include "clients.h"
 #include "monitor.h"
-#include "qemu-char.h"
 #include "qemu-common.h"
 #include "qemu-error.h"
 #include "qemu-option.h"

diff --git a/net/tap.c b/net/tap.c
index 1abfd44bd9116fd069fb3ddae90544f8c3358f69..5ff78934dc59d16b19006645fb74b16a5d986aff 100644 (file)
--- a/net/tap.c
+++ b/net/tap.c
@@ -37,7 +37,6 @@
 #include "clients.h"
 #include "monitor.h"
 #include "sysemu.h"
-#include "qemu-char.h"
 #include "qemu-common.h"
 #include "qemu-error.h"
 

diff --git a/net/vde.c b/net/vde.c
index 275bda92c31fba8ebf6abded41ceeb9d0ceea216..cc5a07d65ef655e252ffd42610c9b4848be8e4ca 100644 (file)
--- a/net/vde.c
+++ b/net/vde.c
@@ -27,7 +27,6 @@
 
 #include "net.h"
 #include "clients.h"
-#include "qemu-char.h"
 #include "qemu-common.h"
 #include "qemu-option.h"
 

diff --git a/qmp.c b/qmp.c
index e3a7f0b21771aaf94f503f31c683bbcd5a4ff55f..e873f0a0dc211782cad387e3de079d235f185887 100644 (file)
--- a/qmp.c
+++ b/qmp.c
@@ -16,6 +16,7 @@
 #include "qemu-common.h"
 #include "sysemu.h"
 #include "qmp-commands.h"
+#include "qemu-char.h"
 #include "ui/qemu-spice.h"
 #include "ui/vnc.h"
 #include "kvm.h"

diff --git a/savevm.c b/savevm.c
index 5d04d59688517895185a40ffd16ac34080f5d5d9..f5886ce772be5f3805dcbac3a2fd44433f876e36 100644 (file)
--- a/savevm.c
+++ b/savevm.c
@@ -76,7 +76,6 @@
 #include "monitor.h"
 #include "sysemu.h"
 #include "qemu-timer.h"
-#include "qemu-char.h"
 #include "audio/audio.h"
 #include "migration.h"
 #include "qemu_socket.h"

diff --git a/ui/qemu-spice.h b/ui/qemu-spice.h
index 3299da87d60b466298ef2bb0fe08e989dac73a50..5857b8a92e660d57aa4d7601fcf13460faa52e51 100644 (file)
--- a/ui/qemu-spice.h
+++ b/ui/qemu-spice.h
@@ -24,7 +24,6 @@
 
 #include "qemu-option.h"
 #include "qemu-config.h"
-#include "qemu-char.h"
 #include "monitor.h"
 
 extern int using_spice;