Merge commit 'ad65aa882c4ed744fc5bae6ccd8630c57251c941' into upstream-merge

Merge commit 'ad65aa882c4ed744fc5bae6ccd8630c57251c941' into upstream-merge

* commit 'ad65aa882c4ed744fc5bae6ccd8630c57251c941':
  test: eliminate libcheck tests and have make check use gtester
  check-qjson: enable disabled tests
  check-qjson: convert to gtest
  check-qlist: convert to gtest
  check-qstring: convert to gtest
  check-qint: convert to gtest
  check-qfloat: convert to gtest
  check-qdict: convert to gtest
  build: split unit test builds to a separate makefile fragment
  tests: mv tests/* -> tests/tcg
  vga: optimize ppm_save() divisions
  Fix qapi code generation fix
  etraxfs-dma: Model metadata and eop
  microblaze: Break the tb at memory barriers
  microblaze: Emulate the hw stackprotector
  microblaze: Add support for the clz insn

Conflicts:
	configure

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