Merge commit '
4a7e1190dfadf1154721125af8510347f8a3c56b' into upstream-merge
* commit '
4a7e1190dfadf1154721125af8510347f8a3c56b': (32 commits)
QMP: Introduce the qmp_capabilities command
QMP: Add QEMU's version to the greeting message
segfault due to buffer overrun in usb-serial
audio streaming from usb devices
vnc: Migrate to using QTAILQ instead of custom implementation
kvm: reduce code duplication in config_iothread
Documentation: Add command line options to function index
Documentation: Add monitor commands to function index
Documentation: Enhance documentation (index, keywords)
Documentation: Fix item list
Documentation: Add some basic documentation on make targets
Documentation: Use UTF-8 encoding and fix one wrong encoding
Documentation: Add direntry for info format
block: saner flags filtering in bdrv_open2
virtio-blk: Generate BLOCK_IO_ERROR QMP event
scsi: Generate BLOCK_IO_ERROR QMP event
ide: Generate BLOCK_IO_ERROR QMP event
block: BLOCK_IO_ERROR QMP event
QMP: BLOCK_IO_ERROR event handling
qcow2: Fix signedness bugs
...
Conflicts:
qemu-monitor.hx
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>