Commit 0c460dac authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

libqtest: add qmp(fmt, ...) -> QDict* function 



Add a qtest qmp() function that returns the response object.  This
allows test cases to verify the result or to check for error responses.
It also allows waiting for QMP events.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarAndreas Färber <afaerber@suse.de>
parent 0d1aa05e

tests/libqtest.c

+52 −14
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 


#include "qemu/compiler.h"

#include "qemu/osdep.h"

#include "qapi/qmp/json-streamer.h"

#include "qapi/qmp/json-parser.h"



#define MAX_IRQ 256
@@ -291,16 +293,38 @@ redo: 
    return words;

}



void qtest_qmpv_discard_response(QTestState *s, const char *fmt, va_list ap)

typedef struct {

    JSONMessageParser parser;

    QDict *response;

} QMPResponseParser;



static void qmp_response(JSONMessageParser *parser, QList *tokens)

{

    QMPResponseParser *qmp = container_of(parser, QMPResponseParser, parser);

    QObject *obj;



    obj = json_parser_parse(tokens, NULL);

    if (!obj) {

        fprintf(stderr, "QMP JSON response parsing failed\n");

        exit(1);

    }



    g_assert(qobject_type(obj) == QTYPE_QDICT);

    g_assert(!qmp->response);

    qmp->response = (QDict *)obj;

}



QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap)

{

    bool has_reply = false;

    int nesting = 0;

    QMPResponseParser qmp;



    /* Send QMP request */

    socket_sendf(s->qmp_fd, fmt, ap);



    /* Receive reply */

    while (!has_reply || nesting > 0) {

    qmp.response = NULL;

    json_message_parser_init(&qmp.parser, qmp_response);

    while (!qmp.response) {

        ssize_t len;

        char c;
@@ -314,25 +338,39 @@ void qtest_qmpv_discard_response(QTestState *s, const char *fmt, va_list ap) 
            exit(1);

        }



        switch (c) {

        case '{':

            nesting++;

            has_reply = true;

            break;

        case '}':

            nesting--;

            break;

        json_message_parser_feed(&qmp.parser, &c, 1);

    }

    json_message_parser_destroy(&qmp.parser);



    return qmp.response;

}



QDict *qtest_qmp(QTestState *s, const char *fmt, ...)

{

    va_list ap;

    QDict *response;



    va_start(ap, fmt);

    response = qtest_qmpv(s, fmt, ap);

    va_end(ap);

    return response;

}



void qtest_qmpv_discard_response(QTestState *s, const char *fmt, va_list ap)

{

    QDict *response = qtest_qmpv(s, fmt, ap);

    QDECREF(response);

}



void qtest_qmp_discard_response(QTestState *s, const char *fmt, ...)

{

    va_list ap;

    QDict *response;



    va_start(ap, fmt);

    qtest_qmpv_discard_response(s, fmt, ap);

    response = qtest_qmpv(s, fmt, ap);

    va_end(ap);

    QDECREF(response);

}



const char *qtest_get_arch(void)

tests/libqtest.h

+37 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <stdbool.h>

#include <stdarg.h>

#include <sys/types.h>

#include "qapi/qmp/qdict.h"



typedef struct QTestState QTestState;
@@ -52,6 +53,15 @@ void qtest_quit(QTestState *s); 
 */

void qtest_qmp_discard_response(QTestState *s, const char *fmt, ...);



/**

 * qtest_qmp:

 * @s: #QTestState instance to operate on.

 * @fmt...: QMP message to send to qemu

 *

 * Sends a QMP message to QEMU and returns the response.

 */

QDict *qtest_qmp(QTestState *s, const char *fmt, ...);



/**

 * qtest_qmpv_discard_response:

 * @s: #QTestState instance to operate on.
@@ -62,6 +72,16 @@ void qtest_qmp_discard_response(QTestState *s, const char *fmt, ...); 
 */

void qtest_qmpv_discard_response(QTestState *s, const char *fmt, va_list ap);



/**

 * qtest_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 returns the response.

 */

QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap);



/**

 * qtest_get_irq:

 * @s: #QTestState instance to operate on.
@@ -330,6 +350,23 @@ static inline void qtest_end(void) 
    global_qtest = NULL;

}



/**

 * qmp:

 * @fmt...: QMP message to send to qemu

 *

 * Sends a QMP message to QEMU and returns the response.

 */

static inline QDict *qmp(const char *fmt, ...)

{

    va_list ap;

    QDict *response;



    va_start(ap, fmt);

    response = qtest_qmpv(global_qtest, fmt, ap);

    va_end(ap);

    return response;

}



/**

 * qmp_discard_response:

 * @fmt...: QMP message to send to qemu