mirror of https://github.com/proxmox/mirror_qemu
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: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Andreas Färber <afaerber@suse.de>master
parent
0d1aa05e9e
commit
0c460dac03
|
@ -30,6 +30,8 @@
|
||||||
|
|
||||||
#include "qemu/compiler.h"
|
#include "qemu/compiler.h"
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
|
#include "qapi/qmp/json-streamer.h"
|
||||||
|
#include "qapi/qmp/json-parser.h"
|
||||||
|
|
||||||
#define MAX_IRQ 256
|
#define MAX_IRQ 256
|
||||||
|
|
||||||
|
@ -291,16 +293,38 @@ redo:
|
||||||
return words;
|
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)
|
||||||
{
|
{
|
||||||
bool has_reply = false;
|
QMPResponseParser *qmp = container_of(parser, QMPResponseParser, parser);
|
||||||
int nesting = 0;
|
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)
|
||||||
|
{
|
||||||
|
QMPResponseParser qmp;
|
||||||
|
|
||||||
/* Send QMP request */
|
/* Send QMP request */
|
||||||
socket_sendf(s->qmp_fd, fmt, ap);
|
socket_sendf(s->qmp_fd, fmt, ap);
|
||||||
|
|
||||||
/* Receive reply */
|
/* Receive reply */
|
||||||
while (!has_reply || nesting > 0) {
|
qmp.response = NULL;
|
||||||
|
json_message_parser_init(&qmp.parser, qmp_response);
|
||||||
|
while (!qmp.response) {
|
||||||
ssize_t len;
|
ssize_t len;
|
||||||
char c;
|
char c;
|
||||||
|
|
||||||
|
@ -314,25 +338,39 @@ void qtest_qmpv_discard_response(QTestState *s, const char *fmt, va_list ap)
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (c) {
|
json_message_parser_feed(&qmp.parser, &c, 1);
|
||||||
case '{':
|
|
||||||
nesting++;
|
|
||||||
has_reply = true;
|
|
||||||
break;
|
|
||||||
case '}':
|
|
||||||
nesting--;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
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, ...)
|
void qtest_qmp_discard_response(QTestState *s, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
QDict *response;
|
||||||
|
|
||||||
va_start(ap, fmt);
|
va_start(ap, fmt);
|
||||||
qtest_qmpv_discard_response(s, fmt, ap);
|
response = qtest_qmpv(s, fmt, ap);
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
|
QDECREF(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *qtest_get_arch(void)
|
const char *qtest_get_arch(void)
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
#include "qapi/qmp/qdict.h"
|
||||||
|
|
||||||
typedef struct QTestState QTestState;
|
typedef struct QTestState QTestState;
|
||||||
|
|
||||||
|
@ -52,6 +53,15 @@ void qtest_quit(QTestState *s);
|
||||||
*/
|
*/
|
||||||
void qtest_qmp_discard_response(QTestState *s, const char *fmt, ...);
|
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:
|
* qtest_qmpv_discard_response:
|
||||||
* @s: #QTestState instance to operate on.
|
* @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);
|
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:
|
* qtest_get_irq:
|
||||||
* @s: #QTestState instance to operate on.
|
* @s: #QTestState instance to operate on.
|
||||||
|
@ -330,6 +350,23 @@ static inline void qtest_end(void)
|
||||||
global_qtest = NULL;
|
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:
|
* qmp_discard_response:
|
||||||
* @fmt...: QMP message to send to qemu
|
* @fmt...: QMP message to send to qemu
|
||||||
|
|
Loading…
Reference in New Issue