Failed in applying to current master (
apply log)
backends/rng-egd.c | 2 +-
chardev/char-mux.c | 1 +
chardev/char.c | 235 +++++++++++++++++++++++++++++++++++++-------
gdbstub.c | 4 +-
hmp-commands.hx | 16 +++
hmp.c | 34 +++++++
hmp.h | 1 +
hw/arm/pxa2xx.c | 3 +-
hw/arm/strongarm.c | 4 +-
hw/char/bcm2835_aux.c | 2 +-
hw/char/cadence_uart.c | 4 +-
hw/char/debugcon.c | 4 +-
hw/char/digic-uart.c | 2 +-
hw/char/escc.c | 8 +-
hw/char/etraxfs_ser.c | 2 +-
hw/char/exynos4210_uart.c | 4 +-
hw/char/grlib_apbuart.c | 4 +-
hw/char/imx_serial.c | 2 +-
hw/char/ipoctal232.c | 4 +-
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/parallel.c | 2 +-
hw/char/pl011.c | 2 +-
hw/char/sclpconsole-lm.c | 4 +-
hw/char/sclpconsole.c | 4 +-
hw/char/serial.c | 63 +++++++++---
hw/char/sh_serial.c | 4 +-
hw/char/spapr_vty.c | 4 +-
hw/char/stm32f2xx_usart.c | 3 +-
hw/char/terminal3270.c | 4 +-
hw/char/virtio-console.c | 35 ++++++-
hw/char/xen_console.c | 4 +-
hw/char/xilinx_uartlite.c | 2 +-
hw/ipmi/ipmi_bmc_extern.c | 4 +-
hw/mips/boston.c | 2 +-
hw/mips/mips_malta.c | 2 +-
hw/misc/ivshmem.c | 6 +-
hw/usb/ccid-card-passthru.c | 6 +-
hw/usb/dev-serial.c | 7 +-
hw/usb/redirect.c | 7 +-
include/sysemu/char.h | 44 +++++++++
monitor.c | 4 +-
net/colo-compare.c | 14 +--
net/filter-mirror.c | 8 +-
net/slirp.c | 2 +-
net/vhost-user.c | 7 +-
qapi-schema.json | 40 ++++++++
qtest.c | 2 +-
tests/test-char.c | 14 ++-
tests/vhost-user-test.c | 2 +-
52 files changed, 506 insertions(+), 140 deletions(-)