提交 bb340eb2 编写于 作者: E Eric Blake 提交者: Markus Armbruster

libqtest: Document calling conventions

We have two flavors of vararg usage in qtest: qtest_hmp() etc. work
like sprintf(), and qtest_qmp() etc. work like qobject_from_jsonf().
Spell that out in the comments.

Also add GCC_FMT_ATTR() to qtest_hmp() etc. so that the compiler can
flag incorrect use.

We have some cleanup work to do before we can do the same for
qtest_qmp() etc.  This would get us the same better-than-nothing
checking we already have for qobject_from_jsonf(): common incorrect
uses of supported conversion specifications will be flagged
(e.g. passing a double for %d), but use of unsupported ones won't.
Signed-off-by: NEric Blake <eblake@redhat.com>
Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: NMarkus Armbruster <armbru@redhat.com>
[Rebased, comment wording tweaked, commit message rewritten]
Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
Message-Id: <20180806065344.7103-6-armbru@redhat.com>
上级 055a1efc
...@@ -76,7 +76,9 @@ void qtest_quit(QTestState *s); ...@@ -76,7 +76,9 @@ void qtest_quit(QTestState *s);
/** /**
* qtest_qmp: * qtest_qmp:
* @s: #QTestState instance to operate on. * @s: #QTestState instance to operate on.
* @fmt...: QMP message to send to qemu * @fmt...: QMP message to send to qemu, formatted like
* qobject_from_jsonf(). See parse_escape() for what's supported
* after '%'.
* *
* Sends a QMP message to QEMU and returns the response. * Sends a QMP message to QEMU and returns the response.
*/ */
...@@ -85,7 +87,9 @@ QDict *qtest_qmp(QTestState *s, const char *fmt, ...); ...@@ -85,7 +87,9 @@ QDict *qtest_qmp(QTestState *s, const char *fmt, ...);
/** /**
* qtest_qmp_send: * qtest_qmp_send:
* @s: #QTestState instance to operate on. * @s: #QTestState instance to operate on.
* @fmt...: QMP message to send to qemu * @fmt...: QMP message to send to qemu, formatted like
* qobject_from_jsonf(). See parse_escape() for what's supported
* after '%'.
* *
* Sends a QMP message to QEMU and leaves the response in the stream. * Sends a QMP message to QEMU and leaves the response in the stream.
*/ */
...@@ -94,7 +98,9 @@ void qtest_qmp_send(QTestState *s, const char *fmt, ...); ...@@ -94,7 +98,9 @@ void qtest_qmp_send(QTestState *s, const char *fmt, ...);
/** /**
* qtest_qmpv: * qtest_qmpv:
* @s: #QTestState instance to operate on. * @s: #QTestState instance to operate on.
* @fmt: QMP message to send to QEMU * @fmt: QMP message to send to QEMU, formatted like
* qobject_from_jsonf(). See parse_escape() for what's supported
* after '%'.
* @ap: QMP message arguments * @ap: QMP message arguments
* *
* Sends a QMP message to QEMU and returns the response. * Sends a QMP message to QEMU and returns the response.
...@@ -104,7 +110,9 @@ QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap); ...@@ -104,7 +110,9 @@ QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap);
/** /**
* qtest_qmp_vsend: * qtest_qmp_vsend:
* @s: #QTestState instance to operate on. * @s: #QTestState instance to operate on.
* @fmt: QMP message to send to QEMU * @fmt: QMP message to send to QEMU, formatted like
* qobject_from_jsonf(). See parse_escape() for what's supported
* after '%'.
* @ap: QMP message arguments * @ap: QMP message arguments
* *
* Sends a QMP message to QEMU and leaves the response in the stream. * Sends a QMP message to QEMU and leaves the response in the stream.
...@@ -153,7 +161,7 @@ char *qtest_hmp(QTestState *s, const char *fmt, ...) GCC_FMT_ATTR(2, 3); ...@@ -153,7 +161,7 @@ char *qtest_hmp(QTestState *s, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
/** /**
* qtest_hmpv: * qtest_hmpv:
* @s: #QTestState instance to operate on. * @s: #QTestState instance to operate on.
* @fmt: HMP command to send to QEMU * @fmt: HMP command to send to QEMU, formats arguments like vsprintf().
* @ap: HMP command arguments * @ap: HMP command arguments
* *
* Send HMP command to QEMU via QMP's human-monitor-command. * Send HMP command to QEMU via QMP's human-monitor-command.
...@@ -161,7 +169,8 @@ char *qtest_hmp(QTestState *s, const char *fmt, ...) GCC_FMT_ATTR(2, 3); ...@@ -161,7 +169,8 @@ char *qtest_hmp(QTestState *s, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
* *
* Returns: the command's output. The caller should g_free() it. * Returns: the command's output. The caller should g_free() it.
*/ */
char *qtest_hmpv(QTestState *s, const char *fmt, va_list ap); char *qtest_hmpv(QTestState *s, const char *fmt, va_list ap)
GCC_FMT_ATTR(2, 0);
/** /**
* qtest_get_irq: * qtest_get_irq:
...@@ -542,7 +551,9 @@ static inline void qtest_end(void) ...@@ -542,7 +551,9 @@ static inline void qtest_end(void)
/** /**
* qmp: * qmp:
* @fmt...: QMP message to send to qemu * @fmt...: QMP message to send to qemu, formatted like
* qobject_from_jsonf(). See parse_escape() for what's supported
* after '%'.
* *
* Sends a QMP message to QEMU and returns the response. * Sends a QMP message to QEMU and returns the response.
*/ */
...@@ -550,7 +561,9 @@ QDict *qmp(const char *fmt, ...); ...@@ -550,7 +561,9 @@ QDict *qmp(const char *fmt, ...);
/** /**
* qmp_send: * qmp_send:
* @fmt...: QMP message to send to qemu * @fmt...: QMP message to send to qemu, formatted like
* qobject_from_jsonf(). See parse_escape() for what's supported
* after '%'.
* *
* Sends a QMP message to QEMU and leaves the response in the stream. * Sends a QMP message to QEMU and leaves the response in the stream.
*/ */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册