mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtest: add a few fd-level qmp helpers

Browse Source 
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>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Marc-André Lureau 2015-10-02 14:58:16 +02:00 committed by Michael Roth
parent 6eaeae37a5
commit dc47995e52
2 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tests/libqtest.c
View File

@ -356,7 +356,7 @@ static void qmp_response(JSONMessageParser *parser, QList *tokens)
qmp->response = (QDict *)obj; qmp->response = (QDict *)obj;
} }
QDict *qtest_qmp_receive(QTestState *s) QDict *qmp_fd_receive(int fd)
{ {
QMPResponseParser qmp; QMPResponseParser qmp;
bool log = getenv("QTEST_LOG") != NULL; bool log = getenv("QTEST_LOG") != NULL;
@ -367,7 +367,7 @@ QDict *qtest_qmp_receive(QTestState *s)
ssize_t len; ssize_t len;
char c; char c;
len = read(s->qmp_fd, &c, 1); len = read(fd, &c, 1);
if (len == -1 && errno == EINTR) { if (len == -1 && errno == EINTR) {
continue; continue;
} }
@ -387,12 +387,17 @@ QDict *qtest_qmp_receive(QTestState *s)
return qmp.response; 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, * Allow users to send a message without waiting for the reply,
* in the case that they choose to discard all replies up until * in the case that they choose to discard all replies up until
* a particular EVENT is received. * 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; va_list ap_copy;
QObject *qobj; QObject *qobj;
@ -416,13 +421,25 @@ void qtest_async_qmpv(QTestState *s, const char *fmt, va_list ap)
fprintf(stderr, "%s", str); fprintf(stderr, "%s", str);
} }
/* Send QMP request */ /* Send QMP request */
socket_send(s->qmp_fd, str, size); socket_send(fd, str, size);
QDECREF(qstr); QDECREF(qstr);
qobject_decref(qobj); 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) QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap)
{ {
qtest_async_qmpv(s, fmt, ap); qtest_async_qmpv(s, fmt, ap);
@ -431,6 +448,26 @@ QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap)
return qtest_qmp_receive(s); 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, ...) QDict *qtest_qmp(QTestState *s, const char *fmt, ...)
{ {
va_list ap; va_list ap;

7
tests/libqtest.h
View File

@ -851,4 +851,11 @@ static inline int64_t clock_set(int64_t val)
*/ */
bool qtest_big_endian(void); 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 #endif