OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qtest: Factor out qtest_qmp_receive() 

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2014-02-21 20:55:30 +01:00
parent abc53733f3
commit 66e0c7b187
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/libqtest.c
View File

@ -345,14 +345,10 @@ static void qmp_response(JSONMessageParser *parser, QList *tokens)
qmp->response = (QDict *)obj;
}
QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap)
QDict *qtest_qmp_receive(QTestState *s)
{
QMPResponseParser qmp;
/* Send QMP request */
socket_sendf(s->qmp_fd, fmt, ap);
/* Receive reply */
qmp.response = NULL;
json_message_parser_init(&qmp.parser, qmp_response);
while (!qmp.response) {
@ -376,6 +372,15 @@ QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap)
return qmp.response;
}
QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap)
{
/* Send QMP request */
socket_sendf(s->qmp_fd, fmt, ap);
/* Receive reply */
return qtest_qmp_receive(s);
}
QDict *qtest_qmp(QTestState *s, const char *fmt, ...)
{
va_list ap;

18
tests/libqtest.h
View File

@ -82,6 +82,14 @@ void qtest_qmpv_discard_response(QTestState *s, const char *fmt, va_list ap);
*/
QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap);
/**
* qtest_receive:
* @s: #QTestState instance to operate on.
*
* Reads a QMP message from QEMU and returns the response.
*/
QDict *qtest_qmp_receive(QTestState *s);
/**
* qtest_get_irq:
* @s: #QTestState instance to operate on.
@ -366,6 +374,16 @@ QDict *qmp(const char *fmt, ...);
*/
void qmp_discard_response(const char *fmt, ...);
/**
* qmp_receive:
*
* Reads a QMP message from QEMU and returns the response.
*/
static inline QDict *qmp_receive(void)
{
return qtest_qmp_receive(global_qtest);
}
/**
* get_irq:
* @num: Interrupt to observe.