[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 20/23] libqtest: Enable compile-time format strin
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 20/23] libqtest: Enable compile-time format string checking |
Date: |
Fri, 27 Jul 2018 17:13:56 +0200 |
qtest_qmp() & friends pass their format string and variable arguments
to qobject_from_vjsonf_nofail(). Unlike qobject_from_jsonv(), they
aren't decorated with GCC_FMT_ATTR(). Fix that to get compile-time
format string checking.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
tests/libqtest.h | 32 +++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/tests/libqtest.h b/tests/libqtest.h
index ee58fcdf6d..327e402da5 100644
--- a/tests/libqtest.h
+++ b/tests/libqtest.h
@@ -82,7 +82,8 @@ void qtest_quit(QTestState *s);
*
* Sends a QMP message to QEMU and consumes the response.
*/
-void qtest_qmp_discard_response(QTestState *s, const char *fmt, ...);
+void qtest_qmp_discard_response(QTestState *s, const char *fmt, ...)
+ GCC_FMT_ATTR(2, 3);
/**
* qtest_qmp:
@@ -93,7 +94,8 @@ void qtest_qmp_discard_response(QTestState *s, const char
*fmt, ...);
*
* Sends a QMP message to QEMU and returns the response.
*/
-QDict *qtest_qmp(QTestState *s, const char *fmt, ...);
+QDict *qtest_qmp(QTestState *s, const char *fmt, ...)
+ GCC_FMT_ATTR(2, 3);
/**
* qtest_qmp_send:
@@ -104,7 +106,8 @@ QDict *qtest_qmp(QTestState *s, const char *fmt, ...);
*
* Sends a QMP message to QEMU and leaves the response in the stream.
*/
-void qtest_qmp_send(QTestState *s, const char *fmt, ...);
+void qtest_qmp_send(QTestState *s, const char *fmt, ...)
+ GCC_FMT_ATTR(2, 3);
/**
* qtest_qmpv_discard_response:
@@ -116,7 +119,8 @@ void qtest_qmp_send(QTestState *s, const char *fmt, ...);
*
* Sends a QMP message to QEMU and consumes the response.
*/
-void qtest_qmpv_discard_response(QTestState *s, const char *fmt, va_list ap);
+void qtest_qmpv_discard_response(QTestState *s, const char *fmt, va_list ap)
+ GCC_FMT_ATTR(2, 0);
/**
* qtest_qmpv:
@@ -128,7 +132,8 @@ void qtest_qmpv_discard_response(QTestState *s, const char
*fmt, va_list ap);
*
* Sends a QMP message to QEMU and returns the response.
*/
-QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap);
+QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap)
+ GCC_FMT_ATTR(2, 0);
/**
* qtest_qmp_vsend:
@@ -140,7 +145,8 @@ QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list
ap);
*
* Sends a QMP message to QEMU and leaves the response in the stream.
*/
-void qtest_qmp_vsend(QTestState *s, const char *fmt, va_list ap);
+void qtest_qmp_vsend(QTestState *s, const char *fmt, va_list ap)
+ GCC_FMT_ATTR(2, 0);
/**
* qtest_receive:
@@ -597,7 +603,7 @@ static inline void qtest_end(void)
*
* Sends a QMP message to QEMU and returns the response.
*/
-QDict *qmp(const char *fmt, ...);
+QDict *qmp(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
/**
* qmp_send:
@@ -607,7 +613,7 @@ QDict *qmp(const char *fmt, ...);
*
* Sends a QMP message to QEMU and leaves the response in the stream.
*/
-void qmp_send(const char *fmt, ...);
+void qmp_send(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
/**
* qmp_discard_response:
@@ -617,7 +623,7 @@ void qmp_send(const char *fmt, ...);
*
* Sends a QMP message to QEMU and consumes the response.
*/
-void qmp_discard_response(const char *fmt, ...);
+void qmp_discard_response(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
/**
* qmp_receive:
@@ -976,10 +982,10 @@ static inline int64_t clock_set(int64_t val)
}
QDict *qmp_fd_receive(int fd);
-void qmp_fd_vsend(int fd, const char *fmt, va_list ap);
-void qmp_fd_send(int fd, const char *fmt, ...);
-QDict *qmp_fdv(int fd, const char *fmt, va_list ap);
-QDict *qmp_fd(int fd, const char *fmt, ...);
+void qmp_fd_vsend(int fd, const char *fmt, va_list ap) GCC_FMT_ATTR(2, 0);
+void qmp_fd_send(int fd, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
+QDict *qmp_fdv(int fd, const char *fmt, va_list ap) GCC_FMT_ATTR(2, 0);
+QDict *qmp_fd(int fd, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
/**
* qtest_cb_for_every_machine:
--
2.17.1
- Re: [Qemu-devel] [PATCH v2 21/23] libqtest: Remove qtest_qmp_discard_response() & friends, (continued)
- [Qemu-devel] [PATCH v2 18/23] migration-test: Clean up string interpolation into QMP, part 2, Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 17/23] migration-test: Clean up string interpolation into QMP, part 1, Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 12/23] cpu-plug-test: Don't pass integers as strings to device_add, Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 20/23] libqtest: Enable compile-time format string checking,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 16/23] migration-test: Make wait_command() cope with '%', Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 23/23] libqtest: Rename qtest_FOOv() to qtest_vFOO() for consistency, Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 15/23] tests: New helper qtest_qmp_receive_success(), Markus Armbruster, 2018/07/27