chardev: move headers to include/chardev

So they are all in one place. The following patch will move serial &
parallel declarations to the respective headers.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 7df088259b210d9a10c4e0700869f7828bf60914..48e2964ed88f64e31ff35a9123b9ed29b3693533 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1238,6 +1238,7 @@ M: Paolo Bonzini <pbonzini@redhat.com>
 M: Marc-André Lureau <marcandre.lureau@redhat.com>
 S: Maintained
 F: chardev/
+F: include/chardev/
 F: backends/msmouse.c
 F: backends/testdev.c
 

diff --git a/backends/baum.c b/backends/baum.c
index 2eddcae119966d3cfba7e9d208a12aa3fc510368..302dd9666c0595bb25a1b8584fef1456f5838858 100644 (file)
--- a/backends/baum.c
+++ b/backends/baum.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/timer.h"
 #include "hw/usb.h"
 #include "ui/console.h"

diff --git a/backends/msmouse.c b/backends/msmouse.c
index d2c3162f1ed616b18f2ce8d6796acfc61244177c..0ffd137ce8eade2dc6bb1864cbd2edaf1b315147 100644 (file)
--- a/backends/msmouse.c
+++ b/backends/msmouse.c
@@ -23,7 +23,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "ui/console.h"
 #include "ui/input.h"
 

diff --git a/backends/rng-egd.c b/backends/rng-egd.c
index 380b19a0a126c50550c5277ad2523d72b2688ad2..5448f6e5f5c2c8cd448969e862f970df8f561b4a 100644 (file)
--- a/backends/rng-egd.c
+++ b/backends/rng-egd.c
@@ -12,7 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "sysemu/rng.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 

diff --git a/backends/testdev.c b/backends/testdev.c
index 7df9248a1389e0bcebeee3890c6788a2b1f9a7d5..031e9a23e8b4e5d51b41e241a4671cd4fdaa413c 100644 (file)
--- a/backends/testdev.c
+++ b/backends/testdev.c
@@ -25,7 +25,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 #define BUF_SIZE 32
 

diff --git a/backends/wctablet.c b/backends/wctablet.c
index a4d3ae098ad94c48d3ed68cf27c77d0f84592510..07a4cde956de36132230f96bde19fdf57b9deae9 100644 (file)
--- a/backends/wctablet.c
+++ b/backends/wctablet.c
@@ -32,7 +32,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "ui/console.h"
 #include "ui/input.h"
 #include "trace.h"

