This series cleans up two kinds of error_printf() misuse: * Errors and warnings should be reported with error_report() and warn_report().
* Help output should be go to stdout, not stderr. This is obviously for 4.1. If nobody objects, I'll take the whole series through my tree. Markus Armbruster (15): qemu-img: Use error_vreport() in error_exit() block/ssh: Do not report read/write/flush errors to the user char-pty: Drop "char device redirected to" message loader-fit: Wean off error_printf() mips/boston: Report errors with error_report(), not error_printf() pci: Report fatal errors with error_report(), not error_printf() hpet: Report warnings with warn_report(), not error_printf() vfio: Report warnings with warn_report(), not error_printf() s390x/kvm: Report warnings with warn_report(), not error_printf() vl: Make -machine $TYPE,help and -accel help print to stdout monitor error: Make printf()-like functions return a value qemu-print: New qemu_printf(), qemu_vprintf() etc. blockdev: Make -drive format=help print to stdout char: Make -chardev help print to stdout monitor: Simplify how -device/device_add print help MAINTAINERS | 2 ++ block/ssh.c | 36 +++++++------------ block/trace-events | 3 ++ blockdev.c | 9 ++--- chardev/char-pty.c | 2 -- chardev/char.c | 3 +- hw/core/loader-fit.c | 62 +++++++++++++++++++-------------- hw/mips/boston.c | 6 ++-- hw/pci/pci.c | 2 +- hw/timer/hpet.c | 2 +- hw/vfio/pci.c | 19 ++++++---- include/monitor/monitor.h | 7 ++-- include/qemu/error-report.h | 8 ++--- include/qemu/qemu-print.h | 19 ++++++++++ monitor.c | 69 ++++++++++++++++++------------------- qdev-monitor.c | 36 ++++++++----------- qemu-img.c | 6 ++-- stubs/error-printf.c | 10 +++--- stubs/monitor.c | 5 +++ target/s390x/kvm.c | 2 +- util/Makefile.objs | 1 + util/qemu-error.c | 12 ++++--- util/qemu-print.c | 42 ++++++++++++++++++++++ vl.c | 10 +++--- 24 files changed, 219 insertions(+), 154 deletions(-) create mode 100644 include/qemu/qemu-print.h create mode 100644 util/qemu-print.c -- 2.17.2