The following changes since commit 6b342cc9c872e82620fdd32730cd92affa8a19b3:
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-7' into staging (2014-05-08 10:57:25 +0100) are available in the git repository at: git://repo.or.cz/qemu/qmp-unstable.git queue/qmp for you to fetch changes up to 4c56cbae6908cc597842e86e523886bb8ea8cfb8: Revert "qapi: Clean up superfluous null check in qapi_dealloc_type_str()" (2014-05-08 14:20:26 -0400) ---------------------------------------------------------------- Amos Kong (1): qapi: treat all negative return of strtosz_suffix() as error Eric Blake (2): qmp: use valid JSON in transaction example qapi: Document optional arguments' backwards compatibility Laszlo Ersek (16): cutils: tighten qemu_parse_fd() monitor: add Error-propagating monitor_handle_fd_param2() pci-assign: accept Error from monitor_handle_fd_param2() pci-assign: make assign_failed_examine() just format the cause pci-assign: propagate errors from get_real_id() pci-assign: propagate Error from check_irqchip_in_kernel() pci: add Error-propagating pci_add_capability2() pci-assign: accept Error from pci_add_capability2() pci-assign: assignment should fail if we can't read config space pci-assign: propagate errors from get_real_device() pci-assign: propagate errors from assigned_device_pci_cap_init() pci-assign: propagate errors from assigned_dev_register_msix_mmio() pci-assign: propagate errors from assigned_dev_register_regions() pci-assign: propagate errors from assign_device() pci-assign: propagate errors from assign_intx() pci-assign: assigned_initfn(): set monitor error in common error handler LluĂs Vilanova (4): qapi: [trivial] Break long command lines qapi: [trivial] Do not catch unknown exceptions in "test-qapi.py" qapi: Use an explicit input file qapi: Add a primitive to include other files from a QAPI schema file Markus Armbruster (14): qmp hmp: Consistently name Error * objects err, and not errp qga: Consistently name Error ** objects errp, and not err qmp: Consistently name Error ** objects errp, and not err error: Consistently name Error ** objects errp, and not err qga: Use return values instead of error_is_set(errp) hmp: Guard against misuse of hmp_handle_error() qapi: Drop redundant, unclean error_is_set() tests/qapi-schema: Drop superfluous error_is_set() qapi: Clean up fragile use of error_is_set() qga: Clean up fragile use of error_is_set() qga: Drop superfluous error_is_set() qemu-option: Clean up fragile use of error_is_set() dump: Drop pointless error_is_set(), DumpState member errp qmp: Don't use error_is_set() to suppress additional errors Peter Lieven (1): Revert "qapi: Clean up superfluous null check in qapi_dealloc_type_str()" Makefile | 24 +- docs/qapi-code-gen.txt | 45 +++- docs/writing-qmp-commands.txt | 28 +-- dump.c | 6 +- hmp.c | 141 +++++------ hw/i386/kvm/pci-assign.c | 273 +++++++++++++-------- hw/pci/pci.c | 32 ++- include/hw/pci/pci.h | 4 + include/monitor/monitor.h | 1 + include/qapi/error.h | 27 +- include/qapi/qmp/dispatch.h | 2 +- monitor.c | 27 +- qapi/opts-visitor.c | 11 +- qapi/qapi-dealloc-visitor.c | 4 +- qapi/qmp-dispatch.c | 24 +- qga/commands-posix.c | 213 ++++++++-------- qga/commands-win32.c | 123 +++++----- qga/commands.c | 4 +- qga/main.c | 1 + qga/vss-win32.c | 4 +- qga/vss-win32.h | 2 +- qmp-commands.hx | 8 +- qmp.c | 42 ++-- scripts/qapi-commands.py | 9 +- scripts/qapi-types.py | 9 +- scripts/qapi-visit.py | 9 +- scripts/qapi.py | 69 ++++-- tests/Makefile | 26 +- tests/qapi-schema/duplicate-key.err | 2 +- .../qapi-schema/flat-union-invalid-branch-key.err | 2 +- .../flat-union-invalid-discriminator.err | 2 +- tests/qapi-schema/flat-union-no-base.err | 2 +- .../flat-union-string-discriminator.err | 2 +- tests/qapi-schema/funny-char.err | 2 +- tests/qapi-schema/include-before-err.err | 1 + tests/qapi-schema/include-before-err.exit | 1 + tests/qapi-schema/include-before-err.json | 2 + tests/qapi-schema/include-before-err.out | 0 tests/qapi-schema/include-cycle-b.json | 1 + tests/qapi-schema/include-cycle-c.json | 1 + tests/qapi-schema/include-cycle.err | 3 + tests/qapi-schema/include-cycle.exit | 1 + tests/qapi-schema/include-cycle.json | 1 + tests/qapi-schema/include-cycle.out | 0 tests/qapi-schema/include-format-err.err | 1 + tests/qapi-schema/include-format-err.exit | 1 + tests/qapi-schema/include-format-err.json | 2 + tests/qapi-schema/include-format-err.out | 0 tests/qapi-schema/include-nested-err.err | 2 + tests/qapi-schema/include-nested-err.exit | 1 + tests/qapi-schema/include-nested-err.json | 1 + tests/qapi-schema/include-nested-err.out | 0 tests/qapi-schema/include-no-file.err | 1 + tests/qapi-schema/include-no-file.exit | 1 + tests/qapi-schema/include-no-file.json | 1 + tests/qapi-schema/include-no-file.out | 0 tests/qapi-schema/include-non-file.err | 1 + tests/qapi-schema/include-non-file.exit | 1 + tests/qapi-schema/include-non-file.json | 1 + tests/qapi-schema/include-non-file.out | 0 tests/qapi-schema/include-relpath-sub.json | 2 + tests/qapi-schema/include-relpath.err | 0 tests/qapi-schema/include-relpath.exit | 1 + tests/qapi-schema/include-relpath.json | 1 + tests/qapi-schema/include-relpath.out | 3 + tests/qapi-schema/include-self-cycle.err | 1 + tests/qapi-schema/include-self-cycle.exit | 1 + tests/qapi-schema/include-self-cycle.json | 1 + tests/qapi-schema/include-self-cycle.out | 0 tests/qapi-schema/include-simple-sub.json | 2 + tests/qapi-schema/include-simple.err | 0 tests/qapi-schema/include-simple.exit | 1 + tests/qapi-schema/include-simple.json | 1 + tests/qapi-schema/include-simple.out | 3 + tests/qapi-schema/include/relpath.json | 1 + tests/qapi-schema/missing-colon.err | 2 +- tests/qapi-schema/missing-comma-list.err | 2 +- tests/qapi-schema/missing-comma-object.err | 2 +- tests/qapi-schema/non-objects.err | 2 +- tests/qapi-schema/quoted-structural-chars.err | 2 +- tests/qapi-schema/test-qapi.py | 6 +- tests/qapi-schema/trailing-comma-list.err | 2 +- tests/qapi-schema/trailing-comma-object.err | 2 +- tests/qapi-schema/unclosed-list.err | 2 +- tests/qapi-schema/unclosed-object.err | 2 +- tests/qapi-schema/unclosed-string.err | 2 +- tests/qapi-schema/union-invalid-base.err | 2 +- tests/test-qmp-input-strict.c | 72 +++--- tests/test-qmp-input-visitor.c | 89 ++++--- tests/test-qmp-output-visitor.c | 74 +++--- tests/test-string-input-visitor.c | 50 ++-- tests/test-string-output-visitor.c | 46 ++-- util/cutils.c | 13 +- util/error.c | 8 +- util/qemu-option.c | 2 +- 95 files changed, 941 insertions(+), 664 deletions(-) create mode 100644 tests/qapi-schema/include-before-err.err create mode 100644 tests/qapi-schema/include-before-err.exit create mode 100644 tests/qapi-schema/include-before-err.json create mode 100644 tests/qapi-schema/include-before-err.out create mode 100644 tests/qapi-schema/include-cycle-b.json create mode 100644 tests/qapi-schema/include-cycle-c.json create mode 100644 tests/qapi-schema/include-cycle.err create mode 100644 tests/qapi-schema/include-cycle.exit create mode 100644 tests/qapi-schema/include-cycle.json create mode 100644 tests/qapi-schema/include-cycle.out create mode 100644 tests/qapi-schema/include-format-err.err create mode 100644 tests/qapi-schema/include-format-err.exit create mode 100644 tests/qapi-schema/include-format-err.json create mode 100644 tests/qapi-schema/include-format-err.out create mode 100644 tests/qapi-schema/include-nested-err.err create mode 100644 tests/qapi-schema/include-nested-err.exit create mode 100644 tests/qapi-schema/include-nested-err.json create mode 100644 tests/qapi-schema/include-nested-err.out create mode 100644 tests/qapi-schema/include-no-file.err create mode 100644 tests/qapi-schema/include-no-file.exit create mode 100644 tests/qapi-schema/include-no-file.json create mode 100644 tests/qapi-schema/include-no-file.out create mode 100644 tests/qapi-schema/include-non-file.err create mode 100644 tests/qapi-schema/include-non-file.exit create mode 100644 tests/qapi-schema/include-non-file.json create mode 100644 tests/qapi-schema/include-non-file.out create mode 100644 tests/qapi-schema/include-relpath-sub.json create mode 100644 tests/qapi-schema/include-relpath.err create mode 100644 tests/qapi-schema/include-relpath.exit create mode 100644 tests/qapi-schema/include-relpath.json create mode 100644 tests/qapi-schema/include-relpath.out create mode 100644 tests/qapi-schema/include-self-cycle.err create mode 100644 tests/qapi-schema/include-self-cycle.exit create mode 100644 tests/qapi-schema/include-self-cycle.json create mode 100644 tests/qapi-schema/include-self-cycle.out create mode 100644 tests/qapi-schema/include-simple-sub.json create mode 100644 tests/qapi-schema/include-simple.err create mode 100644 tests/qapi-schema/include-simple.exit create mode 100644 tests/qapi-schema/include-simple.json create mode 100644 tests/qapi-schema/include-simple.out create mode 100644 tests/qapi-schema/include/relpath.json