From 5bb8590d376094ea7d28fc54d7ab0c1f22906f03 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 19 Nov 2016 20:47:15 +0100 Subject: include: Fix typos found by codespell Add also a missing parenthesis in a comment. Signed-off-by: Stefan Weil Acked-by: Alistair Francis Signed-off-by: Michael Tokarev --- include/hw/dma/xlnx_dpdma.h | 3 ++- include/hw/pci-host/q35.h | 2 +- include/hw/register.h | 2 +- include/qapi/dealloc-visitor.h | 2 +- include/qemu/qht.h | 2 +- include/qemu/xattr.h | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/hw/dma/xlnx_dpdma.h b/include/hw/dma/xlnx_dpdma.h index 664df28ae6..7a304a5bb4 100644 --- a/include/hw/dma/xlnx_dpdma.h +++ b/include/hw/dma/xlnx_dpdma.h @@ -53,7 +53,8 @@ typedef struct XlnxDPDMAState XlnxDPDMAState; * data to the buffer specified by * dpdma_set_host_data_location(). * - * Returns The number of bytes transfered by the DPDMA or 0 if an error occured. + * Returns The number of bytes transferred by the DPDMA + * or 0 if an error occurred. * * @s The DPDMA state. * @channel The channel to start. diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h index 94486fdd37..53b6760c16 100644 --- a/include/hw/pci-host/q35.h +++ b/include/hw/pci-host/q35.h @@ -180,7 +180,7 @@ typedef struct Q35PCIHost { uint64_t mch_mcfg_base(void); /* - * Arbitary but unique BNF number for IOAPIC device. + * Arbitrary but unique BNF number for IOAPIC device. * * TODO: make sure there would have no conflict with real PCI bus */ diff --git a/include/hw/register.h b/include/hw/register.h index 8c12233b75..5b6dc32091 100644 --- a/include/hw/register.h +++ b/include/hw/register.h @@ -92,7 +92,7 @@ struct RegisterInfo { * This structure is used to group all of the individual registers which are * modeled using the RegisterInfo structure. * - * @r is an aray containing of all the relevent RegisterInfo structures. + * @r is an array containing of all the relevant RegisterInfo structures. * * @num_elements is the number of elements in the array r * diff --git a/include/qapi/dealloc-visitor.h b/include/qapi/dealloc-visitor.h index b3e5c85fd8..c36715fdf3 100644 --- a/include/qapi/dealloc-visitor.h +++ b/include/qapi/dealloc-visitor.h @@ -19,7 +19,7 @@ typedef struct QapiDeallocVisitor QapiDeallocVisitor; /* - * The dealloc visitor is primarly used only by generated + * The dealloc visitor is primarily used only by generated * qapi_free_FOO() functions, and is the only visitor designed to work * correctly in the face of a partially-constructed QAPI tree. */ diff --git a/include/qemu/qht.h b/include/qemu/qht.h index 311139b85a..56c2c7784c 100644 --- a/include/qemu/qht.h +++ b/include/qemu/qht.h @@ -72,7 +72,7 @@ void qht_destroy(struct qht *ht); * In case of successful operation, smp_wmb() is implied before the pointer is * inserted into the hash table. * - * Returns true on sucess. + * Returns true on success. * Returns false if the @p-@hash pair already exists in the hash table. */ bool qht_insert(struct qht *ht, void *p, uint32_t hash); diff --git a/include/qemu/xattr.h b/include/qemu/xattr.h index 83cf98cbd8..a83fe8e749 100644 --- a/include/qemu/xattr.h +++ b/include/qemu/xattr.h @@ -14,7 +14,7 @@ #define QEMU_XATTR_H /* - * Modern distributions (e.g. Fedora 15, have no libattr.so, place attr.h + * Modern distributions (e.g. Fedora 15), have no libattr.so, place attr.h * in /usr/include/sys, and don't have ENOATTR. */ -- cgit v1.2.3-55-g7522 From 39a1075a8b54aeb48a2d400f3d6ba5674e194fca Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Mon, 12 Dec 2016 20:31:49 +0300 Subject: object.h: spelling fix Signed-off-by: Marc-André Lureau Signed-off-by: Michael Tokarev --- include/qom/object.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/qom/object.h b/include/qom/object.h index 5ecc2d166d..c5e6fc1f5d 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -432,7 +432,7 @@ struct Object * @class_base_init: This function is called for all base classes after all * parent class initialization has occurred, but before the class itself * is initialized. This is the function to use to undo the effects of - * memcpy from the parent class to the descendents. + * memcpy from the parent class to the descendants. * @class_finalize: This function is called during class destruction and is * meant to release and dynamic parameters allocated by @class_init. * @class_data: Data to pass to the @class_init, @class_base_init and -- cgit v1.2.3-55-g7522 From 63f7b10bc552be8a2cd1da87e8b27f9a5a217b91 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Mon, 12 Dec 2016 20:31:51 +0300 Subject: object: make some funcs static There is no need to have those functions as public API. Signed-off-by: Marc-André Lureau Signed-off-by: Michael Tokarev --- include/qom/object.h | 24 ------------------------ qom/object.c | 4 ++-- 2 files changed, 2 insertions(+), 26 deletions(-) (limited to 'include') diff --git a/include/qom/object.h b/include/qom/object.h index c5e6fc1f5d..cd0f412ce9 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -586,18 +586,6 @@ struct InterfaceClass */ Object *object_new(const char *typename); -/** - * object_new_with_type: - * @type: The type of the object to instantiate. - * - * This function will initialize a new object using heap allocated memory. - * The returned object has a reference count of 1, and will be freed when - * the last reference is dropped. - * - * Returns: The newly allocated and instantiated object. - */ -Object *object_new_with_type(Type type); - /** * object_new_with_props: * @typename: The name of the type of the object to instantiate. @@ -726,18 +714,6 @@ int object_set_propv(Object *obj, Error **errp, va_list vargs); -/** - * object_initialize_with_type: - * @data: A pointer to the memory to be used for the object. - * @size: The maximum size available at @data for the object. - * @type: The type of the object to instantiate. - * - * This function will initialize an object. The memory for the object should - * have already been allocated. The returned object has a reference count of 1, - * and will be finalized when the last reference is dropped. - */ -void object_initialize_with_type(void *data, size_t size, Type type); - /** * object_initialize: * @obj: A pointer to the memory to be used for the object. diff --git a/qom/object.c b/qom/object.c index 760fafb0dc..eb4bc924ff 100644 --- a/qom/object.c +++ b/qom/object.c @@ -357,7 +357,7 @@ static void object_post_init_with_type(Object *obj, TypeImpl *ti) } } -void object_initialize_with_type(void *data, size_t size, TypeImpl *type) +static void object_initialize_with_type(void *data, size_t size, TypeImpl *type) { Object *obj = data; @@ -473,7 +473,7 @@ static void object_finalize(void *data) } } -Object *object_new_with_type(Type type) +static Object *object_new_with_type(Type type) { Object *obj; -- cgit v1.2.3-55-g7522 From 1706e9d819ff610154fe47ef3a195c2fd6604efe Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Tue, 3 Jan 2017 20:19:33 +0100 Subject: win32: use glib gpoll if glib >= 2.50 A fix has been committed in upstream glib commit 210a9796f78eb90f76f1bd6a304e9fea05e97617. (See also related bug https://bugzilla.gnome.org/show_bug.cgi?id=764415) It is desirable to use the glib version instead of qemu copy, since it provides more debugging facilities (G_MAIN_POLL_DEBUG etc), and hopefully has a better maintainance. Hopefully, we can drop the qemu copy in a few years. Signed-off-by: Marc-André Lureau Reviewed-by: Daniel P. Berrange Reviewed-by: Stefan Weil Signed-off-by: Michael Tokarev --- include/glib-compat.h | 2 +- util/oslib-win32.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/glib-compat.h b/include/glib-compat.h index acf254d2a0..0cd24ffbe9 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -39,7 +39,7 @@ static inline gint64 qemu_g_get_monotonic_time(void) #define g_get_monotonic_time() qemu_g_get_monotonic_time() #endif -#ifdef _WIN32 +#if defined(_WIN32) && !GLIB_CHECK_VERSION(2, 50, 0) /* * g_poll has a problem on Windows when using * timeouts < 10ms, so use wrapper. diff --git a/util/oslib-win32.c b/util/oslib-win32.c index d09863cc9d..0b1890fd33 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -327,6 +327,7 @@ char *qemu_get_exec_dir(void) return g_strdup(exec_dir); } +#if !GLIB_CHECK_VERSION(2, 50, 0) /* * The original implementation of g_poll from glib has a problem on Windows * when using timeouts < 10 ms. @@ -530,6 +531,7 @@ gint g_poll(GPollFD *fds, guint nfds, gint timeout) return retval; } +#endif int getpagesize(void) { -- cgit v1.2.3-55-g7522