From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 4 Dec 2015 18:11:40 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a5582eac15171ffea99f9962dd9a4bf3c1dd2f1c;p=qemu.git

Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging

QOM infrastructure fixes and device conversions

* Documentation update
* qom-test and related fixes

# gpg: Signature made Fri 04 Dec 2015 17:54:55 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/qom-devices-for-peter:
  qom-test: Fix qmp() leaks
  tests: Use proper functions types instead of void (*fn)
  qom: Update documentation comment of struct Object
  tests: Fix check-report-qtest-% target

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

a5582eac15171ffea99f9962dd9a4bf3c1dd2f1c