This is a resend of my previous pull request, but without patch 6 "migration/rdma: clean up qemu_rdma_dest_init a bit". I won't include all the other patches since they're the same, there's no need to bomb people again.
Thanks, /mjt The following changes since commit 576a94d8bcaa1bb07a81d9ffd2cf76095a66ad9a: vl: take iothread lock very early (2015-03-03 13:21:53 +0000) are available in the git repository at: git://git.corpit.ru/qemu.git tags/pull-trivial-patches-2015-03-04 for you to fetch changes up to a49f076ea6b016ee14766db2b247b48f187794b1: 9pfs: remove useless return (2015-03-04 20:14:22 +0300) ---------------------------------------------------------------- trivial patches for 2015-03-04 ---------------------------------------------------------------- Alberto Garcia (2): qerror.h: Swap definitions that were not in alphabetical order qmp-commands.hx: Fix several typos Borislav Petkov (1): memsave: Improve and disambiguate error message Cole Robinson (3): qapi-schema: Fix SpiceChannel docs gitignore: Track common.env in iotests gitignore gitignore: Ignore new tests Gabriel L. Somlo (1): smbios: document cmdline options for smbios type 2-4, 17 structures Gonglei (19): xen-pt: fix Negative array index read xen-pt: fix Out-of-bounds read block: remove superfluous '\n' around error_report/error_setg a9gtimer: remove superfluous '\n' around error_setg pl330.c: remove superfluous '\n' around error_setg numa: remove superfluous '\n' around error_setg Remove superfluous '\n' around error_report() vhost-scsi: Remove superfluous '\n' around error_report() vfio: Remove superfluous '\n' around error_report() xtensa: Remove superfluous '\n' around error_report() tpm: Remove superfluous '\n' around error_report() arm/digic_boards: Remove superfluous '\n' around error_report() vhost: Remove superfluous '\n' around error_report() nbd: fix resource leak sparc/leon3.c: fix memory leak macio: fix possible memory leak milkymist.c: fix memory leak sysbus: fix memory leak microblaze: fix memory leak Markus Armbruster (1): xilinx_ethlite: Clean up after commit 2f991ad Michael Tokarev (3): qemu-options: fix/document -incoming options e500: fix memory leak 9pfs: remove useless return Paolo Bonzini (2): cutils: refine strtol error handling in parse_debug_env gdbstub: avoid possible NULL pointer dereference Radim Krčmář (2): fix GCC 5.0.0 logical-not-parentheses warnings milkymist-pfpu: fix GCC 5.0.0 aggressive-loop-optimizations warning Stefan Berger (1): Add copyright and author after file split Stefan Weil (6): vhost_net: Add missing 'static' attribute disas/arm: Fix warnings caused by missing 'static' attribute disas/cris: Fix warning caused by missing 'static' attribute disas/microblaze: Fix warnings caused by missing 'static' attribute oslib-posix: Fix compiler warning (-Wclobbered) and simplify the code migration: Fix coding style (whitespace issues) Thomas Huth (3): ui: Removed unused functions ui/vnc: Remove vnc_stop_worker_thread() xen: Remove xen_cmos_set_s3_resume() Wang Xin (2): qemu-char: add cyrillic characters 'numerosign' to VNC keysyms qemu-char: add cyrillic key 'numerosign' to Russian keymap .gitignore | 1 - block/archipelago.c | 6 +- block/nbd.c | 1 + cpus.c | 4 +- disas/arm.c | 128 ------------------------------------------ disas/cris.c | 2 +- disas/microblaze.c | 13 +++-- exec.c | 2 +- gdbstub.c | 8 ++- hw/9pfs/virtio-9p-local.c | 1 - hw/arm/digic_boards.c | 6 +- hw/block/nand.c | 2 +- hw/core/sysbus.c | 2 + hw/dma/pl330.c | 4 +- hw/ide/pci.c | 2 +- hw/lm32/milkymist.c | 1 + hw/microblaze/boot.c | 6 +- hw/misc/macio/macio.c | 3 +- hw/misc/milkymist-pfpu.c | 2 +- hw/net/vhost_net.c | 2 +- hw/net/virtio-net.c | 4 +- hw/net/xilinx_ethlite.c | 1 + hw/ppc/e500.c | 1 + hw/scsi/vhost-scsi.c | 6 +- hw/sparc/leon3.c | 1 + hw/timer/a9gtimer.c | 2 +- hw/tpm/tpm_passthrough.c | 12 ++-- hw/vfio/common.c | 10 ++-- hw/virtio/vhost-backend.c | 2 +- hw/xen/xen_pt_config_init.c | 8 +-- hw/xtensa/sim.c | 2 +- hw/xtensa/xtfpga.c | 10 ++-- include/hw/xen/xen.h | 1 - include/qapi/qmp/qerror.h | 6 +- include/ui/console.h | 3 - kvm-all.c | 2 +- migration/qemu-file-buf.c | 4 ++ migration/rdma.c | 22 ++++---- net/vhost-user.c | 4 +- numa.c | 6 +- pc-bios/keymaps/ru | 2 +- qapi-schema.json | 6 +- qemu-img.c | 5 +- qemu-options.hx | 56 ++++++++++++++++-- qmp-commands.hx | 6 +- target-s390x/kvm.c | 2 +- tests/.gitignore | 3 + tests/qemu-iotests/.gitignore | 1 + tpm.c | 2 +- trace/control.c | 2 +- ui/console.c | 12 ---- ui/d3des.c | 9 --- ui/d3des.h | 6 -- ui/input-legacy.c | 6 -- ui/vnc-jobs.c | 13 ----- ui/vnc-jobs.h | 1 - ui/vnc_keysym.h | 1 + util/cutils.c | 5 +- util/oslib-posix.c | 4 +- xen-hvm-stub.c | 4 -- 60 files changed, 166 insertions(+), 283 deletions(-)