diff --git a/chardev/char-console.c b/chardev/char-console.c
index 8d972c150690a45961611eb62ed8aa6b8c8bf81d..535ed65136c693ab0e0fb53f248c9b3b575578d4 100644 (file)
--- a/chardev/char-console.c
+++ b/chardev/char-console.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "char-win.h"
+#include "chardev/char-win.h"
 
 static void qemu_chr_open_win_con(Chardev *chr,
                                   ChardevBackend *backend,

diff --git a/chardev/char-fd.c b/chardev/char-fd.c
index 0b182c552c4e5705dfe73a1517372c21d2b346bd..1584a3de20101dc4c826ddf5240680f6c7714e0a 100644 (file)
--- a/chardev/char-fd.c
+++ b/chardev/char-fd.c
@@ -25,11 +25,11 @@
 #include "qemu/sockets.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "io/channel-file.h"
 
-#include "char-fd.h"
-#include "char-io.h"
+#include "chardev/char-fd.h"
+#include "chardev/char-io.h"
 
 /* Called with chr_write_lock held.  */
 static int fd_chr_write(Chardev *chr, const uint8_t *buf, int len)

diff --git a/chardev/char-file.c b/chardev/char-file.c
index aed4ae15693315ade0a501bbde421c44720b7603..a57b88aaf2bd7eee75705900f920468231cf98f1 100644 (file)
--- a/chardev/char-file.c
+++ b/chardev/char-file.c
@@ -24,12 +24,12 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 #ifdef _WIN32
-#include "char-win.h"
+#include "chardev/char-win.h"
 #else
-#include "char-fd.h"
+#include "chardev/char-fd.h"
 #endif
 
 static void qmp_chardev_open_file(Chardev *chr,

diff --git a/chardev/char-io.c b/chardev/char-io.c
index b5708eef456d3e2224b499770284b60875a06c69..f81052481a557f660ab162a7dd59e52cb0eead33 100644 (file)
--- a/chardev/char-io.c
+++ b/chardev/char-io.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "char-io.h"
+#include "chardev/char-io.h"
 
 typedef struct IOWatchPoll {
     GSource parent;

diff --git a/chardev/char-mux.c b/chardev/char-mux.c
index 37d42c65c63d28e98d241538bf9352c1fee220d6..106c682e7ff162a504e045fa7840819607d3e3db 100644 (file)
--- a/chardev/char-mux.c
+++ b/chardev/char-mux.c
@@ -24,9 +24,9 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "sysemu/block-backend.h"
-#include "char-mux.h"
+#include "chardev/char-mux.h"
 
 /* MUX driver for serial I/O splitting */
 

diff --git a/chardev/char-null.c b/chardev/char-null.c
index dc0d68ab2dd971cc2d7e973d3170523cbae77e2e..90bafe76f43660f70b12fef4e972f23d19c03707 100644 (file)
--- a/chardev/char-null.c
+++ b/chardev/char-null.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 static void null_chr_open(Chardev *chr,
                           ChardevBackend *backend,

diff --git a/chardev/char-parallel.c b/chardev/char-parallel.c
index 3fa22ce29d4520c8afb2391d028c3189e9287f17..bce89f8c36180d97e106e7946170c966f7309603 100644 (file)
--- a/chardev/char-parallel.c
+++ b/chardev/char-parallel.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qapi/error.h"
 #include <sys/ioctl.h>
 
@@ -41,8 +41,8 @@
 #endif
 #endif
 
-#include "char-fd.h"
-#include "char-parallel.h"
+#include "chardev/char-fd.h"
+#include "chardev/char-parallel.h"
 
 #if defined(__linux__)
 

diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c
index aae950a22b7ecfd4b9e5996a7197966393bb2b19..3a95e4c1b2ab6d587a3447c3e799a8bf0250f9b5 100644 (file)
--- a/chardev/char-pipe.c
+++ b/chardev/char-pipe.c
@@ -23,12 +23,12 @@
  */
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 #ifdef _WIN32
-#include "char-win.h"
+#include "chardev/char-win.h"
 #else
-#include "char-fd.h"
+#include "chardev/char-fd.h"
 #endif
 
 #ifdef _WIN32

diff --git a/chardev/char-pty.c b/chardev/char-pty.c
index 35a175d796f17757ca744ed6c72e68beb2c57b79..e5d20a0e6a8454263630f8e9f41268fbf931f90f 100644 (file)
--- a/chardev/char-pty.c
+++ b/chardev/char-pty.c
@@ -24,12 +24,12 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "io/channel-file.h"
 #include "qemu/sockets.h"
 #include "qemu/error-report.h"
 
-#include "char-io.h"
+#include "chardev/char-io.h"
 
 #if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__)      \
     || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) \

diff --git a/chardev/char-ringbuf.c b/chardev/char-ringbuf.c
index d130069e8886f79fce593246d21dd7462da2b0ee..df52b04d2295c1298e97f951470c1bc796529f31 100644 (file)
--- a/chardev/char-ringbuf.c
+++ b/chardev/char-ringbuf.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qmp-commands.h"
 #include "qemu/base64.h"
 

diff --git a/chardev/char-serial.c b/chardev/char-serial.c
index fef3a91c7747b4c09ac3008678261b09bc5f5dbf..2f8f83821da5ed3d0d489848c4fdc20234f47070 100644 (file)
--- a/chardev/char-serial.c
+++ b/chardev/char-serial.c
@@ -27,14 +27,14 @@
 #include "qapi/error.h"
 
 #ifdef _WIN32
-#include "char-win.h"
+#include "chardev/char-win.h"
 #else
 #include <sys/ioctl.h>
 #include <termios.h>
-#include "char-fd.h"
+#include "chardev/char-fd.h"
 #endif
 
-#include "char-serial.h"
+#include "chardev/char-serial.h"
 
 #ifdef _WIN32
 

diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index e2fb7f7cd571eeef2cc276028183d4aaefc01900..ccc499cfa1e29c31c70c9f4b811ede0ee2951d49 100644 (file)
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -22,14 +22,14 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "io/channel-socket.h"
 #include "io/channel-tls.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qapi/clone-visitor.h"
 
-#include "char-io.h"
+#include "chardev/char-io.h"
 
 /***********************************************************/
 /* TCP Net console */

diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c
index be4a65962c2264f043fbd0996d0bf863bd34d857..6f5d798d7b7735c54a88d3418ae0e6cb45b1869a 100644 (file)
--- a/chardev/char-stdio.c
+++ b/chardev/char-stdio.c
@@ -25,14 +25,14 @@
 #include "qemu/sockets.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 #ifdef _WIN32
-#include "char-win.h"
-#include "char-win-stdio.h"
+#include "chardev/char-win.h"
+#include "chardev/char-win-stdio.h"
 #else
 #include <termios.h>
-#include "char-fd.h"
+#include "chardev/char-fd.h"
 #endif
 
 #ifndef _WIN32

diff --git a/chardev/char-udp.c b/chardev/char-udp.c
index 607647642ae9b9853990f5ed414f5aadea7ba2ca..4ee11d3ebf15219d2627dd0fda21ea362f7dec5b 100644 (file)
--- a/chardev/char-udp.c
+++ b/chardev/char-udp.c
@@ -22,11 +22,11 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "io/channel-socket.h"
 #include "qapi/error.h"
 
-#include "char-io.h"
+#include "chardev/char-io.h"
 
 /***********************************************************/
 /* UDP Net console */

diff --git a/chardev/char-win-stdio.c b/chardev/char-win-stdio.c
index eb44afc17abab31cb9fb28fdf6f6b16467098ef4..efcf7827eb026bcd671f7c3889dc96dff4291a9b 100644 (file)
--- a/chardev/char-win-stdio.c
+++ b/chardev/char-win-stdio.c
@@ -23,8 +23,8 @@
  */
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "char-win.h"
-#include "char-win-stdio.h"
+#include "chardev/char-win.h"
+#include "chardev/char-win-stdio.h"
 
 typedef struct {
     Chardev parent;

diff --git a/chardev/char-win.c b/chardev/char-win.c
index ec9a731be95305c96cb1f9df2cc495d2cc2bc05b..05518e095822c2a7ec97192e0ea6802d31eb8fbf 100644 (file)
--- a/chardev/char-win.c
+++ b/chardev/char-win.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/error.h"
-#include "char-win.h"
+#include "chardev/char-win.h"
 
 static void win_chr_read(Chardev *chr, DWORD len)
 {

diff --git a/chardev/char.c b/chardev/char.c
index 26607c1c6ba775a03e1ccc4d757df686b1696c7f..02142b480edb434abc9c44afae77817f66bb65f4 100644 (file)
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -28,16 +28,16 @@
 #include "sysemu/sysemu.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qmp-commands.h"
 #include "qapi-visit.h"
 #include "sysemu/replay.h"
 #include "qemu/help_option.h"
 
-#include "char-mux.h"
-#include "char-io.h"
-#include "char-parallel.h"
-#include "char-serial.h"
+#include "chardev/char-mux.h"
+#include "chardev/char-io.h"
+#include "chardev/char-parallel.h"
+#include "chardev/char-serial.h"
 
 /***********************************************************/
 /* character device */

diff --git a/gdbstub.c b/gdbstub.c
index 86eed4f97c72481798ea5c6579ac6278b44c8976..6515c635dcae323c4eed6a0624925e0ec9cf1ac3 100644 (file)
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -25,7 +25,7 @@
 #include "qemu.h"
 #else
 #include "monitor/monitor.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "sysemu/sysemu.h"
 #include "exec/gdbstub.h"
 #endif

diff --git a/hmp.c b/hmp.c
index 20f5daba5e042ebc6993c633980bd9a88d1b518d..97d4822e52bbb9aa4e0d560697af434782710afa 100644 (file)
--- a/hmp.c
+++ b/hmp.c
@@ -17,7 +17,7 @@
 #include "hmp.h"
 #include "net/net.h"
 #include "net/eth.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/sysemu.h"
 #include "qemu/config-file.h"

diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
index 9056f27bf800b607025223acc282d6259a99d159..40666b68a30ef8ad84aefdefbdc671bcdf3fefce 100644 (file)
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -30,7 +30,7 @@
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
 #include "hw/boards.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 static void fsl_imx25_init(Object *obj)
 {

diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c
index d7e2d832b226453c00dfffcf2a386046c5d70ebe..c30130667e824907effaf7fb12f2b7b86b12634e 100644 (file)
--- a/hw/arm/fsl-imx31.c
+++ b/hw/arm/fsl-imx31.c
@@ -27,7 +27,7 @@
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
 #include "hw/boards.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 static void fsl_imx31_init(Object *obj)
 {

diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
index 6969e734adc840ccd98104745cc4c06aa0ca0597..27773c9c47599fcf242892d890a4db5a8d21f70e 100644 (file)
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -24,7 +24,7 @@
 #include "qemu-common.h"
 #include "hw/arm/fsl-imx6.h"
 #include "sysemu/sysemu.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/error-report.h"
 
 #define NAME_SIZE 20

diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index 8afb854c740c71a45fb71c429eeb0af1f6f0f137..9eabbaeea52f51dd7c6d7d638d509903733e6a31 100644 (file)
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -30,7 +30,7 @@
 #include "hw/arm/omap.h"
 #include "sysemu/sysemu.h"
 #include "qemu/timer.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "hw/block/flash.h"
 #include "hw/arm/soc_dma.h"
 #include "hw/sysbus.h"

diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index eea551dc166b73b2a1ebf2bb3130c5796a46a304..0d43cc707c09a2bc104731156e7c392c57d13e6e 100644 (file)
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -17,7 +17,7 @@
 #include "hw/char/serial.h"
 #include "hw/i2c/i2c.h"
 #include "hw/ssi/ssi.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "qemu/cutils.h"

diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index 3311cc38a4778379ff628666db45f60b027860f3..66cad198d4b864f7ab0012eacfa1f439a9797fd2 100644 (file)
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -34,7 +34,7 @@
 #include "strongarm.h"
 #include "qemu/error-report.h"
 #include "hw/arm/arm.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "sysemu/sysemu.h"
 #include "hw/ssi/ssi.h"
 #include "qemu/cutils.h"

diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c
index 3c193848fce8934f67ea77aa21f9308b913d20ee..cc2087392ef55de811048febd1d1db5b7972b0c9 100644 (file)
--- a/hw/bt/hci-csr.c
+++ b/hw/bt/hci-csr.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/timer.h"
 #include "qemu/bswap.h"
 #include "hw/irq.h"

diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
index 4dcee571c0f9f32a67e3e3db0f703e539bd8b172..cf4c1d56ff338d7ac8b153c8871bcbed3fcc3528 100644 (file)
--- a/hw/char/cadence_uart.c
+++ b/hw/char/cadence_uart.c
@@ -23,7 +23,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"
 #include "hw/char/cadence_uart.h"

diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c
index 80dce07e7f106582ad86e2535b671221bb7fb58e..77d91c85585f59b1d6a4f20c13dbbfae8dc43c8c 100644 (file)
--- a/hw/char/debugcon.c
+++ b/hw/char/debugcon.c
@@ -27,7 +27,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "hw/isa/isa.h"
 #include "hw/i386/pc.h"
 

diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c
index 029f5bbf5eeba0fe666164a6e0dc4dfc3e453f1e..4f1dec7f1d9958e9fccd057f0716c406c621f889 100644 (file)
--- a/hw/char/digic-uart.c
+++ b/hw/char/digic-uart.c
@@ -29,7 +29,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/log.h"
 
 #include "hw/char/digic-uart.h"

diff --git a/hw/char/escc.c b/hw/char/escc.c
index 9228091cecae5005fabbf2d369ea0fd64738201f..df89d58eedd54ff6f6d1e30fe0bb30d541f8d790 100644 (file)
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -26,7 +26,7 @@
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/char/escc.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "ui/console.h"
 #include "ui/input.h"
 #include "trace.h"

diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c
index 54383878e03d9ed880e0379877d0ef4667da1aae..33e3e163972ebf63f9ae36a20feeded121551c92 100644 (file)
--- a/hw/char/etraxfs_ser.c
+++ b/hw/char/etraxfs_ser.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/log.h"
 
 #define D(x)

diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
index bff706ab3a68ad49db6bf963b4a23cee2ef0a556..94952fb90f02cb79fc32cc594a2b8c622bcf9bce 100644 (file)
--- a/hw/char/exynos4210_uart.c
+++ b/hw/char/exynos4210_uart.c
@@ -23,7 +23,7 @@
 #include "hw/sysbus.h"
 #include "qemu/error-report.h"
 #include "sysemu/sysemu.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 #include "hw/arm/exynos4210.h"
 

diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c
index db686e6a6fdcdc281da4f3bc05bf43ec87706170..39d1133c614b21bf60b5c9619215994f4f634f35 100644 (file)
--- a/hw/char/grlib_apbuart.c
+++ b/hw/char/grlib_apbuart.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 #include "trace.h"
 

diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c
index 93929c2880566e1592d60dd79ccf7a2d3214af1c..b8a3c92c9ee5f085c020f69779768a8654c6b714 100644 (file)
--- a/hw/char/ipoctal232.c
+++ b/hw/char/ipoctal232.c
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 #include "hw/ipack/ipack.h"
 #include "qemu/bitops.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 /* #define DEBUG_IPOCTAL */
 

diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c
index f8c1e0d076ffd5b23b35681a2021c16f20392c3c..6b0633e518dce169992641770a65148e3228aaee 100644 (file)
--- a/hw/char/lm32_juart.c
+++ b/hw/char/lm32_juart.c
@@ -21,7 +21,7 @@
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "trace.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 #include "hw/char/lm32_juart.h"
 

diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c
index 7f3597c4b0abc83a4063500b483bdc8d1d76f001..a7610c28ce1eac9491491372a66d41cf0badc84f 100644 (file)
--- a/hw/char/lm32_uart.c
+++ b/hw/char/lm32_uart.c
@@ -26,7 +26,7 @@
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "trace.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/error-report.h"
 
 enum {

diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index e69672f4e9f151cc8681f04335b3973612782631..b639b53c836b7bca1cc93e981c9fe1b9158672e2 100644 (file)
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -9,7 +9,7 @@
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/m68k/mcf.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "exec/address-spaces.h"
 #include "qapi/error.h"
 

diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c
index ae8e2f35546af398940bce9a134c9c89dc37397f..5ef847c5ebf885b26bad5bb4b760c6a4bbd1284c 100644 (file)
--- a/hw/char/milkymist-uart.c
+++ b/hw/char/milkymist-uart.c
@@ -25,7 +25,7 @@
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "trace.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/error-report.h"
 
 enum {

diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c
index 31ebb1592c16e642a9764cc16e7e23a86ef14988..6fd1b9cf6b6a7a86471810b18243c0b2d96321b3 100644 (file)
--- a/hw/char/omap_uart.c
+++ b/hw/char/omap_uart.c
@@ -18,7 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu/osdep.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "hw/hw.h"
 #include "hw/arm/omap.h"
 #include "hw/char/serial.h"

diff --git a/hw/char/parallel.c b/hw/char/parallel.c
index c71a4a0f4f5e01772f6a2bb8bb0d0c7978253d00..c926df0bee63de46f45f4cc760d87a4fa2b5a138 100644 (file)
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "hw/isa/isa.h"
 #include "hw/i386/pc.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index 24ea9738b62b78f6465fc8db6e22d50cc72d3715..1757035bb38bd61838ca3510e3e17eb0aaf5f188 100644 (file)
--- a/hw/char/pl011.c
+++ b/hw/char/pl011.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/log.h"
 #include "trace.h"
 

diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c
index 07d6ebd112b974ad4711c23777fa0140d557531b..755d514188066a60bbf7dd39169105edd952fd26 100644 (file)
--- a/hw/char/sclpconsole-lm.c
+++ b/hw/char/sclpconsole-lm.c
@@ -17,7 +17,7 @@
 #include "hw/qdev.h"
 #include "qemu/thread.h"
 #include "qemu/error-report.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 #include "hw/s390x/sclp.h"
 #include "hw/s390x/event-facility.h"

diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c
index b78f240a73df9d6aa244cc1c91d644f7df62774a..0fd3cb4887bb2de12d161b7f80757408f85bad59 100644 (file)
--- a/hw/char/sclpconsole.c
+++ b/hw/char/sclpconsole.c
@@ -19,7 +19,7 @@
 
 #include "hw/s390x/sclp.h"
 #include "hw/s390x/event-facility.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 typedef struct ASCIIConsoleData {
     EventBufferHeader ebh;

diff --git a/hw/char/serial.c b/hw/char/serial.c
index 03d890ca24287caee679a19d555ee411752988bc..aa336333be86b34f0b67f536c65c6490b71fbd0f 100644 (file)
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/char/serial.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
 #include "exec/address-spaces.h"

diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index 303eb0a678d3a5e4488c87efc034861b916ddb0e..80c7696d8d2daf31eb868223599dfef81f5520bd 100644 (file)
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -27,7 +27,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sh4/sh.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "exec/address-spaces.h"
 #include "qapi/error.h"
 

diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c
index e30c8da57c554e419d1628e2d2a7eb1242a07260..2317e454048c7bc2022e08a2eebecb17ef61d9a2 100644 (file)
--- a/hw/char/spapr_vty.c
+++ b/hw/char/spapr_vty.c
@@ -4,7 +4,7 @@
 #include "qemu-common.h"
 #include "cpu.h"
 #include "hw/qdev.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_vio.h"
 

diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c
index b2dda01baa1754e45590e1c273d416e0d68dae16..c043104185b07378c761f44edf0c3d0929b3fddb 100644 (file)
--- a/hw/char/terminal3270.c
+++ b/hw/char/terminal3270.c
@@ -13,7 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "sysemu/char.h"
+#include "chardev/char.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 798d9b69fd7c05a8d70dbc8a33544263ad44e3eb..8418db6a07e9ff0770358aaba866f09d5a98b6eb 100644 (file)
--- a/hw/char/virtio-console.c
+++ b/hw/char/virtio-console.c
@@ -11,7 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/error-report.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 c01f41090eb846c560e189117f0d0d33bcc02adf..1cdbe59f8a38ca9072f23615638db92f395155e2 100644 (file)
--- a/hw/char/xen_console.c
+++ b/hw/char/xen_console.c
@@ -25,7 +25,7 @@
 
 #include "qapi/error.h"
 #include "hw/hw.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "hw/xen/xen_backend.h"
 #include "qapi/error.h"
 

diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c
index 37d313b4295d0b6ccde88bac2705a336e06d49bf..bcebdae3da1db5773374f568f41ad9ee2543bfd7 100644 (file)
--- a/hw/char/xilinx_uartlite.c
+++ b/hw/char/xilinx_uartlite.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 #define DUART(x)
 

diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 79c2014135e9d5cb669ab189107d597816ccab0c..4da0c6a24eadb70fb6d413d15392092d502981d5 100644 (file)
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -20,7 +20,7 @@
 #include "hw/block/block.h"
 #include "net/hub.h"
 #include "qapi/visitor.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "sysemu/iothread.h"
 
 static void get_pointer(Object *obj, Visitor *v, Property *prop,

diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index fa3617db2df1a7f667b3181953c1aca24ab2822f..9f1a497322cb2b98da40d072c718b4de39136914 100644 (file)
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -9,7 +9,7 @@
 #include "hw/block/block.h"
 #include "net/hub.h"
 #include "qapi/visitor.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 void qdev_prop_set_after_realize(DeviceState *dev, const char *name,
                                   Error **errp)

diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c
index e8e3d250b6c2e3d2f9ccb122e2bd8364e979bb7b..35285383fd974f68a59cb9c8b3a0ba3f41a91aaf 100644 (file)
--- a/hw/ipmi/ipmi_bmc_extern.c
+++ b/hw/ipmi/ipmi_bmc_extern.c
@@ -30,7 +30,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "sysemu/sysemu.h"
 #include "hw/ipmi/ipmi.h"
 

diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c
index c707d24db492f1b8bd3d3e203890b91899db98b6..5ce9f0a062ee5dc2d4eccec06a2442dfa9751d4f 100644 (file)
--- a/hw/isa/pc87312.c
+++ b/hw/isa/pc87312.c
@@ -30,7 +30,7 @@
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/sysemu.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "trace.h"
 
 

diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index 53d1e0ce451e194f1dc27571086b6ebdb672d519..a4677f7da471e26a856b0c37eb2f18ba7f90f460 100644 (file)
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -35,7 +35,7 @@
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "sysemu/device_tree.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/qtest.h"

diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index 475e36a4c7f74c26f8ab50d0f23b3758a48191c3..cd064dcf8cc383fef801b364ef661172b155d0d1 100644 (file)
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -29,7 +29,7 @@
 #include "qemu/error-report.h"
 #include "qemu/event_notifier.h"
 #include "qom/object_interfaces.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "sysemu/hostmem.h"
 #include "sysemu/qtest.h"
 #include "qapi/visitor.h"

diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index a41b0d6ec531b570b9366921728bb26775563f8b..c2096b25ab6fae904e19059c9277ad012797bf5d 100644 (file)
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -9,7 +9,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "ccid.h"

diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 76ceca1f5c0d9cbffaf917892516b358af23e490..4df995109bd978013fe1c2a9b3d3277f7c0ef37e 100644 (file)
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -15,7 +15,7 @@
 #include "qemu/error-report.h"
 #include "hw/usb.h"
 #include "hw/usb/desc.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 //#define DEBUG_Serial
 

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index ad5ef783a680a3c54716b11defafc7380fa9d9f8..c862c1adeacf5a489969b89488bc89bfa597f891 100644 (file)
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -33,7 +33,7 @@
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 #include "qemu/iov.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 #include <usbredirparser.h>
 #include <usbredirfilter.h>

diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index dde094abb44ed036fe77dfbc6688c84c04eba108..44c9d8c9544ffb1a4c776b8232dd91dad030c081 100644 (file)
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -13,7 +13,7 @@
 #include "hw/virtio/vhost.h"
 #include "hw/virtio/vhost-backend.h"
 #include "hw/virtio/virtio-net.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "sysemu/kvm.h"
 #include "qemu/error-report.h"
 #include "qemu/sockets.h"

diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c
index a9055e9eba23042ba5624cb16839d851f400b10a..0bed5770c9fa1121cdae455822f0a7dfb61fcb28 100644 (file)
--- a/hw/xen/xen-common.c
+++ b/hw/xen/xen-common.c
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 #include "hw/xen/xen_backend.h"
 #include "qmp-commands.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "sysemu/accel.h"
 #include "migration/migration.h"
 

diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index 4636f8e934610a4db2553c1ca917122e02ac484e..d5ac080d4ae2da571e5f2eb44949cbdc8cc6bbca 100644 (file)
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -40,7 +40,7 @@
 #include "hw/sysbus.h"
 #include "hw/block/flash.h"
 #include "sysemu/block-backend.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "sysemu/device_tree.h"
 #include "qemu/error-report.h"
 #include "bootparam.h"

diff --git a/chardev/char-fd.h b/include/chardev/char-fd.h
similarity index 98%
rename from chardev/char-fd.h
rename to include/chardev/char-fd.h
index d8327982fbbb1618a8a474eb708b84e77b4d50dc..55ae5b47b06afb1aa686b10b06bb97faced23863 100644 (file)
--- a/chardev/char-fd.h
+++ b/include/chardev/char-fd.h
@@ -25,7 +25,7 @@
 #define CHAR_FD_H
 
 #include "io/channel.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 typedef struct FDChardev {
     Chardev parent;

diff --git a/chardev/char-io.h b/include/chardev/char-io.h
similarity index 98%
rename from chardev/char-io.h
rename to include/chardev/char-io.h
index 55973a7671e4e50aa9727052fb64a7e17675b58c..9638da51003d8c9c232c5401fd3ec70feef57da2 100644 (file)
--- a/chardev/char-io.h
+++ b/include/chardev/char-io.h
@@ -26,7 +26,7 @@
 
 #include "qemu-common.h"
 #include "io/channel.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 /* Can only be used for read */
 GSource *io_add_watch_poll(Chardev *chr,

diff --git a/chardev/char-mux.h b/include/chardev/char-mux.h
similarity index 98%
rename from chardev/char-mux.h
rename to include/chardev/char-mux.h
index 3f41dfcfd252bca65bc1c0d5ec178db234914672..45cdfc7e678df17ca3f2ef373fafffeeaf26e40a 100644 (file)
--- a/chardev/char-mux.h
+++ b/include/chardev/char-mux.h
@@ -24,7 +24,7 @@
 #ifndef CHAR_MUX_H
 #define CHAR_MUX_H
 
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 extern bool muxes_realized;
 

diff --git a/chardev/char-parallel.h b/include/chardev/char-parallel.h
similarity index 100%
rename from chardev/char-parallel.h
rename to include/chardev/char-parallel.h

diff --git a/chardev/char-serial.h b/include/chardev/char-serial.h
similarity index 100%
rename from chardev/char-serial.h
rename to include/chardev/char-serial.h

diff --git a/chardev/char-win-stdio.h b/include/chardev/char-win-stdio.h
similarity index 100%
rename from chardev/char-win-stdio.h
rename to include/chardev/char-win-stdio.h

diff --git a/chardev/char-win.h b/include/chardev/char-win.h
similarity index 98%
rename from chardev/char-win.h
rename to include/chardev/char-win.h
index 4994425e9efc622f2f37990861f2c6520bea5753..fa59e9e423ac66ef68072a85852af1c1cc25e80c 100644 (file)
--- a/chardev/char-win.h
+++ b/include/chardev/char-win.h
@@ -24,7 +24,7 @@
 #ifndef CHAR_WIN_H
 #define CHAR_WIN_H
 
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 typedef struct {
     Chardev parent;

diff --git a/include/sysemu/char.h b/include/chardev/char.h
similarity index 100%
rename from include/sysemu/char.h
rename to include/chardev/char.h

diff --git a/include/hw/char/bcm2835_aux.h b/include/hw/char/bcm2835_aux.h
index 6865f154bc197d23d5ae7619513b136fe4461a5d..2a051c5646ff7c6a95b0cde6714bc9e7898c48a6 100644 (file)
--- a/include/hw/char/bcm2835_aux.h
+++ b/include/hw/char/bcm2835_aux.h
@@ -9,7 +9,7 @@
 #define BCM2835_AUX_H
 
 #include "hw/sysbus.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 #define TYPE_BCM2835_AUX "bcm2835-aux"
 #define BCM2835_AUX(obj) OBJECT_CHECK(BCM2835AuxState, (obj), TYPE_BCM2835_AUX)

diff --git a/include/hw/char/cadence_uart.h b/include/hw/char/cadence_uart.h
index c836db4b7405830d880fdd256697be3872af9744..eed7d8d358408bcac6308324928b40b4a3561043 100644 (file)
--- a/include/hw/char/cadence_uart.h
+++ b/include/hw/char/cadence_uart.h
@@ -19,7 +19,7 @@
 #ifndef CADENCE_UART_H
 
 #include "hw/sysbus.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/timer.h"
 
 #define CADENCE_UART_RX_FIFO_SIZE           16

diff --git a/include/hw/char/digic-uart.h b/include/hw/char/digic-uart.h
index 340c8e1111e9c1d593e689ed5632a2c3ac4ad453..370b48a6c5a1916774f94307e67a6d6617f29212 100644 (file)
--- a/include/hw/char/digic-uart.h
+++ b/include/hw/char/digic-uart.h
@@ -19,7 +19,7 @@
 #define HW_CHAR_DIGIC_UART_H
 
 #include "hw/sysbus.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 #define TYPE_DIGIC_UART "digic-uart"
 #define DIGIC_UART(obj) \

diff --git a/include/hw/char/imx_serial.h b/include/hw/char/imx_serial.h
index 4cc3fbc395194bb278b9da3a7ece781fd5fa5cee..05500f5346c095554a483d6c2e70feb5d9432ef4 100644 (file)
--- a/include/hw/char/imx_serial.h
+++ b/include/hw/char/imx_serial.h
@@ -19,7 +19,7 @@
 #define IMX_SERIAL_H
 
 #include "hw/sysbus.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 #define TYPE_IMX_SERIAL "imx.serial"
 #define IMX_SERIAL(obj) OBJECT_CHECK(IMXSerialState, (obj), TYPE_IMX_SERIAL)

diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h
index daebb076c2012edb1247cadf13d4d0d668ac2e1b..01dcd2a8d2f4f51a28b7e98aa72e9305dab57d05 100644 (file)
--- a/include/hw/char/serial.h
+++ b/include/hw/char/serial.h
@@ -28,10 +28,10 @@
 
 #include "hw/hw.h"
 #include "sysemu/sysemu.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "exec/memory.h"
 #include "qemu/fifo8.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 #define UART_FIFO_LENGTH    16      /* 16550A Fifo Length */
 

diff --git a/include/hw/char/stm32f2xx_usart.h b/include/hw/char/stm32f2xx_usart.h
index 3267523270c966584b7325cdd8776417f1cc9ebe..4259dbeb1ec1711821320383d201fe1df0c355a9 100644 (file)
--- a/include/hw/char/stm32f2xx_usart.h
+++ b/include/hw/char/stm32f2xx_usart.h
@@ -26,7 +26,7 @@
 #define HW_STM32F2XX_USART_H
 
 #include "hw/sysbus.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "hw/hw.h"
 
 #define USART_SR   0x00

diff --git a/monitor.c b/monitor.c
index baa73c98b7d6d4cd087e17128284af4ab234f474..29b71ff2bc3c5ad9668c3489a34e5492c194794b 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -35,7 +35,7 @@
 #include "exec/gdbstub.h"
 #include "net/net.h"
 #include "net/slirp.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "ui/qemu-spice.h"
 #include "sysemu/numa.h"
 #include "monitor/monitor.h"

diff --git a/net/colo-compare.c b/net/colo-compare.c
index 2639c7f0a2a1122bf0fc8965702d45313198f058..619335d5e8f41b580bd7e4e3c64962ef9eb5c50c 100644 (file)
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -25,7 +25,7 @@
 #include "qom/object.h"
 #include "qemu/typedefs.h"
 #include "net/queue.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/sockets.h"
 #include "qapi-visit.h"
 #include "net/colo.h"

diff --git a/net/filter-mirror.c b/net/filter-mirror.c
index 8b1b06977da26255ad9f7a0bec0cc59eb21aa3f8..7adc2c10d2baf89e206bc552ebdd28d2e14128ba 100644 (file)
--- a/net/filter-mirror.c
+++ b/net/filter-mirror.c
@@ -20,7 +20,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/error-report.h"
 #include "trace.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/iov.h"
 #include "qemu/sockets.h"
 

diff --git a/net/slirp.c b/net/slirp.c
index c705a60b6256ac7473a0f04ab07db67385f88fa3..af3e8b22ac27d233b5c80ca3f4e0d67af1dfbbb5 100644 (file)
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -37,7 +37,7 @@
 #include "qemu/sockets.h"
 #include "slirp/libslirp.h"
 #include "slirp/ip6.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "sysemu/sysemu.h"
 #include "qemu/cutils.h"
 #include "qapi/error.h"

diff --git a/net/vhost-user.c b/net/vhost-user.c
index 00a0c1cbc57698ab5b90652530f3d6e44323512f..77d2ce22a669fd2292fd51a7f3d25ff36a763c01 100644 (file)
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -12,7 +12,7 @@
 #include "clients.h"
 #include "net/vhost_net.h"
 #include "net/vhost-user.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "qmp-commands.h"

diff --git a/qmp.c b/qmp.c
index 84638e2b2b786b79fdafbc09574f207cf301ecd0..7ee9bcfdcf123a55438c106e0202982381045f9e 100644 (file)
--- a/qmp.c
+++ b/qmp.c
@@ -21,7 +21,7 @@
 #include "qemu/config-file.h"
 #include "qemu/uuid.h"
 #include "qmp-commands.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "ui/qemu-spice.h"
 #include "ui/vnc.h"
 #include "sysemu/kvm.h"

diff --git a/qtest.c b/qtest.c
index 5aa6636ca892a2fde3f8661d1718f0f5608a73d7..dbf70a7018d085e19ad78bc2dbb4e35e6957801c 100644 (file)
--- a/qtest.c
+++ b/qtest.c
@@ -17,7 +17,7 @@
 #include "cpu.h"
 #include "sysemu/qtest.h"
 #include "hw/qdev.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "exec/ioport.h"
 #include "exec/memory.h"
 #include "hw/irq.h"

diff --git a/replay/replay-char.c b/replay/replay-char.c
index aa65955942b5193bb62f1b66624e47485069aeeb..cbf7c04a9f6b3c48cc1a15af355dfa9c343bcd72 100755 (executable)
--- a/replay/replay-char.c
+++ b/replay/replay-char.c
@@ -14,7 +14,7 @@
 #include "sysemu/replay.h"
 #include "replay-internal.h"
 #include "sysemu/sysemu.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 
 /* Char drivers that generate qemu_chr_be_write events
    that should be saved into the log. */

diff --git a/slirp/slirp.c b/slirp/slirp.c
index 2f2ec2c1b3648ae3d48e4dacb2f225a2a49e2960..3b92cb54cec20b4470b4a83556eb1b16413c2eb3 100644 (file)
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -25,7 +25,7 @@
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "qemu/error-report.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "slirp.h"
 #include "hw/hw.h"
 #include "qemu/cutils.h"

diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 4d1c76e8a418fb6c45824567ec610e9fae105eec..1c6c2e3969abd3692f0c5173b19f3f0a034411dc 100644 (file)
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -1,7 +1,7 @@
 #include "qemu/osdep.h"
 #include "trace-root.h"
 #include "ui/qemu-spice.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/error-report.h"
 #include <spice.h>
 #include <spice/protocol.h>

diff --git a/tests/postcopy-test.c b/tests/postcopy-test.c
index e86f87656af31b5d084c6e13fbcb82bb868aa35c..8142f2ab90723bc8e2beab0310dcbf412bd7b56c 100644 (file)
--- a/tests/postcopy-test.c
+++ b/tests/postcopy-test.c
@@ -16,7 +16,7 @@
 #include "qemu/option.h"
 #include "qemu/range.h"
 #include "qemu/sockets.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "sysemu/sysemu.h"
 #include "hw/nvram/chrp_nvram.h"
 

diff --git a/tests/test-char.c b/tests/test-char.c
index 124d0c54390bc8936a899e3f2d7b9dd14670b17c..9340c55058ab6cd63f2adbc7c5a5a1022a908eca 100644 (file)
--- a/tests/test-char.c
+++ b/tests/test-char.c
@@ -4,7 +4,7 @@
 #include "qemu-common.h"
 #include "qemu/config-file.h"
 #include "qemu/sockets.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "sysemu/sysemu.h"
 #include "qapi/error.h"
 #include "qom/qom-qobject.h"

diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 9095af267e6a7d5424fb479bc20020943d65c1b5..acc392d04633c2f9f2179dee8fd72e81c86c7c1d 100644 (file)
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -16,7 +16,7 @@
 #include "qemu/option.h"
 #include "qemu/range.h"
 #include "qemu/sockets.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "sysemu/sysemu.h"
 #include "libqos/libqos.h"
 #include "libqos/pci-pc.h"

diff --git a/ui/console.c b/ui/console.c
index ac66b3c910c9be3b7ed818cf7c01b9087e10e59e..6cf795a23d62e99e0f1b1cd2abc675637382e547 100644 (file)
--- a/ui/console.c
+++ b/ui/console.c
@@ -27,7 +27,7 @@
 #include "hw/qdev-core.h"
 #include "qemu/timer.h"
 #include "qmp-commands.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "trace.h"
 #include "exec/memory.h"
 

diff --git a/ui/gtk.c b/ui/gtk.c
index 0213ad0efc3b10337737a4baf46650c817308953..5bd87c265abc41b8ac90e31e72d5c093e86e5711 100644 (file)
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -54,7 +54,7 @@
 #include "qmp-commands.h"
 #include "x_keymap.h"
 #include "keymaps.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qom/object.h"
 
 #define MAX_VCS 10

diff --git a/vl.c b/vl.c
index 993690d4501de4625f9648b2274e202387c9adcc..8456a944383ee15b831e106f473568afff14cd8f 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -81,7 +81,7 @@ int main(int argc, char **argv)
 #include "sysemu/numa.h"
 #include "exec/gdbstub.h"
 #include "qemu/timer.h"
-#include "sysemu/char.h"
+#include "chardev/char.h"
 #include "qemu/bitmap.h"
 #include "qemu/log.h"
 #include "sysemu/blockdev.h"