[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 26/36] qtest: Drop unused qtest_qmp_async()
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH 26/36] qtest: Drop unused qtest_qmp_async() |
Date: |
Wed, 30 Nov 2016 13:44:44 -0600 |
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 <address@hidden>
---
tests/libqtest.h | 19 -------------------
tests/libqtest.c | 18 ++----------------
2 files changed, 2 insertions(+), 35 deletions(-)
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);
}
--
2.7.4
- Re: [Qemu-devel] [PATCH 07/36] fdc-test: Avoid deprecated 'change' command, (continued)
- [Qemu-devel] [PATCH 22/36] qtest: Avoid dynamic JSON in pc-cpu-test, Eric Blake, 2016/11/30
- [Qemu-devel] [PATCH 12/36] nbd: Use simpler QAPI_TO_QOBJECT(), Eric Blake, 2016/11/30
- [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 <=
- [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, 2016/11/30
- [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