qemu-char.h -> include/sysemu/char.h
Change-Id: I8e3d6e9a73a347978789a98035e89ea1e03b59aa
diff --git a/android/charpipe.c b/android/charpipe.c
index 34b6a65..79ab2f2 100644
--- a/android/charpipe.c
+++ b/android/charpipe.c
@@ -9,7 +9,7 @@
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
*/
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "android/cbuffer.h"
#include "android/qemu-debug.h"
diff --git a/android/console.c b/android/console.c
index 60c637a..22fdc17 100644
--- a/android/console.c
+++ b/android/console.c
@@ -22,7 +22,7 @@
*/
#include "android/sockets.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "android/android.h"
#include "cpu.h"
diff --git a/android/gps.c b/android/gps.c
index be68cfc..a66cb88 100644
--- a/android/gps.c
+++ b/android/gps.c
@@ -11,7 +11,7 @@
*/
#include "android/gps.h"
#include "android/utils/debug.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
CharDriverState* android_gps_cs;
diff --git a/android/hw-control.c b/android/hw-control.c
index 1be0b19..44d74fe 100644
--- a/android/hw-control.c
+++ b/android/hw-control.c
@@ -26,7 +26,7 @@
#include "android/globals.h"
#include "android/utils/misc.h"
#include "android/utils/debug.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include <stdio.h>
#include <string.h>
diff --git a/android/hw-kmsg.c b/android/hw-kmsg.c
index 4e50eb1..a5dd7bc 100644
--- a/android/hw-kmsg.c
+++ b/android/hw-kmsg.c
@@ -10,7 +10,7 @@
** GNU General Public License for more details.
*/
#include "android/hw-kmsg.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "android/charpipe.h"
#include "android/utils/debug.h"
diff --git a/android/hw-qemud.c b/android/hw-qemud.c
index ad06ccd..ae38aca 100644
--- a/android/hw-qemud.c
+++ b/android/hw-qemud.c
@@ -17,7 +17,7 @@
#include "android/looper.h"
#include "hw/hw.h"
#include "hw/goldfish_pipe.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "android/charpipe.h"
#include "android/cbuffer.h"
#include "utils/panic.h"
diff --git a/android/hw-sensors.c b/android/hw-sensors.c
index f0d82b1..494bc20 100644
--- a/android/hw-sensors.c
+++ b/android/hw-sensors.c
@@ -18,7 +18,7 @@
#include "android/hw-qemud.h"
#include "android/globals.h"
#include "hw/hw.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "qemu/timer.h"
#include "android/sensors-port.h"
diff --git a/android/looper-qemu.c b/android/looper-qemu.c
index df40afe..49f996f 100644
--- a/android/looper-qemu.c
+++ b/android/looper-qemu.c
@@ -16,7 +16,7 @@
#include <android/utils/panic.h>
#include "qemu-common.h"
#include "qemu/timer.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "android/sockets.h" /* for socket_set_nonblock() */
/**********************************************************************
diff --git a/android/sockets.c b/android/sockets.c
index e57b428..fec87bf 100644
--- a/android/sockets.c
+++ b/android/sockets.c
@@ -18,7 +18,7 @@
#include <fcntl.h>
#include <stddef.h>
#include "android/qemu-debug.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include <stdlib.h>
#include <string.h>
#include "android/utils/path.h"
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 10aab8f..cd54733 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -24,7 +24,7 @@
*/
#include <alsa/asoundlib.h>
#include "qemu-common.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "audio.h"
#if QEMU_GNUC_PREREQ(4, 3)
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index f7e765d..127c9a5 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -32,7 +32,7 @@
#endif
#include "qemu-common.h"
#include "qemu/host-utils.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "audio.h"
#define AUDIO_CAP "oss"
diff --git a/block.c b/block.c
index 0427b2d..70826ef 100644
--- a/block.c
+++ b/block.c
@@ -26,7 +26,8 @@
#include "monitor/monitor.h"
#include "block/block_int.h"
#include "qemu/module.h"
-#include "qemu-objects.h"
+//#include "qemu-objects.h"
+#include "qapi/qmp/qjson.h"
#ifdef CONFIG_BSD
#include <sys/types.h>
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 3abf184..6437300 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "qemu/timer.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "qemu/log.h"
#include "block/block_int.h"
#include "qemu/module.h"
diff --git a/bt-host.c b/bt-host.c
index 038566a..7b26cea 100644
--- a/bt-host.c
+++ b/bt-host.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "net/net.h"
#include "bt-host.h"
diff --git a/bt-vhci.c b/bt-vhci.c
index eab761f..b6b670f 100644
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "net/net.h"
#include "hw/bt.h"
diff --git a/buffered_file.c b/buffered_file.c
index 2355189..185ef57 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -14,7 +14,7 @@
#include "qemu-common.h"
#include "hw/hw.h"
#include "qemu/timer.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "buffered_file.h"
//#define DEBUG_BUFFERED_FILE
diff --git a/gdbstub.c b/gdbstub.c
index a391ae7..99171a3 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -30,7 +30,7 @@
#include "qemu.h"
#else
#include "monitor/monitor.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "exec/gdbstub.h"
#endif
diff --git a/hw/bt-hci-csr.c b/hw/bt-hci-csr.c
index d7fbcfd..daa994f 100644
--- a/hw/bt-hci-csr.c
+++ b/hw/bt-hci-csr.c
@@ -19,7 +19,7 @@
*/
#include "qemu-common.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "qemu/timer.h"
#include "irq.h"
#include "sysemu/sysemu.h"
diff --git a/hw/goldfish_tty.c b/hw/goldfish_tty.c
index 2a2b2a4..6b62c77 100644
--- a/hw/goldfish_tty.c
+++ b/hw/goldfish_tty.c
@@ -10,7 +10,7 @@
** GNU General Public License for more details.
*/
#include "migration/qemu-file.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "goldfish_device.h"
#include "goldfish_vmem.h"
diff --git a/hw/msmouse.c b/hw/msmouse.c
index 06b4363..b499bd9 100644
--- a/hw/msmouse.c
+++ b/hw/msmouse.c
@@ -23,7 +23,7 @@
*/
#include <stdlib.h>
#include "qemu-common.h"
-#include "../qemu-char.h"
+#include "sysemu/char.h"
#include "ui/console.h"
#include "msmouse.h"
diff --git a/include/block/qemu-aio.h b/include/block/qemu-aio.h
index 3bdd749..ce6976c 100644
--- a/include/block/qemu-aio.h
+++ b/include/block/qemu-aio.h
@@ -15,7 +15,7 @@
#define QEMU_AIO_H
#include "qemu-common.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
/* Returns 1 if there are still outstanding AIO requests; 0 otherwise */
typedef int (AioFlushHandler)(void *opaque);
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index 7ee9d31..58018ff 100644
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -2,7 +2,7 @@
#define MONITOR_H
#include "qemu-common.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "qapi/qmp/qerror.h"
#include "qapi/qmp/qdict.h"
#include "block/block.h"
diff --git a/qemu-char.h b/include/sysemu/char.h
similarity index 100%
rename from qemu-char.h
rename to include/sysemu/char.h
diff --git a/include/ui/console.h b/include/ui/console.h
index 906274d..64a5510c 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -1,7 +1,7 @@
#ifndef CONSOLE_H
#define CONSOLE_H
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "qapi/qmp/qdict.h"
#include "qemu/notify.h"
diff --git a/iohandler.c b/iohandler.c
index 2b82421..20129ed 100644
--- a/iohandler.c
+++ b/iohandler.c
@@ -24,7 +24,7 @@
#include "config-host.h"
#include "qemu-common.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "qemu-queue.h"
#ifndef _WIN32
diff --git a/migration-exec.c b/migration-exec.c
index 37cae4d..be48261 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -16,7 +16,7 @@
#include "qemu-common.h"
#include "qemu_socket.h"
#include "migration/migration.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "buffered_file.h"
#include "block/block.h"
diff --git a/migration-tcp-android.c b/migration-tcp-android.c
index e7e5216..c4b0672 100644
--- a/migration-tcp-android.c
+++ b/migration-tcp-android.c
@@ -14,7 +14,7 @@
#include "qemu-common.h"
#include "qemu_socket.h"
#include "migration/migration.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "buffered_file.h"
#include "block/block.h"
diff --git a/migration-tcp.c b/migration-tcp.c
index a54548d..b36e165 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -14,7 +14,7 @@
#include "qemu-common.h"
#include "qemu_socket.h"
#include "migration/migration.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "buffered_file.h"
#include "block/block.h"
diff --git a/monitor.c b/monitor.c
index 4619cb9..9230af2 100644
--- a/monitor.c
+++ b/monitor.c
@@ -31,7 +31,7 @@
#include "hw/watchdog.h"
#include "exec/gdbstub.h"
#include "net/net.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
#include "monitor/readline.h"
diff --git a/net/net-android.c b/net/net-android.c
index c2d570a..3e3c048 100644
--- a/net/net-android.c
+++ b/net/net-android.c
@@ -117,7 +117,7 @@
#include "monitor/monitor.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "audio/audio.h"
#include "qemu_socket.h"
#include "qemu/log.h"
diff --git a/net/net.c b/net/net.c
index 5a5bb05..06c04e3 100644
--- a/net/net.c
+++ b/net/net.c
@@ -115,7 +115,7 @@
#include "monitor/monitor.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "audio/audio.h"
#include "qemu_socket.h"
#include "qemu/log.h"
diff --git a/qemu-char.c b/qemu-char.c
index 7b2d5bd..c3601af 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -28,7 +28,7 @@
#include "ui/console.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "block/block.h"
#include "hw/usb.h"
#include "hw/baum.h"
diff --git a/savevm.c b/savevm.c
index 5ee29d9..6d1df7d 100644
--- a/savevm.c
+++ b/savevm.c
@@ -76,7 +76,7 @@
#include "monitor/monitor.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "sysemu/blockdev.h"
#include "block/block.h"
#include "audio/audio.h"
diff --git a/slirp-android/slirp.c b/slirp-android/slirp.c
index 5ae6648..2de6b64 100644
--- a/slirp-android/slirp.c
+++ b/slirp-android/slirp.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "slirp.h"
#include "proxy_common.h"
#include "hw/hw.h"
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 30d4ee2..ed846da 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "slirp.h"
#include "hw/hw.h"
diff --git a/telephony/modem_driver.c b/telephony/modem_driver.c
index 99bbe6c..abb302f 100644
--- a/telephony/modem_driver.c
+++ b/telephony/modem_driver.c
@@ -14,7 +14,7 @@
* on the emulated device.
*/
#include "modem_driver.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#define xxDEBUG
diff --git a/telephony/sysdeps_qemu.c b/telephony/sysdeps_qemu.c
index 443029b..b8501bf 100644
--- a/telephony/sysdeps_qemu.c
+++ b/telephony/sysdeps_qemu.c
@@ -13,7 +13,7 @@
#include "sysdeps.h"
#include "qemu-common.h"
#include "qemu/timer.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#ifdef _WIN32
#include <winsock2.h>
#else
diff --git a/vl-android-ui.c b/vl-android-ui.c
index 54a60ed..5e06159 100644
--- a/vl-android-ui.c
+++ b/vl-android-ui.c
@@ -40,7 +40,7 @@
#include "net/net.h"
#include "ui/console.h"
#include "qemu/timer.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "block/block.h"
#include "android/sockets.h"
#include "audio/audio.h"
diff --git a/vl-android.c b/vl-android.c
index 9a34d36..eee5508 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -42,7 +42,7 @@
#include "sysemu/sysemu.h"
#include "exec/gdbstub.h"
#include "qemu/timer.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "sysemu/blockdev.h"
#include "audio/audio.h"
@@ -193,7 +193,7 @@
#include "sysemu/sysemu.h"
#include "exec/gdbstub.h"
#include "qemu/timer.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "qemu/cache-utils.h"
#include "block/block.h"
#include "sysemu/dma.h"
diff --git a/vl.c b/vl.c
index 6f8d41a..3edb78c 100644
--- a/vl.c
+++ b/vl.c
@@ -151,7 +151,7 @@
#include "sysemu/sysemu.h"
#include "exec/gdbstub.h"
#include "qemu/timer.h"
-#include "qemu-char.h"
+#include "sysemu/char.h"
#include "qemu/cache-utils.h"
#include "block/block.h"
#include "sysemu/dma.h"
