[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/36] qtest: Drop unused qmp_fdv()
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH 24/36] qtest: Drop unused qmp_fdv() |
Date: |
Wed, 30 Nov 2016 13:44:42 -0600 |
Now that no more clients are passing variadic arguments, we can
simplify the testsuite by requiring that qmp_fd() be given the
final string to pass over the wire, rather than a dynamic JSON
string that has to be parsed into QObject and back out again.
Signed-off-by: Eric Blake <address@hidden>
---
tests/libqtest.h | 3 +--
tests/libqtest.c | 17 +++--------------
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/tests/libqtest.h b/tests/libqtest.h
index c89c075..0adf880 100644
--- a/tests/libqtest.h
+++ b/tests/libqtest.h
@@ -927,7 +927,6 @@ static inline int64_t clock_set(int64_t val)
QDict *qmp_fd_receive(int fd);
void qmp_fd_sendv(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, ...);
+QDict *qmp_fd(int fd, const char *msg);
#endif
diff --git a/tests/libqtest.c b/tests/libqtest.c
index 1328bd9..b5b9f01 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -469,13 +469,6 @@ void qtest_async_qmpv(QTestState *s, const char *fmt,
va_list ap)
qmp_fd_sendv(s->qmp_fd, fmt, ap);
}
-QDict *qmp_fdv(int fd, const char *fmt, va_list ap)
-{
- qmp_fd_sendv(fd, fmt, ap);
-
- return qmp_fd_receive(fd);
-}
-
QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap)
{
qtest_async_qmpv(s, fmt, ap);
@@ -484,15 +477,11 @@ QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list
ap)
return qtest_qmp_receive(s);
}
-QDict *qmp_fd(int fd, const char *fmt, ...)
+QDict *qmp_fd(int fd, const char *msg)
{
- va_list ap;
- QDict *response;
+ qmp_fd_send(fd, msg);
- va_start(ap, fmt);
- response = qmp_fdv(fd, fmt, ap);
- va_end(ap);
- return response;
+ return qmp_fd_receive(fd);
}
void qmp_fd_send(int fd, const char *fmt, ...)
--
2.7.4
- [Qemu-devel] [PATCH 11/36] qapi: Add QAPI_TO_QOBJECT() convenience macro, (continued)
- [Qemu-devel] [PATCH 11/36] qapi: Add QAPI_TO_QOBJECT() convenience macro, Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 19/36] qtest: Change qmp_discard_response() to drop varargs, Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 25/36] qtest: Change qmp_fd_send() to drop varags, Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 13/36] nfs: Use simpler QAPI_TO_QOBJECT(), Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 16/36] qapi: Promote blockdev-change-medium arguments to QAPI type, Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 14/36] qapi: Use simpler QAPI_TO_QOBJECT(), Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 20/36] qtest: Avoid dynamic JSON in device-introspect-test, Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 26/36] qtest: Drop unused qtest_qmp_async(), Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 21/36] qtest: Avoid dynamic JSON in tmp105-test, Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 28/36] qapi: Factor out JSON string escaping, Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 24/36] qtest: Drop unused qmp_fdv(),
Eric Blake <=
- [Qemu-devel] [PATCH 27/36] qtest: Avoid dynamic JSON in qmp_cmd(), Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 18/36] qtest: Avoid dynamic JSON in fdc-test, Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 33/36] qtest: Avoid dynamic JSON in test-x86-cpuid-compat, Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 35/36] qapi: Rip out dynamic JSON parser escape sequence support, Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 31/36] qtest: Document calling conventions, Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 15/36] blockdev: Use simpler QAPI_TO_QOBJECT(), Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 34/36] qapi: Rip out dynamic JSON parser frontend, Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 32/36] qtest: Avoid dynamic JSON in qom-test, Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 17/36] qtest: Avoid dynamic JSON in ahci-test, Eric Blake, 2016/11/30