Merge commit 'c7f0f3b1c826901358a0656f80a5fabb88f73c61' into upstream-merge

Merge commit 'c7f0f3b1c826901358a0656f80a5fabb88f73c61' into upstream-merge

* commit 'c7f0f3b1c826901358a0656f80a5fabb88f73c61': (121 commits)
  qtest: add test framework
  test makefile overhaul
  qemu tcg: Remove one entry of INDEX_op_ld_i64 from ppc_op_defs
  sparc: pass page aligned addresses to tlb_set_page
  xen_disk: detach the blkdev before bdrv_delete
  xen_console: ignore console disconnect events from console/0
  qmp: document strict parsing
  qmp: parse commands in strict mode
  qmp: add and use q type specifier
  qapi: add strict mode to input visitor
  qapi: place outermost object on qiv stack
  qapi: untangle next_list
  qapi: allow freeing partially-allocated objects
  qapi: shortcut visits on errors
  qapi: fix memory leak on error
  qapi: fail hard on stack imbalance
  qapi: add a test case for type errors
  qapi: add struct-errors test case to test-qmp-output-visitor
  qapi: fix double free in qmp_output_visitor_cleanup()
  test: remove qemu-ga reference
  ...

Conflicts:
	qemu-options.hx

Signed-off-by: Avi Kivity <avi@redhat.com>