summaryrefslogtreecommitdiff
path: root/include/qemu/object.h
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-03-09 12:30:20 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2012-03-09 12:30:20 -0600
commitdac6b1b22cbad29ca34735a1e56c9feb9586e3c0 (patch)
tree3691bc37b70059c458ad7b5972ff756be56a6a9d /include/qemu/object.h
parentbf75fec175d00885c7ae06e5917bde86110c386a (diff)
parent979ae168e5fac830fcf8ca63fed732051af0611a (diff)
downloadqemu-dac6b1b22cbad29ca34735a1e56c9feb9586e3c0.tar.gz
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches: configure: Quote the configure args printed in config.log osdep: Remove local definition of macro offsetof libcacard: Spelling and grammar fixes in documentation Spelling fixes in comments (it's -> its) vnc: Add break statement libcacard: Use format specifier %u instead of %d for unsigned values Fix sign of sscanf format specifiers block/vmdk: Fix warning from splint (comparision of unsigned value) qmp: Fix spelling fourty -> forty qom: Fix spelling in documentation sh7750: Remove redundant 'struct' from MemoryRegionOps
Diffstat (limited to 'include/qemu/object.h')
-rw-r--r--include/qemu/object.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/qemu/object.h b/include/qemu/object.h
index 69e4b7b282..ec2d2943c2 100644
--- a/include/qemu/object.h
+++ b/include/qemu/object.h
@@ -124,7 +124,7 @@ typedef struct InterfaceInfo InterfaceInfo;
*
* Once all of the parent classes have been initialized, #TypeInfo::class_init
* is called to let the class being instantiated provide default initialize for
- * it's virtual functions. Here is how the above example might be modified
+ * its virtual functions. Here is how the above example might be modified
* to introduce an overridden virtual function:
*
* <example>
@@ -288,7 +288,7 @@ struct Object
* implementing an explicit class type if they are not adding additional
* virtual functions.
* @class_init: This function is called after all parent class initialization
- * has occured to allow a class to set its default virtual method pointers.
+ * has occurred to allow a class to set its default virtual method pointers.
* This is also the function to use to override virtual methods from a parent
* class.
* @class_finalize: This function is called during class destruction and is
@@ -527,7 +527,7 @@ Type type_register_static(const TypeInfo *info);
* type_register:
* @info: The #TypeInfo of the new type
*
- * Unlike type_register_static(), this call does not require @info or it's
+ * Unlike type_register_static(), this call does not require @info or its
* string members to continue to exist after the call returns.
*
* Returns: 0 on failure, the new #Type on success.