{chardev => include/chardev}/char-fd.h | 2 +- include/chardev/char-fe.h | 251 +++++++++++++ {chardev => include/chardev}/char-io.h | 2 +- {chardev => include/chardev}/char-mux.h | 3 +- {chardev => include/chardev}/char-parallel.h | 20 +- {chardev => include/chardev}/char-serial.h | 22 ++ {chardev => include/chardev}/char-win-stdio.h | 0 {chardev => include/chardev}/char-win.h | 14 +- include/chardev/char.h | 229 ++++++++++++ include/hw/char/bcm2835_aux.h | 2 +- include/hw/char/cadence_uart.h | 2 +- include/hw/char/digic-uart.h | 2 +- include/hw/char/imx_serial.h | 2 +- include/hw/char/serial.h | 4 +- include/hw/char/stm32f2xx_usart.h | 2 +- include/sysemu/char.h | 499 -------------------------- backends/rng-egd.c | 4 +- {backends => chardev}/baum.c | 2 +- chardev/char-console.c | 4 +- chardev/char-fd.c | 6 +- chardev/char-fe.c | 361 +++++++++++++++++++ chardev/char-file.c | 8 +- chardev/char-io.c | 2 +- chardev/char-mux.c | 6 +- chardev/char-null.c | 2 +- chardev/char-parallel.c | 6 +- chardev/char-pipe.c | 16 +- chardev/char-pty.c | 4 +- chardev/char-ringbuf.c | 2 +- chardev/char-serial.c | 8 +- chardev/char-socket.c | 4 +- chardev/char-stdio.c | 8 +- chardev/char-udp.c | 4 +- chardev/char-win-stdio.c | 4 +- chardev/char-win.c | 95 ++--- chardev/char.c | 390 +------------------- {backends => chardev}/msmouse.c | 2 +- spice-qemu-char.c => chardev/spice.c | 4 +- {backends => chardev}/testdev.c | 2 +- {backends => chardev}/wctablet.c | 2 +- gdbstub.c | 18 +- hmp.c | 2 +- hw/arm/bcm2835_peripherals.c | 1 - hw/arm/fsl-imx25.c | 2 +- hw/arm/fsl-imx31.c | 2 +- hw/arm/fsl-imx6.c | 2 +- hw/arm/omap2.c | 2 +- hw/arm/pxa2xx.c | 2 +- hw/arm/strongarm.c | 3 +- hw/bt/hci-csr.c | 11 +- hw/char/cadence_uart.c | 3 +- hw/char/debugcon.c | 2 +- hw/char/digic-uart.c | 2 +- hw/char/escc.c | 3 +- hw/char/etraxfs_ser.c | 2 +- hw/char/exynos4210_uart.c | 3 +- hw/char/grlib_apbuart.c | 2 +- hw/char/imx_serial.c | 1 - hw/char/ipoctal232.c | 2 +- hw/char/lm32_juart.c | 2 +- hw/char/lm32_uart.c | 2 +- hw/char/mcf_uart.c | 2 +- hw/char/milkymist-uart.c | 2 +- hw/char/omap_uart.c | 2 +- hw/char/parallel.c | 3 +- hw/char/pl011.c | 2 +- hw/char/sclpconsole-lm.c | 2 +- hw/char/sclpconsole.c | 2 +- hw/char/serial.c | 4 +- hw/char/sh_serial.c | 2 +- hw/char/spapr_vty.c | 2 +- hw/char/terminal3270.c | 2 +- hw/char/virtio-console.c | 2 +- hw/char/xen_console.c | 4 +- hw/char/xilinx_uartlite.c | 2 +- hw/core/qdev-properties-system.c | 4 +- hw/core/qdev-properties.c | 2 +- hw/display/xenfb.c | 1 - hw/i386/xen/xen-hvm.c | 1 - hw/ipmi/ipmi_bmc_extern.c | 2 +- hw/isa/pc87312.c | 2 +- hw/mips/boston.c | 2 +- hw/mips/mips_fulong2e.c | 1 - hw/mips/mips_malta.c | 1 - hw/misc/ivshmem.c | 2 +- hw/net/xgmac.c | 1 - hw/ppc/spapr_events.c | 1 - hw/ppc/spapr_rtas.c | 1 - hw/sparc/leon3.c | 1 - hw/usb/ccid-card-emulated.c | 2 +- hw/usb/ccid-card-passthru.c | 7 +- hw/usb/dev-serial.c | 3 +- hw/usb/redirect.c | 6 +- hw/virtio/vhost-user.c | 2 +- hw/xen/xen-common.c | 2 +- hw/xen/xen_backend.c | 1 - hw/xtensa/xtfpga.c | 2 +- monitor.c | 4 +- net/colo-compare.c | 10 +- net/filter-mirror.c | 8 +- net/slirp.c | 2 +- net/vhost-user.c | 7 +- qmp.c | 2 +- qtest.c | 2 +- replay/replay-char.c | 2 +- slirp/slirp.c | 2 +- tests/postcopy-test.c | 2 +- tests/test-char.c | 24 +- tests/vhost-user-test.c | 6 +- ui/console.c | 2 +- ui/gtk.c | 2 +- util/event_notifier-posix.c | 1 - vl.c | 2 +- MAINTAINERS | 5 +- Makefile.objs | 4 +- backends/Makefile.objs | 4 - backends/trace-events | 10 - chardev/Makefile.objs | 7 + chardev/trace-events | 18 + trace-events | 7 - 120 files changed, 1126 insertions(+), 1158 deletions(-) rename {chardev => include/chardev}/char-fd.h (98%) create mode 100644 include/chardev/char-fe.h rename {chardev => include/chardev}/char-io.h (98%) rename {chardev => include/chardev}/char-mux.h (97%) rename {chardev => include/chardev}/char-parallel.h (70%) rename {chardev => include/chardev}/char-serial.h (75%) rename {chardev => include/chardev}/char-win-stdio.h (100%) rename {chardev => include/chardev}/char-win.h (84%) create mode 100644 include/chardev/char.h delete mode 100644 include/sysemu/char.h rename {backends => chardev}/baum.c (99%) create mode 100644 chardev/char-fe.c rename {backends => chardev}/msmouse.c (99%) rename spice-qemu-char.c => chardev/spice.c (99%) rename {backends => chardev}/testdev.c (99%) rename {backends => chardev}/wctablet.c (99%) create mode 100644 chardev/trace-events