From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50706) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4lHj-0005ce-A3 for qemu-devel@nongnu.org; Fri, 04 Dec 2015 03:00:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4lHf-0004R2-7x for qemu-devel@nongnu.org; Fri, 04 Dec 2015 03:00:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38567) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4lHf-0004Qy-2w for qemu-devel@nongnu.org; Fri, 04 Dec 2015 03:00:03 -0500 From: Markus Armbruster Date: Fri, 4 Dec 2015 08:59:59 +0100 Message-Id: <1449215999-26220-1-git-send-email-armbru@redhat.com> In-Reply-To: <1449087634-30846-2-git-send-email-armbru@redhat.com> References: <1449087634-30846-2-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH] fixup! tests: Use proper functions types instead of void (*fn) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, afaerber@suse.de, peter.maydell@linaro.org Signed-off-by: Markus Armbruster --- tests/libqtest.c | 5 +++-- tests/libqtest.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index c52ceb2..fa314e1 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -760,14 +760,15 @@ void qtest_memread(QTestState *s, uint64_t addr, void *data, size_t size) g_strfreev(args); } -void qtest_add_func(const char *str, GTestFunc fn) +void qtest_add_func(const char *str, void (*fn)(void)) { gchar *path = g_strdup_printf("/%s/%s", qtest_get_arch(), str); g_test_add_func(path, fn); g_free(path); } -void qtest_add_data_func(const char *str, const void *data, GTestDataFunc fn) +void qtest_add_data_func(const char *str, const void *data, + void (*fn)(const void *)) { gchar *path = g_strdup_printf("/%s/%s", qtest_get_arch(), str); g_test_add_data_func(path, data, fn); diff --git a/tests/libqtest.h b/tests/libqtest.h index d11b5a4..ebdd5bb 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -416,7 +416,7 @@ const char *qtest_get_arch(void); * The path is prefixed with the architecture under test, as * returned by qtest_get_arch(). */ -void qtest_add_func(const char *str, GTestFunc fn); +void qtest_add_func(const char *str, void (*fn)(void)); /** * qtest_add_data_func: @@ -428,7 +428,8 @@ void qtest_add_func(const char *str, GTestFunc fn); * The path is prefixed with the architecture under test, as * returned by qtest_get_arch(). */ -void qtest_add_data_func(const char *str, const void *data, GTestDataFunc fn); +void qtest_add_data_func(const char *str, const void *data, + void (*fn)(const void *)); /** * qtest_add: -- 2.4.3