summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-12-04 18:11:40 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-12-04 18:11:40 +0000
commita5582eac15171ffea99f9962dd9a4bf3c1dd2f1c (patch)
tree2388c2239d2c860df58c5b8642e86ec848ab8771 /include
parent61e3aa25b129b48d8a8cb851aae2a787af7ca5e1 (diff)
parent0d2cd785ef1282b14687f9f7f4b63ae4a2430be3 (diff)
downloadhqemu-a5582eac15171ffea99f9962dd9a4bf3c1dd2f1c.zip
hqemu-a5582eac15171ffea99f9962dd9a4bf3c1dd2f1c.tar.gz
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>
Diffstat (limited to 'include')
-rw-r--r--include/qom/object.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/qom/object.h b/include/qom/object.h
index f172fea..4509166 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -394,9 +394,6 @@ struct ObjectClass
* As a result, #Object contains a reference to the objects type as its
* first member. This allows identification of the real type of the object at
* run time.
- *
- * #Object also contains a list of #Interfaces that this object
- * implements.
*/
struct Object
{
OpenPOWER on IntegriCloud