diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-22 13:05:57 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-22 13:05:57 -0500 |
| commit | cecd77ae6df060bbe8f0eea6691112097e680a52 (patch) | |
| tree | 4c82bcf59884c6555cb0199a1f96a26a2dfaf83a /include | |
| parent | f9308207040dc4a1484cee459bedaec03645b935 (diff) | |
| parent | 01ed1d527c59356e6c4c9d54b5710a3c9e78ce4e (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
# By liguang (2) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
qdev: remove redundant abort()
gitignore: ignore more files
Use proper term in TCG README
serial: Fix debug format strings
Fix typos and misspellings
Advertise --libdir in configure --help output
memory: fix a bug of detection of memory region collision
MinGW: Replace setsockopt by qemu_setsocketopt
Diffstat (limited to 'include')
| -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 cf094e7142..d0f99c5782 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -202,7 +202,7 @@ typedef struct InterfaceInfo InterfaceInfo; * Methods are always <emphasis>virtual</emphasis>. Overriding a method in * #TypeInfo.class_init of a subclass leads to any user of the class obtained * via OBJECT_GET_CLASS() accessing the overridden function. - * The original function is not automatically invoked. It is the responsability + * The original function is not automatically invoked. It is the responsibility * of the overriding class to determine whether and when to invoke the method * being overridden. * |