diff mbox

[1/2] qtest: add a few fd-level qmp helpers

Message ID 1440672727-20231-1-git-send-email-marcandre.lureau@redhat.com
State New
Headers show

Commit Message

Marc-André Lureau Aug. 27, 2015, 10:52 a.m. UTC 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

Add a few functions to interact with qmp via a simple fd.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 tests/libqtest.c | 45 +++++++++++++++++++++++++++++++++++++++++----
 tests/libqtest.h |  7 +++++++
 2 files changed, 48 insertions(+), 4 deletions(-)

Comments

Michael Roth Sept. 9, 2015, 8:05 p.m. UTC | #1 
Quoting marcandre.lureau@redhat.com (2015-08-27 05:52:06)
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Add a few functions to interact with qmp via a simple fd.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>

> ---
>  tests/libqtest.c | 45 +++++++++++++++++++++++++++++++++++++++++----
>  tests/libqtest.h |  7 +++++++
>  2 files changed, 48 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/libqtest.c b/tests/libqtest.c
> index e5188e0..11e541d 100644
> --- a/tests/libqtest.c
> +++ b/tests/libqtest.c
> @@ -357,7 +357,7 @@ static void qmp_response(JSONMessageParser *parser, QList *tokens)
>      qmp->response = (QDict *)obj;
>  }
> 
> -QDict *qtest_qmp_receive(QTestState *s)
> +QDict *qmp_fd_receive(int fd)
>  {
>      QMPResponseParser qmp;
>      bool log = getenv("QTEST_LOG") != NULL;
> @@ -368,7 +368,7 @@ QDict *qtest_qmp_receive(QTestState *s)
>          ssize_t len;
>          char c;
> 
> -        len = read(s->qmp_fd, &c, 1);
> +        len = read(fd, &c, 1);
>          if (len == -1 && errno == EINTR) {
>              continue;
>          }
> @@ -388,12 +388,17 @@ QDict *qtest_qmp_receive(QTestState *s)
>      return qmp.response;
>  }
> 
> +QDict *qtest_qmp_receive(QTestState *s)
> +{
> +    return qmp_fd_receive(s->qmp_fd);
> +}
> +
>  /**
>   * Allow users to send a message without waiting for the reply,
>   * in the case that they choose to discard all replies up until
>   * a particular EVENT is received.
>   */
> -void qtest_async_qmpv(QTestState *s, const char *fmt, va_list ap)
> +void qmp_fd_sendv(int fd, const char *fmt, va_list ap)
>  {
>      va_list ap_copy;
>      QObject *qobj;
> @@ -417,13 +422,25 @@ void qtest_async_qmpv(QTestState *s, const char *fmt, va_list ap)
>              fprintf(stderr, "%s", str);
>          }
>          /* Send QMP request */
> -        socket_send(s->qmp_fd, str, size);
> +        socket_send(fd, str, size);
> 
>          QDECREF(qstr);
>          qobject_decref(qobj);
>      }
>  }
> 
> +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);
> @@ -432,6 +449,26 @@ QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap)
>      return qtest_qmp_receive(s);
>  }
> 
> +QDict *qmp_fd(int fd, const char *fmt, ...)
> +{
> +    va_list ap;
> +    QDict *response;
> +
> +    va_start(ap, fmt);
> +    response = qmp_fdv(fd, fmt, ap);
> +    va_end(ap);
> +    return response;
> +}
> +
> +void qmp_fd_send(int fd, const char *fmt, ...)
> +{
> +    va_list ap;
> +
> +    va_start(ap, fmt);
> +    qmp_fd_sendv(fd, fmt, ap);
> +    va_end(ap);
> +}
> +
>  QDict *qtest_qmp(QTestState *s, const char *fmt, ...)
>  {
>      va_list ap;
> diff --git a/tests/libqtest.h b/tests/libqtest.h
> index ec42031..ecd9872 100644
> --- a/tests/libqtest.h
> +++ b/tests/libqtest.h
> @@ -818,4 +818,11 @@ static inline int64_t clock_set(int64_t val)
>   */
>  bool qtest_big_endian(void);
> 
> +
> +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, ...);
> +
>  #endif
> -- 
> 2.4.3
> 
>
diff mbox

Patch

diff --git a/tests/libqtest.c b/tests/libqtest.c
index e5188e0..11e541d 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -357,7 +357,7 @@  static void qmp_response(JSONMessageParser *parser, QList *tokens)
     qmp->response = (QDict *)obj;
 }
 
-QDict *qtest_qmp_receive(QTestState *s)
+QDict *qmp_fd_receive(int fd)
 {
     QMPResponseParser qmp;
     bool log = getenv("QTEST_LOG") != NULL;
@@ -368,7 +368,7 @@  QDict *qtest_qmp_receive(QTestState *s)
         ssize_t len;
         char c;
 
-        len = read(s->qmp_fd, &c, 1);
+        len = read(fd, &c, 1);
         if (len == -1 && errno == EINTR) {
             continue;
         }
@@ -388,12 +388,17 @@  QDict *qtest_qmp_receive(QTestState *s)
     return qmp.response;
 }
 
+QDict *qtest_qmp_receive(QTestState *s)
+{
+    return qmp_fd_receive(s->qmp_fd);
+}
+
 /**
  * Allow users to send a message without waiting for the reply,
  * in the case that they choose to discard all replies up until
  * a particular EVENT is received.
  */
-void qtest_async_qmpv(QTestState *s, const char *fmt, va_list ap)
+void qmp_fd_sendv(int fd, const char *fmt, va_list ap)
 {
     va_list ap_copy;
     QObject *qobj;
@@ -417,13 +422,25 @@  void qtest_async_qmpv(QTestState *s, const char *fmt, va_list ap)
             fprintf(stderr, "%s", str);
         }
         /* Send QMP request */
-        socket_send(s->qmp_fd, str, size);
+        socket_send(fd, str, size);
 
         QDECREF(qstr);
         qobject_decref(qobj);
     }
 }
 
+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);
@@ -432,6 +449,26 @@  QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap)
     return qtest_qmp_receive(s);
 }
 
+QDict *qmp_fd(int fd, const char *fmt, ...)
+{
+    va_list ap;
+    QDict *response;
+
+    va_start(ap, fmt);
+    response = qmp_fdv(fd, fmt, ap);
+    va_end(ap);
+    return response;
+}
+
+void qmp_fd_send(int fd, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    qmp_fd_sendv(fd, fmt, ap);
+    va_end(ap);
+}
+
 QDict *qtest_qmp(QTestState *s, const char *fmt, ...)
 {
     va_list ap;
diff --git a/tests/libqtest.h b/tests/libqtest.h
index ec42031..ecd9872 100644
--- a/tests/libqtest.h
+++ b/tests/libqtest.h
@@ -818,4 +818,11 @@  static inline int64_t clock_set(int64_t val)
  */
 bool qtest_big_endian(void);
 
+
+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, ...);
+
 #endif