[26/36] qtest: Drop unused qtest_qmp_async()

Commit Message

Eric Blake Nov. 30, 2016, 7:44 p.m. UTC

There were no external clients of qtest_qmp_async(); delete
this wrapper for one less varargs call in the chain.

Signed-off-by: Eric Blake <[e-mail]>
---
 tests/libqtest.h | 19 -------------------
 tests/libqtest.c | 18 ++----------------
 2 files changed, 2 insertions(+), 35 deletions(-)

Patch

diff --git a/tests/libqtest.h b/tests/libqtest.h
index 1f640c0..bab8d95 100644
--- a/tests/libqtest.h
+++ b/tests/libqtest.h
@@ -69,15 +69,6 @@  QDict *qtest_qmp(QTestState *s, const char *fmt, ...);
 QDict *qtest_qmp_cmd(QTestState *s, const char *cmd, QDict *args);

 /**
- * qtest_async_qmp:
- * @s: #QTestState instance to operate on.
- * @fmt...: QMP message to send to qemu
- *
- * Sends a QMP message to QEMU and leaves the response in the stream.
- */
-void qtest_async_qmp(QTestState *s, const char *fmt, ...);
-
-/**
  * qtest_qmpv:
  * @s: #QTestState instance to operate on.
  * @fmt: QMP message to send to QEMU
@@ -88,16 +79,6 @@  void qtest_async_qmp(QTestState *s, const char *fmt, ...);
 QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap);

 /**
- * qtest_async_qmpv:
- * @s: #QTestState instance to operate on.
- * @fmt: QMP message to send to QEMU
- * @ap: QMP message arguments
- *
- * Sends a QMP message to QEMU and leaves the response in the stream.
- */
-void qtest_async_qmpv(QTestState *s, const char *fmt, va_list ap);
-
-/**
  * qtest_receive:
  * @s: #QTestState instance to operate on.
  *
diff --git a/tests/libqtest.c b/tests/libqtest.c
index 555d0c4..ba329c0 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -450,14 +450,9 @@  static void qmp_fd_sendv(int fd, const char *fmt, va_list ap)
     }
 }

-void qtest_async_qmpv(QTestState *s, const char *fmt, va_list ap)
-{
-    qmp_fd_sendv(s->qmp_fd, fmt, ap);
-}
-
 QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap)
 {
-    qtest_async_qmpv(s, fmt, ap);
+    qmp_fd_sendv(s->qmp_fd, fmt, ap);

     /* Receive reply */
     return qtest_qmp_receive(s);
@@ -507,15 +502,6 @@  QDict *qtest_qmp_cmd(QTestState *s, const char *cmd, QDict *args)
     return qtest_qmp(s, "%p", QOBJECT(dict));
 }

-void qtest_async_qmp(QTestState *s, const char *fmt, ...)
-{
-    va_list ap;
-
-    va_start(ap, fmt);
-    qtest_async_qmpv(s, fmt, ap);
-    va_end(ap);
-}
-
 void qtest_qmp_discard_response(QTestState *s, const char *json)
 {
     QDict *response;
@@ -888,7 +874,7 @@  void qmp_async(const char *fmt, ...)
     va_list ap;

     va_start(ap, fmt);
-    qtest_async_qmpv(global_qtest, fmt, ap);
+    qmp_fd_sendv(global_qtest->qmp_fd, fmt, ap);
     va_end(ap);
 }