diff options
| author | Peter Maydell | 2016-07-06 11:23:25 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-07-06 11:23:25 +0200 |
| commit | fc5d0a2b243ad7bd4db1f29e6e274507df54a8a8 (patch) | |
| tree | 3e35accca27ff2ac6608aaee57aee79f70f4f7f8 | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | qom: Fix comment typo (diff) | |
| download | qemu-fc5d0a2b243ad7bd4db1f29e6e274507df54a8a8.tar.gz qemu-fc5d0a2b243ad7bd4db1f29e6e274507df54a8a8.tar.xz qemu-fc5d0a2b243ad7bd4db1f29e6e274507df54a8a8.zip | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging
QOM infrastructure fixes and device conversions
* Documentation fix
# gpg: Signature made Wed 06 Jul 2016 08:26:49 BST
# gpg: using RSA key 0xFA2ED12D3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
# Primary key fingerprint: 174F 0347 1BCC 221A 6175 6F96 FA2E D12D 3E7E 013F
* remotes/afaerber/tags/qom-devices-for-peter:
qom: Fix comment typo
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | include/qom/object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/qom/object.h b/include/qom/object.h index 2f8ac47c7c..5ecc2d166d 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -901,7 +901,7 @@ GSList *object_class_get_list(const char *implements_type, void object_ref(Object *obj); /** - * qdef_unref: + * object_unref: * @obj: the object * * Decrease the reference count of a object. A object cannot be freed as long |