diff options
author | Stefan Hajnoczi <stefanha@redhat.com> | 2013-10-30 14:54:32 +0100 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@redhat.com> | 2013-11-07 13:58:43 +0100 |
commit | 0d1aa05e9eba2437fdcdfbaa846c850c986bf7c6 (patch) | |
tree | f3e288737dd2885353c75b1d5ead6a49cccdc530 /tests/libqtest.c | |
parent | ec9c10d29c6bb5613a680af62f5825d3bb2d31d4 (diff) |
libqtest: rename qmp() to qmp_discard_response()
Existing qmp() callers do not expect a response object. In order to
implement real QMP test cases it will be necessary to inspect the
response object.
Rename qmp() to qmp_discard_response(). Later patches will introduce a
qmp() function that returns the response object and tests that use it.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'tests/libqtest.c')
-rw-r--r-- | tests/libqtest.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/libqtest.c b/tests/libqtest.c index bb82069f5c..dc4c9833b9 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -151,8 +151,8 @@ QTestState *qtest_init(const char *extra_args) } /* Read the QMP greeting and then do the handshake */ - qtest_qmp(s, ""); - qtest_qmp(s, "{ 'execute': 'qmp_capabilities' }"); + qtest_qmp_discard_response(s, ""); + qtest_qmp_discard_response(s, "{ 'execute': 'qmp_capabilities' }"); if (getenv("QTEST_STOP")) { kill(qtest_qemu_pid(s), SIGSTOP); @@ -291,7 +291,7 @@ redo: return words; } -void qtest_qmpv(QTestState *s, const char *fmt, va_list ap) +void qtest_qmpv_discard_response(QTestState *s, const char *fmt, va_list ap) { bool has_reply = false; int nesting = 0; @@ -326,12 +326,12 @@ void qtest_qmpv(QTestState *s, const char *fmt, va_list ap) } } -void qtest_qmp(QTestState *s, const char *fmt, ...) +void qtest_qmp_discard_response(QTestState *s, const char *fmt, ...) { va_list ap; va_start(ap, fmt); - qtest_qmpv(s, fmt, ap); + qtest_qmpv_discard_response(s, fmt, ap); va_end(ap); } |